diff options
| author | Cheng Hann Gan <chenghanngan.us@gmail.com> | 2021-09-09 19:22:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-09 16:22:48 -0700 |
| commit | 8237e29a164211eb2ec4cd161eb4183cc1947fee (patch) | |
| tree | 67dc502264b755dc620f56969f3bea68a40b17af /data/dungeon/MtBlaze | |
| parent | 4eff1882443b0004d9c9fa4895cdfefdc356565f (diff) | |
Defined more in-dungeon structs and enums (#53)
* Defined DungeonEntity
* Rename EntityType enums
* Revert EntityType rename
* Defined more in-dungeon structs and enums
* Added more dungeon global structs/enums
* Prefixed dungeonGlobalData with g
* Fixed compile errors
* Removed some CRLFs
* Fixed compile after merge
* Revert Makefile
* Rename DungeonEntityData.entityType
Co-authored-by: Seth Barberee <seth.barberee@gmail.com>
* Renamed symbols per PR comments
Co-authored-by: Cheng Hann Gan <chenghann_gan@ultimatesoftware.com>
Co-authored-by: Seth Barberee <seth.barberee@gmail.com>
Diffstat (limited to 'data/dungeon/MtBlaze')
| -rw-r--r-- | data/dungeon/MtBlaze/floor_id.json | 226 | ||||
| -rw-r--r-- | data/dungeon/MtBlaze/pokemon_found.json | 440 |
2 files changed, 333 insertions, 333 deletions
diff --git a/data/dungeon/MtBlaze/floor_id.json b/data/dungeon/MtBlaze/floor_id.json index 6dcb1a4..6c6cc42 100644 --- a/data/dungeon/MtBlaze/floor_id.json +++ b/data/dungeon/MtBlaze/floor_id.json @@ -1,113 +1,113 @@ -{
- "name": "MtBlazeFloorID",
- "tables": [
- {
- "MainData": 78,
- "Pokemon": 55,
- "Traps": 3,
- "Items": 24,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 79,
- "Pokemon": 55,
- "Traps": 3,
- "Items": 24,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 80,
- "Pokemon": 55,
- "Traps": 3,
- "Items": 24,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 81,
- "Pokemon": 56,
- "Traps": 3,
- "Items": 25,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 82,
- "Pokemon": 57,
- "Traps": 3,
- "Items": 25,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 83,
- "Pokemon": 58,
- "Traps": 3,
- "Items": 25,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 84,
- "Pokemon": 59,
- "Traps": 3,
- "Items": 25,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 85,
- "Pokemon": 60,
- "Traps": 3,
- "Items": 25,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 86,
- "Pokemon": 60,
- "Traps": 3,
- "Items": 25,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 87,
- "Pokemon": 61,
- "Traps": 3,
- "Items": 25,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 88,
- "Pokemon": 61,
- "Traps": 3,
- "Items": 25,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 89,
- "Pokemon": 61,
- "Traps": 3,
- "Items": 25,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- }
- ]
-}
+{ + "name": "MtBlazeFloorID", + "tables": [ + { + "MainData": 78, + "Pokemon": 55, + "Traps": 3, + "Items": 24, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 79, + "Pokemon": 55, + "Traps": 3, + "Items": 24, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 80, + "Pokemon": 55, + "Traps": 3, + "Items": 24, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 81, + "Pokemon": 56, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 82, + "Pokemon": 57, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 83, + "Pokemon": 58, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 84, + "Pokemon": 59, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 85, + "Pokemon": 60, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 86, + "Pokemon": 60, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 87, + "Pokemon": 61, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 88, + "Pokemon": 61, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 89, + "Pokemon": 61, + "Traps": 3, + "Items": 25, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/MtBlaze/pokemon_found.json b/data/dungeon/MtBlaze/pokemon_found.json index 2961618..b269470 100644 --- a/data/dungeon/MtBlaze/pokemon_found.json +++ b/data/dungeon/MtBlaze/pokemon_found.json @@ -1,220 +1,220 @@ -{
- "tables": [{
- "name": "MtBlaze_1F_3F_Pokemon",
- "pokemon": [{
- "species": "SPECIES_PIDGEOT",
- "level": 16,
- "probability": 2857
- },
- {
- "species": "SPECIES_SLUGMA",
- "level": 16,
- "probability": 1429
- },
- {
- "species": "SPECIES_MAGBY",
- "level": 17,
- "probability": 2857
- },
- {
- "species": "SPECIES_NUMEL",
- "level": 14,
- "probability": 2857
- },
- {
- "species": "SPECIES_KECLEON",
- "level": 90,
- "probability": 0
- },
- {
- "species": "SPECIES_DECOY",
- "level": 1,
- "probability": 0
- }
- ]
- }, {
-
- "name": "MtBlaze_4F_Pokemon",
- "pokemon": [
- {
- "species": "SPECIES_SLUGMA",
- "level": 16,
- "probability": 2000
- },
- {
- "species": "SPECIES_MAGBY",
- "level": 17,
- "probability": 4000
- },
- {
- "species": "SPECIES_NUMEL",
- "level": 14,
- "probability": 4000
- },
- {
- "species": "SPECIES_KECLEON",
- "level": 90,
- "probability": 0
- },
- {
- "species": "SPECIES_DECOY",
- "level": 1,
- "probability": 0
- }
-
- ]
- }, {
- "name": "MtBlaze_5F_Pokemon",
- "pokemon": [{
- "species": "SPECIES_SHUCKLE",
- "level": 15,
- "probability": 1304
- },
- {
- "species": "SPECIES_SLUGMA",
- "level": 16,
- "probability": 1739
- },
- {
- "species": "SPECIES_MAGBY",
- "level": 17,
- "probability": 3479
- },
- {
- "species": "SPECIES_NUMEL",
- "level": 14,
- "probability": 3478
- },
- {
- "species": "SPECIES_KECLEON",
- "level": 90,
- "probability": 0
- },
- {
- "species": "SPECIES_DECOY",
- "level": 1,
- "probability": 0
- }
- ]
- }, {
- "name": "MtBlaze_6F_Pokemon",
- "pokemon": [{
- "species": "SPECIES_SHUCKLE",
- "level": 15,
- "probability": 2000
- },
- {
- "species": "SPECIES_SLUGMA",
- "level": 16,
- "probability": 2667
- },
- {
- "species": "SPECIES_NUMEL",
- "level": 14,
- "probability": 5333
- },
- {
- "species": "SPECIES_KECLEON",
- "level": 90,
- "probability": 0
- },
- {
- "species": "SPECIES_DECOY",
- "level": 1,
- "probability": 0
- }
- ]
- }, {
- "name": "MtBlaze_7F_Pokemon",
- "pokemon": [{
- "species": "SPECIES_SHUCKLE",
- "level": 15,
- "probability": 2000
- },
- {
- "species": "SPECIES_SLUGMA",
- "level": 16,
- "probability": 2667
- },
- {
- "species": "SPECIES_TORKOAL",
- "level": 15,
- "probability": 5333
- },
- {
- "species": "SPECIES_KECLEON",
- "level": 90,
- "probability": 0
- },
- {
- "species": "SPECIES_DECOY",
- "level": 1,
- "probability": 0
- }
- ]
- }, {
- "name": "MtBlaze_8F_9F_Pokemon",
- "pokemon": [
- {
- "species": "SPECIES_RAPIDASH",
- "level": 10,
- "probability": 3478
- },
- {
- "species": "SPECIES_SHUCKLE",
- "level": 15,
- "probability": 1305
- },
- {
- "species": "SPECIES_SLUGMA",
- "level": 16,
- "probability": 1739
- },
- {
- "species": "SPECIES_TORKOAL",
- "level": 15,
- "probability": 3478
- },
- {
- "species": "SPECIES_KECLEON",
- "level": 90,
- "probability": 0
- },
- {
- "species": "SPECIES_DECOY",
- "level": 1,
- "probability": 0
- }
- ]
- }, {
- "name": "MtBlaze_10F_12F_Pokemon",
- "pokemon": [
- {
- "species": "SPECIES_RAPIDASH",
- "level": 10,
- "probability": 4000
- },
- {
- "species": "SPECIES_SLUGMA",
- "level": 16,
- "probability": 2000
- },
- {
- "species": "SPECIES_TORKOAL",
- "level": 15,
- "probability": 4000
- },
- {
- "species": "SPECIES_KECLEON",
- "level": 90,
- "probability": 0
- },
- {
- "species": "SPECIES_DECOY",
- "level": 1,
- "probability": 0
- }
- ]
- }
- ]
-}
+{ + "tables": [{ + "name": "MtBlaze_1F_3F_Pokemon", + "pokemon": [{ + "species": "SPECIES_PIDGEOT", + "level": 16, + "probability": 2857 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 1429 + }, + { + "species": "SPECIES_MAGBY", + "level": 17, + "probability": 2857 + }, + { + "species": "SPECIES_NUMEL", + "level": 14, + "probability": 2857 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + + "name": "MtBlaze_4F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 2000 + }, + { + "species": "SPECIES_MAGBY", + "level": 17, + "probability": 4000 + }, + { + "species": "SPECIES_NUMEL", + "level": 14, + "probability": 4000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + + ] + }, { + "name": "MtBlaze_5F_Pokemon", + "pokemon": [{ + "species": "SPECIES_SHUCKLE", + "level": 15, + "probability": 1304 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 1739 + }, + { + "species": "SPECIES_MAGBY", + "level": 17, + "probability": 3479 + }, + { + "species": "SPECIES_NUMEL", + "level": 14, + "probability": 3478 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtBlaze_6F_Pokemon", + "pokemon": [{ + "species": "SPECIES_SHUCKLE", + "level": 15, + "probability": 2000 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 2667 + }, + { + "species": "SPECIES_NUMEL", + "level": 14, + "probability": 5333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtBlaze_7F_Pokemon", + "pokemon": [{ + "species": "SPECIES_SHUCKLE", + "level": 15, + "probability": 2000 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 2667 + }, + { + "species": "SPECIES_TORKOAL", + "level": 15, + "probability": 5333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtBlaze_8F_9F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_RAPIDASH", + "level": 10, + "probability": 3478 + }, + { + "species": "SPECIES_SHUCKLE", + "level": 15, + "probability": 1305 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 1739 + }, + { + "species": "SPECIES_TORKOAL", + "level": 15, + "probability": 3478 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtBlaze_10F_12F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_RAPIDASH", + "level": 10, + "probability": 4000 + }, + { + "species": "SPECIES_SLUGMA", + "level": 16, + "probability": 2000 + }, + { + "species": "SPECIES_TORKOAL", + "level": 15, + "probability": 4000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + } + ] +} |
