Merge pull request #216 from AmProsius/bug216

Digger doesn't repair hut
AmProsius · Apr 2, 2021 · c5097df · c5097df
2 parents 4d01a96 + b6fcdf1
commit c5097df
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@
 * Fix [#183](https://g1cp.org/issues/183): Corristo no longer offers to sell a High Robe of Fire if the player already obtained one.
 * Fix [#214](https://g1cp.org/issues/214): Graham now correctly sits at the campfire in the evening.
 * Fix [#215](https://g1cp.org/issues/215): Guy now correctly sits at the arena in the evening.
+* Fix [#216](https://g1cp.org/issues/216): A digger now correctly repairs his hut during daytime.
 
 ## [v1.0.0](https://github.com/AmProsius/gothic-1-community-patch/releases/tag/v1.0.0) (2021-03-15)
 ### General

diff --git a/docs/changelog_de.md b/docs/changelog_de.md
@@ -32,6 +32,7 @@
 * Fix [#183](https://g1cp.org/issues/183): Corristo bietet nun keine Große Feuerrobe mehr an, wenn der Spieler bereits eine erworben hat.
 * Fix [#214](https://g1cp.org/issues/214): Graham sitzt nun korrekt abends am Lagerfeuer.
 * Fix [#215](https://g1cp.org/issues/215): Guy sitzt nun korrekt abends bei der Arena.
+* Fix [#216](https://g1cp.org/issues/216): Ein Buddler repariert jetzt korrekt tagsüber seine Hütte.
 
 ## [v1.0.0](https://github.com/AmProsius/gothic-1-community-patch/releases/tag/v1.0.0) (2021-03-15)
 ### General

diff --git a/src/Ninja/G1CP/Content/Fixes/Session/fix216_DiggerDailyRoutine.d b/src/Ninja/G1CP/Content/Fixes/Session/fix216_DiggerDailyRoutine.d
@@ -0,0 +1,7 @@
+/*
+ * #216 Digger doesn't repair hut
+ */
+func int G1CP_216_DiggerDailyRoutine() {
+    var int funcId; funcId = MEM_GetSymbolIndex("Rtn_start_506");
+    return (G1CP_ReplacePushStr(funcId, "OCR_Hut_15", "OCR_HUT_15") > 0);
+};
diff --git a/src/Ninja/G1CP/Content/Tests/test216.d b/src/Ninja/G1CP/Content/Tests/test216.d
@@ -0,0 +1,14 @@
+/*
+ * #216 Digger doesn't repair hut
+ *
+ * There does not seem an easy way to test this fix programmatically, so this test relies on manual confirmation.
+ *
+ * Expected behavior: The Digger will repair his hut shortly after triggering this test.
+ */
+func void G1CP_Test_216() {
+    if (G1CP_TestsuiteAllowManual) {
+        // Set time and place
+        Wld_SetTime(11, 0);
+        AI_Teleport(hero, "OCR_HUT_15");
+    };
+};
diff --git a/src/Ninja/G1CP/Content/patchInit.d b/src/Ninja/G1CP/Content/patchInit.d
@@ -84,6 +84,7 @@ func void Ninja_G1CP_Menu(var int menuPtr) {
         G1CP_201_DE_AncientOreArmorText();              // #201
         G1CP_214_GrahamDailyRoutine();                  // #214
         G1CP_215_GuyDailyRoutine();                     // #215
+        G1CP_216_DiggerDailyRoutine();                  // #216
     };
 };
 

diff --git a/src/Ninja/G1CP/Content_G1.src b/src/Ninja/G1CP/Content_G1.src
@@ -105,6 +105,7 @@ Content\Fixes\Session\fix200_DE_ImprovedOreArmorText.d
 Content\Fixes\Session\fix201_DE_AncientOreArmorText.d
 Content\Fixes\Session\fix214_GrahamDailyRoutine.d
 Content\Fixes\Session\fix215_GuyDailyRoutine.d
+Content\Fixes\Session\fix216_DiggerDailyRoutine.d
 
 // Game save fixes
 Content\Fixes\Gamesave\fix037_LogEntryGravoMerchant.d
@@ -199,6 +200,7 @@ Content\Tests\test200.d
 Content\Tests\test201.d
 Content\Tests\test214.d
 Content\Tests\test215.d
+Content\Tests\test216.d
 
 // Initialization
 Content\initPre.d