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/MtThunderPeak | |
| 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/MtThunderPeak')
| -rw-r--r-- | data/dungeon/MtThunderPeak/floor_id.json | 66 | ||||
| -rw-r--r-- | data/dungeon/MtThunderPeak/pokemon_found.json | 118 |
2 files changed, 92 insertions, 92 deletions
diff --git a/data/dungeon/MtThunderPeak/floor_id.json b/data/dungeon/MtThunderPeak/floor_id.json index f59f15a..6e39e10 100644 --- a/data/dungeon/MtThunderPeak/floor_id.json +++ b/data/dungeon/MtThunderPeak/floor_id.json @@ -1,33 +1,33 @@ -{
- "name": "MtThunderPeakFloorID",
- "tables": [
- {
- "MainData": 49,
- "Pokemon": 37,
- "Traps": 3,
- "Items": 17,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 50,
- "Pokemon": 37,
- "Traps": 3,
- "Items": 17,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 51,
- "Pokemon": 38,
- "Traps": 3,
- "Items": 17,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- }
-
- ]
-}
+{ + "name": "MtThunderPeakFloorID", + "tables": [ + { + "MainData": 49, + "Pokemon": 37, + "Traps": 3, + "Items": 17, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 50, + "Pokemon": 37, + "Traps": 3, + "Items": 17, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 51, + "Pokemon": 38, + "Traps": 3, + "Items": 17, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + + ] +} diff --git a/data/dungeon/MtThunderPeak/pokemon_found.json b/data/dungeon/MtThunderPeak/pokemon_found.json index 964e37f..22f230e 100644 --- a/data/dungeon/MtThunderPeak/pokemon_found.json +++ b/data/dungeon/MtThunderPeak/pokemon_found.json @@ -1,59 +1,59 @@ -{
- "tables": [{
- "name": "MtThunderPeak_1F_2F_Pokemon",
- "pokemon": [{
- "species": "SPECIES_GROWLITHE",
- "level": 10,
- "probability": 2000
- },
- {
- "species": "SPECIES_ELECTABUZZ",
- "level": 12,
- "probability": 2000
- },
- {
- "species": "SPECIES_AMPHAROS",
- "level": 12,
- "probability": 2000
- },
- {
- "species": "SPECIES_GLIGAR",
- "level": 12,
- "probability": 2000
- },
- {
- "species": "SPECIES_MANECTRIC",
- "level": 9,
- "probability": 2000
- },
- {
- "species": "SPECIES_KECLEON",
- "level": 90,
- "probability": 0
- },
- {
- "species": "SPECIES_DECOY",
- "level": 1,
- "probability": 0
- }
- ]
- }, {
- "name": "MtThunderPeak_3F_Pokemon",
- "pokemon": [{
- "species": "SPECIES_ZAPDOS",
- "level": 25,
- "probability": 10000
- },
- {
- "species": "SPECIES_KECLEON",
- "level": 90,
- "probability": 0
- },
- {
- "species": "SPECIES_DECOY",
- "level": 1,
- "probability": 0
- }
- ]
- }]
-}
+{ + "tables": [{ + "name": "MtThunderPeak_1F_2F_Pokemon", + "pokemon": [{ + "species": "SPECIES_GROWLITHE", + "level": 10, + "probability": 2000 + }, + { + "species": "SPECIES_ELECTABUZZ", + "level": 12, + "probability": 2000 + }, + { + "species": "SPECIES_AMPHAROS", + "level": 12, + "probability": 2000 + }, + { + "species": "SPECIES_GLIGAR", + "level": 12, + "probability": 2000 + }, + { + "species": "SPECIES_MANECTRIC", + "level": 9, + "probability": 2000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MtThunderPeak_3F_Pokemon", + "pokemon": [{ + "species": "SPECIES_ZAPDOS", + "level": 25, + "probability": 10000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} |