Merge pull request #30 from Escapingbug/clear-item

Author: kdxcxs

README.md

@@ -66,3 +66,4 @@ All other information should be explored by reading the source code!
 - [2023/3/27 00:22] feat: support getting game time by `GetGameTime()`.([#28](https://github.com/Escapingbug/dotaxctf/pull/28), reporter: Syclover)
 - [2023/3/27 23:53] fix: use `npc:GetEntityIndex()` and `npc:GetTeam()` to avoid unexpect behaviors.([#27](https://github.com/Escapingbug/dotaxctf/pull/27), reporter: 114@x1ct34m)
 - [2023/3/28 09:11] fix: ban nonhero units for hero choosing.([#31](https://github.com/Escapingbug/dotaxctf/pull/31))
+- [2023/3/28 09:16] feat: clean up items when round ends.([#30](https://github.com/Escapingbug/dotaxctf/pull/30))

commands.lua

@@ -29,13 +29,15 @@ end
 function Commands:FullRestart()
     Timers:RemoveTimer("round_periodic_timer")
     Timers:RemoveTimer("round_limit_timer")
+    Sandbox:CleanUpItems()
     Rounds.restarting = true
     Rounds:InitFromServerAndBeginGame()
 end
 
 function Commands:RoundRestart()
     Timers:RemoveTimer("round_periodic_timer")
     Timers:RemoveTimer("round_limit_timer")
+    Sandbox:CleanUpItems()
     Rounds:PrepareBeginRound()
 end
 

rounds.lua

@@ -537,6 +537,7 @@ function Rounds:BeginRound(bot_scripts)
                 Timers:RemoveTimer("round_periodic_timer")
                 Rounds:RoundEndedScoring()
                 Rounds:FlushScoresAndRunNextRound()
+                Sandbox:CleanUpItems()
             end
         }
     )
@@ -551,6 +552,7 @@ function Rounds:BeginRound(bot_scripts)
                     Timers:RemoveTimer("round_limit_timer")
                     Rounds:RoundEndedScoring()
                     Rounds:FlushScoresAndRunNextRound()
+                    Sandbox:CleanUpItems()
                     return
                 else
                     return 1

sandbox.lua

@@ -15,6 +15,7 @@ function Sandbox:Init()
     self.public_api = self:SandboxPublicAPI()
     self.default_hero = "npc_dota_hero_axe"
     self.init = true
+    self.items = {}
 end
 
 function Sandbox:SetupGameInfo(game_info)
@@ -240,6 +241,7 @@ function Sandbox:SandboxBaseNPC(npc, readonly)
         -- we only use unreliable gold
         npc:SetGold(gold_left, false)
         npc:AddItem(item)
+        table.insert(Sandbox.items, item)
         return true
     end
 
@@ -330,6 +332,18 @@ function Sandbox:SandboxItem(item)
     return sandboxed
 end
 
+function Sandbox:CleanUpItems()
+    for _, item in ipairs(self.items) do
+        item:RemoveSelf()
+    end
+    self.items = {}
+
+    local total = GameRules:NumDroppedItems()
+    for _ = 1, total do
+        GameRules:GetDroppedItem(0):RemoveSelf()
+    end
+end
+
 if not Sandbox.init then Sandbox:Init() end
 
 GameRules.Sandbox = Sandbox