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/GrandSea | |
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/GrandSea')
-rw-r--r-- | data/dungeon/GrandSea/floor_id.json | 550 |
1 files changed, 275 insertions, 275 deletions
diff --git a/data/dungeon/GrandSea/floor_id.json b/data/dungeon/GrandSea/floor_id.json index 4f3333d..a69fa5c 100644 --- a/data/dungeon/GrandSea/floor_id.json +++ b/data/dungeon/GrandSea/floor_id.json @@ -1,275 +1,275 @@ -{
- "name": "GrandSeaFloorID",
- "tables": [
- {
- "MainData": 996,
- "Pokemon": 460,
- "Traps": 6,
- "Items": 113,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 997,
- "Pokemon": 460,
- "Traps": 6,
- "Items": 113,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 998,
- "Pokemon": 460,
- "Traps": 6,
- "Items": 113,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 999,
- "Pokemon": 460,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1000,
- "Pokemon": 461,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1001,
- "Pokemon": 462,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1002,
- "Pokemon": 462,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1003,
- "Pokemon": 462,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1004,
- "Pokemon": 462,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1005,
- "Pokemon": 463,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1006,
- "Pokemon": 464,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1007,
- "Pokemon": 464,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1008,
- "Pokemon": 464,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1009,
- "Pokemon": 465,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1010,
- "Pokemon": 466,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1011,
- "Pokemon": 467,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1012,
- "Pokemon": 467,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1013,
- "Pokemon": 467,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1014,
- "Pokemon": 467,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1015,
- "Pokemon": 468,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1016,
- "Pokemon": 469,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1017,
- "Pokemon": 469,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1018,
- "Pokemon": 469,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1019,
- "Pokemon": 470,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1020,
- "Pokemon": 471,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1021,
- "Pokemon": 472,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1022,
- "Pokemon": 473,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1023,
- "Pokemon": 473,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1024,
- "Pokemon": 473,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- },
- {
- "MainData": 1025,
- "Pokemon": 474,
- "Traps": 6,
- "Items": 114,
- "KecleonShop": 1,
- "MonsterRoomItems": 2,
- "BuriedItems": 66
- }
- ]
-}
+{ + "name": "GrandSeaFloorID", + "tables": [ + { + "MainData": 996, + "Pokemon": 460, + "Traps": 6, + "Items": 113, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 997, + "Pokemon": 460, + "Traps": 6, + "Items": 113, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 998, + "Pokemon": 460, + "Traps": 6, + "Items": 113, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 999, + "Pokemon": 460, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1000, + "Pokemon": 461, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1001, + "Pokemon": 462, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1002, + "Pokemon": 462, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1003, + "Pokemon": 462, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1004, + "Pokemon": 462, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1005, + "Pokemon": 463, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1006, + "Pokemon": 464, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1007, + "Pokemon": 464, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1008, + "Pokemon": 464, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1009, + "Pokemon": 465, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1010, + "Pokemon": 466, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1011, + "Pokemon": 467, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1012, + "Pokemon": 467, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1013, + "Pokemon": 467, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1014, + "Pokemon": 467, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1015, + "Pokemon": 468, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1016, + "Pokemon": 469, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1017, + "Pokemon": 469, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1018, + "Pokemon": 469, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1019, + "Pokemon": 470, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1020, + "Pokemon": 471, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1021, + "Pokemon": 472, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1022, + "Pokemon": 473, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1023, + "Pokemon": 473, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1024, + "Pokemon": 473, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + }, + { + "MainData": 1025, + "Pokemon": 474, + "Traps": 6, + "Items": 114, + "KecleonShop": 1, + "MonsterRoomItems": 2, + "BuriedItems": 66 + } + ] +} |