From 8237e29a164211eb2ec4cd161eb4183cc1947fee Mon Sep 17 00:00:00 2001 From: Cheng Hann Gan Date: Thu, 9 Sep 2021 19:22:48 -0400 Subject: 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 * Renamed symbols per PR comments Co-authored-by: Cheng Hann Gan Co-authored-by: Seth Barberee --- data/dungeon/MtSteel/floor_id.json | 172 +++++++-------- data/dungeon/MtSteel/pokemon_found.json | 376 ++++++++++++++++---------------- 2 files changed, 274 insertions(+), 274 deletions(-) (limited to 'data/dungeon/MtSteel') diff --git a/data/dungeon/MtSteel/floor_id.json b/data/dungeon/MtSteel/floor_id.json index fc28d1a..986c5f3 100644 --- a/data/dungeon/MtSteel/floor_id.json +++ b/data/dungeon/MtSteel/floor_id.json @@ -1,86 +1,86 @@ -{ - "name": "MtSteelFloorID", - "tables": [ - { - "MainData": 8, - "Pokemon": 5, - "Traps": 1, - "Items": 8, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 9, - "Pokemon": 5, - "Traps": 1, - "Items": 8, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 10, - "Pokemon": 5, - "Traps": 1, - "Items": 8, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 11, - "Pokemon": 5, - "Traps": 1, - "Items": 9, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 12, - "Pokemon": 6, - "Traps": 1, - "Items": 9, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 13, - "Pokemon": 7, - "Traps": 1, - "Items": 9, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 14, - "Pokemon": 8, - "Traps": 1, - "Items": 10, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 15, - "Pokemon": 8, - "Traps": 1, - "Items": 10, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - }, - { - "MainData": 16, - "Pokemon": 9, - "Traps": 1, - "Items": 10, - "KecleonShop": 1, - "MonsterRoomItems": 2, - "BuriedItems": 3 - } - ] -} +{ + "name": "MtSteelFloorID", + "tables": [ + { + "MainData": 8, + "Pokemon": 5, + "Traps": 1, + "Items": 8, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 9, + "Pokemon": 5, + "Traps": 1, + "Items": 8, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 10, + "Pokemon": 5, + "Traps": 1, + "Items": 8, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 11, + "Pokemon": 5, + "Traps": 1, + "Items": 9, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 12, + "Pokemon": 6, + "Traps": 1, + "Items": 9, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 13, + "Pokemon": 7, + "Traps": 1, + "Items": 9, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 14, + "Pokemon": 8, + "Traps": 1, + "Items": 10, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 15, + "Pokemon": 8, + "Traps": 1, + "Items": 10, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 16, + "Pokemon": 9, + "Traps": 1, + "Items": 10, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/MtSteel/pokemon_found.json b/data/dungeon/MtSteel/pokemon_found.json index dbaeff9..8b8b110 100644 --- a/data/dungeon/MtSteel/pokemon_found.json +++ b/data/dungeon/MtSteel/pokemon_found.json @@ -1,188 +1,188 @@ -{ - "tables": [{ - "name": "MtSteel_1F_4F_Pokemon", - "pokemon": [{ - "species": "SPECIES_SPEAROW", - "level": 4, - "probability": 2353 - }, - { - "species": "SPECIES_ZIGZAGOON", - "level": 5, - "probability": 2353 - }, - { - "species": "SPECIES_ARON", - "level": 6, - "probability": 2941 - }, - { - "species": "SPECIES_BALTOY", - "level": 5, - "probability": 2353 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtSteel_5F_Pokemon", - "pokemon": [{ - "species": "SPECIES_GEODUDE", - "level": 5, - "probability": 1905 - }, - { - "species": "SPECIES_TYROGUE", - "level": 6, - "probability": 1905 - }, - { - "species": "SPECIES_ZIGZAGOON", - "level": 5, - "probability": 1904 - }, - { - "species": "SPECIES_ARON", - "level": 6, - "probability": 2381 - }, - { - "species": "SPECIES_MEDITITE", - "level": 6, - "probability": 1905 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtSteel_6F_Pokemon", - "pokemon": [{ - "species": "SPECIES_GEODUDE", - "level": 5, - "probability": 2051 - }, - { - "species": "SPECIES_TYROGUE", - "level": 6, - "probability": 2052 - }, - { - "species": "SPECIES_ARON", - "level": 6, - "probability": 2564 - }, - { - "species": "SPECIES_MEDITITE", - "level": 6, - "probability": 2051 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_BELDUM", - "level": 5, - "probability": 1282 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtSteel_7F_8F_Pokemon", - "pokemon": [{ - "species": "SPECIES_GEODUDE", - "level": 5, - "probability": 1633 - }, - { - "species": "SPECIES_PINSIR", - "level": 6, - "probability": 2040 - }, - { - "species": "SPECIES_TYROGUE", - "level": 6, - "probability": 1633 - }, - { - "species": "SPECIES_ARON", - "level": 6, - "probability": 2041 - }, - { - "species": "SPECIES_MEDITITE", - "level": 6, - "probability": 1633 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_BELDUM", - "level": 5, - "probability": 1020 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }, { - "name": "MtSteel_9F_Pokemon", - "pokemon": [{ - "species": "SPECIES_DIGLETT", - "level": 5, - "probability": 0 - }, - { - "species": "SPECIES_SKARMORY", - "level": 10, - "probability": 0 - }, - { - "species": "SPECIES_ARON", - "level": 6, - "probability": 6667 - }, - { - "species": "SPECIES_KECLEON", - "level": 90, - "probability": 0 - }, - { - "species": "SPECIES_BELDUM", - "level": 5, - "probability": 3333 - }, - { - "species": "SPECIES_DECOY", - "level": 1, - "probability": 0 - } - ] - }] -} +{ + "tables": [{ + "name": "MtSteel_1F_4F_Pokemon", + "pokemon": [{ + "species": "SPECIES_SPEAROW", + "level": 4, + "probability": 2353 + }, + { + "species": "SPECIES_ZIGZAGOON", + "level": 5, + "probability": 2353 + }, + { + "species": "SPECIES_ARON", + "level": 6, + "probability": 2941 + }, + { + "species": "SPECIES_BALTOY", + "level": 5, + "probability": 2353 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtSteel_5F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GEODUDE", + "level": 5, + "probability": 1905 + }, + { + "species": "SPECIES_TYROGUE", + "level": 6, + "probability": 1905 + }, + { + "species": "SPECIES_ZIGZAGOON", + "level": 5, + "probability": 1904 + }, + { + "species": "SPECIES_ARON", + "level": 6, + "probability": 2381 + }, + { + "species": "SPECIES_MEDITITE", + "level": 6, + "probability": 1905 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtSteel_6F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GEODUDE", + "level": 5, + "probability": 2051 + }, + { + "species": "SPECIES_TYROGUE", + "level": 6, + "probability": 2052 + }, + { + "species": "SPECIES_ARON", + "level": 6, + "probability": 2564 + }, + { + "species": "SPECIES_MEDITITE", + "level": 6, + "probability": 2051 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BELDUM", + "level": 5, + "probability": 1282 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtSteel_7F_8F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GEODUDE", + "level": 5, + "probability": 1633 + }, + { + "species": "SPECIES_PINSIR", + "level": 6, + "probability": 2040 + }, + { + "species": "SPECIES_TYROGUE", + "level": 6, + "probability": 1633 + }, + { + "species": "SPECIES_ARON", + "level": 6, + "probability": 2041 + }, + { + "species": "SPECIES_MEDITITE", + "level": 6, + "probability": 1633 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BELDUM", + "level": 5, + "probability": 1020 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtSteel_9F_Pokemon", + "pokemon": [{ + "species": "SPECIES_DIGLETT", + "level": 5, + "probability": 0 + }, + { + "species": "SPECIES_SKARMORY", + "level": 10, + "probability": 0 + }, + { + "species": "SPECIES_ARON", + "level": 6, + "probability": 6667 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_BELDUM", + "level": 5, + "probability": 3333 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} -- cgit v1.2.3