From ff9be4ad80564c085a49d3a3f4bfbb95669dc594 Mon Sep 17 00:00:00 2001 From: Eltrac Date: Tue, 4 Mar 2025 11:50:56 +0800 Subject: refactor: make data tables local --- data/bulletData.lua | 2 ++ data/enemyData.lua | 8 +++----- data/enemyNames.lua | 8 ++++++++ data/heartTypes.lua | 4 +++- data/roomData.lua | 16 +++------------- data/roomNames.lua | 10 ++++++++++ data/roomType.lua | 7 +++++++ 7 files changed, 36 insertions(+), 19 deletions(-) create mode 100644 data/enemyNames.lua create mode 100644 data/roomNames.lua create mode 100644 data/roomType.lua (limited to 'data') 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 -- cgit v1.2.3