diff --git a/worlds/mlss/Locations.py b/worlds/mlss/Locations.py index 87c0731fc250..d70d0c1b0b5a 100644 --- a/worlds/mlss/Locations.py +++ b/worlds/mlss/Locations.py @@ -273,10 +273,10 @@ class MLSSLocation(Location): LocationData("Sewers Prison Room Coin Block", 0x39e01e, 0), LocationData("Gwarhar Lagoon First Underwater Area Room 2 Coin Block", 0x39e455, 0), LocationData("Teehee Valley Past Ultra Hammer Rocks Coin Block", 0x39e588, 0), - LocationData("S.S Chuckola Storage Room Coin Block 1", 0x39e618, 0), - LocationData("S.S Chuckola Storage Room Coin Block 2", 0x39e620, 0), - LocationData("Jokes End Second Floor West Room Coin Block", 0x39e771, 0), - LocationData("Jokes End North of Bridge Room Coin Block", 0x39e836, 0), + LocationData("S.S. Chuckola Storage Room Coin Block 1", 0x39e618, 0), + LocationData("S.S. Chuckola Storage Room Coin Block 2", 0x39e620, 0), + LocationData("Joke's End Second Floor West Room Coin Block", 0x39e771, 0), + LocationData("Joke's End North of Bridge Room Coin Block", 0x39e836, 0), LocationData("Outside Woohoo Hooniversity Coin Block 1", 0x39e9ad, 0), LocationData("Outside Woohoo Hooniversity Coin Block 2", 0x39e9bd, 0), LocationData("Outside Woohoo Hooniversity Coin Block 3", 0x39e9c5, 0), @@ -313,7 +313,7 @@ class MLSSLocation(Location): LocationData("Chateau Popple Fight Room Block 1", 0x39dd38, 0), LocationData("Chateau Popple Fight Room Block 2", 0x39dd48, 0), LocationData("Chateau Popple Fight Room Digspot", 0x39dd50, 0), - LocationData("Chateau Barrel Room Digspot ", 0x39dd5d, 0), + LocationData("Chateau Barrel Room Digspot", 0x39dd5d, 0), LocationData("Chateau Goblet Room Digspot", 0x39dd6d, 0), LocationData("Chucklehuck Woods Cave Room 1 Block 1", 0x39dd82, 0), LocationData("Chucklehuck Woods Cave Room 1 Block 2", 0x39dd8a, 0), @@ -549,8 +549,8 @@ class MLSSLocation(Location): LocationData("Ocean South Whirlpool Digspot 5", 0x39e0fa, 0), LocationData("Ocean South Whirlpool Digspot 6", 0x39e102, 0), LocationData("Ocean South Whirlpool Room 2 Digspot", 0x39e10f, 0), - LocationData("Jokes End Pipe Digspot", 0x39e6c2, 0), - LocationData("Jokes End Staircase Digspot", 0x39e6cf, 0), + LocationData("Joke's End Pipe Digspot", 0x39e6c2, 0), + LocationData("Joke's End Staircase Digspot", 0x39e6cf, 0), LocationData("Surf Minigame", 0x2753ea, 1), LocationData("North Ocean Whirlpool Mole", 0x277956, 1), LocationData("Beanbean Outskirts Surf Beach Digspot 1", 0x39dcfb, 0), @@ -627,9 +627,9 @@ class MLSSLocation(Location): LocationData("Teehee Valley Past Ultra Hammers Digspot 3", 0x39e5a8, 0), LocationData("Teehee Valley Solo Luigi Maze Room 1 Block", 0x39e5e0, 0), LocationData("Teehee Valley Before Trunkle Digspot", 0x39e5f0, 0), - LocationData("S.S Chuckola Storage Room Block 1", 0x39e610, 0), - LocationData("S.S Chuckola Storage Room Block 2", 0x39e628, 0), - LocationData("S.S Chuckola Membership Card", 0x260637, 1) + LocationData("S.S. Chuckola Storage Room Block 1", 0x39e610, 0), + LocationData("S.S. Chuckola Storage Room Block 2", 0x39e628, 0), + LocationData("S.S. Chuckola Membership Card", 0x260637, 1) ] fungitown: typing.List[LocationData] = [ @@ -703,47 +703,47 @@ class MLSSLocation(Location): ] jokesEntrance: typing.List[LocationData] = [ - LocationData("Jokes End West of First Boiler Room Block 1", 0x39e6e5, 0), - LocationData("Jokes End West of First Boiler Room Block 2", 0x39e6ed, 0), - LocationData("Jokes End First Boiler Room Digspot 1", 0x39e6fa, 0), - LocationData("Jokes End First Boiler Room Digspot 2", 0x39e702, 0), - LocationData("Jokes End Second Floor West Room Block 1", 0x39e761, 0), - LocationData("Jokes End Second Floor West Room Block 2", 0x39e769, 0), - LocationData("Jokes End Second Floor West Room Block 3", 0x39e779, 0), - LocationData("Jokes End Second Floor West Room Block 4", 0x39e781, 0), - LocationData("Jokes End Mole Reward 1", 0x27788e, 1), - LocationData("Jokes End Mole Reward 2", 0x2778d2, 1) + LocationData("Joke's End West of First Boiler Room Block 1", 0x39e6e5, 0), + LocationData("Joke's End West of First Boiler Room Block 2", 0x39e6ed, 0), + LocationData("Joke's End First Boiler Room Digspot 1", 0x39e6fa, 0), + LocationData("Joke's End First Boiler Room Digspot 2", 0x39e702, 0), + LocationData("Joke's End Second Floor West Room Block 1", 0x39e761, 0), + LocationData("Joke's End Second Floor West Room Block 2", 0x39e769, 0), + LocationData("Joke's End Second Floor West Room Block 3", 0x39e779, 0), + LocationData("Joke's End Second Floor West Room Block 4", 0x39e781, 0), + LocationData("Joke's End Mole Reward 1", 0x27788e, 1), + LocationData("Joke's End Mole Reward 2", 0x2778d2, 1) ] jokesMain: typing.List[LocationData] = [ - LocationData("Jokes End Furnace Room 1 Block 1", 0x39e70f, 0), - LocationData("Jokes End Furnace Room 1 Block 2", 0x39e717, 0), - LocationData("Jokes End Furnace Room 1 Block 3", 0x39e71f, 0), - LocationData("Jokes End Northeast of Boiler Room 1 Block", 0x39e732, 0), - LocationData("Jokes End Northeast of Boiler Room 3 Digspot", 0x39e73f, 0), - LocationData("Jokes End Northeast of Boiler Room 2 Block", 0x39e74c, 0), - LocationData("Jokes End Northeast of Boiler Room 2 Digspot", 0x39e754, 0), - LocationData("Jokes End Second Floor East Room Digspot", 0x39e794, 0), - LocationData("Jokes End Final Split up Room Digspot", 0x39e7a7, 0), - LocationData("Jokes End South of Bridge Room Block", 0x39e7b4, 0), - LocationData("Jokes End Solo Luigi Room 1 Block", 0x39e7c4, 0), - LocationData("Jokes End Solo Luigi Room 1 Digspot", 0x39e7cc, 0), - LocationData("Jokes End Solo Mario Final Room Block 1", 0x39e7d9, 0), - LocationData("Jokes End Solo Mario Final Room Block 2", 0x39e7e1, 0), - LocationData("Jokes End Solo Mario Final Room Block 3", 0x39e7e9, 0), - LocationData("Jokes End Solo Luigi Room 2 Digspot", 0x39e7fc, 0), - LocationData("Jokes End Solo Mario Room 1 Digspot", 0x39e809, 0), - LocationData("Jokes End Solo Mario Room 2 Block 1", 0x39e819, 0), - LocationData("Jokes End Solo Mario Room 2 Block 2", 0x39e821, 0), - LocationData("Jokes End Solo Mario Room 2 Block 3", 0x39e829, 0), - LocationData("Jokes End Second Boiler Room Digspot 1", 0x39e84f, 0), - LocationData("Jokes End Second Boiler Room Digspot 2", 0x39e857, 0), - LocationData("Jokes End North of Second Boiler Room Block 1", 0x39e864, 0), - LocationData("Jokes End North of Second Boiler Room Block 2", 0x39e86c, 0), - LocationData("Jokes End Before Jojora Room Block 1", 0x39e927, 0), - LocationData("Jokes End Before Jojora Room Block 2", 0x39e92f, 0), - LocationData("Jokes End Before Jojora Room Digspot", 0x39e937, 0), - LocationData("Jokes End Jojora Room Digspot", 0x39e944, 0) + LocationData("Joke's End Furnace Room 1 Block 1", 0x39e70f, 0), + LocationData("Joke's End Furnace Room 1 Block 2", 0x39e717, 0), + LocationData("Joke's End Furnace Room 1 Block 3", 0x39e71f, 0), + LocationData("Joke's End Northeast of Boiler Room 1 Block", 0x39e732, 0), + LocationData("Joke's End Northeast of Boiler Room 3 Digspot", 0x39e73f, 0), + LocationData("Joke's End Northeast of Boiler Room 2 Block", 0x39e74c, 0), + LocationData("Joke's End Northeast of Boiler Room 2 Digspot", 0x39e754, 0), + LocationData("Joke's End Second Floor East Room Digspot", 0x39e794, 0), + LocationData("Joke's End Final Split up Room Digspot", 0x39e7a7, 0), + LocationData("Joke's End South of Bridge Room Block", 0x39e7b4, 0), + LocationData("Joke's End Solo Luigi Room 1 Block", 0x39e7c4, 0), + LocationData("Joke's End Solo Luigi Room 1 Digspot", 0x39e7cc, 0), + LocationData("Joke's End Solo Mario Final Room Block 1", 0x39e7d9, 0), + LocationData("Joke's End Solo Mario Final Room Block 2", 0x39e7e1, 0), + LocationData("Joke's End Solo Mario Final Room Block 3", 0x39e7e9, 0), + LocationData("Joke's End Solo Luigi Room 2 Digspot", 0x39e7fc, 0), + LocationData("Joke's End Solo Mario Room 1 Digspot", 0x39e809, 0), + LocationData("Joke's End Solo Mario Room 2 Block 1", 0x39e819, 0), + LocationData("Joke's End Solo Mario Room 2 Block 2", 0x39e821, 0), + LocationData("Joke's End Solo Mario Room 2 Block 3", 0x39e829, 0), + LocationData("Joke's End Second Boiler Room Digspot 1", 0x39e84f, 0), + LocationData("Joke's End Second Boiler Room Digspot 2", 0x39e857, 0), + LocationData("Joke's End North of Second Boiler Room Block 1", 0x39e864, 0), + LocationData("Joke's End North of Second Boiler Room Block 2", 0x39e86c, 0), + LocationData("Joke's End Before Jojora Room Block 1", 0x39e927, 0), + LocationData("Joke's End Before Jojora Room Block 2", 0x39e92f, 0), + LocationData("Joke's End Before Jojora Room Digspot", 0x39e937, 0), + LocationData("Joke's End Jojora Room Digspot", 0x39e944, 0) ] postJokes: typing.List[LocationData] = [ diff --git a/worlds/mlss/Names/LocationName.py b/worlds/mlss/Names/LocationName.py index c50d86d6265c..b68c86fcf5bb 100644 --- a/worlds/mlss/Names/LocationName.py +++ b/worlds/mlss/Names/LocationName.py @@ -301,54 +301,54 @@ class LocationName(): TeeheeValleySoloLuigiMazeRoom1Block = "Teehee Valley Solo Luigi Maze Room 1 Block" TeeheeValleyBeforeTrunkleDigspot = "Teehee Valley Before Trunkle Digspot" TeeheeValleyTrunkleRoomDigspot = "Teehee Valley Trunkle Room Digspot" - SSChuckolaStorageRoomBlock1 = "S.S Chuckola Storage Room Block 1" - SSChuckolaStorageRoomBlock2 = "S.S Chuckola Storage Room Block 2" + SSChuckolaStorageRoomBlock1 = "S.S. Chuckola Storage Room Block 1" + SSChuckolaStorageRoomBlock2 = "S.S. Chuckola Storage Room Block 2" LittleFungitownEmbassyRoomBlock = "Little Fungitown Embassy Room Block" LittleFungitownEntranceRoomBlock = "Little Fungitown Entrance Room Block" - JokesEndPipeDigspot = "Jokes End Pipe Digspot" - JokesEndStaircaseDigspot = "Jokes End Staircase Digspot" - JokesEndWestOfFirstBoilerRoomBlock1 = "Jokes End West Of First Boiler Room Block 1" - JokesEndWestOfFirstBoilerRoomBlock2 = "Jokes End West Of First Boiler Room Block 2" - JokesEndFirstBoilerRoomDigspot1 = "Jokes End First Boiler Room Digspot 1" - JokesEndFirstBoilerRoomDigspot2 = "Jokes End First Boiler Room Digspot 2" - JokesEndFurnaceRoom1Block1 = "Jokes End Furnace Room 1 Block 1" - JokesEndFurnaceRoom1Block2 = "Jokes End Furnace Room 1 Block 2" - JokesEndFurnaceRoom1Block3 = "Jokes End Furnace Room 1 Block 3" - JokesEndNortheastOfBoilerRoom1Block = "Jokes End Northeast Of Boiler Room 1 Block" - JokesEndNortheastOfBoilerRoom3Digspot = "Jokes End Northeast Of Boiler Room 3 Digspot" - JokesEndNortheastOfBoilerRoom2Block1 = "Jokes End Northeast Of Boiler Room 2 Block" - JokesEndNortheastOfBoilerRoom2Block2 = "Jokes End Northeast Of Boiler Room 2 Digspot" - JokesEndSecondFloorWestRoomBlock1 = "Jokes End Second Floor West Room Block 1" - JokesEndSecondFloorWestRoomBlock2 = "Jokes End Second Floor West Room Block 2" - JokesEndSecondFloorWestRoomBlock3 = "Jokes End Second Floor West Room Block 3" - JokesEndSecondFloorWestRoomBlock4 = "Jokes End Second Floor West Room Block 4" - JokesEndSecondFloorEastRoomDigspot = "Jokes End Second Floor East Room Digspot" - JokesEndFinalSplitUpRoomDigspot = "Jokes End Final Split Up Room Digspot" - JokesEndSouthOfBridgeRoomBlock = "Jokes End South Of Bridge Room Block" - JokesEndSoloLuigiRoom1Block = "Jokes End Solo Luigi Room 1 Block" - JokesEndSoloLuigiRoom1Digspot = "Jokes End Solo Luigi Room 1 Digspot" - JokesEndSoloMarioFinalRoomBlock1 = "Jokes End Solo Mario Final Room Block 1" - JokesEndSoloMarioFinalRoomBlock2 = "Jokes End Solo Mario Final Room Block 2" - JokesEndSoloMarioFinalRoomBlock3 = "Jokes End Solo Mario Final Room Block 3" - JokesEndSoloLuigiRoom2Digspot = "Jokes End Solo Luigi Room 2 Digspot" - JokesEndSoloMarioRoom1Digspot = "Jokes End Solo Mario Room 1 Digspot" - JokesEndSoloMarioRoom2Block1 = "Jokes End Solo Mario Room 2 Block 1" - JokesEndSoloMarioRoom2Block2 = "Jokes End Solo Mario Room 2 Block 2" - JokesEndSoloMarioRoom2Block3 = "Jokes End Solo Mario Room 2 Block 3" - JokesEndSecondBoilerRoomDigspot1 = "Jokes End Second Boiler Room Digspot 1" - JokesEndSecondBoilerRoomDigspot2 = "Jokes End Second Boiler Room Digspot 2" - JokesEndNorthOfSecondBoilerRoomBlock1 = "Jokes End North Of Second Boiler Room Block 1" - JokesEndNorthOfSecondBoilerRoomBlock2 = "Jokes End North Of Second Boiler Room Block 2" + JokesEndPipeDigspot = "Joke's End Pipe Digspot" + JokesEndStaircaseDigspot = "Joke's End Staircase Digspot" + JokesEndWestOfFirstBoilerRoomBlock1 = "Joke's End West Of First Boiler Room Block 1" + JokesEndWestOfFirstBoilerRoomBlock2 = "Joke's End West Of First Boiler Room Block 2" + JokesEndFirstBoilerRoomDigspot1 = "Joke's End First Boiler Room Digspot 1" + JokesEndFirstBoilerRoomDigspot2 = "Joke's End First Boiler Room Digspot 2" + JokesEndFurnaceRoom1Block1 = "Joke's End Furnace Room 1 Block 1" + JokesEndFurnaceRoom1Block2 = "Joke's End Furnace Room 1 Block 2" + JokesEndFurnaceRoom1Block3 = "Joke's End Furnace Room 1 Block 3" + JokesEndNortheastOfBoilerRoom1Block = "Joke's End Northeast Of Boiler Room 1 Block" + JokesEndNortheastOfBoilerRoom3Digspot = "Joke's End Northeast Of Boiler Room 3 Digspot" + JokesEndNortheastOfBoilerRoom2Block1 = "Joke's End Northeast Of Boiler Room 2 Block" + JokesEndNortheastOfBoilerRoom2Block2 = "Joke's End Northeast Of Boiler Room 2 Digspot" + JokesEndSecondFloorWestRoomBlock1 = "Joke's End Second Floor West Room Block 1" + JokesEndSecondFloorWestRoomBlock2 = "Joke's End Second Floor West Room Block 2" + JokesEndSecondFloorWestRoomBlock3 = "Joke's End Second Floor West Room Block 3" + JokesEndSecondFloorWestRoomBlock4 = "Joke's End Second Floor West Room Block 4" + JokesEndSecondFloorEastRoomDigspot = "Joke's End Second Floor East Room Digspot" + JokesEndFinalSplitUpRoomDigspot = "Joke's End Final Split Up Room Digspot" + JokesEndSouthOfBridgeRoomBlock = "Joke's End South Of Bridge Room Block" + JokesEndSoloLuigiRoom1Block = "Joke's End Solo Luigi Room 1 Block" + JokesEndSoloLuigiRoom1Digspot = "Joke's End Solo Luigi Room 1 Digspot" + JokesEndSoloMarioFinalRoomBlock1 = "Joke's End Solo Mario Final Room Block 1" + JokesEndSoloMarioFinalRoomBlock2 = "Joke's End Solo Mario Final Room Block 2" + JokesEndSoloMarioFinalRoomBlock3 = "Joke's End Solo Mario Final Room Block 3" + JokesEndSoloLuigiRoom2Digspot = "Joke's End Solo Luigi Room 2 Digspot" + JokesEndSoloMarioRoom1Digspot = "Joke's End Solo Mario Room 1 Digspot" + JokesEndSoloMarioRoom2Block1 = "Joke's End Solo Mario Room 2 Block 1" + JokesEndSoloMarioRoom2Block2 = "Joke's End Solo Mario Room 2 Block 2" + JokesEndSoloMarioRoom2Block3 = "Joke's End Solo Mario Room 2 Block 3" + JokesEndSecondBoilerRoomDigspot1 = "Joke's End Second Boiler Room Digspot 1" + JokesEndSecondBoilerRoomDigspot2 = "Joke's End Second Boiler Room Digspot 2" + JokesEndNorthOfSecondBoilerRoomBlock1 = "Joke's End North Of Second Boiler Room Block 1" + JokesEndNorthOfSecondBoilerRoomBlock2 = "Joke's End North Of Second Boiler Room Block 2" WinkleAreaColloseumDigspot = "Winkle Area Colloseum Digspot" HoohooMountainFountainRoom2Block = "Hoohoo Mountain Fountain Room 2 Block" HoohooMountainFountainRoom2Digspot = "Hoohoo Mountain Fountain Room 2 Digspot" HoohooMountainPastHoohoorosConnectorRoomDigspot1 = "Hoohoo Mountain Past Hoohooros Connector Room Digspot 1" HoohooMountainPastHoohoorosConnectorRoomBlock = "Hoohoo Mountain Past Hoohooros Connector Room Block" HoohooMountainPastHoohoorosConnectorRoomDigspot2 = "Hoohoo Mountain Past Hoohooros Connector Room Digspot 2" - JokesEndBeforeJojoraRoomBlock1 = "Jokes End Before Jojora Room Block 1" - JokesEndBeforeJojoraRoomBlock2 = "Jokes End Before Jojora Room Block 2" - JokesEndBeforeJojoraRoomDigspot = "Jokes End Before Jojora Room Digspot" - JokesEndJojoraRoomDigspot = "Jokes End Jojora Room Digspot" + JokesEndBeforeJojoraRoomBlock1 = "Joke's End Before Jojora Room Block 1" + JokesEndBeforeJojoraRoomBlock2 = "Joke's End Before Jojora Room Block 2" + JokesEndBeforeJojoraRoomDigspot = "Joke's End Before Jojora Room Digspot" + JokesEndJojoraRoomDigspot = "Joke's End Jojora Room Digspot" BeanbeanOutskirtsBeforeHarhallDigspot1 = "Beanbean Outskirts Before Harhall Digspot 1" BeanbeanOutskirtsBeforeHarhallDigspot2 = "Beanbean Outskirts Before Harhall Digspot 2" BeanbeanOutskirtsBroochGuardsRoomDigspot1 = "Beanbean Outskirts Brooch Guards Room Digspot 1" @@ -372,8 +372,8 @@ class LocationName(): BeanbeanOutskirtsSoloLuigiCaveMole = "Beanbean Outskirts Solo Luigi Cave Mole" BeanbeanOutskirtsFarmRoomMoleReward1 = "Beanbean Outskirts Farm Room Mole Reward 1" BeanbeanOutskirtsFarmRoomMoleReward2 = "Beanbean Outskirts Farm Room Mole Reward 2" - JokesEndMoleReward1 = "Jokes End Mole Reward 1" - JokesEndMoleReward2 = "Jokes End Mole Reward 2" + JokesEndMoleReward1 = "Joke's End Mole Reward 1" + JokesEndMoleReward2 = "Joke's End Mole Reward 2" NorthOceanWhirlpoolMole = "North Ocean Whirlpool Mole" BeanbeanOutskirtsNESoloMarioMole1 = "Beanbean Outskirts NE Solo Mario Mole 1" HoohooVillageHammers = "Hoohoo Village Hammers" @@ -384,7 +384,7 @@ class LocationName(): ChucklehuckWoodsRedChuckolaFruit = "Chucklehuck Woods Red Chuckola Fruit" ChucklehuckWoodsWhiteChuckolaFruit = "Chucklehuck Woods White Chuckola Fruit" ChucklehuckWoodsPurpleChuckolaFruit = "Chucklehuck Woods Purple Chuckola Fruit" - SSChuckolaMembershipCard = "S.S Chuckola Membership Card" + SSChuckolaMembershipCard = "S.S. Chuckola Membership Card" WinkleAreaWinkleCard = "Winkle Area Winkle Card" BeanbeanCastlePeachsExtraDress = "Beanbean Castle Peach's Extra Dress" BeanbeanCastleFakeBeastar = "Beanbean Castle Fake Beanstar" diff --git a/worlds/mlss/Rom.py b/worlds/mlss/Rom.py index 739570abcb45..39f8ea66666d 100644 --- a/worlds/mlss/Rom.py +++ b/worlds/mlss/Rom.py @@ -431,8 +431,8 @@ def write_tokens(world: "MLSSWorld", patch: MLSSProcedurePatch) -> None: swap_colors(world, patch, colors[world.options.mario_color], 0) swap_colors(world, patch, colors[world.options.luigi_color], 1) - swap_pants(world, patch, colors[world.options.mario_pants], 0) - swap_pants(world, patch, colors[world.options.luigi_pants], 1) + swap_pants(world, patch, cpants[world.options.mario_pants], 0) + swap_pants(world, patch, cpants[world.options.luigi_pants], 1) patch.write_file("token_data.bin", patch.get_token_binary()) @@ -468,7 +468,7 @@ def swap_pants(world: "MLSSWorld", patch: MLSSProcedurePatch, color: str, bro: i return if bro == 1 and (colors[luigi_color] == "TrueChaos" or colors[luigi_color] == "Silhouette"): return - if color == "Vanilla" or color == "Silhouette": + if color == "Vanilla": return temp = pkgutil.get_data(__name__, "colors/pants/" + color + ".txt") temp_io = io.BytesIO(temp) @@ -476,7 +476,7 @@ def swap_pants(world: "MLSSWorld", patch: MLSSProcedurePatch, color: str, bro: i for lines in temp_io.readlines(): arr = lines.decode('utf-8').strip().split(',') - if color != "Chaos" and color != "TrueChaos": + if color != "Chaos": color_arr.append(Color(int(arr[0], 16), int(arr[1], 16), int(arr[2], 16), int(arr[3], 16))) else: color_arr.append( diff --git a/worlds/mlss/data/basepatch.bsdiff b/worlds/mlss/data/basepatch.bsdiff index 0bced2b5061d..1b8bdedd6b1e 100644 Binary files a/worlds/mlss/data/basepatch.bsdiff and b/worlds/mlss/data/basepatch.bsdiff differ