From 52a61a05b3a082446d2df6ee053ebaebfa4489c4 Mon Sep 17 00:00:00 2001 From: Haodong Mo Date: Thu, 29 Dec 2022 20:21:21 +1000 Subject: [PATCH] Free atts off actually works --- README.md => .README.md | 0 .../Lense scopes template.blend | Bin .../Charm — копия.qc | 0 .../Temp workfolder delete later/Charm.qc | 0 .../Temp workfolder delete later/Charm.smd | 0 .../anims/idleflat.smd | 0 .../anims/idlemassive.smd | 0 .../uc_charm_urbancharm_decay.lua | 0 .../att2bulk.py | 0 ...pixel grid template for digital scopes.pdn | 0 .../vmtrepath.py | 0 addon.json | 23 ++++++------------ lua/weapons/arc9_base/sh_net.lua | 3 ++- lua/weapons/arc9_base/sh_subatts.lua | 2 +- 14 files changed, 11 insertions(+), 17 deletions(-) rename README.md => .README.md (100%) rename {Stuff for developers => .Stuff for developers}/Lense scopes template.blend (100%) rename {Stuff for developers => .Stuff for developers}/Temp workfolder delete later/Charm — копия.qc (100%) rename {Stuff for developers => .Stuff for developers}/Temp workfolder delete later/Charm.qc (100%) rename {Stuff for developers => .Stuff for developers}/Temp workfolder delete later/Charm.smd (100%) rename {Stuff for developers => .Stuff for developers}/Temp workfolder delete later/anims/idleflat.smd (100%) rename {Stuff for developers => .Stuff for developers}/Temp workfolder delete later/anims/idlemassive.smd (100%) rename {Stuff for developers => .Stuff for developers}/Temp workfolder delete later/uc_charm_urbancharm_decay.lua (100%) rename {Stuff for developers => .Stuff for developers}/att2bulk.py (100%) rename {Stuff for developers => .Stuff for developers}/pixel grid template for digital scopes.pdn (100%) rename {Stuff for developers => .Stuff for developers}/vmtrepath.py (100%) diff --git a/README.md b/.README.md similarity index 100% rename from README.md rename to .README.md diff --git a/Stuff for developers/Lense scopes template.blend b/.Stuff for developers/Lense scopes template.blend similarity index 100% rename from Stuff for developers/Lense scopes template.blend rename to .Stuff for developers/Lense scopes template.blend diff --git a/Stuff for developers/Temp workfolder delete later/Charm — копия.qc b/.Stuff for developers/Temp workfolder delete later/Charm — копия.qc similarity index 100% rename from Stuff for developers/Temp workfolder delete later/Charm — копия.qc rename to .Stuff for developers/Temp workfolder delete later/Charm — копия.qc diff --git a/Stuff for developers/Temp workfolder delete later/Charm.qc b/.Stuff for developers/Temp workfolder delete later/Charm.qc similarity index 100% rename from Stuff for developers/Temp workfolder delete later/Charm.qc rename to .Stuff for developers/Temp workfolder delete later/Charm.qc diff --git a/Stuff for developers/Temp workfolder delete later/Charm.smd b/.Stuff for developers/Temp workfolder delete later/Charm.smd similarity index 100% rename from Stuff for developers/Temp workfolder delete later/Charm.smd rename to .Stuff for developers/Temp workfolder delete later/Charm.smd diff --git a/Stuff for developers/Temp workfolder delete later/anims/idleflat.smd b/.Stuff for developers/Temp workfolder delete later/anims/idleflat.smd similarity index 100% rename from Stuff for developers/Temp workfolder delete later/anims/idleflat.smd rename to .Stuff for developers/Temp workfolder delete later/anims/idleflat.smd diff --git a/Stuff for developers/Temp workfolder delete later/anims/idlemassive.smd b/.Stuff for developers/Temp workfolder delete later/anims/idlemassive.smd similarity index 100% rename from Stuff for developers/Temp workfolder delete later/anims/idlemassive.smd rename to .Stuff for developers/Temp workfolder delete later/anims/idlemassive.smd diff --git a/Stuff for developers/Temp workfolder delete later/uc_charm_urbancharm_decay.lua b/.Stuff for developers/Temp workfolder delete later/uc_charm_urbancharm_decay.lua similarity index 100% rename from Stuff for developers/Temp workfolder delete later/uc_charm_urbancharm_decay.lua rename to .Stuff for developers/Temp workfolder delete later/uc_charm_urbancharm_decay.lua diff --git a/Stuff for developers/att2bulk.py b/.Stuff for developers/att2bulk.py similarity index 100% rename from Stuff for developers/att2bulk.py rename to .Stuff for developers/att2bulk.py diff --git a/Stuff for developers/pixel grid template for digital scopes.pdn b/.Stuff for developers/pixel grid template for digital scopes.pdn similarity index 100% rename from Stuff for developers/pixel grid template for digital scopes.pdn rename to .Stuff for developers/pixel grid template for digital scopes.pdn diff --git a/Stuff for developers/vmtrepath.py b/.Stuff for developers/vmtrepath.py similarity index 100% rename from Stuff for developers/vmtrepath.py rename to .Stuff for developers/vmtrepath.py diff --git a/addon.json b/addon.json index 842779a3..876eb32c 100644 --- a/addon.json +++ b/addon.json @@ -1,16 +1,9 @@ { - "title": "ARC9", - "description": "", - "type": "weapon", - "tags": [ - "roleplay", - "realism" - ], - "ignore": [ - ".git/*", - "README.md", - ".py/*", - ".blend/*", - ".pdn/*" - ] -} \ No newline at end of file + "title": "ARC9 Weapon Base", + "type": "weapon", + "tags": + [ + "roleplay", + "realism" + ] +} diff --git a/lua/weapons/arc9_base/sh_net.lua b/lua/weapons/arc9_base/sh_net.lua index 0b008cd9..69e63cfc 100644 --- a/lua/weapons/arc9_base/sh_net.lua +++ b/lua/weapons/arc9_base/sh_net.lua @@ -51,7 +51,7 @@ function SWEP:CountAttsInTree(tree) local count = {} - for _, i in ipairs(flattree) do + for _, i in pairs(flattree[1]) do if i.Installed then local att = i.Installed count[att] = (count[att] or 0) + 1 @@ -72,6 +72,7 @@ function SWEP:ReceiveWeapon() if SERVER then if !self:ValidateInventoryForNewTree(tbl) then + self:SendWeapon() return end end diff --git a/lua/weapons/arc9_base/sh_subatts.lua b/lua/weapons/arc9_base/sh_subatts.lua index 8ea0fd77..cf658a8c 100644 --- a/lua/weapons/arc9_base/sh_subatts.lua +++ b/lua/weapons/arc9_base/sh_subatts.lua @@ -214,7 +214,7 @@ function SWEP:ValidateInventoryForNewTree(tree) local currcount = self:CountAttsInTree(self.Attachments) - for att, attc in ipairs(count) do + for att, attc in pairs(count) do local atttbl = ARC9.GetAttTable(att) if atttbl.Free then continue end