From 8237e29a164211eb2ec4cd161eb4183cc1947fee Mon Sep 17 00:00:00 2001
From: Cheng Hann Gan <chenghanngan.us@gmail.com>
Date: Thu, 9 Sep 2021 19:22:48 -0400
Subject: 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>
---
 data/dungeon/Autopilot/floor_id.json | 190 +++++++++++++++++------------------
 1 file changed, 95 insertions(+), 95 deletions(-)

(limited to 'data/dungeon/Autopilot')

diff --git a/data/dungeon/Autopilot/floor_id.json b/data/dungeon/Autopilot/floor_id.json
index a61ad82..7c7662a 100644
--- a/data/dungeon/Autopilot/floor_id.json
+++ b/data/dungeon/Autopilot/floor_id.json
@@ -1,95 +1,95 @@
-{
-    "name": "AutopilotFloorID",
-    "tables": [
-    {
-        "MainData": 1129,
-        "Pokemon": 526,
-        "Traps": 10,
-        "Items": 126,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1130,
-        "Pokemon": 526,
-        "Traps": 10,
-        "Items": 126,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1131,
-        "Pokemon": 527,
-        "Traps": 10,
-        "Items": 126,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1132,
-        "Pokemon": 528,
-        "Traps": 10,
-        "Items": 127,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1133,
-        "Pokemon": 529,
-        "Traps": 10,
-        "Items": 127,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1134,
-        "Pokemon": 529,
-        "Traps": 10,
-        "Items": 127,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1135,
-        "Pokemon": 530,
-        "Traps": 10,
-        "Items": 127,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1136,
-        "Pokemon": 530,
-        "Traps": 10,
-        "Items": 127,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1137,
-        "Pokemon": 530,
-        "Traps": 10,
-        "Items": 127,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    },
-    {
-        "MainData": 1138,
-        "Pokemon": 531,
-        "Traps": 10,
-        "Items": 127,
-        "KecleonShop": 1,
-        "MonsterRoomItems": 2,
-        "BuriedItems": 66
-    }
-    ]
-}
+{
+    "name": "AutopilotFloorID",
+    "tables": [
+    {
+        "MainData": 1129,
+        "Pokemon": 526,
+        "Traps": 10,
+        "Items": 126,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1130,
+        "Pokemon": 526,
+        "Traps": 10,
+        "Items": 126,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1131,
+        "Pokemon": 527,
+        "Traps": 10,
+        "Items": 126,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1132,
+        "Pokemon": 528,
+        "Traps": 10,
+        "Items": 127,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1133,
+        "Pokemon": 529,
+        "Traps": 10,
+        "Items": 127,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1134,
+        "Pokemon": 529,
+        "Traps": 10,
+        "Items": 127,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1135,
+        "Pokemon": 530,
+        "Traps": 10,
+        "Items": 127,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1136,
+        "Pokemon": 530,
+        "Traps": 10,
+        "Items": 127,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1137,
+        "Pokemon": 530,
+        "Traps": 10,
+        "Items": 127,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    },
+    {
+        "MainData": 1138,
+        "Pokemon": 531,
+        "Traps": 10,
+        "Items": 127,
+        "KecleonShop": 1,
+        "MonsterRoomItems": 2,
+        "BuriedItems": 66
+    }
+    ]
+}
-- 
cgit v1.2.3