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/TinyWoods | |
| 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/TinyWoods')
| -rw-r--r-- | data/dungeon/TinyWoods/floor_id.json | 64 | ||||
| -rw-r--r-- | data/dungeon/TinyWoods/pokemon_found.json | 128 |
2 files changed, 96 insertions, 96 deletions
diff --git a/data/dungeon/TinyWoods/floor_id.json b/data/dungeon/TinyWoods/floor_id.json index 5326904..4471594 100644 --- a/data/dungeon/TinyWoods/floor_id.json +++ b/data/dungeon/TinyWoods/floor_id.json @@ -1,32 +1,32 @@ -{
- "name": "TinyWoodsFloorID",
- "tables": [
- {
- "MainData": 0,
- "Pokemon": 0,
- "Traps": 0,
- "Items": 0,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 1,
- "Pokemon": 0,
- "Traps": 0,
- "Items": 4,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- },
- {
- "MainData": 2,
- "Pokemon": 1,
- "Traps": 0,
- "Items": 5,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 3
- }
- ]
-}
+{ + "name": "TinyWoodsFloorID", + "tables": [ + { + "MainData": 0, + "Pokemon": 0, + "Traps": 0, + "Items": 0, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 1, + "Pokemon": 0, + "Traps": 0, + "Items": 4, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + }, + { + "MainData": 2, + "Pokemon": 1, + "Traps": 0, + "Items": 5, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 3 + } + ] +} diff --git a/data/dungeon/TinyWoods/pokemon_found.json b/data/dungeon/TinyWoods/pokemon_found.json index 79b8844..4f28076 100644 --- a/data/dungeon/TinyWoods/pokemon_found.json +++ b/data/dungeon/TinyWoods/pokemon_found.json @@ -1,64 +1,64 @@ -{
- "tables": [{
- "name": "TinyWoods1F_2F_Pokemon",
- "pokemon": [{
- "species": "SPECIES_PIDGEY",
- "level": 1,
- "probability": 3333
- },
- {
- "species": "SPECIES_SUNKERN",
- "level": 1,
- "probability": 3334
- },
- {
- "species": "SPECIES_WURMPLE",
- "level": 1,
- "probability": 3333
- },
- {
- "species": "SPECIES_KECLEON",
- "level": 90,
- "probability": 0
- },
- {
- "species": "SPECIES_DECOY",
- "level": 1,
- "probability": 0
- }
- ]
- }, {
- "name": "TinyWoods3F_Pokemon",
- "pokemon": [{
- "species": "SPECIES_PIDGEY",
- "level": 1,
- "probability": 2857
- },
- {
- "species": "SPECIES_EXEGGCUTE",
- "level": 1,
- "probability": 1429
- },
- {
- "species": "SPECIES_SUNKERN",
- "level": 1,
- "probability": 2857
- },
- {
- "species": "SPECIES_WURMPLE",
- "level": 1,
- "probability": 2857
- },
- {
- "species": "SPECIES_KECLEON",
- "level": 90,
- "probability": 0
- },
- {
- "species": "SPECIES_DECOY",
- "level": 1,
- "probability": 0
- }
- ]
- }]
-}
+{ + "tables": [{ + "name": "TinyWoods1F_2F_Pokemon", + "pokemon": [{ + "species": "SPECIES_PIDGEY", + "level": 1, + "probability": 3333 + }, + { + "species": "SPECIES_SUNKERN", + "level": 1, + "probability": 3334 + }, + { + "species": "SPECIES_WURMPLE", + "level": 1, + "probability": 3333 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }, { + "name": "TinyWoods3F_Pokemon", + "pokemon": [{ + "species": "SPECIES_PIDGEY", + "level": 1, + "probability": 2857 + }, + { + "species": "SPECIES_EXEGGCUTE", + "level": 1, + "probability": 1429 + }, + { + "species": "SPECIES_SUNKERN", + "level": 1, + "probability": 2857 + }, + { + "species": "SPECIES_WURMPLE", + "level": 1, + "probability": 2857 + }, + { + "species": "SPECIES_KECLEON", + "level": 90, + "probability": 0 + }, + { + "species": "SPECIES_DECOY", + "level": 1, + "probability": 0 + } + ] + }] +} |