Merge branch 'master' into clear-item

Author: kdxcxs

README.md

@@ -63,4 +63,7 @@ All other information should be explored by reading the source code!
 - [2023/3/21 22:00] feat: support getting hero's candidate id.([#21](https://github.com/Escapingbug/dotaxctf/pull/21))
 - [2023/3/23 13:30] fix: remove non-hero units after round ends.([#23](https://github.com/Escapingbug/dotaxctf/pull/23), reporter: AAA剑圣)
 - [2023/3/24 00:22] feat: support `GetItemInSlot(slot)` to return a sandboxed item.([#24](https://github.com/Escapingbug/dotaxctf/pull/24), reporter: AAA剑圣)
+- [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))

rounds.lua

@@ -123,6 +123,9 @@ function Rounds:Init()
         scores = {},
         choices = {},
     }
+
+    self.default_hero = "npc_dota_hero_bloodseeker"
+    self.default_action = "return {}"
 end
 
 function Rounds:InitGameMode()
@@ -299,7 +302,7 @@ function Rounds:NextRound(scripts)
     end
 
     Rounds:CleanupLivingHerosAndClearUnits()
-    Rounds:ChooseHeros(scripts["chooser_scripts"], scripts["attributes"])
+    Rounds:ChooseHeros(scripts["chooser_scripts"], scripts["attributes"], scripts["bot_scripts"])
     Timers:CreateTimer(
         Config.round_begin_delay,
         function ()
@@ -319,7 +322,7 @@ function Rounds:InitCandidateHero(hero, attr)
     hero:ModifyAgility(attr.agility or 0)
 end
 
-function Rounds:ChooseHeros(chooser_scripts, attributes)
+function Rounds:ChooseHeros(chooser_scripts, attributes, bot_scripts)
     -- TODO: add hero chooser fetch flag so that game only starts
     -- when hero is added
     print("[xctf Rounds:ChooseHeros()]" .. "choosing heros")
@@ -360,7 +363,15 @@ function Rounds:ChooseHeros(chooser_scripts, attributes)
             local hero_name = Sandbox:RunChooseHero(chooser)
             local player_id = self.candidate_to_player[candidate_id]
             local player_owner = PlayerResource:GetPlayer(player_id)
+            
+            -- ban non-hero unit
+            if string.sub(hero_name, 1, 14) ~= "npc_dota_hero_" then
+                print("[xctf Rounds:ChooseHeros()]" .. "found non-hero unit, using default hero instead")
+                hero_name = self.default_hero
+                bot_scripts[candidate_id] = self.default_action
+            end
             print("[xctf Rounds:ChooseHeros()]" .. "player owner: " .. tostring(player_owner) .. "team id " .. tostring(cur_team_id))
+
             local candidate_hero = CreateUnitByName(
                 hero_name,
                 hero_locations[cur_id],
@@ -412,7 +423,7 @@ function Rounds:PrepareBeginRound()
         local round_index = self.round_count / Config.total_rounds_count
         round_index = math.min(round_index, 1) -- make sure it is not greater than 1
         for _, team in pairs(data.teams) do
-            self.scores_this_round[team.team_id] = team.score
+            self.scores_this_round[team.team_id] = 0
             chooser_scripts[team.team_id] = from_base64(team.select)
             bot_scripts[team.team_id] = from_base64(team.act)
             local rank_index = (Config.candidate_count - team.rank) / (Config.candidate_count - 1)

sandbox.lua

@@ -75,10 +75,15 @@ function Sandbox:RunAction(act_func, entity, ctx)
     return new_ctx
 end
 
+function GetGameTime()
+    return GameRules:GetGameTime()
+end
+
 function Sandbox:SandboxPublicAPI()
     local api = {
         Vector = Vector,
         QAngle = QAngle,
+        GetGameTime = GetGameTime,
         print = print, -- TODO: remove this
     }
     return api
@@ -163,7 +168,7 @@ function Sandbox:SandboxBaseNPC(npc, readonly)
         find_order
     )
         local units = FindUnitsInRadius(
-            self:GetTeam(),
+            npc:GetTeam(),
             location,
             nil, -- cacheUnit
             radius,
@@ -206,7 +211,7 @@ function Sandbox:SandboxBaseNPC(npc, readonly)
             return
         end
         ExecuteOrderFromTable{
-            UnitIndex = self:GetEntityIndex(),
+            UnitIndex = npc:GetEntityIndex(),
             OrderType = order_type,
             TargetIndex = target_index,
             AbilityIndex = ability_index,
@@ -263,15 +268,15 @@ function Sandbox:SandboxAbility(ability)
         GetAOERadius              = copy_method(ability, "GetAOERadius"),
         GetBehavior               = copy_method(ability, "GetBehavior"),
         GetChannelledManaCostPerSecond
-                                  = copy_method(ability, "GetChannelledManaCostPerSecond"),
+                                       = copy_method(ability, "GetChannelledManaCostPerSecond"),
         GetChannelTime            = copy_method(ability, "GetChannelTime"),
         GetCooldownTimeRemaining  = copy_method(ability, "GetCooldownTimeRemaining"),
         GetCurrentAbilityCharges  = copy_method(ability, "GetCurrentAbilityCharges"),
         GetEffectiveCastRange     = copy_method(ability, "GetEffectiveCastRange"), -- TODO: fix args
         GetEffectiveCooldown      = copy_method(ability, "GetEffectiveCooldown"),
         GetLevel                  = copy_method(ability, "GetLevel"),
         GetLevelSpecialValueNoOverride
-                                  = copy_method(ability, "GetLevelSpecialValueNoOverride"),
+                                       = copy_method(ability, "GetLevelSpecialValueNoOverride"),
         GetManaCost               = copy_method(ability, "GetManaCost"),
         GetSpecialValueFor        = copy_method(ability, "GetSpecialValueFor"),
         GetToggleState            = copy_method(ability, "GetToggleState"),