Skip to content

Commit 8cd2e59

Browse files
committed
limit skirmish defense to unbrokenness, fix rockets plummeting, fix eruptor error
1 parent 88aab52 commit 8cd2e59

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

Data/Base.rte/AI/RocketAI.lua

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,12 @@ function ThreadedUpdateAI(self)
206206
self.burstUp = nil;
207207
self.Ctrl:SetState(Controller.MOVE_UP, true); -- Don't burst when returning to orbit
208208
else
209-
if change < -3 and not self.burstUp then
209+
if change < -1.5 and not self.burstUp then
210210
self.burstUp = math.max(9 - change, 2); -- Wait n frames until next burst (lower -> better control)
211+
if change < -6 then
212+
self.Ctrl:SetState(Controller.MOVE_UP, true);
213+
self.burstUp = nil;
214+
end
211215
elseif change > 20 then
212216
self.burstUp = nil;
213217
self.Ctrl:SetState(Controller.MOVE_DOWN, true);
@@ -275,7 +279,7 @@ function ThreadedUpdateAI(self)
275279
self.burstUp = self.burstUp - SettingsMan.AIUpdateInterval;
276280
if self.burstUp < 0 then
277281
self.Ctrl:SetState(Controller.MOVE_UP, true);
278-
if self.burstUp < -16 then
282+
if self.burstUp < -8 then
279283
self.burstUp = nil;
280284
end
281285
end

Data/Base.rte/Activities.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ AddActivity = GAScripted
1818
Description = Survive waves of AI-controlled enemies until they run out of gold, skirmish against human players, or both! Adjust the Difficulty to change AI funds and spawn frequency.
1919
SceneName = Ketanot Hills
2020
ScriptPath = Base.rte/Activities/SkirmishDefense.lua
21-
TeamOfPlayer1 = 0
21+
TeamOfPlayer1 = 1
2222
TeamOfPlayer2 = 1
23-
TeamOfPlayer3 = 2
24-
TeamOfPlayer4 = 3
23+
TeamOfPlayer3 = 1
24+
TeamOfPlayer4 = 1
25+
CPUTeam = 0
2526
MinTeamsRequired = 2
2627
LuaClassName = SkirmishDefense
2728
DefaultRequireClearPathToOrbit = 1

Data/Browncoats.rte/Devices/Shields/Eruptor/Eruptor.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function Create(self)
2222
self:SetOneHanded(true);
2323
local rootParent = self:GetRootParent();
2424
if IsAHuman(rootParent) then
25-
if ToAHuman(rootParent).EquippedItem.UniqueID == self.UniqueID then
25+
if ToAHuman(rootParent).EquippedItem and ToAHuman(rootParent).EquippedItem.UniqueID == self.UniqueID then
2626
ToAHuman(rootParent):UnequipBGArm();
2727
self.equippedInMainHand = true;
2828
self:SetOneHanded(false);

0 commit comments

Comments
 (0)