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/MagmaCavernPit | |
| 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/MagmaCavernPit')
| -rw-r--r-- | data/dungeon/MagmaCavernPit/floor_id.json | 64 | ||||
| -rw-r--r-- | data/dungeon/MagmaCavernPit/pokemon_found.json | 150 |
2 files changed, 107 insertions, 107 deletions
diff --git a/data/dungeon/MagmaCavernPit/floor_id.json b/data/dungeon/MagmaCavernPit/floor_id.json index 42995f5..837d1d1 100644 --- a/data/dungeon/MagmaCavernPit/floor_id.json +++ b/data/dungeon/MagmaCavernPit/floor_id.json @@ -1,32 +1,32 @@ -{
- "name": "MagmaCavernPitFloorID",
- "tables": [
- {
- "MainData": 150,
- "Pokemon": 94,
- "Traps": 3,
- "Items": 40,
- "KecleonShop": 37,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 151,
- "Pokemon": 95,
- "Traps": 3,
- "Items": 40,
- "KecleonShop": 37,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 152,
- "Pokemon": 96,
- "Traps": 3,
- "Items": 40,
- "KecleonShop": 37,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- }
- ]
-}
+{ + "name": "MagmaCavernPitFloorID", + "tables": [ + { + "MainData": 150, + "Pokemon": 94, + "Traps": 3, + "Items": 40, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 151, + "Pokemon": 95, + "Traps": 3, + "Items": 40, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 152, + "Pokemon": 96, + "Traps": 3, + "Items": 40, + "KecleonShop": 37, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/MagmaCavernPit/pokemon_found.json b/data/dungeon/MagmaCavernPit/pokemon_found.json index c0e312f..c2cd5f2 100644 --- a/data/dungeon/MagmaCavernPit/pokemon_found.json +++ b/data/dungeon/MagmaCavernPit/pokemon_found.json @@ -1,75 +1,75 @@ -{
- "tables": [{
- "name": "MagmaCavernPit_1F_Pokemon",
- "pokemon": [
- {
- "species": "SPECIES_ONIX",
- "level": 30,
- "probability": 5000
- },
- {
- "species": "SPECIES_STEELIX",
- "level": 25,
- "probability": 5000
- },
- {
- "species": "SPECIES_KECLEON",
- "level": 90,
- "probability": 0
- },
- {
- "species": "SPECIES_DECOY",
- "level": 1,
- "probability": 0
- }
- ]
- }, {
- "name": "MagmaCavernPit_2F_Pokemon",
- "pokemon": [
- {
- "species": "SPECIES_CHARIZARD",
- "level": 55,
- "probability": 0
- },
- {
- "species": "SPECIES_TYRANITAR",
- "level": 50,
- "probability": 10000
- },
- {
- "species": "SPECIES_KECLEON",
- "level": 90,
- "probability": 0
- },
- {
- "species": "SPECIES_DECOY",
- "level": 1,
- "probability": 0
- }
- ]
- }, {
- "name": "MagmaCavernPit_3F_Pokemon",
- "pokemon": [
- {
- "species": "SPECIES_ALAKAZAM",
- "level": 50,
- "probability": 5000
- },
- {
- "species": "SPECIES_KECLEON",
- "level": 90,
- "probability": 0
- },
- {
- "species": "SPECIES_GROUDON",
- "level": 27,
- "probability": 5000
- },
- {
- "species": "SPECIES_DECOY",
- "level": 1,
- "probability": 0
- }
- ]
- }]
-}
+{ + "tables": [{ + "name": "MagmaCavernPit_1F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ONIX", + "level": 30, + "probability": 5000 + }, + { + "species": "SPECIES_STEELIX", + "level": 25, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MagmaCavernPit_2F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_CHARIZARD", + "level": 55, + "probability": 0 + }, + { + "species": "SPECIES_TYRANITAR", + "level": 50, + "probability": 10000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "MagmaCavernPit_3F_Pokemon", + "pokemon": [ + { + "species": "SPECIES_ALAKAZAM", + "level": 50, + "probability": 5000 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_GROUDON", + "level": 27, + "probability": 5000 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} |