Merge pull request #2962 from 2dos/final-changes-for-ballaam

Breaks older cosmetics packs

Author: theballaam96

archipelago.json

@@ -1,6 +1,6 @@
 {
     "minimum_ap_version": "0.6.5", 
-    "world_version": "1.4.20",
+    "world_version": "1.4.21",
     "authors": ["2dos", "AlmostSeagull", "Ballaam", "Green Bean", "Killklli", "Lrauq", "PoryGone", "Umed"],
     "version": 7,
     "compatible_version": 7,

archipelago/FillSettings.py

@@ -50,6 +50,7 @@
 )
 from randomizer.Enums.Items import Items as DK64RItems
 from randomizer.Enums.Types import Types
+from randomizer.Enums.Maps import Maps
 from randomizer.Enums.Enemies import Enemies
 from randomizer.Enums.Kongs import Kongs
 from randomizer.Enums.Levels import Levels
@@ -79,6 +80,20 @@ def get_default_settings() -> dict:
         "blocker_7": 8,
         "blocker_selection_behavior": BLockerSetting.normal_random,
         "blocker_text": 60,
+        "bosses_selected": [
+            Maps.JapesBoss,
+            Maps.AztecBoss,
+            Maps.FactoryBoss,
+            Maps.GalleonBoss,
+            Maps.FungiBoss,
+            Maps.CavesBoss,
+            Maps.CastleBoss,
+            Maps.KroolDonkeyPhase,
+            Maps.KroolDiddyPhase,
+            Maps.KroolLankyPhase,
+            Maps.KroolTinyPhase,
+            Maps.KroolChunkyPhase,
+        ],
         "bonus_barrel_auto_complete": False,
         "boss_location_rando": True,
         "cannons_require_blast": True,

archipelago/Logic.py

@@ -1236,15 +1236,21 @@ def hasMoveSwitchsanity(
             return kong_data and misc_abilities[data.kong]
         elif data.switch_type == SwitchType.GunSwitch:
             gun_abilities = [self.coconut, self.peanut, self.grape, self.feather, self.pineapple]
+            if data.kong == Kongs.any:
+                return self.HasGun(Kongs.any)
             return kong_data and gun_abilities[data.kong]
         elif data.switch_type == SwitchType.InstrumentPad:
             instrument_abilities = [self.bongos, self.guitar, self.trombone, self.saxophone, self.triangle]
+            if data.kong == Kongs.any:
+                return self.HasInstrument(Kongs.any)
             return kong_data and instrument_abilities[data.kong]
         elif data.switch_type == SwitchType.SlamSwitch:
             return kong_data and self.CanSlamSwitch(level, default_slam_level)
         elif data.switch_type == SwitchType.GunInstrumentCombo:
             gun_abilities = [self.coconut, self.peanut, self.grape, self.feather, self.pineapple]
             instrument_abilities = [self.bongos, self.guitar, self.trombone, self.saxophone, self.triangle]
+            if data.kong == Kongs.any:
+                return self.HasGun(Kongs.any) and self.HasInstrument(Kongs.any)
             return kong_data and gun_abilities[data.kong] and instrument_abilities[data.kong]
         elif data.switch_type == SwitchType.PushableButton:
             if data.kong == Kongs.diddy:

base-hack/Build/BuildEnums.py

@@ -922,6 +922,17 @@ class ExtraTextures(IntEnum):
     SpecialAPPearlSilver = auto()
     FoolsAPPearlBlack = auto()
     FoolsAPPearlSilver = auto()
+    DonkeyPadLeft = auto()
+    DonkeyPadRight = auto()
+    DiddyPadLeft = auto()
+    DiddyPadRight = auto()
+    LankyPadLeft = auto()
+    LankyPadRight = auto()
+    ChunkyPadLeft = auto()
+    ChunkyPadRight = auto()
+    AnyGunFront = auto()
+    AnyInsLeft = auto()
+    AnyInsRight = auto()
 
 
 class MoveTypes(IntEnum):

base-hack/Build/build.py

@@ -28,7 +28,7 @@
 from convertSetup import convertSetup
 from cutscene_builder import buildScripts
 from end_seq_writer import createSquishFile, createTextFile
-from generate_yellow_wrinkly import generateYellowWrinkly, generateSprintSwitch, fixFactoryDoor, modifyOtherWrinklyDoors
+from generate_yellow_wrinkly import generateYellowWrinkly, generateSprintSwitch, fixFactoryDoor, modifyOtherWrinklyDoors, buildAnyKongSwitches
 from helm_doors import getHelmDoorModel
 from instance_script_maker import BuildInstanceScripts
 from model_shrink import shrinkModel
@@ -67,6 +67,7 @@
 modifyOtherWrinklyDoors()
 generateSprintSwitch()
 fixFactoryDoor()
+buildAnyKongSwitches()
 generateIceMaze()
 
 getHelmDoorModel(6022, 6023, "crown_door.bin")
@@ -315,6 +316,8 @@
     File(name="Melon Model", pointer_table_index=TableNames.ModelTwoGeometry, file_index=606, source_file="melon_3d_om2.bin", do_not_extract=True, do_not_delete_source=True),
     File(name="Sprint Switch", pointer_table_index=TableNames.ModelTwoGeometry, file_index=611, source_file="assets/Gong/sprint_switch.bin", do_not_extract=True, do_not_delete_source=True),
     File(name="Factory Door", pointer_table_index=TableNames.ModelTwoGeometry, file_index=664, source_file="assets/Gong/factory_door.bin", do_not_extract=True, do_not_delete_source=True),
+    File(name="Any Gun Switch", pointer_table_index=TableNames.ModelTwoGeometry, file_index=0x296, source_file="assets/Gong/any_gun.bin", do_not_extract=True, do_not_delete_source=True),
+    File(name="Any Instrument Pad", pointer_table_index=TableNames.ModelTwoGeometry, file_index=0x297, source_file="assets/Gong/any_ins.bin", do_not_extract=True, do_not_delete_source=True),
     File(name="21132 Sign", pointer_table_index=TableNames.TexturesGeometry, file_index=0x7CA, source_file="21132_tex.bin", target_size=2 * 64 * 32),
     File(name="Crypt Lever Sign 1", pointer_table_index=TableNames.TexturesGeometry, file_index=0x999, source_file="cryptlev1_tex.bin", target_size=2 * 64 * 32),
     File(name="Crypt Lever Sign 2", pointer_table_index=TableNames.TexturesGeometry, file_index=0x99A, source_file="cryptlev2_tex.bin", target_size=2 * 64 * 32),
@@ -1916,6 +1919,33 @@
         )
     )
 
+# Pads
+pad_data = {
+    "donkey_pad_left": ExtraTextures.DonkeyPadLeft,
+    "donkey_pad_right": ExtraTextures.DonkeyPadRight,
+    "diddy_pad_left": ExtraTextures.DiddyPadLeft,
+    "diddy_pad_right": ExtraTextures.DiddyPadRight,
+    "lanky_pad_left": ExtraTextures.LankyPadLeft,
+    "lanky_pad_right": ExtraTextures.LankyPadRight,
+    "chunky_pad_left": ExtraTextures.ChunkyPadLeft,
+    "chunky_pad_right": ExtraTextures.ChunkyPadRight,
+    "any_gun": ExtraTextures.AnyGunFront,
+    "any_ins_left": ExtraTextures.AnyInsLeft,
+    "any_ins_right": ExtraTextures.AnyInsRight,
+}
+
+for tex, index in pad_data.items():
+    file_dict.append(
+        File(
+            name=f"Pad ({int(index)})",
+            pointer_table_index=TableNames.TexturesGeometry,
+            file_index=getBonusSkinOffset(index),
+            source_file=f"assets/displays/{tex}.png",
+            texture_format=TextureFormat.RGBA5551,
+            do_not_extract=True,
+        )
+    )
+
 # Force all geo files to not be compressed
 expanded_tables = {
     TableNames.MapGeometry: list(range(216)),
@@ -2484,6 +2514,17 @@
         "white_special_chars",
         "blank",
         "fakefairy",
+        "donkey_pad_left",
+        "donkey_pad_right",
+        "diddy_pad_left",
+        "diddy_pad_right",
+        "lanky_pad_left",
+        "lanky_pad_right",
+        "chunky_pad_left",
+        "chunky_pad_right",
+        "any_gun",
+        "any_ins_left",
+        "any_ins_right",
     ]
     for b in barrel_skins:
         displays.extend([f"barrel_{b}_0", f"barrel_{b}_1", f"dirt_reward_{b}", f"shop_{b}"])

base-hack/Build/createComplexImages.py

@@ -656,6 +656,70 @@ def bump_saturation(image: Image, factor: float) -> Image:
             px[x, y] = (0, 0, 0, 0)  # fully transparent
 font_im.save(f"{disp_dir}white_special_chars.png")
 
+pad_warp_eq = {
+    "donkey": 5,
+    "diddy": 4,
+    "lanky": 1,
+    "chunky": 2,
+}
+
+
+def pointInPolygon(x, y, polygon):
+    """Define whether an xy point is within a concave or concave polygon."""
+    inside = False
+    n = len(polygon)
+
+    j = n - 1
+    for i in range(n):
+        xi, yi = polygon[i]
+        xj, yj = polygon[j]
+
+        intersect = ((yi > y) != (yj > y)) and (x < (xj - xi) * (y - yi) / (yj - yi) + xi)
+
+        if intersect:
+            inside = not inside
+
+        j = i
+
+    return inside
+
+
+for kong, eq_warp in pad_warp_eq.items():
+    for seg in ("left", "right"):
+        pad_im = Image.open(f"{hash_dir}ins_pad_{seg}.png")
+        color_im = Image.open(f"{hash_dir}w{eq_warp}_pad_{seg}.png")
+        apexes = [
+            [32, 6],
+            [12, 14],
+            [6, 32],
+            [13, 50],
+            [32, 58],
+        ]
+        if seg == "right":
+            for i, a in enumerate(apexes):
+                apexes[i][0] = 32 - apexes[i][0]
+        px = pad_im.load()
+        c_px = color_im.load()
+        for y in range(64):
+            for x in range(32):
+                if pointInPolygon(x, y, apexes):
+                    px[x, y] = c_px[x, y]
+        pad_im.save(f"{disp_dir}{kong}_pad_{seg}.png")
+
+# Any kong activators
+gun_base = Image.open(f"{hash_dir}gun_face_base.png")
+crate_left = Image.open(f"{hash_dir}standard_crate_0.png").transpose(Image.Transpose.FLIP_TOP_BOTTOM)
+crate_right = Image.open(f"{hash_dir}standard_crate_1.png").transpose(Image.Transpose.FLIP_TOP_BOTTOM)
+crate_im = Image.new(mode="RGBA", size=(64, 64))
+crate_im.paste(crate_left, (0, 0), crate_left)
+crate_im.paste(crate_right, (32, 0), crate_right)
+crate_im = crate_im.resize((32, 32))
+gun_base.paste(crate_im, (0, -6), crate_im)
+gun_base.crop((0, 0, 32, 32)).save(f"{disp_dir}any_gun.png")
+headphones_im = Image.open(f"{hash_dir}headphones.png").transpose(Image.Transpose.FLIP_TOP_BOTTOM)
+headphones_im.crop((0, 0, 20, 40)).resize((32, 64)).save(f"{disp_dir}any_ins_left.png")
+headphones_im.crop((20, 0, 40, 40)).resize((32, 64)).save(f"{disp_dir}any_ins_right.png")
+
 # AP Pearls
 ap_colors = [
     "#FB9152",  # ORANGE
@@ -932,6 +996,17 @@ def alterWood(image):
     "funky_face_3.png",
     "snide_face.png",
     "white_special_chars.png",
+    "ins_pad_left.png",
+    "ins_pad_right.png",
+    "w5_pad_left.png",
+    "w5_pad_right.png",
+    "w4_pad_left.png",
+    "w4_pad_right.png",
+    "w1_pad_left.png",
+    "w1_pad_right.png",
+    "w2_pad_left.png",
+    "w2_pad_right.png",
+    "gun_face_base.png",
 ]
 for kong in kongs:
     for x in range(2):

base-hack/Build/generate_yellow_wrinkly.py

@@ -11,6 +11,8 @@
 hint_file = "assets/Gong/hint_door.bin"
 switch_file = "assets/Gong/sprint_switch.bin"
 door_file = "assets/Gong/factory_door.bin"
+any_gun_file = "assets/Gong/any_gun.bin"
+any_ins_file = "assets/Gong/any_ins.bin"
 
 image_offsets = {
     Kong.DK: 0xF0,
@@ -166,3 +168,38 @@ def fixFactoryDoor():
                 new = old + inc
                 fg.seek(offset)
                 fg.write(new.to_bytes(4, "big"))
+
+
+def buildAnyKongSwitches():
+    """Build the prop models for the any kong switches."""
+    with open(ROMName, "rb") as fh:
+        gun_f = ROMPointerFile(fh, TableNames.ModelTwoGeometry, 0x125)
+        fh.seek(gun_f.start)
+        dec = zlib.decompress(fh.read(gun_f.size), 15 + 32)
+        with open(any_gun_file, "wb") as fg:
+            fg.write(dec)
+
+    with open(any_gun_file, "r+b") as switch_f:
+        switch_f.seek(0x22C)
+        switch_f.write((getBonusSkinOffset(ExtraTextures.AnyGunFront)).to_bytes(4, "big"))
+
+    with open(ROMName, "rb") as fh:
+        ins_f = ROMPointerFile(fh, TableNames.ModelTwoGeometry, 0xAB)
+        fh.seek(ins_f.start)
+        dec = zlib.decompress(fh.read(ins_f.size), 15 + 32)
+        with open(any_ins_file, "wb") as fg:
+            fg.write(dec)
+
+    with open(any_ins_file, "r+b") as pad_f:
+        pad_f.seek(0x324)
+        pad_f.write((getBonusSkinOffset(ExtraTextures.AnyInsLeft)).to_bytes(4, "big"))
+        pad_f.seek(0x384)
+        pad_f.write((getBonusSkinOffset(ExtraTextures.AnyInsRight)).to_bytes(4, "big"))
+        pad_f.seek(0x50)
+        floor_start = int.from_bytes(pad_f.read(4), "big")
+        pad_f.seek(floor_start)
+        floor_count = int.from_bytes(pad_f.read(4), "big")
+        for x in range(floor_count):
+            tri_start = floor_start + 0x10 + (0x18 * x)
+            pad_f.seek(tri_start + 0x15)
+            pad_f.write((2).to_bytes(1, "big"))

base-hack/Build/getModelSkeleton.py

@@ -102,11 +102,7 @@ def getSkeleton(model_index: int, model_file: str = None):
         image.save(file_name)
 
 
-getSkeleton(3)
-getSkeleton(0x10)
-getSkeleton(0x48)
-getSkeleton(0x67)
-getSkeleton(0xDA)
-getSkeleton(8)
-getSkeleton(0x12)
-getSkeleton(0x11)
+for x in range(0xEC):
+    if x in (68, 132, 151, 213):
+        continue
+    getSkeleton(x)

base-hack/Build/pull_images_from_rom.py

@@ -120,6 +120,17 @@ def __init__(self, name: str, format: str, table: int, index: int, width: int, h
     ImageData("bandit_coconut", TextureFormat.RGBA5551, TableNames.TexturesGeometry, 0x12E3, 40, 51, False, False),
     ImageData("bandit_melon", TextureFormat.RGBA5551, TableNames.TexturesGeometry, 0x12E4, 48, 42, False, False),
     ImageData("bandit_pineapple", TextureFormat.RGBA5551, TableNames.TexturesGeometry, 0x12E5, 32, 48, False, False),
+    ImageData("ins_pad_left", TextureFormat.RGBA5551, TableNames.TexturesGeometry, 0xBC5, 32, 64, False, False),
+    ImageData("ins_pad_right", TextureFormat.RGBA5551, TableNames.TexturesGeometry, 0xBC4, 32, 64, False, False),
+    ImageData("w5_pad_left", TextureFormat.RGBA5551, TableNames.TexturesGeometry, 0xDEE, 32, 64, False, False),
+    ImageData("w5_pad_right", TextureFormat.RGBA5551, TableNames.TexturesGeometry, 0xDEF, 32, 64, False, False),
+    ImageData("w4_pad_left", TextureFormat.RGBA5551, TableNames.TexturesGeometry, 0xDF4, 32, 64, False, False),
+    ImageData("w4_pad_right", TextureFormat.RGBA5551, TableNames.TexturesGeometry, 0xDF5, 32, 64, False, False),
+    ImageData("w1_pad_left", TextureFormat.RGBA5551, TableNames.TexturesGeometry, 0xDF9, 32, 64, False, False),
+    ImageData("w1_pad_right", TextureFormat.RGBA5551, TableNames.TexturesGeometry, 0xDFA, 32, 64, False, False),
+    ImageData("w2_pad_left", TextureFormat.RGBA5551, TableNames.TexturesGeometry, 0xDF6, 32, 64, False, False),
+    ImageData("w2_pad_right", TextureFormat.RGBA5551, TableNames.TexturesGeometry, 0xDF7, 32, 64, False, False),
+    ImageData("gun_face_base", TextureFormat.RGBA5551, TableNames.TexturesGeometry, 0xC20, 32, 32, False, False),
 ]
 
 shop_owners = {

base-hack/asm/hookcode/modeltwo.asm

@@ -98,4 +98,14 @@ ModelTwoToSetupState:
     sb $t9, 0x11 ($v1)
     lbu $t9, 0x8F ($t8)
     j 0x8063BA0C
-    sb $t9, 0x12 ($v1)
+    sb $t9, 0x12 ($v1)
+
+AnyInsPadCheck:
+    addiu $a1, $zero, 0x297  ; Any instrument pad
+    beq $a1, $v0, AnyInsPadCheck_finish
+    addiu $v1, $zero, 1
+    or $v1, $zero, $zero
+
+    AnyInsPadCheck_finish:
+        j 0x806E5644
+        sltiu $at, $t7, 5