Refactor Zones to be used as an included module
This enables data hiding and enforces a functional interface.
This commit is contained in:
Buhallin
parent
3cf51936f2
commit
70b2cf420b
@ -1,7 +1,8 @@
|
||||
require("playermat/Zones")
|
||||
require("arkhamdb/LoaderUi")
|
||||
require("playercards/PlayerCardSpawner")
|
||||
|
||||
local zones = require("playermat/Zones")
|
||||
|
||||
local bondedList = { }
|
||||
local customizationRowsWithFields = { }
|
||||
-- inputMap maps from (our 1-indexes) customization row index to inputValue table index
|
||||
@ -88,6 +89,8 @@ local function getConfiguration()
|
||||
end
|
||||
|
||||
function onLoad(script_state)
|
||||
log("loaing")
|
||||
log(zoneData)
|
||||
local state = JSON.decode(script_state)
|
||||
initializeUi(state)
|
||||
math.randomseed(os.time())
|
||||
@ -370,7 +373,7 @@ function loadCards(slots, investigatorId, customizations, playerColor, commandMa
|
||||
local zoneDecks = buildZoneLists(cardsToSpawn)
|
||||
-- Spawn the list for each zone
|
||||
for zone, zoneCards in pairs(zoneDecks) do
|
||||
local deckPos = Zones.getZonePosition(playerColor, zone)
|
||||
local deckPos = zones.getZonePosition(playerColor, zone)
|
||||
deckPos.y = 3
|
||||
|
||||
local spreadCallback = nil
|
||||
@ -390,7 +393,7 @@ function loadCards(slots, investigatorId, customizations, playerColor, commandMa
|
||||
Spawner.spawnCards(
|
||||
zoneCards,
|
||||
deckPos,
|
||||
Zones.getDefaultCardRotation(playerColor, zone),
|
||||
zones.getDefaultCardRotation(playerColor, zone),
|
||||
true, -- Sort deck
|
||||
spreadCallback)
|
||||
|
||||
|
||||
@ -19,119 +19,125 @@
|
||||
-- SetAside4: Upgrade sheets for customizable cards
|
||||
-- SetAside5: Hunch Deck for Joe Diamond
|
||||
-- SetAside6: currently unused
|
||||
local playerMatGuids = {}
|
||||
playerMatGuids["Red"] = "0840d5"
|
||||
playerMatGuids["Orange"] = "bd0ff4"
|
||||
playerMatGuids["White"] = "8b081b"
|
||||
playerMatGuids["Green"] = "383d8b"
|
||||
do
|
||||
local Zones = { }
|
||||
|
||||
commonZones = {}
|
||||
commonZones["Investigator"] = { -1.17702, 0, 0.00209 }
|
||||
commonZones["Minicard"] = { -0.16, 0, -1.222326 }
|
||||
commonZones["Deck"] = { -1.822724, 0, -0.02940192 }
|
||||
commonZones["Discard"] = { -1.822451, 0, 0.6092291 }
|
||||
commonZones["Ally"] = { -0.6157398, 0, 0.02435675 }
|
||||
commonZones["Body"] = { -0.6306521, 0, 0.553170 }
|
||||
commonZones["Hand1"] = { 0.2155387, 0, 0.04257287 }
|
||||
commonZones["Hand2"] = { -0.1803701, 0, 0.03745948 }
|
||||
commonZones["Arcane1"] = { 0.2124223, 0, 0.5596902 }
|
||||
commonZones["Arcane2"] = { -0.1711275, 0, 0.5567944 }
|
||||
commonZones["Tarot"] = { 0.6016169, 0, 0.03273106 }
|
||||
commonZones["Accessory"] = { 0.6049907, 0, 0.5546234 }
|
||||
commonZones["BlankTop"] = { 1.758446, 0, 0.03965336 }
|
||||
commonZones["BlankBottom"] = { 1.754469, 0, 0.5634764 }
|
||||
commonZones["Threat1"] = { -0.9116555, 0, -0.6446251 }
|
||||
commonZones["Threat2"] = { -0.4544126, 0, -0.6428719 }
|
||||
commonZones["Threat3"] = { 0.002246313, 0, -0.6430681 }
|
||||
commonZones["Threat4"] = { 0.4590618, 0, -0.6432732 }
|
||||
local playerMatGuids = {}
|
||||
playerMatGuids["Red"] = "0840d5"
|
||||
playerMatGuids["Orange"] = "bd0ff4"
|
||||
playerMatGuids["White"] = "8b081b"
|
||||
playerMatGuids["Green"] = "383d8b"
|
||||
|
||||
Zones = {}
|
||||
Zones["White"] = {}
|
||||
Zones["White"]["Investigator"] = commonZones["Investigator"]
|
||||
Zones["White"]["Minicard"] = commonZones["Minicard"]
|
||||
Zones["White"]["Deck"] = commonZones["Deck"]
|
||||
Zones["White"]["Discard"] = commonZones["Discard"]
|
||||
Zones["White"]["Ally"] = commonZones["Ally"]
|
||||
Zones["White"]["Body"] = commonZones["Body"]
|
||||
Zones["White"]["Hand1"] = commonZones["Hand1"]
|
||||
Zones["White"]["Hand2"] = commonZones["Hand2"]
|
||||
Zones["White"]["Arcane1"] = commonZones["Arcane1"]
|
||||
Zones["White"]["Arcane2"] = commonZones["Arcane2"]
|
||||
Zones["White"]["Tarot"] = commonZones["Tarot"]
|
||||
Zones["White"]["Accessory"] = commonZones["Accessory"]
|
||||
Zones["White"]["BlankTop"] = commonZones["BlankTop"]
|
||||
Zones["White"]["BlankBottom"] = commonZones["BlankBottom"]
|
||||
Zones["White"]["Threat1"] = commonZones["Threat1"]
|
||||
Zones["White"]["Threat2"] = commonZones["Threat2"]
|
||||
Zones["White"]["Threat3"] = commonZones["Threat3"]
|
||||
Zones["White"]["Threat4"] = commonZones["Threat4"]
|
||||
Zones["White"]["SetAside1"] = { 2.345893, 0, -0.520315 }
|
||||
Zones["White"]["SetAside2"] = { 2.345893, 0, 0.042552 }
|
||||
Zones["White"]["SetAside3"] = { 2.345893, 0, 0.605419 }
|
||||
Zones["White"]["UnderSetAside3"] = { 2.495893, 0, 0.805419 }
|
||||
Zones["White"]["SetAside4"] = { 2.775893, 0, -0.520315 }
|
||||
Zones["White"]["SetAside5"] = { 2.775893, 0, 0.042552 }
|
||||
Zones["White"]["SetAside6"] = { 2.775893, 0, 0.605419 }
|
||||
Zones["White"]["UnderSetAside6"] = { 2.925893, 0, 0.805419 }
|
||||
local commonZones = {}
|
||||
commonZones["Investigator"] = { -1.17702, 0, 0.00209 }
|
||||
commonZones["Minicard"] = { -0.16, 0, -1.222326 }
|
||||
commonZones["Deck"] = { -1.822724, 0, -0.02940192 }
|
||||
commonZones["Discard"] = { -1.822451, 0, 0.6092291 }
|
||||
commonZones["Ally"] = { -0.6157398, 0, 0.02435675 }
|
||||
commonZones["Body"] = { -0.6306521, 0, 0.553170 }
|
||||
commonZones["Hand1"] = { 0.2155387, 0, 0.04257287 }
|
||||
commonZones["Hand2"] = { -0.1803701, 0, 0.03745948 }
|
||||
commonZones["Arcane1"] = { 0.2124223, 0, 0.5596902 }
|
||||
commonZones["Arcane2"] = { -0.1711275, 0, 0.5567944 }
|
||||
commonZones["Tarot"] = { 0.6016169, 0, 0.03273106 }
|
||||
commonZones["Accessory"] = { 0.6049907, 0, 0.5546234 }
|
||||
commonZones["BlankTop"] = { 1.758446, 0, 0.03965336 }
|
||||
commonZones["BlankBottom"] = { 1.754469, 0, 0.5634764 }
|
||||
commonZones["Threat1"] = { -0.9116555, 0, -0.6446251 }
|
||||
commonZones["Threat2"] = { -0.4544126, 0, -0.6428719 }
|
||||
commonZones["Threat3"] = { 0.002246313, 0, -0.6430681 }
|
||||
commonZones["Threat4"] = { 0.4590618, 0, -0.6432732 }
|
||||
|
||||
Zones["Orange"] = {}
|
||||
Zones["Orange"]["Investigator"] = commonZones["Investigator"]
|
||||
Zones["Orange"]["Minicard"] = commonZones["Minicard"]
|
||||
Zones["Orange"]["Deck"] = commonZones["Deck"]
|
||||
Zones["Orange"]["Discard"] = commonZones["Discard"]
|
||||
Zones["Orange"]["Ally"] = commonZones["Ally"]
|
||||
Zones["Orange"]["Body"] = commonZones["Body"]
|
||||
Zones["Orange"]["Hand1"] = commonZones["Hand1"]
|
||||
Zones["Orange"]["Hand2"] = commonZones["Hand2"]
|
||||
Zones["Orange"]["Arcane1"] = commonZones["Arcane1"]
|
||||
Zones["Orange"]["Arcane2"] = commonZones["Arcane2"]
|
||||
Zones["Orange"]["Tarot"] = commonZones["Tarot"]
|
||||
Zones["Orange"]["Accessory"] = commonZones["Accessory"]
|
||||
Zones["Orange"]["BlankTop"] = commonZones["BlankTop"]
|
||||
Zones["Orange"]["BlankBottom"] = commonZones["BlankBottom"]
|
||||
Zones["Orange"]["Threat1"] = commonZones["Threat1"]
|
||||
Zones["Orange"]["Threat2"] = commonZones["Threat2"]
|
||||
Zones["Orange"]["Threat3"] = commonZones["Threat3"]
|
||||
Zones["Orange"]["Threat4"] = commonZones["Threat4"]
|
||||
Zones["Orange"]["SetAside1"] = { -2.350362, 0, -0.520315 }
|
||||
Zones["Orange"]["SetAside2"] = { -2.350362, 0, 0.042552 }
|
||||
Zones["Orange"]["SetAside3"] = { -2.350362, 0, 0.605419 }
|
||||
Zones["Orange"]["UnderSetAside3"] = { -2.500362, 0, 0.80419 }
|
||||
Zones["Orange"]["SetAside4"] = { -2.7803627, 0, -0.520315 }
|
||||
Zones["Orange"]["SetAside5"] = { -2.7803627, 0, 0.042552 }
|
||||
Zones["Orange"]["SetAside6"] = { -2.7803627, 0, 0.605419 }
|
||||
Zones["Orange"]["UnderSetAside6"] = { -2.9303627, 0, 0.80419 }
|
||||
local zoneData = {}
|
||||
zoneData["White"] = {}
|
||||
zoneData["White"]["Investigator"] = commonZones["Investigator"]
|
||||
zoneData["White"]["Minicard"] = commonZones["Minicard"]
|
||||
zoneData["White"]["Deck"] = commonZones["Deck"]
|
||||
zoneData["White"]["Discard"] = commonZones["Discard"]
|
||||
zoneData["White"]["Ally"] = commonZones["Ally"]
|
||||
zoneData["White"]["Body"] = commonZones["Body"]
|
||||
zoneData["White"]["Hand1"] = commonZones["Hand1"]
|
||||
zoneData["White"]["Hand2"] = commonZones["Hand2"]
|
||||
zoneData["White"]["Arcane1"] = commonZones["Arcane1"]
|
||||
zoneData["White"]["Arcane2"] = commonZones["Arcane2"]
|
||||
zoneData["White"]["Tarot"] = commonZones["Tarot"]
|
||||
zoneData["White"]["Accessory"] = commonZones["Accessory"]
|
||||
zoneData["White"]["BlankTop"] = commonZones["BlankTop"]
|
||||
zoneData["White"]["BlankBottom"] = commonZones["BlankBottom"]
|
||||
zoneData["White"]["Threat1"] = commonZones["Threat1"]
|
||||
zoneData["White"]["Threat2"] = commonZones["Threat2"]
|
||||
zoneData["White"]["Threat3"] = commonZones["Threat3"]
|
||||
zoneData["White"]["Threat4"] = commonZones["Threat4"]
|
||||
zoneData["White"]["SetAside1"] = { 2.345893, 0, -0.520315 }
|
||||
zoneData["White"]["SetAside2"] = { 2.345893, 0, 0.042552 }
|
||||
zoneData["White"]["SetAside3"] = { 2.345893, 0, 0.605419 }
|
||||
zoneData["White"]["UnderSetAside3"] = { 2.495893, 0, 0.805419 }
|
||||
zoneData["White"]["SetAside4"] = { 2.775893, 0, -0.520315 }
|
||||
zoneData["White"]["SetAside5"] = { 2.775893, 0, 0.042552 }
|
||||
zoneData["White"]["SetAside6"] = { 2.775893, 0, 0.605419 }
|
||||
zoneData["White"]["UnderSetAside6"] = { 2.925893, 0, 0.805419 }
|
||||
|
||||
-- Green positions are the same as White and Red the same as Orange
|
||||
Zones["Red"] = Zones["Orange"]
|
||||
Zones["Green"] = Zones["White"]
|
||||
zoneData["Orange"] = {}
|
||||
zoneData["Orange"]["Investigator"] = commonZones["Investigator"]
|
||||
zoneData["Orange"]["Minicard"] = commonZones["Minicard"]
|
||||
zoneData["Orange"]["Deck"] = commonZones["Deck"]
|
||||
zoneData["Orange"]["Discard"] = commonZones["Discard"]
|
||||
zoneData["Orange"]["Ally"] = commonZones["Ally"]
|
||||
zoneData["Orange"]["Body"] = commonZones["Body"]
|
||||
zoneData["Orange"]["Hand1"] = commonZones["Hand1"]
|
||||
zoneData["Orange"]["Hand2"] = commonZones["Hand2"]
|
||||
zoneData["Orange"]["Arcane1"] = commonZones["Arcane1"]
|
||||
zoneData["Orange"]["Arcane2"] = commonZones["Arcane2"]
|
||||
zoneData["Orange"]["Tarot"] = commonZones["Tarot"]
|
||||
zoneData["Orange"]["Accessory"] = commonZones["Accessory"]
|
||||
zoneData["Orange"]["BlankTop"] = commonZones["BlankTop"]
|
||||
zoneData["Orange"]["BlankBottom"] = commonZones["BlankBottom"]
|
||||
zoneData["Orange"]["Threat1"] = commonZones["Threat1"]
|
||||
zoneData["Orange"]["Threat2"] = commonZones["Threat2"]
|
||||
zoneData["Orange"]["Threat3"] = commonZones["Threat3"]
|
||||
zoneData["Orange"]["Threat4"] = commonZones["Threat4"]
|
||||
zoneData["Orange"]["SetAside1"] = { -2.350362, 0, -0.520315 }
|
||||
zoneData["Orange"]["SetAside2"] = { -2.350362, 0, 0.042552 }
|
||||
zoneData["Orange"]["SetAside3"] = { -2.350362, 0, 0.605419 }
|
||||
zoneData["Orange"]["UnderSetAside3"] = { -2.500362, 0, 0.80419 }
|
||||
zoneData["Orange"]["SetAside4"] = { -2.7803627, 0, -0.520315 }
|
||||
zoneData["Orange"]["SetAside5"] = { -2.7803627, 0, 0.042552 }
|
||||
zoneData["Orange"]["SetAside6"] = { -2.7803627, 0, 0.605419 }
|
||||
zoneData["Orange"]["UnderSetAside6"] = { -2.9303627, 0, 0.80419 }
|
||||
|
||||
-- Gets the global position for the given zone on the specified player mat.
|
||||
---@param playerColor: Color name of the player mat to get the zone position for (e.g. "Red")
|
||||
---@param zoneName: Name of the zone to get the position for. See Zones object documentation for a list of valid zones.
|
||||
---@return: Global position table, or nil if an invalid player color or zone is specified
|
||||
function Zones.getZonePosition(playerColor, zoneName)
|
||||
if (playerColor ~= "Red"
|
||||
and playerColor ~= "Orange"
|
||||
and playerColor ~= "White"
|
||||
and playerColor ~= "Green") then
|
||||
return nil
|
||||
end
|
||||
return getObjectFromGUID(playerMatGuids[playerColor]).positionToWorld(Zones[playerColor][zoneName])
|
||||
end
|
||||
-- Green positions are the same as White and Red the same as Orange
|
||||
zoneData["Red"] = zoneData["Orange"]
|
||||
zoneData["Green"] = zoneData["White"]
|
||||
|
||||
-- Return the global rotation for a card on the given player mat, based on its metadata.
|
||||
---@param playerColor: Color name of the player mat to get the rotation for (e.g. "Red")
|
||||
---@param cardMetadata: Table of card metadata. Metadata fields type and permanent are required; all others are optional.
|
||||
---@return: Global rotation vector for the given card. This will include the
|
||||
-- Y rotation to orient the card on the given player mat as well as a
|
||||
-- Z rotation to place the card face up or face down.
|
||||
function Zones.getDefaultCardRotation(playerColor, zone)
|
||||
local deckRotation = getObjectFromGUID(playerMatGuids[playerColor]).getRotation()
|
||||
|
||||
if zone == "Deck" then
|
||||
deckRotation = deckRotation + Vector(0, 0, 180)
|
||||
-- Gets the global position for the given zone on the specified player mat.
|
||||
---@param playerColor: Color name of the player mat to get the zone position for (e.g. "Red")
|
||||
---@param zoneName: Name of the zone to get the position for. See Zones object documentation for a list of valid zones.
|
||||
---@return: Global position table, or nil if an invalid player color or zone is specified
|
||||
Zones.getZonePosition = function(playerColor, zoneName)
|
||||
if (playerColor ~= "Red"
|
||||
and playerColor ~= "Orange"
|
||||
and playerColor ~= "White"
|
||||
and playerColor ~= "Green") then
|
||||
return nil
|
||||
end
|
||||
return getObjectFromGUID(playerMatGuids[playerColor]).positionToWorld(zoneData[playerColor][zoneName])
|
||||
end
|
||||
|
||||
return deckRotation
|
||||
-- Return the global rotation for a card on the given player mat, based on its metadata.
|
||||
---@param playerColor: Color name of the player mat to get the rotation for (e.g. "Red")
|
||||
---@param cardMetadata: Table of card metadata. Metadata fields type and permanent are required; all others are optional.
|
||||
---@return: Global rotation vector for the given card. This will include the
|
||||
-- Y rotation to orient the card on the given player mat as well as a
|
||||
-- Z rotation to place the card face up or face down.
|
||||
Zones.getDefaultCardRotation = function(playerColor, zone)
|
||||
local deckRotation = getObjectFromGUID(playerMatGuids[playerColor]).getRotation()
|
||||
|
||||
if zone == "Deck" then
|
||||
deckRotation = deckRotation + Vector(0, 0, 180)
|
||||
end
|
||||
|
||||
return deckRotation
|
||||
end
|
||||
|
||||
return Zones
|
||||
end
|
||||
|
||||
Loading…
Reference in New Issue
Block a user