diff --git a/tools/deck/gen-slaydeck.mjs b/tools/deck/gen-slaydeck.mjs index 77e92d6..8ee0fea 100644 --- a/tools/deck/gen-slaydeck.mjs +++ b/tools/deck/gen-slaydeck.mjs @@ -1707,16 +1707,28 @@ self:RenderCombat()`), method('RegisterMonster', `if self.Registered == nil then self.Registered = {} end -table.insert(self.Registered, { entity = monster, enemyId = enemyId })`, [ +local g = group +if g == nil or g == "" then g = "combat" end +table.insert(self.Registered, { entity = monster, enemyId = enemyId, group = g })`, [ { Type: 'any', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'monster' }, { Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'enemyId' }, + { Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'group' }, ]), method('BuildMonsters', `self.Monsters = {} +local g = "combat" +local node = self.MapNodes[self.CurrentNodeId] +if node ~= nil and node.type ~= nil then g = node.type end +self.ActiveSlotPos = self.SlotPos[g] local reg = self.Registered or {} +for i = 1, #reg do + if reg[i].entity ~= nil and isvalid(reg[i].entity) then + reg[i].entity:SetVisible(false) + end +end local list = {} for i = 1, #reg do local r = reg[i] - if r.entity ~= nil and isvalid(r.entity) then + if r.entity ~= nil and isvalid(r.entity) and r.group == g then local x = 0 if r.entity.TransformComponent ~= nil then x = r.entity.TransformComponent.WorldPosition.x