Merge branch 'dev' into archipelago-setup

Author: theballaam96

.bumpversion.cfg

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

ap_version.py

@@ -1,3 +1,3 @@
 """Holds the version for Archipelago."""
 
-version = "1.0.20"
+version = "1.0.21"

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

@@ -298,7 +298,7 @@ void handleArchipelagoFeed(void) {
             }
         }
     }
-    ap_info.can_die = cc_allower_generic() && cc_allower_spawnkop();
+    ap_info.can_die = canDie();
     if (CutsceneActive > 1) {
         ap_info.can_die = 0;
     }
@@ -310,6 +310,28 @@ void handleArchipelagoFeed(void) {
     }
 }
 
+int canDie(void) {
+    // Check if the spawn kop CC effect can be triggered to simulate death without issues
+    if(!cc_allower_generic()){
+        // No cc effects in general would be allowed
+        return 0;
+    }
+    int level = levelIndexMapping[CurrentMap];
+    if(level == LEVEL_BONUS || level == LEVEL_SHARED){
+        // In a bonus/shared map
+        return 0;
+    }
+    if(!cc_allower_spawnkop()){
+        // This cc effect is already active
+        return 0;
+    }
+    if (TBVoidByte & 0x30 == 0) {
+        // In a tag barrel. Kops hate this one trick.
+        return 0;
+    }
+    return 1;
+}
+
 void sendDeath(void) {
     if (isAPEnabled()) {
         if (!isActorLoaded(CUSTOM_ACTORS_START + NEWACTOR_KOPDUMMY)) {

randomizer/CompileHints.py

@@ -3258,7 +3258,25 @@ def IsMultipathHintTooLong(message):
         if character in measure_message_size:
             measure_message_size = measure_message_size.replace(character, "")
     measure_message_size_nospace = measure_message_size.replace(" ", "")
-    return len(message) > 255 or len(measure_message_size) > 150 or len(measure_message_size_nospace) > 125
+    # Also account for the fact that words are kept together when splitting across lines
+    cutOff_1 = getNumberOfCutoffCharacters(measure_message_size, 50)
+    cutOff_2 = getNumberOfCutoffCharacters(measure_message_size[(50 - cutOff_1) :], 50)
+    effective_length = len(measure_message_size) + cutOff_1 + cutOff_2
+    return len(message) > 255 or effective_length > 150 or len(measure_message_size_nospace) > 125
+
+
+def getNumberOfCutoffCharacters(message, number):
+    """Determine how many characters early a line would get cut off."""
+    if number < 2 or len(message) < (number - 1):
+        return 0
+    index = number - 1
+    initial_index = index
+    while message[index] != " ":
+        index -= 1
+        if index == 0:
+            index = initial_index
+            break
+    return initial_index - index
 
 
 def AssociateHintsWithFlags(spoiler):

randomizer/Lists/CustomLocations.py

@@ -377,6 +377,7 @@ class LocationTypes(IntEnum):
             rot_y=3305,
             max_size=64,
             logic_region=Regions.JapesUselessSlope,
+            banned_types=[LocationTypes.MelonCrate],
             group=2,
         ),
         CustomLocation(

randomizer/Logic.py

@@ -943,7 +943,8 @@ def HintAccess(self, location, region_id):
         # The only weird exception: vanilla Fungi Lobby hint doors only check for Chunky, not the current Kong, and all besides Chunky's needs grab
         if not self.settings.wrinkly_location_rando and not self.settings.remove_wrinkly_puzzles and region_id == RegionEnum.FungiForestLobby:
             return self.chunky and (location.kong == Kongs.chunky or (self.donkey and self.grab))
-        return self.HasKong(location.kong)
+        # Last step: either have the kong or have Kongless Hint Doors enabled
+        return self.HasKong(location.kong) or self.settings.wrinkly_available
 
     def CanBuy(self, location, buy_empty=False):
         """Check if there are enough coins to purchase this location."""