Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit ed824f6

Browse files
authored
Merge pull request #107 from cortex-command-community/4zk-content
Followup to `KillAllActors` -> `KillAllEnemyActors` and `ShowEnemyHUD`
2 parents 6b88b5b + 96fd385 commit ed824f6

File tree

4 files changed

+22
-8
lines changed

4 files changed

+22
-8
lines changed

Base.rte/Activities/BrainVsBrain.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,12 +383,12 @@ function BrainvsBrain:UpdateActivity()
383383

384384
if red_players < 1 and green_players > 0 then
385385
self.WinnerTeam = Activity.TEAM_2
386-
MovableMan:KillAllActors(self.WinnerTeam)
386+
MovableMan:KillAllEnemyActors(self.WinnerTeam)
387387
ActivityMan:EndActivity()
388388
return
389389
elseif green_players < 1 and red_players > 0 then
390390
self.WinnerTeam = Activity.TEAM_1
391-
MovableMan:KillAllActors(self.WinnerTeam)
391+
MovableMan:KillAllEnemyActors(self.WinnerTeam)
392392
ActivityMan:EndActivity()
393393
return
394394
elseif green_players < 1 and red_players < 1 then

Base.rte/Activities/BunkerBreach.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ function BunkerBreach:UpdateActivity()
263263

264264
if not MovableMan:IsActor(self.CPUBrain) then
265265
self.WinnerTeam = Activity.TEAM_1
266-
MovableMan:KillAllActors(self.WinnerTeam)
266+
MovableMan:KillAllEnemyActors(self.WinnerTeam)
267267
ActivityMan:EndActivity()
268268
return
269269
else
@@ -296,7 +296,7 @@ function BunkerBreach:UpdateActivity()
296296

297297
if players < 1 then
298298
self.WinnerTeam = self.CPUTeam
299-
MovableMan:KillAllActors(self.WinnerTeam)
299+
MovableMan:KillAllEnemyActors(self.WinnerTeam)
300300
ActivityMan:EndActivity()
301301
return
302302
end

Base.rte/Activities/Siege.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ function Siege:UpdateActivity()
334334

335335
if players < 1 then
336336
self.WinnerTeam = self.CPUTeam
337-
MovableMan:KillAllActors(self.WinnerTeam)
337+
MovableMan:KillAllEnemyActors(self.WinnerTeam)
338338
ActivityMan:EndActivity()
339339
return
340340
end
@@ -444,7 +444,7 @@ function Siege:UpdateActivity()
444444

445445
if troops < 2 then
446446
self.WinnerTeam = self.PlayerTeam
447-
MovableMan:KillAllActors(self.WinnerTeam)
447+
MovableMan:KillAllEnemyActors(self.WinnerTeam)
448448
ActivityMan:EndActivity()
449449
return
450450
end

Base.rte/GUIs/SettingsGUI.ini

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3293,12 +3293,26 @@ Anchor = Right, Bottom, Left
32933293
Checked = Checked
32943294
Text = Endless MetaGame mode
32953295

3296-
[CheckboxCrabBombs]
3296+
[CheckboxEnemyHUD]
32973297
ControlType = CHECKBOX
32983298
Parent = CollectionBoxGameplaySettings
32993299
X = 245
33003300
Y = 55
3301-
Width = 110
3301+
Width = 220
3302+
Height = 20
3303+
Visible = True
3304+
Enabled = True
3305+
Name = CheckboxEnemyHUD
3306+
Anchor = Right, Bottom, Left
3307+
Checked = Checked
3308+
Text = Show enemy Actor HUDs
3309+
3310+
[CheckboxCrabBombs]
3311+
ControlType = CHECKBOX
3312+
Parent = CollectionBoxGameplaySettings
3313+
X = 245
3314+
Y = 75
3315+
Width = 220
33023316
Height = 20
33033317
Visible = True
33043318
Enabled = True

0 commit comments

Comments
 (0)