Skip to content

Commit 016b4b8

Browse files
theballaam96theballaam96
committed
Lint
1 parent 67ee8a5 commit 016b4b8

File tree

3 files changed

+61
-59
lines changed

3 files changed

+61
-59
lines changed

‎base-hack/Build/build_cutscene_dict.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
else:
1616
cs_hi |= 1 << (cs_index - 32)
1717
fh.write(cs_lo.to_bytes(4, "big"))
18-
fh.write(cs_hi.to_bytes(4, "big"))
18+
fh.write(cs_hi.to_bytes(4, "big"))

‎base-hack/Build/skipped_cutscenes.py‎

Lines changed: 59 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,62 @@
1+
"""Database of skipped cutscenes."""
2+
13
from BuildEnums import Maps
24

35
skipped = {
4-
Maps.JapesMountain: [0, 1, 2],
5-
Maps.Japes: [2, 3, 4, 5, 7, 8, 9, 10, 11, 15, 16, 17, 19, 20, 26],
6-
Maps.JapesDillo: [2],
7-
Maps.JapesShell: [0, 1],
8-
Maps.JapesPainting: [0, 1, 2],
9-
Maps.AztecTinyTemple: [0, 1, 3, 5, 7, 8, 9, 10, 12],
10-
Maps.Helm: [0, 1, 2],
11-
Maps.AztecLlamaTemple: [0, 1, 2, 4, 5, 6, 7, 8, 9],
12-
Maps.Factory: [0, 1, 2, 3, 4, 5, 10, 11, 12, 13, 14, 21, 22, 25, 26, 27, 28, 32, 33, 34, 35, 36, 45],
13-
Maps.FactoryPowerShed: [1],
14-
Maps.Galleon: [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 25, 26, 27, 28, 32, 33, 34],
15-
Maps.JapesUnderground: [0, 1],
16-
Maps.Isles: [2, 3, 10, 11, 12, 13, 14, 15, 16, 20, 23],
17-
Maps.Aztec: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 15, 16, 18, 20, 22],
18-
Maps.Fungi: [1, 2, 4, 5, 6, 8, 13, 14, 16, 18, 23, 24, 25, 27, 32],
19-
Maps.GalleonLighthouse: [1],
20-
Maps.FungiAntHill: [0, 2],
21-
Maps.FungiMinecart: [0, 1, 3, 4],
22-
Maps.FungiDiddyBarn: [0],
23-
Maps.FungiLankyAttic: [0, 1],
24-
Maps.FungiDKBarn: [0, 1],
25-
Maps.FungiMillFront: [0, 3, 4],
26-
Maps.FungiMushroomSlam: [0],
27-
Maps.FungiGiantMushroom: [0, 1, 5],
28-
Maps.FungiShootingGame: [1],
29-
Maps.Caves: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 20, 21, 22, 23, 24],
30-
Maps.Caves5DITiny: [0, 1, 2],
31-
Maps.Caves5DILanky: [0, 1],
32-
Maps.Castle: [0, 1, 2, 3, 4, 5],
33-
Maps.CastleBallroom: [0, 1],
34-
Maps.CavesRotatingRoom: [0],
35-
Maps.Caves5DCChunky: [0],
36-
Maps.Caves5DCDK: [0],
37-
Maps.Caves5DCDiddyLow: [0, 1, 2],
38-
Maps.Caves5DCTiny: [0],
39-
Maps.CavesTileFlip: [4],
40-
Maps.Caves5DIDiddy: [0, 1, 2],
41-
Maps.CastleTower: [0, 1, 2, 3, 4],
42-
Maps.CastleCryptLankyTiny: [0, 1, 2],
43-
Maps.CastleCryptDKDiddyChunky: [1, 2, 3],
44-
Maps.CastleMuseum: [0, 1],
45-
Maps.CastleLibrary: [0, 1, 2, 3],
46-
Maps.CastleBasement: [0, 1, 2, 3],
47-
Maps.CastleTree: [0, 1, 2, 3, 4, 5, 6],
48-
Maps.CastleShed: [0, 1],
49-
Maps.CastleTrash: [0],
50-
Maps.CastleGreenhouse: [0, 1],
51-
Maps.HelmLobby: [0, 1],
52-
Maps.AztecLobby: [2, 3, 4],
53-
Maps.GalleonLobby: [2],
54-
Maps.FactoryLobby: [2, 3],
55-
Maps.CastleCrypt: [0, 1],
56-
Maps.CavesShackDiddyHigh: [0, 2],
57-
Maps.KRoolDiddy: [0],
58-
Maps.KRoolLanky: [0, 1],
59-
Maps.KRoolChunky: [0, 2],
60-
}
6+
Maps.JapesMountain: [0, 1, 2],
7+
Maps.Japes: [2, 3, 4, 5, 7, 8, 9, 10, 11, 15, 16, 17, 19, 20, 26],
8+
Maps.JapesDillo: [2],
9+
Maps.JapesShell: [0, 1],
10+
Maps.JapesPainting: [0, 1, 2],
11+
Maps.AztecTinyTemple: [0, 1, 3, 5, 7, 8, 9, 10, 12],
12+
Maps.Helm: [0, 1, 2],
13+
Maps.AztecLlamaTemple: [0, 1, 2, 4, 5, 6, 7, 8, 9],
14+
Maps.Factory: [0, 1, 2, 3, 4, 5, 10, 11, 12, 13, 14, 21, 22, 25, 26, 27, 28, 32, 33, 34, 35, 36, 45],
15+
Maps.FactoryPowerShed: [1],
16+
Maps.Galleon: [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 25, 26, 27, 28, 32, 33, 34],
17+
Maps.JapesUnderground: [0, 1],
18+
Maps.Isles: [2, 3, 10, 11, 12, 13, 14, 15, 16, 20, 23],
19+
Maps.Aztec: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 15, 16, 18, 20, 22],
20+
Maps.Fungi: [1, 2, 4, 5, 6, 8, 13, 14, 16, 18, 23, 24, 25, 27, 32],
21+
Maps.GalleonLighthouse: [1],
22+
Maps.FungiAntHill: [0, 2],
23+
Maps.FungiMinecart: [0, 1, 3, 4],
24+
Maps.FungiDiddyBarn: [0],
25+
Maps.FungiLankyAttic: [0, 1],
26+
Maps.FungiDKBarn: [0, 1],
27+
Maps.FungiMillFront: [0, 3, 4],
28+
Maps.FungiMushroomSlam: [0],
29+
Maps.FungiGiantMushroom: [0, 1, 5],
30+
Maps.FungiShootingGame: [1],
31+
Maps.Caves: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 20, 21, 22, 23, 24],
32+
Maps.Caves5DITiny: [0, 1, 2],
33+
Maps.Caves5DILanky: [0, 1],
34+
Maps.Castle: [0, 1, 2, 3, 4, 5],
35+
Maps.CastleBallroom: [0, 1],
36+
Maps.CavesRotatingRoom: [0],
37+
Maps.Caves5DCChunky: [0],
38+
Maps.Caves5DCDK: [0],
39+
Maps.Caves5DCDiddyLow: [0, 1, 2],
40+
Maps.Caves5DCTiny: [0],
41+
Maps.CavesTileFlip: [4],
42+
Maps.Caves5DIDiddy: [0, 1, 2],
43+
Maps.CastleTower: [0, 1, 2, 3, 4],
44+
Maps.CastleCryptLankyTiny: [0, 1, 2],
45+
Maps.CastleCryptDKDiddyChunky: [1, 2, 3],
46+
Maps.CastleMuseum: [0, 1],
47+
Maps.CastleLibrary: [0, 1, 2, 3],
48+
Maps.CastleBasement: [0, 1, 2, 3],
49+
Maps.CastleTree: [0, 1, 2, 3, 4, 5, 6],
50+
Maps.CastleShed: [0, 1],
51+
Maps.CastleTrash: [0],
52+
Maps.CastleGreenhouse: [0, 1],
53+
Maps.HelmLobby: [0, 1],
54+
Maps.AztecLobby: [2, 3, 4],
55+
Maps.GalleonLobby: [2],
56+
Maps.FactoryLobby: [2, 3],
57+
Maps.CastleCrypt: [0, 1],
58+
Maps.CavesShackDiddyHigh: [0, 2],
59+
Maps.KRoolDiddy: [0],
60+
Maps.KRoolLanky: [0, 1],
61+
Maps.KRoolChunky: [0, 2],
62+
}

‎wiki/article_markdown/custom_locations/CustomLocationsCoins.MD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@
556556
| Behind the second lowest ladder in the Giant Mushroom Area | 2 | `self.logic = lambda _: True` |
557557
| Above the second lowest ladder in the Giant Mushroom Area | 2 | `self.logic = lambda _: True` |
558558
| On the entryways to the 3 top rooms in the Giant Mushroom Area | 3 | `self.logic = lambda _: True` |
559-
| On the Giant Mushroom top | 12 | `(l.jetpack and l.isdiddy) or (l.islanky and l.handstand)` |
559+
| On the Giant Mushroom top | 12 | `logic=lambda _: True` |
560560
| On the Rabbit Race roof | 5 | `self.logic = lambda _: True` |
561561
| Around the Saxophone pad | 4 | `self.logic = lambda _: True` |
562562
| On the stump at the start of the hollow tree area | 2 | `self.logic = lambda _: True` |

0 commit comments

Comments
 (0)