Merge branch 'dev' of https://github.com/GreenestBeen/DK64-Randomizer into dev

Author: GreenestBeen

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = False
-current_version = 5.7.53
+current_version = 5.7.55
 
 [bumpversion:file:version.py]
 search = version = "{current_version}"

archipelago/Logic.py

@@ -1710,7 +1710,7 @@ def CanAccessKRool(self):
             Events.CastleKeyTurnedIn,
             Events.HelmKeyTurnedIn,
         ]
-        if self.settings.k_rool_vanilla_requirement:
+        if self.settings.win_condition_item == WinConditionComplex.get_keys_3_and_8:
             required_base_keys = [
                 Events.FactoryKeyTurnedIn,
                 Events.HelmKeyTurnedIn,

archipelago/Options.py

@@ -37,7 +37,7 @@ class Goal(Choice):
     - pearls: Find a certain number of Pearls to win. See goal_quantity option for more info.
     - bosses: Defeat a certain number of bosses to win. See goal_quantity option for more info.
     - bonuses: Complete a certain number of Bonus Barrels to win. Automatically disables auto_complete_bonus_barrels if set. See goal_quantity option for more info.
-    - treasure_hurry: Run down the timer by collecting treasure! You win when the timer reaches 0.
+    - treasure_hurry: Run down the timer by collecting treasure! You win when the timer reaches 0. If you beat Helm, the wincon automatically changes to beating K. Rool.
     - krools_challenge: K. Rool's ship does not spawn until you collect All keys, Defeat All bosses, Play all Bonus Barrels, and collect All Blueprints.
     - kill_the_rabbit: Kill the rabbit in Chunky's igloo in Caves. Turn it to Ash. Simple as that.
     """

base-hack/assets/displays/treasurechest.png

@@ -236,7 +236,6 @@ extern void checkSeedVictory(void);
 extern void checkVictory_flaghook(int flag);
 extern void winRabbitSeed(int song, float volume);
 extern void safeguardRabbitReward(void);
-extern int canAccessKroolsChallenge(void);
 extern int canAccessWinCondition(void);
 extern void FileProgressInitSub(int file, int shuffle);
 extern void handleFileSelectSprites(void* paad, void* sprite, int x, int y, float scale, int unk0, int control);
@@ -389,6 +388,9 @@ extern void HelmLobbyGoneCode(behaviour_data* behaviour_pointer, int index);
 extern void setObjectOpacity(behaviour_data* behaviour_pointer, int opacity);
 extern int standingOnM2Object(int index);
 
+extern void renderSparkles(float scale);
+extern void renderBoulderSparkles(actorData *actor);
+
 extern int getItemCountReq(requirement_item item);
 extern int isItemRequirementSatisfied(ItemRequirement* req);
 

base-hack/include/global.h

@@ -138,7 +138,7 @@ typedef struct varspace {
 	/* 0x1C6 */ RandomSwitchesSetting switchsanity; // Size 0x15
 	/* 0x1DB */ unsigned char fungi_time_of_day_setting; // See fungi_time enum
 	/* 0x1DC */ unsigned char galleon_water_raised;
-	/* 0x1DD */ unsigned char krool_requirements; // K Rool bitfield 8765 4321
+	/* 0x1DD */ unsigned char unk_1dd;
 	/* 0x1DE */ RemovedBarriers removed_barriers; // Size: 2
 	/* 0x1E0 */ FasterChecks faster_checks; // Size: 1
 	/* 0x1E1 */ char big_head_mode; // 0 = off, 1 = on, 2 = small head

base-hack/include/variable_space_structs.h

@@ -495,19 +495,15 @@ int change_object_scripts(behaviour_data* behaviour_pointer, int id, int index,
 					}
 				} else if (param2 == K_ROOL_SHIP) {
 					// Check access requirements based on ship spawn method
-					if (Rando.win_condition_spawns_ship == 1) {
+					if (Rando.win_condition_spawns_ship) {
 						// Win condition-based access
 						if (!canAccessWinCondition()) {
 							return 0;
 						}
 					} else {
 						// Key-based access
-						for (int i = 0; i < 8; i++) {
-							if (Rando.krool_requirements & (1 << i)) {
-								if (!getItemCount_new(REQITEM_KEY, i, 0)) {
-									return 0;
-								}
-							}
+						if (!getItemCount_new(REQITEM_KEY, -1, 0) < 8) {
+							return 0;
 						}
 					}
 					return 1;

base-hack/src/instances/instances.c

@@ -109,6 +109,27 @@ float getRNGWithinRange(float min, float max) {
     return min + offset;
 }
 
+void renderSparkles(float scale) {
+    *(char*)(0x807FDB18) = 1; // Adjust Z-Indexing
+    *(short*)(0x807FDB36) = 4; // Fix rendering
+    float x_offset = getRNGWithinRange(-20.f, 20.0f);
+    float y_offset = getRNGWithinRange(5.0f, 25.0f);
+    float z_offset = getRNGWithinRange(-20.f, 20.0f);
+    x_offset *= scale;
+    y_offset *= scale;
+    z_offset *= scale;
+    int sprite = 0x5E;
+    if (getRNGLower31() & 1) {
+        sprite = 0x69;
+    }
+    displaySpriteAtXYZ(
+        sprite_table[sprite],
+        0.6f,
+        CurrentActorPointer_0->xPos + x_offset,
+        CurrentActorPointer_0->yPos + y_offset,
+        CurrentActorPointer_0->zPos + z_offset);
+}
+
 void indicateCollectionStatus(void) {
     *(char*)(0x807F94AE) = 0;
     *(char*)(0x807F94AF) = 0;
@@ -125,21 +146,7 @@ void indicateCollectionStatus(void) {
     if (!canSpawnEnemyReward()) {
         return;
     }
-    *(char*)(0x807FDB18) = 1; // Adjust Z-Indexing
-    *(short*)(0x807FDB36) = 4; // Fix rendering
-    float x_offset = getRNGWithinRange(-20.f, 20.0f);
-    float y_offset = getRNGWithinRange(5.0f, 25.0f);
-    float z_offset = getRNGWithinRange(-20.f, 20.0f);
-    int sprite = 0x5E;
-    if (getRNGLower31() & 1) {
-        sprite = 0x69;
-    }
-    displaySpriteAtXYZ(
-        sprite_table[sprite],
-        0.6f,
-        CurrentActorPointer_0->xPos + x_offset,
-        CurrentActorPointer_0->yPos + y_offset,
-        CurrentActorPointer_0->zPos + z_offset);
+    renderSparkles(1.0f);
 }
 
 

base-hack/src/item rando/enemy_items.c

@@ -300,23 +300,28 @@ void* updateKegIDs(int actor, float x, float y, float z) {
     return spawnActorAtXYZ(actor, x, y, z);
 }
 
-void spawnBoulderObject(actorData *actor) {
-    int index = getBoulderIndex();
+int isValidBoulderObject(int index) {
     if (index < 0) {
-        return;
+        return 0;
     }
     if (HoldableSpawnBitfield & (1 << index)) {
-        return;
+        return 0;
     }
     int flag = FLAG_GRABBABLES_DESTROYED + index;
     if (checkFlag(flag, FLAGTYPE_PERMANENT)) {
-        return;
+        return 0;
     }
     int item = getBoulderItem(index);
-    if (!item) {
-        return;
-    }
     if (item == NEWACTOR_NULL) {
+        return 0;
+    }
+    return item;
+}
+
+void spawnBoulderObject(actorData *actor) {
+    int index = getBoulderIndex();
+    int item = isValidBoulderObject(index);
+    if (!item) {
         return;
     }
     int cutscene = 1;
@@ -328,8 +333,26 @@ void spawnBoulderObject(actorData *actor) {
         actor->yPos,
         actor->zPos,
         0, cutscene,
-        flag, 0,
+        FLAG_GRABBABLES_DESTROYED + index, 0,
         boulder_item_table[index].level,
         boulder_item_table[index].kong);
     HoldableSpawnBitfield |= (1 << index);
+}
+
+void renderBoulderSparkles(actorData *actor) {
+    unkBonusFunction(actor);
+    int index = getBoulderIndex();
+    int item = isValidBoulderObject(index);
+    if (!item) {
+        return;
+    }
+    int timer = ObjectModel2Timer + (index * 5);
+    if (timer % 10) {
+        return;
+    }
+    float scale = 1.0f;
+    if (index == GRABBABLE_CAVES_LARGE) {
+        scale = 3.0f;
+    }
+    renderSparkles(scale);
 }

base-hack/src/item rando/spawning.c

@@ -62,26 +62,17 @@ void SpeedUpMusic(void) {
         return;
     }
     win_conditions win_con = Rando.win_condition;
-    if (win_con == GOAL_KROOLS_CHALLENGE) {
-        if (!canAccessKroolsChallenge()) {
+    if (Rando.win_condition_spawns_ship) {
+        if (!canAccessWinCondition()) {
             return;
         }
-    } else {
-        requirement_item win_con_item = Rando.win_condition_extra.item;
+    } else if (win_con == GOAL_CUSTOMITEM)  {
         int win_con_count = Rando.win_condition_extra.count;
-        // Checking items
-        if (win_con == GOAL_KROOL) {
-            win_con_item = REQITEM_KEY;
-            win_con_count = 9; // Triggers upon picking up the 8th key
-        } else if (win_con != GOAL_CUSTOMITEM) {
-            // Goal is ineligible for speed up
-            return;
-        }
         if (win_con_count < 2) {
             // Doesn't work for 1-item win conditions
             return;
         }
-        int item_count = getItemCountReq(win_con_item);
+        int item_count = getItemCountReq(Rando.win_condition_extra.item);
         if (item_count != (win_con_count - 1)) {
             return;
         }