summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorEltrac <hi@guhub.cn>2025-03-04 11:50:56 +0800
committerEltrac <hi@guhub.cn>2025-03-04 11:50:56 +0800
commitff9be4ad80564c085a49d3a3f4bfbb95669dc594 (patch)
tree4fb161007f8aa3d7765c7bd5857264c738d04527 /data
parent1307ecc06232e606e57190b4e3dfef497bc7c185 (diff)
refactor: make data tables local
Diffstat (limited to 'data')
-rw-r--r--data/bulletData.lua2
-rw-r--r--data/enemyData.lua8
-rw-r--r--data/enemyNames.lua8
-rw-r--r--data/heartTypes.lua4
-rw-r--r--data/roomData.lua16
-rw-r--r--data/roomNames.lua10
-rw-r--r--data/roomType.lua7
7 files changed, 36 insertions, 19 deletions
diff --git a/data/bulletData.lua b/data/bulletData.lua
index 50eb044..8d3af26 100644
--- a/data/bulletData.lua
+++ b/data/bulletData.lua
@@ -1,3 +1,5 @@
+local enemyData = require "data.enemyData"
+
local bulletData = {
bigheart = {
damage = 200,
diff --git a/data/enemyData.lua b/data/enemyData.lua
index c58eb51..1a06229 100644
--- a/data/enemyData.lua
+++ b/data/enemyData.lua
@@ -1,4 +1,5 @@
-enemyData = {
+require "objects.direction"
+local enemyData = {
lancer = {
size = 20,
zoom = 1/16,
@@ -80,7 +81,4 @@ enemyData = {
}
}
-enemyTypes = {}
-for type, _ in pairs(enemyData) do
- table.insert(enemyTypes, type)
-end
+return enemyData
diff --git a/data/enemyNames.lua b/data/enemyNames.lua
new file mode 100644
index 0000000..62cd72f
--- /dev/null
+++ b/data/enemyNames.lua
@@ -0,0 +1,8 @@
+local enemyData = require "data.enemyData"
+
+local enemyNames = {}
+for type, _ in pairs(enemyData) do
+ table.insert(enemyNames, type)
+end
+
+return enemyNames
diff --git a/data/heartTypes.lua b/data/heartTypes.lua
index 349bdde..2c9a033 100644
--- a/data/heartTypes.lua
+++ b/data/heartTypes.lua
@@ -1,4 +1,4 @@
-heartTypes = {
+local heartTypes = {
"arrowheart",
"bigheart",
"blockheart",
@@ -16,3 +16,5 @@ heartTypes = {
"whiteheart",
"yellowheart"
}
+
+return heartTypes
diff --git a/data/roomData.lua b/data/roomData.lua
index d644edf..cc4f3bf 100644
--- a/data/roomData.lua
+++ b/data/roomData.lua
@@ -1,12 +1,7 @@
require "objects.Enemy"
+local roomType = require "data.roomType"
-roomType = {
- INITIAL = 1,
- COMBAT = 2,
- LOOT = 3
-}
-
-roomData = {
+local roomData = {
initialRoom = {
type = roomType.INITIAL,
width = config.defaultRoomW,
@@ -92,9 +87,4 @@ roomData = {
},
}
-roomNames = {}
-for name, data in pairs(roomData) do
- if not data.manualPlacementOnly then
- table.insert(roomNames, name)
- end
-end
+return roomData
diff --git a/data/roomNames.lua b/data/roomNames.lua
new file mode 100644
index 0000000..bdc2924
--- /dev/null
+++ b/data/roomNames.lua
@@ -0,0 +1,10 @@
+local roomData = require "data.roomData"
+
+local roomNames = {}
+for name, data in pairs(roomData) do
+ if not data.manualPlacementOnly then
+ table.insert(roomNames, name)
+ end
+end
+
+return roomNames
diff --git a/data/roomType.lua b/data/roomType.lua
new file mode 100644
index 0000000..ad770f9
--- /dev/null
+++ b/data/roomType.lua
@@ -0,0 +1,7 @@
+local roomType = {
+ INITIAL = 1,
+ COMBAT = 2,
+ LOOT = 3
+}
+
+return roomType