diff --git a/__init__.py b/__init__.py index 9a3951d01..d131e9f28 100644 --- a/__init__.py +++ b/__init__.py @@ -842,11 +842,11 @@ def _generate_archipelago_prices(self): # Constants MAX_COINS = { - Kongs.donkey: 178, + Kongs.donkey: 179, Kongs.diddy: 183, Kongs.lanky: 190, Kongs.tiny: 198, - Kongs.chunky: 219, + Kongs.chunky: 224, } PRICE_PERCENTAGES = { diff --git a/ap_version.py b/ap_version.py index 5313d3eec..381122ed6 100644 --- a/ap_version.py +++ b/ap_version.py @@ -1,3 +1,3 @@ """Holds the version for Archipelago.""" -version = "1.4.11" +version = "1.4.12" diff --git a/base-hack/src/item rando/ice_trap.c b/base-hack/src/item rando/ice_trap.c index 23a50af0d..51418674a 100644 --- a/base-hack/src/item rando/ice_trap.c +++ b/base-hack/src/item rando/ice_trap.c @@ -662,6 +662,11 @@ int canLoadIceTrap(ICE_TRAP_TYPES trap_type) { } } } + if (trap_type == ICETRAP_ANIMALS) { + if (Player->characterID >= 6) { + return 0; + } + } return 1; } diff --git a/randomizer/CollectibleLogicFiles/GloomyGalleon.py b/randomizer/CollectibleLogicFiles/GloomyGalleon.py index a280414ba..505e33ecf 100644 --- a/randomizer/CollectibleLogicFiles/GloomyGalleon.py +++ b/randomizer/CollectibleLogicFiles/GloomyGalleon.py @@ -159,5 +159,6 @@ Collectible(Collectibles.coin, Kongs.tiny, lambda _: True, None, 2), ], Regions.TriangleShip: [ + Collectible(Collectibles.coin, Kongs.chunky, lambda _: True, None, 3) ], } diff --git a/randomizer/Fill.py b/randomizer/Fill.py index 240cf4ba8..66950fdf3 100644 --- a/randomizer/Fill.py +++ b/randomizer/Fill.py @@ -551,36 +551,61 @@ def GetAccessibleLocations( def VerifyMinimalLogic(spoiler: Spoiler) -> bool: """Verify a world in the context of minimal logic.""" - # Key 5 not in Level 7 with non-LZR level_7 = None + level_7_lobby_map = None if spoiler.settings.shuffle_loading_zones != ShuffleLoadingZones.all: # Non-LZR - level_7 = Levels.CreepyCastle if spoiler.settings.shuffle_loading_zones == ShuffleLoadingZones.levels: - level_7 = spoiler.settings.level_order[6] - - # Kongs not in shops tied to them - kong_shop_locations = [ - [], # DK - [], # Diddy - [], # Lanky - [], # Tiny - [], # Chunky - ] - for level, shop_level_data in ShopLocationReference.items(): - for vendor, shop_vendor_data in shop_level_data.items(): - for kong_idx, kong_loc in enumerate(shop_vendor_data): - if kong_idx < 5: - kong_shop_locations[kong_idx].append(kong_loc) + # In level shuffle, check level 7 + level_7 = spoiler.settings.level_order[7] + else: + # Vanilla Order + level_7 = Levels.CreepyCastle + + # Map the level to its lobby map + lobby_map_dict = { + Levels.JungleJapes: Maps.JungleJapesLobby, + Levels.AngryAztec: Maps.AngryAztecLobby, + Levels.FranticFactory: Maps.FranticFactoryLobby, + Levels.GloomyGalleon: Maps.GloomyGalleonLobby, + Levels.FungiForest: Maps.FungiForestLobby, + Levels.CrystalCaves: Maps.CrystalCavesLobby, + Levels.CreepyCastle: Maps.CreepyCastleLobby, + } + level_7_lobby_map = lobby_map_dict.get(level_7) + level_7_items = [] + kong_items = [Items.Donkey, Items.Diddy, Items.Lanky, Items.Tiny, Items.Chunky] for loc, data in spoiler.LocationList.items(): - if level_7 is not None: - if data.level == level_7 and data.item == Items.FungiForestKey: - print("Placement invalid because of Key 5 being in Level 7") + + # Track items in Level 7 + if level_7 is not None and data.level == level_7 and data.item is not None: + level_7_items.append(data.item) + + # Key 5 cannot be in Level 7 or its lobby + if level_7 is not None and data.item == Items.FungiForestKey: + # Check if in the level itself + if data.level == level_7: + print(f"Placement invalid because of Key 5 being in Level 7 at {data.name}") return False - for kong_index, kong_locs in enumerate(kong_shop_locations): - if loc in kong_locs and data.item == kong_items[kong_index]: - print("Placement invalid due to shop in shop location") + # Check if in the level's lobby + if level_7_lobby_map is not None and data.default_mapid_data is not None: + for map_data in data.default_mapid_data: + if map_data.map == level_7_lobby_map: + print(f"Placement invalid because of Key 5 being in Level 7 lobby at {data.name}") + return False + + # Kongs cannot be locked behind shops that require that specific Kong to access + if data.type == Types.Shop and data.kong < 5: + if data.item == kong_items[data.kong]: + print(f"Placement invalid: {kong_items[data.kong].name} is locked behind their own shop at {data.name}") return False + + # Kongs cannot be on their own banana medal or half-medal locations + if data.type in (Types.Medal, Types.HalfMedal) and data.kong < 5: + if data.item == kong_items[data.kong]: + print(f"Placement invalid: {kong_items[data.kong].name} is on their own medal location at {data.name}") + return False + # Blasts/Arcade R2 can't contain DK non_dk_locations = [ Locations.JapesDonkeyBaboonBlast, @@ -1466,6 +1491,15 @@ def RandomFill(spoiler: Spoiler, itemsToPlace: List[Items], inOrder: bool = Fals spoiler.settings.random.shuffle(itemEmpty) locationId = itemEmpty.pop() spoiler.LocationList[locationId].PlaceItem(spoiler, item) + + # In minimal logic, verify placement doesn't violate minimal logic rules + if settings.logic_type == LogicType.minimal: + if not VerifyMinimalLogic(spoiler): + # Placement violated minimal logic, unplace and try another location + spoiler.LocationList[locationId].UnplaceItem(spoiler) + itemsToPlace.append(item) + continue + empty.remove(locationId) if locationId in SharedShopLocations: settings.placed_shared_shops += 1 diff --git a/randomizer/Patching/Library/Generic.py b/randomizer/Patching/Library/Generic.py index ebc8d3e07..2317ef677 100644 --- a/randomizer/Patching/Library/Generic.py +++ b/randomizer/Patching/Library/Generic.py @@ -802,7 +802,7 @@ def sumChecks(spoiler, ownedItems, locations: list) -> int: def getHolidaySetting(settings): """Get the holiday setting.""" - is_offseason = False + is_offseason = True if is_offseason: return settings.holiday_setting_offseason return settings.holiday_setting @@ -811,7 +811,7 @@ def getHolidaySetting(settings): def getHoliday(settings): """Get the holiday experienced.""" if getHolidaySetting(settings): - return Holidays.Halloween + return Holidays.Christmas return Holidays.no_holiday diff --git a/static/patches/shrink-dk64.bps b/static/patches/shrink-dk64.bps index c5831c3cf..ce3af0955 100644 Binary files a/static/patches/shrink-dk64.bps and b/static/patches/shrink-dk64.bps differ diff --git a/static/patches/symbols.json b/static/patches/symbols.json index 8f7219012..f3558eb33 100644 --- a/static/patches/symbols.json +++ b/static/patches/symbols.json @@ -673,392 +673,392 @@ "slippeelcode": 2153659232, "reseticetrapbuttons": 2153659384, "canloadicetrap": 2153659460, - "handleicetrapbuttons": 2153659784, - "queueicetrap": 2153660228, - "isbannedtrapmap": 2153660256, - "setfairymusicspeed": 2153660328, - "istrapmodel": 2153660392, - "cancelicetrapsong": 2153660420, - "playicetrapsong": 2153660540, - "callicetrap": 2153660660, - "ice_trap_queued": 2153660852, - "refreshpads": 2153661248, - "ismodeltwotiedflag_new": 2153661572, - "displaymedaloverlay": 2153662168, - "banana_medal_check": 2153662796, - "banana_medal_acquisition": 2153662860, - "getflagindex_corrected": 2153663164, - "giveitemfromsend": 2153663220, - "giveitemfromkongdata": 2153663348, - "givefairyitem": 2153663396, - "iscavesbeetlereward": 2153663460, - "candanceskip": 2153663528, - "forcedance": 2153663880, - "balloonshoot": 2153664004, - "getitem": 2153664076, - "getobjectcollectability": 2153665492, - "iscollectable": 2153665896, - "handlemodeltwoopacity": 2153666208, - "getflagmappingdata": 2153666292, - "updateitemtotalshandler": 2153666388, - "giveitem": 2153670708, - "giveitemfrompacket": 2153672256, - "getitemcount_new": 2153672288, - "getkongownershipfromflag": 2153673224, - "givekongfromflag": 2153673284, - "hasflagmove": 2153673408, - "setflagmove": 2153673552, - "getshopflag": 2153673704, - "grabfileparameters_fileinfo": 2153673864, - "inititemrandopointer": 2153673968, - "readitemsfromfile": 2153673988, - "saveitemstofile": 2153674500, - "file_info_expansion": 2153675126, - "spawnactorwithflaghandler": 2153675392, - "spawnweirdreward": 2153675540, - "spawnweirdreward0": 2153675644, - "spawnbonusreward": 2153675736, - "spawnrewardatactor": 2153675892, - "spawnminecartreward": 2153676124, - "spawncrownreward": 2153676280, - "spawnbossreward": 2153676452, - "spawndirtpatchreward": 2153676784, - "spawncharspawneractor": 2153676996, - "meloncrateitemhandler": 2153677296, - "updatekegids": 2153677788, - "spawnboulderobject": 2153678004, - "handledynamicitemtext": 2153678300, - "gettextdata": 2153678384, - "getcharwidthmask": 2153678460, - "aztec_beetle": 2153678508, - "caves_beetle": 2153678540, - "wonarena": 2153678576, - "resolvebonuscontainer": 2153678600, - "warpoutofarenas": 2153678668, - "failtraining": 2153678800, - "warpoutoftraining": 2153678900, - "arenatagkongcode": 2153679080, - "arenaearlycompletioncheck": 2153679380, - "getminecartmayhemcoinreq": 2153679496, - "renderget": 2153679568, - "rendergetwrapper": 2153679832, - "wonminecartmayhem": 2153679988, - "initmmayhem": 2153680120, - "mayhem_minecart_size": 2153680328, - "updateskipcheck": 2153680364, - "iscutsceneskipped": 2153680420, - "cancelcutsceneinternals": 2153680464, - "clearqueuedcutscenefunctions": 2153680544, - "presstoskip": 2153680596, - "clearskipcache": 2153680828, - "pressskiphandler": 2153680860, - "updateskippablecutscenes": 2153680904, - "renderscreentransitioncheck": 2153681064, - "enable_skip_check": 2153681228, - "beaverextrahithandle": 2153681232, - "handlecrowntimerinternal": 2153681320, - "handlecrowntimer": 2153681588, - "klumpcrownhandler": 2153681664, - "handlebugenemy": 2153681728, - "kioskbugend": 2153682092, - "stomphandler": 2153682216, - "kioskbugcode": 2153682340, - "spawnenemydrops": 2153683264, - "loadexits": 2153684232, - "wipetrackercache": 2153684376, - "getenabledstate": 2153684476, - "updateenabledstates": 2153684768, - "inittracker": 2153685096, - "resettracker": 2153685108, - "modifytrackerimage": 2153685120, - "display_file_images": 2153685928, - "display_text": 2153686200, - "displayhash": 2153686696, - "correctkongfaces": 2153687048, - "wipefilemod": 2153687228, - "enterfileprogress": 2153687276, - "givecollectables": 2153687328, - "setalldefaultflags": 2153687520, - "startfile": 2153687624, - "testpasswordsequence": 2153688172, - "wipepassword": 2153688228, - "handlepassword": 2153688256, - "password_screen_code": 2153688456, - "password_screen_init": 2153688736, - "password_screen_gfx": 2153688888, - "file_progress_screen_code": 2153689308, - "displayinverted": 2153689536, - "setprevsavemap": 2153689608, - "quitgame": 2153689628, - "updateleveligt": 2153689656, - "changefileselectaction": 2153689964, - "changefileselectaction_0": 2153690244, - "pregiven_status": 2153691276, - "getmemorychallengetype": 2153691624, - "isdarkworld": 2153691708, - "alterchunklighting": 2153691864, - "alterchunkdata": 2153692160, - "shinelight": 2153692296, - "isskyworld": 2153692504, - "displaynogeochunk": 2153692584, - "setfalldamageimmunity": 2153692712, - "handlefalldamageimmunity": 2153692724, - "transformbarrelimmunity": 2153692792, - "factoryshedfallimmunity": 2153692808, - "falldamagewrapper": 2153692824, - "spawnstalactite": 2153692872, - "spawnkroollankyballoon": 2153693108, - "popexistingballoon": 2153693204, - "handlekrooldirecting": 2153693292, - "inchitcounter": 2153693552, - "parsecontrollerinput": 2153693608, - "hitlessdeath": 2153693740, - "sethardpathspeed": 2153693828, - "cansavehelmhurry": 2153693952, - "addhelmtime": 2153694076, - "checktotalcache": 2153694160, - "finishhelmhurry": 2153694276, - "inithelmhurry": 2153694328, - "savehelmhurrytime": 2153694472, - "inithuddirection": 2153694616, - "allocatehud": 2153694788, - "gethudsprite_complex": 2153695580, - "updatebarriercounts": 2153695916, - "displaybarrierhud": 2153696064, - "canusedpad": 2153696108, - "drawdpad": 2153696364, - "handledpadfunctionality": 2153697320, - "item_db": 2153698644, - "adjustgunbone": 2153699832, - "getcutscenemodeltableindex": 2153699992, - "fixcutscenemodels": 2153700036, - "adjustanimationtables": 2153700280, - "krushaslide": 2153700868, - "adaptkrushazbanimation_punchostand": 2153700956, - "adaptkrushazbanimation_charge": 2153701204, - "updatecutscenemodels": 2153701452, - "diddyswimfix": 2153701480, - "minecartjumpfix": 2153701632, - "minecartjumpfix_0": 2153701672, - "setkrushaammocolor": 2153701752, - "orangeguncode": 2153701880, - "gethinttextindex": 2153703164, - "isgoodtextbox": 2153703384, - "getmovehint": 2153703496, - "purchase_hint_text_items": 2153703680, - "resetdisplayedmusic": 2153703920, - "detectsongchange": 2153703932, - "speedupmusic": 2153704272, - "initsongdisplay": 2153704764, - "displaysongnamehandler": 2153705076, - "curseremoved": 2153705688, - "haspermalossgrace": 2153705700, - "determinekongunlock": 2153705728, - "unlockkongpermaloss": 2153705872, - "givekongmoves": 2153705984, - "isdeathstate": 2153706052, - "kong_has_died": 2153706092, - "determinestartkong_permalossmode": 2153706636, - "transitionkong": 2153706792, - "fixgracecheese": 2153707092, - "changekongontransition_permaloss": 2153707264, - "forcebosskong": 2153707312, - "preventbosscheese": 2153707540, - "issharedmove": 2153707712, - "getcounteritem": 2153707952, - "getmovecountinshop": 2153708000, - "wipecounterimagecache": 2153708244, - "loadinternaltexture": 2153708292, - "loadfonttexture_counter": 2153708456, - "updatecounterdisplay": 2153708620, - "getactormodeltwodist": 2153708776, - "getclosestshop": 2153708912, - "getshopscale": 2153709208, - "newcountercode": 2153709340, - "handlefootprogress": 2153710816, - "setkongigt": 2153711268, - "updatepercentagekongstat": 2153711320, - "updatetagstat": 2153711584, - "updatefairystat": 2153711684, - "updateenemykillstat": 2153711720, - "createendseqcreditsfile": 2153711924, - "gamestats": 2153712448, - "displaynumberonobject": 2153712780, - "shiftbrokenjapesportal": 2153712976, - "displaynumberontns": 2153713088, - "writewti": 2153713636, - "handle_wti": 2153713676, - "warptoisles": 2153713888, - "beatgame": 2153713992, - "finalizebeatgame": 2153714068, - "hasbeatendkrapwincon": 2153714168, - "canaccesskroolschallenge": 2153714412, - "checkseedvictory": 2153714520, - "winrabbitseed": 2153714812, - "safeguardrabbitreward": 2153714840, - "checkvictory_flaghook": 2153714900, - "issnapenemyinrange": 2153714928, - "getpkmnsnapdata": 2153715428, - "pokemonsnapmode": 2153715584, - "arcadeexit": 2153715948, - "determinearcadelevel": 2153715980, - "handlearcadevictory": 2153716184, - "spawnoverlaytext": 2153716608, - "overlay_mod_bonus": 2153716920, - "overlay_mod_boss": 2153717176, - "overlay_changes": 2153717392, - "parsecutscenedata": 2153717616, - "loadjetpacsprites_handler": 2153718060, - "exitjetpac": 2153718128, - "completejetpac": 2153718164, - "patchcrankycode": 2153718220, - "overlay_mod_menu": 2153718368, - "overlay_mod_race": 2153718728, - "updatepausescreenwheel": 2153718784, - "newpausespritecode": 2153718864, - "totalssprite": 2153719744, - "checkssprite": 2153719752, - "initcarousel_onpause": 2153719760, - "file_sprites": 2153719980, - "file_item_caps": 2153720048, - "file_items": 2153720080, - "initprogressivetimer": 2153720172, - "renderprogressivesprite": 2153720188, - "playprogressiveding": 2153720248, - "handleprogressiveindicator": 2153720268, - "resetprogressive": 2153720300, - "inithints": 2153720340, - "wipehintcache": 2153720688, - "drawhinttext": 2153720764, - "drawsplitstring": 2153721304, - "gethintrequirement": 2153721620, - "displaycbcount": 2153721664, - "gethintitemregion": 2153721860, - "showhint": 2153721884, - "displaybubble": 2153722028, - "inithintflags": 2153722188, - "getitemname": 2153722360, - "drawhintscreen": 2153722500, - "drawitemlocationscreen": 2153723492, - "itemloc_flags": 2153724460, - "item_names": 2153724748, - "item_name_plural": 2153724812, - "hints_initialized": 2153724828, - "display_billboard_fix": 2153724829, - "hint_region_names": 2153725884, - "unknown_hints": 2153726152, - "printleveligt": 2153727488, - "inititemcheckdenominators": 2153727888, - "checkitemdb": 2153728124, - "handlecshifting": 2153728864, - "pausescreen3and4header": 2153728996, - "drawtextpointers": 2153729576, - "pausescreen3and4itemname": 2153729728, - "pausescreen3and4counter": 2153729884, - "changepausescreen": 2153730136, - "changeselectedlevel": 2153730280, - "updatefilevariables": 2153730364, - "handleoutofcounters": 2153730400, - "initpausemenu": 2153730572, - "sethintregion": 2153731500, - "storehintregion": 2153732412, - "gethintregiontext": 2153732508, - "displayhintregion": 2153732640, - "getworldoffset": 2153733272, - "setblockerhead": 2153733320, - "displayblockeritemonhud": 2153733468, - "getcountofblockerrequireditem": 2153733560, - "displaycountonblockerteeth": 2153733624, - "cc_enable_drunky": 2153733740, - "cc_disable_drunky": 2153733804, - "cc_allower_generic": 2153733848, - "cc_enabler_icetrap": 2153733996, - "cc_allower_icetrap": 2153734032, - "cc_enabler_warptorap": 2153734084, - "handlegamemodewrapper": 2153734168, - "cc_disabler_warptorap": 2153734240, - "skipdktv": 2153734368, - "displaygetoutreticle": 2153734452, - "cc_enable_getout": 2153734776, - "fakegetout": 2153734960, - "cc_allower_rockfall": 2153735460, - "cc_enabler_rockfall": 2153735476, - "dummyguardcode": 2153735732, - "cc_allower_spawnkop": 2153735976, - "cc_enabler_spawnkop": 2153736068, - "cc_allower_balloon": 2153736224, - "cc_allower_backflip": 2153736276, - "cc_enabler_balloon": 2153736332, - "cc_enabler_slip": 2153736468, - "cc_allower_tag": 2153736540, - "cc_enabler_tag": 2153736660, - "cc_enabler_doabackflip": 2153736856, - "cc_enabler_ice": 2153736940, - "cc_disabler_ice": 2153736964, - "cc_allower_animals": 2153737012, - "cc_enabler_animals": 2153737072, - "cc_disabler_animals": 2153737320, - "cc_allower_mini": 2153737392, - "cc_setscale": 2153737436, - "cc_enabler_mini": 2153737484, - "cc_disabler_mini": 2153737564, - "cc_allower_boulder": 2153737620, - "cc_enabler_boulder": 2153737672, - "cc_allower_crate": 2153737748, - "cc_enabler_crate": 2153737828, - "cc_enabler_paper": 2153737904, - "cc_disabler_paper": 2153738076, - "cc_enabler_time": 2153738168, - "cc_allower_time": 2153738432, - "cc_enabler_water": 2153738480, - "cc_allower_water": 2153738740, - "cc_effect_handler": 2153738796, - "replace_zones": 2153739880, - "blastwarpgetter": 2153740276, - "blastwarphandler": 2153740368, - "blast_entrances": 2153740560, - "swap_ending_cutscene_model": 2153740584, - "completeboss": 2153740800, - "fixkroolkong": 2153741512, - "handlekroolsaveprogress": 2153741612, - "writehudamount": 2153742296, - "coinhudelements": 2153742464, - "movetransplant": 2153742508, - "isshopempty": 2153742576, - "getinstrumentlevel": 2153742684, - "getprice": 2153742740, - "getnextmovepurchase": 2153742928, - "purchasemove": 2153743272, - "checkfirstmovepurchase": 2153743768, - "purchasefirstmovehandler": 2153743932, - "setlocation": 2153744000, - "setlocationstatus": 2153744028, - "getlocationstatus": 2153744248, - "displaymovetext": 2153744276, - "getnextmovetext": 2153744588, - "displaybfimovetext": 2153746908, - "showpostmovetext": 2153747036, - "simianslamnames": 2153748176, - "specialmovesnames": 2153748184, - "gunnames": 2153748224, - "gunupgnames": 2153748232, - "ammobeltnames": 2153748236, - "instrumentnames": 2153748240, - "instrumentupgnames": 2153748248, - "destroybonus": 2153748256, - "completebonus": 2153748288, - "helminit": 2153748416, - "helmbarrelcode": 2153749344, - "crowndoorcheck": 2153749712, - "coindoorcheck": 2153749724, - "unlockmoves": 2153749840, - "starting_item_data": 2153750292, - "auto_turn_keys": 2153750356, - "qualityoflife_shorteners": 2153750488, - "fastwarp": 2153750580, - "fastwarp_playmusic": 2153750612, - "fastwarpshockwavefix": 2153750640, - "clearvulturecutscene": 2153750744, + "handleicetrapbuttons": 2153659804, + "queueicetrap": 2153660248, + "isbannedtrapmap": 2153660276, + "setfairymusicspeed": 2153660348, + "istrapmodel": 2153660412, + "cancelicetrapsong": 2153660440, + "playicetrapsong": 2153660560, + "callicetrap": 2153660680, + "ice_trap_queued": 2153660872, + "refreshpads": 2153661268, + "ismodeltwotiedflag_new": 2153661592, + "displaymedaloverlay": 2153662188, + "banana_medal_check": 2153662816, + "banana_medal_acquisition": 2153662880, + "getflagindex_corrected": 2153663184, + "giveitemfromsend": 2153663240, + "giveitemfromkongdata": 2153663368, + "givefairyitem": 2153663416, + "iscavesbeetlereward": 2153663480, + "candanceskip": 2153663548, + "forcedance": 2153663900, + "balloonshoot": 2153664024, + "getitem": 2153664096, + "getobjectcollectability": 2153665512, + "iscollectable": 2153665916, + "handlemodeltwoopacity": 2153666228, + "getflagmappingdata": 2153666312, + "updateitemtotalshandler": 2153666408, + "giveitem": 2153670728, + "giveitemfrompacket": 2153672276, + "getitemcount_new": 2153672308, + "getkongownershipfromflag": 2153673244, + "givekongfromflag": 2153673304, + "hasflagmove": 2153673428, + "setflagmove": 2153673572, + "getshopflag": 2153673724, + "grabfileparameters_fileinfo": 2153673884, + "inititemrandopointer": 2153673988, + "readitemsfromfile": 2153674008, + "saveitemstofile": 2153674520, + "file_info_expansion": 2153675146, + "spawnactorwithflaghandler": 2153675412, + "spawnweirdreward": 2153675560, + "spawnweirdreward0": 2153675664, + "spawnbonusreward": 2153675756, + "spawnrewardatactor": 2153675912, + "spawnminecartreward": 2153676144, + "spawncrownreward": 2153676300, + "spawnbossreward": 2153676472, + "spawndirtpatchreward": 2153676804, + "spawncharspawneractor": 2153677016, + "meloncrateitemhandler": 2153677316, + "updatekegids": 2153677808, + "spawnboulderobject": 2153678024, + "handledynamicitemtext": 2153678320, + "gettextdata": 2153678404, + "getcharwidthmask": 2153678480, + "aztec_beetle": 2153678528, + "caves_beetle": 2153678560, + "wonarena": 2153678596, + "resolvebonuscontainer": 2153678620, + "warpoutofarenas": 2153678688, + "failtraining": 2153678820, + "warpoutoftraining": 2153678920, + "arenatagkongcode": 2153679100, + "arenaearlycompletioncheck": 2153679400, + "getminecartmayhemcoinreq": 2153679516, + "renderget": 2153679588, + "rendergetwrapper": 2153679852, + "wonminecartmayhem": 2153680008, + "initmmayhem": 2153680140, + "mayhem_minecart_size": 2153680348, + "updateskipcheck": 2153680384, + "iscutsceneskipped": 2153680440, + "cancelcutsceneinternals": 2153680484, + "clearqueuedcutscenefunctions": 2153680564, + "presstoskip": 2153680616, + "clearskipcache": 2153680848, + "pressskiphandler": 2153680880, + "updateskippablecutscenes": 2153680924, + "renderscreentransitioncheck": 2153681084, + "enable_skip_check": 2153681248, + "beaverextrahithandle": 2153681252, + "handlecrowntimerinternal": 2153681340, + "handlecrowntimer": 2153681608, + "klumpcrownhandler": 2153681684, + "handlebugenemy": 2153681748, + "kioskbugend": 2153682112, + "stomphandler": 2153682236, + "kioskbugcode": 2153682360, + "spawnenemydrops": 2153683284, + "loadexits": 2153684252, + "wipetrackercache": 2153684396, + "getenabledstate": 2153684496, + "updateenabledstates": 2153684788, + "inittracker": 2153685116, + "resettracker": 2153685128, + "modifytrackerimage": 2153685140, + "display_file_images": 2153685948, + "display_text": 2153686220, + "displayhash": 2153686716, + "correctkongfaces": 2153687068, + "wipefilemod": 2153687248, + "enterfileprogress": 2153687296, + "givecollectables": 2153687348, + "setalldefaultflags": 2153687540, + "startfile": 2153687644, + "testpasswordsequence": 2153688192, + "wipepassword": 2153688248, + "handlepassword": 2153688276, + "password_screen_code": 2153688476, + "password_screen_init": 2153688756, + "password_screen_gfx": 2153688908, + "file_progress_screen_code": 2153689328, + "displayinverted": 2153689556, + "setprevsavemap": 2153689628, + "quitgame": 2153689648, + "updateleveligt": 2153689676, + "changefileselectaction": 2153689984, + "changefileselectaction_0": 2153690264, + "pregiven_status": 2153691296, + "getmemorychallengetype": 2153691644, + "isdarkworld": 2153691728, + "alterchunklighting": 2153691884, + "alterchunkdata": 2153692180, + "shinelight": 2153692316, + "isskyworld": 2153692524, + "displaynogeochunk": 2153692604, + "setfalldamageimmunity": 2153692732, + "handlefalldamageimmunity": 2153692744, + "transformbarrelimmunity": 2153692812, + "factoryshedfallimmunity": 2153692828, + "falldamagewrapper": 2153692844, + "spawnstalactite": 2153692892, + "spawnkroollankyballoon": 2153693128, + "popexistingballoon": 2153693224, + "handlekrooldirecting": 2153693312, + "inchitcounter": 2153693572, + "parsecontrollerinput": 2153693628, + "hitlessdeath": 2153693760, + "sethardpathspeed": 2153693848, + "cansavehelmhurry": 2153693972, + "addhelmtime": 2153694096, + "checktotalcache": 2153694180, + "finishhelmhurry": 2153694296, + "inithelmhurry": 2153694348, + "savehelmhurrytime": 2153694492, + "inithuddirection": 2153694636, + "allocatehud": 2153694808, + "gethudsprite_complex": 2153695600, + "updatebarriercounts": 2153695936, + "displaybarrierhud": 2153696084, + "canusedpad": 2153696128, + "drawdpad": 2153696384, + "handledpadfunctionality": 2153697340, + "item_db": 2153698664, + "adjustgunbone": 2153699852, + "getcutscenemodeltableindex": 2153700012, + "fixcutscenemodels": 2153700056, + "adjustanimationtables": 2153700300, + "krushaslide": 2153700888, + "adaptkrushazbanimation_punchostand": 2153700976, + "adaptkrushazbanimation_charge": 2153701224, + "updatecutscenemodels": 2153701472, + "diddyswimfix": 2153701500, + "minecartjumpfix": 2153701652, + "minecartjumpfix_0": 2153701692, + "setkrushaammocolor": 2153701772, + "orangeguncode": 2153701900, + "gethinttextindex": 2153703184, + "isgoodtextbox": 2153703404, + "getmovehint": 2153703516, + "purchase_hint_text_items": 2153703700, + "resetdisplayedmusic": 2153703940, + "detectsongchange": 2153703952, + "speedupmusic": 2153704292, + "initsongdisplay": 2153704784, + "displaysongnamehandler": 2153705096, + "curseremoved": 2153705704, + "haspermalossgrace": 2153705716, + "determinekongunlock": 2153705744, + "unlockkongpermaloss": 2153705888, + "givekongmoves": 2153706000, + "isdeathstate": 2153706068, + "kong_has_died": 2153706108, + "determinestartkong_permalossmode": 2153706652, + "transitionkong": 2153706808, + "fixgracecheese": 2153707108, + "changekongontransition_permaloss": 2153707280, + "forcebosskong": 2153707328, + "preventbosscheese": 2153707556, + "issharedmove": 2153707728, + "getcounteritem": 2153707968, + "getmovecountinshop": 2153708016, + "wipecounterimagecache": 2153708260, + "loadinternaltexture": 2153708308, + "loadfonttexture_counter": 2153708472, + "updatecounterdisplay": 2153708636, + "getactormodeltwodist": 2153708792, + "getclosestshop": 2153708928, + "getshopscale": 2153709224, + "newcountercode": 2153709356, + "handlefootprogress": 2153710832, + "setkongigt": 2153711284, + "updatepercentagekongstat": 2153711336, + "updatetagstat": 2153711600, + "updatefairystat": 2153711700, + "updateenemykillstat": 2153711736, + "createendseqcreditsfile": 2153711940, + "gamestats": 2153712464, + "displaynumberonobject": 2153712796, + "shiftbrokenjapesportal": 2153712992, + "displaynumberontns": 2153713104, + "writewti": 2153713652, + "handle_wti": 2153713692, + "warptoisles": 2153713904, + "beatgame": 2153714008, + "finalizebeatgame": 2153714084, + "hasbeatendkrapwincon": 2153714184, + "canaccesskroolschallenge": 2153714428, + "checkseedvictory": 2153714536, + "winrabbitseed": 2153714828, + "safeguardrabbitreward": 2153714856, + "checkvictory_flaghook": 2153714916, + "issnapenemyinrange": 2153714944, + "getpkmnsnapdata": 2153715444, + "pokemonsnapmode": 2153715600, + "arcadeexit": 2153715964, + "determinearcadelevel": 2153715996, + "handlearcadevictory": 2153716200, + "spawnoverlaytext": 2153716624, + "overlay_mod_bonus": 2153716936, + "overlay_mod_boss": 2153717192, + "overlay_changes": 2153717408, + "parsecutscenedata": 2153717632, + "loadjetpacsprites_handler": 2153718076, + "exitjetpac": 2153718144, + "completejetpac": 2153718180, + "patchcrankycode": 2153718236, + "overlay_mod_menu": 2153718384, + "overlay_mod_race": 2153718744, + "updatepausescreenwheel": 2153718800, + "newpausespritecode": 2153718880, + "totalssprite": 2153719760, + "checkssprite": 2153719768, + "initcarousel_onpause": 2153719776, + "file_sprites": 2153719996, + "file_item_caps": 2153720064, + "file_items": 2153720096, + "initprogressivetimer": 2153720188, + "renderprogressivesprite": 2153720204, + "playprogressiveding": 2153720264, + "handleprogressiveindicator": 2153720284, + "resetprogressive": 2153720316, + "inithints": 2153720356, + "wipehintcache": 2153720704, + "drawhinttext": 2153720780, + "drawsplitstring": 2153721320, + "gethintrequirement": 2153721636, + "displaycbcount": 2153721680, + "gethintitemregion": 2153721876, + "showhint": 2153721900, + "displaybubble": 2153722044, + "inithintflags": 2153722204, + "getitemname": 2153722376, + "drawhintscreen": 2153722516, + "drawitemlocationscreen": 2153723508, + "itemloc_flags": 2153724476, + "item_names": 2153724764, + "item_name_plural": 2153724828, + "hints_initialized": 2153724844, + "display_billboard_fix": 2153724845, + "hint_region_names": 2153725900, + "unknown_hints": 2153726168, + "printleveligt": 2153727504, + "inititemcheckdenominators": 2153727904, + "checkitemdb": 2153728140, + "handlecshifting": 2153728880, + "pausescreen3and4header": 2153729012, + "drawtextpointers": 2153729592, + "pausescreen3and4itemname": 2153729744, + "pausescreen3and4counter": 2153729900, + "changepausescreen": 2153730152, + "changeselectedlevel": 2153730296, + "updatefilevariables": 2153730380, + "handleoutofcounters": 2153730416, + "initpausemenu": 2153730588, + "sethintregion": 2153731516, + "storehintregion": 2153732428, + "gethintregiontext": 2153732524, + "displayhintregion": 2153732656, + "getworldoffset": 2153733288, + "setblockerhead": 2153733336, + "displayblockeritemonhud": 2153733484, + "getcountofblockerrequireditem": 2153733576, + "displaycountonblockerteeth": 2153733640, + "cc_enable_drunky": 2153733756, + "cc_disable_drunky": 2153733820, + "cc_allower_generic": 2153733864, + "cc_enabler_icetrap": 2153734012, + "cc_allower_icetrap": 2153734048, + "cc_enabler_warptorap": 2153734100, + "handlegamemodewrapper": 2153734184, + "cc_disabler_warptorap": 2153734256, + "skipdktv": 2153734384, + "displaygetoutreticle": 2153734468, + "cc_enable_getout": 2153734792, + "fakegetout": 2153734976, + "cc_allower_rockfall": 2153735476, + "cc_enabler_rockfall": 2153735492, + "dummyguardcode": 2153735748, + "cc_allower_spawnkop": 2153735992, + "cc_enabler_spawnkop": 2153736084, + "cc_allower_balloon": 2153736240, + "cc_allower_backflip": 2153736292, + "cc_enabler_balloon": 2153736348, + "cc_enabler_slip": 2153736484, + "cc_allower_tag": 2153736556, + "cc_enabler_tag": 2153736676, + "cc_enabler_doabackflip": 2153736872, + "cc_enabler_ice": 2153736956, + "cc_disabler_ice": 2153736980, + "cc_allower_animals": 2153737028, + "cc_enabler_animals": 2153737088, + "cc_disabler_animals": 2153737336, + "cc_allower_mini": 2153737408, + "cc_setscale": 2153737452, + "cc_enabler_mini": 2153737500, + "cc_disabler_mini": 2153737580, + "cc_allower_boulder": 2153737636, + "cc_enabler_boulder": 2153737688, + "cc_allower_crate": 2153737764, + "cc_enabler_crate": 2153737844, + "cc_enabler_paper": 2153737920, + "cc_disabler_paper": 2153738092, + "cc_enabler_time": 2153738184, + "cc_allower_time": 2153738448, + "cc_enabler_water": 2153738496, + "cc_allower_water": 2153738756, + "cc_effect_handler": 2153738812, + "replace_zones": 2153739896, + "blastwarpgetter": 2153740292, + "blastwarphandler": 2153740384, + "blast_entrances": 2153740576, + "swap_ending_cutscene_model": 2153740600, + "completeboss": 2153740816, + "fixkroolkong": 2153741528, + "handlekroolsaveprogress": 2153741628, + "writehudamount": 2153742312, + "coinhudelements": 2153742480, + "movetransplant": 2153742524, + "isshopempty": 2153742592, + "getinstrumentlevel": 2153742700, + "getprice": 2153742756, + "getnextmovepurchase": 2153742944, + "purchasemove": 2153743288, + "checkfirstmovepurchase": 2153743784, + "purchasefirstmovehandler": 2153743948, + "setlocation": 2153744016, + "setlocationstatus": 2153744044, + "getlocationstatus": 2153744264, + "displaymovetext": 2153744292, + "getnextmovetext": 2153744604, + "displaybfimovetext": 2153746924, + "showpostmovetext": 2153747052, + "simianslamnames": 2153748192, + "specialmovesnames": 2153748200, + "gunnames": 2153748240, + "gunupgnames": 2153748248, + "ammobeltnames": 2153748252, + "instrumentnames": 2153748256, + "instrumentupgnames": 2153748264, + "destroybonus": 2153748272, + "completebonus": 2153748304, + "helminit": 2153748432, + "helmbarrelcode": 2153749360, + "crowndoorcheck": 2153749728, + "coindoorcheck": 2153749740, + "unlockmoves": 2153749856, + "starting_item_data": 2153750308, + "auto_turn_keys": 2153750372, + "qualityoflife_shorteners": 2153750504, + "fastwarp": 2153750596, + "fastwarp_playmusic": 2153750628, + "fastwarpshockwavefix": 2153750656, + "clearvulturecutscene": 2153750760, "codeend": 2153754112, "copyfunc": 2153756496, "regularframeloop": 2153759408, diff --git a/templates/cosmetics.html b/templates/cosmetics.html index 9d534cb6a..4143b6dcd 100644 --- a/templates/cosmetics.html +++ b/templates/cosmetics.html @@ -119,18 +119,18 @@

MISCELLANEOUS

{{ toggle_input("rainbow_ammo", "Rainbow Ammo", "Ammo will slowly change color overtime.") }}
+ title="Happy Holidays from the DK64 Randomizer dev team. Limited time option." hidden> - + value="False" /> +
-
+ {# HANDLING HOLIDAY MODE: Supported Holiday Mode (Is currently a holiday season)