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/SkyTowerSummit | |
| 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/SkyTowerSummit')
| -rw-r--r-- | data/dungeon/SkyTowerSummit/floor_id.json | 172 | ||||
| -rw-r--r-- | data/dungeon/SkyTowerSummit/pokemon_found.json | 132 |
2 files changed, 152 insertions, 152 deletions
diff --git a/data/dungeon/SkyTowerSummit/floor_id.json b/data/dungeon/SkyTowerSummit/floor_id.json index e3b3769..88f7042 100644 --- a/data/dungeon/SkyTowerSummit/floor_id.json +++ b/data/dungeon/SkyTowerSummit/floor_id.json @@ -1,86 +1,86 @@ -{
- "name": "SkyTowerSummitFloorID",
- "tables": [
- {
- "MainData": 178,
- "Pokemon": 110,
- "Traps": 5,
- "Items": 43,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 179,
- "Pokemon": 110,
- "Traps": 5,
- "Items": 43,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 180,
- "Pokemon": 110,
- "Traps": 5,
- "Items": 43,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 181,
- "Pokemon": 110,
- "Traps": 5,
- "Items": 44,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 182,
- "Pokemon": 110,
- "Traps": 5,
- "Items": 44,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 183,
- "Pokemon": 110,
- "Traps": 5,
- "Items": 44,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 184,
- "Pokemon": 110,
- "Traps": 5,
- "Items": 44,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 185,
- "Pokemon": 110,
- "Traps": 5,
- "Items": 44,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 186,
- "Pokemon": 111,
- "Traps": 5,
- "Items": 44,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- }
- ]
-}
+{ + "name": "SkyTowerSummitFloorID", + "tables": [ + { + "MainData": 178, + "Pokemon": 110, + "Traps": 5, + "Items": 43, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 179, + "Pokemon": 110, + "Traps": 5, + "Items": 43, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 180, + "Pokemon": 110, + "Traps": 5, + "Items": 43, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 181, + "Pokemon": 110, + "Traps": 5, + "Items": 44, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 182, + "Pokemon": 110, + "Traps": 5, + "Items": 44, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 183, + "Pokemon": 110, + "Traps": 5, + "Items": 44, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 184, + "Pokemon": 110, + "Traps": 5, + "Items": 44, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 185, + "Pokemon": 110, + "Traps": 5, + "Items": 44, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 186, + "Pokemon": 111, + "Traps": 5, + "Items": 44, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/SkyTowerSummit/pokemon_found.json b/data/dungeon/SkyTowerSummit/pokemon_found.json index 8146ec3..75237dc 100644 --- a/data/dungeon/SkyTowerSummit/pokemon_found.json +++ b/data/dungeon/SkyTowerSummit/pokemon_found.json @@ -1,66 +1,66 @@ -{
- "tables": [{
- "name": "SkyTowerSummit_1F_8F_Pokemon",
- "pokemon": [
- {
- "species": "SPECIES_AERODACTYL",
- "level": 25,
- "probability": 1667
- },
- {
- "species": "SPECIES_FLYGON",
- "level": 27,
- "probability": 1666
- },
- {
- "species": "SPECIES_CLAYDOL",
- "level": 26,
- "probability": 1667
- },
- {
- "species": "SPECIES_KECLEON",
- "level": 90,
- "probability": 0
- },
- {
- "species": "SPECIES_TROPIUS",
- "level": 27,
- "probability": 1667
- },
- {
- "species": "SPECIES_SALAMENCE",
- "level": 29,
- "probability": 1666
- },
- {
- "species": "SPECIES_METAGROSS",
- "level": 30,
- "probability": 1667
- },
- {
- "species": "SPECIES_DECOY",
- "level": 1,
- "probability": 0
- }
- ]
- }, {
- "name": "SkyTowerSummit_9F_Pokemon",
- "pokemon": [
- {
- "species": "SPECIES_KECLEON",
- "level": 90,
- "probability": 0
- },
- {
- "species": "SPECIES_RAYQUAZA",
- "level": 35,
- "probability": 10000
- },
- {
- "species": "SPECIES_DECOY",
- "level": 1,
- "probability": 0
- }
- ]
- }]
-}
+{ + "tables": [{ + "name": "SkyTowerSummit_1F_8F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_AERODACTYL", + "level": 25, + "probability": 1667 + }, + { + "species": "SPECIES_FLYGON", + "level": 27, + "probability": 1666 + }, + { + "species": "SPECIES_CLAYDOL", + "level": 26, + "probability": 1667 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_TROPIUS", + "level": 27, + "probability": 1667 + }, + { + "species": "SPECIES_SALAMENCE", + "level": 29, + "probability": 1666 + }, + { + "species": "SPECIES_METAGROSS", + "level": 30, + "probability": 1667 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "SkyTowerSummit_9F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_RAYQUAZA", + "level": 35, + "probability": 10000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} |