Skip to content

Commit dd3527b

Browse files
MaximDudeMaximDude
committed
Merge branch 'development' into jetpack-enhancements
2 parents ed18d50 + 8c59a63 commit dd3527b

39 files changed

+2922
-461
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Mods/
5959
Userdata/
6060

6161
allegro.log
62-
AbortScreen.bmp
62+
AbortScreen.*
6363
AbortLog.txt
6464
MemCleanupInfo.txt
6565
LogPublish.txt

‎Data/Base.rte/Activities/WaveDefense.lua

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ end
9494

9595
function WaveDefense:StartNewGame()
9696
self:SetTeamFunds(self:GetStartingGold(), self.playerTeam);
97-
self:CheckBrains();
9897

9998
self.triggerWaveInit = true;
10099
self.wave = 1;
@@ -105,8 +104,10 @@ function WaveDefense:StartNewGame()
105104
if actor.ClassName == "AHuman" or actor.ClassName == "ACrab" then
106105
actor.AIMode = Actor.AIMODE_SENTRY;
107106
end
108-
actor.Team = self.playerTeam;
107+
MovableMan:ChangeActorTeam(actor, self.playerTeam);
109108
end
109+
110+
self:CheckBrains();
110111
end
111112

112113
function WaveDefense:ResumeLoadedGame()

‎Data/Base.rte/GUIs/SettingsGUI.ini

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2789,22 +2789,6 @@ DrawBackground = True
27892789
DrawType = Image
27902790
DrawColor = 0
27912791

2792-
[LabelPresetNotAvailableSNES]
2793-
ControlType = LABEL
2794-
Parent = CollectionBoxPresetDPadSNES
2795-
X = 18
2796-
Y = 17
2797-
Width = 64
2798-
Height = 29
2799-
Visible = True
2800-
Enabled = True
2801-
Name = LabelPresetNotAvailableSNES
2802-
Anchor = Left, Top
2803-
ToolTip = None
2804-
Text = N/A
2805-
HAlignment = centre
2806-
VAlignment = middle
2807-
28082792
[CollectionBoxPresetAnalogDS4]
28092793
ControlType = COLLECTIONBOX
28102794
Parent = CollectionBoxWizardPresets
@@ -2851,22 +2835,6 @@ DrawBackground = True
28512835
DrawType = Image
28522836
DrawColor = 0
28532837

2854-
[LabelPresetNotAvailableDS4]
2855-
ControlType = LABEL
2856-
Parent = CollectionBoxPresetAnalogDS4
2857-
X = 16
2858-
Y = 8
2859-
Width = 68
2860-
Height = 47
2861-
Visible = True
2862-
Enabled = True
2863-
Name = LabelPresetNotAvailableDS4
2864-
Anchor = Left, Top
2865-
ToolTip = None
2866-
Text = N/A
2867-
HAlignment = centre
2868-
VAlignment = middle
2869-
28702838
[CollectionBoxPresetAnalogXB360]
28712839
ControlType = COLLECTIONBOX
28722840
Parent = CollectionBoxWizardPresets

‎Data/Base.rte/Scenes/Objects/Bunkers/BunkerBits/MetalBridgeLeftAMat.png

-254 Bytes
Loading

‎Data/Base.rte/Scenes/Objects/Bunkers/BunkerBits/MetalBridgeMidAMat.png

-254 Bytes
Loading

‎Data/Base.rte/Scenes/Objects/Bunkers/BunkerBits/MetalBridgeRightAMat.png

-252 Bytes
Loading

‎Data/Missions.rte/Scenes/Alezer Canyon Bunker.ini

Lines changed: 74 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ AddScene = Scene
7070
Position = Vector
7171
X = 4164
7272
Y = 1716
73-
PlacedByPlayer = 0
7473
Team = 1
74+
PlacedByPlayer = 0
7575
PlaceSceneObject = TerrainObject
7676
CopyOf = Base.rte/Tunnel A
7777
Position = Vector
@@ -383,8 +383,8 @@ AddScene = Scene
383383
Position = Vector
384384
X = 3588
385385
Y = 2076
386-
PlacedByPlayer = 0
387386
Team = 1
387+
PlacedByPlayer = 0
388388
PlaceSceneObject = TerrainObject
389389
CopyOf = Base.rte/Ceiling A
390390
Position = Vector
@@ -3162,15 +3162,15 @@ AddScene = Scene
31623162
Position = Vector
31633163
X = 2532
31643164
Y = 2052
3165-
PlacedByPlayer = 0
31663165
Team = 1
3166+
PlacedByPlayer = 0
31673167
PlaceSceneObject = TerrainObject
31683168
CopyOf = Base.rte/Doors C
31693169
Position = Vector
31703170
X = 2952
31713171
Y = 2544
3172-
PlacedByPlayer = 0
31733172
Team = 1
3173+
PlacedByPlayer = 0
31743174
PlaceSceneObject = TerrainObject
31753175
CopyOf = Base.rte/Right Ladder
31763176
Position = Vector
@@ -4305,6 +4305,76 @@ AddScene = Scene
43054305
X = 1764
43064306
Y = 1248
43074307
PlacedByPlayer = 0
4308+
PlaceSceneObject = Deployment
4309+
CopyOf = Base.rte/Infantry Brain
4310+
Position = Vector
4311+
X = 3238.8
4312+
Y = 2448
4313+
PlaceSceneObject = Deployment
4314+
CopyOf = Base.rte/Infantry Light
4315+
Position = Vector
4316+
X = 2497.2
4317+
Y = 2304
4318+
PlaceSceneObject = Deployment
4319+
CopyOf = Base.rte/Infantry Light
4320+
Position = Vector
4321+
X = 2496
4322+
Y = 2400
4323+
PlaceSceneObject = Deployment
4324+
CopyOf = Base.rte/Infantry Light
4325+
Position = Vector
4326+
X = 2304
4327+
Y = 2544
4328+
PlaceSceneObject = Deployment
4329+
CopyOf = Base.rte/Infantry Heavy
4330+
Position = Vector
4331+
X = 3094.8
4332+
Y = 2544
4333+
PlaceSceneObject = Deployment
4334+
CopyOf = Base.rte/Infantry CQB
4335+
Position = Vector
4336+
X = 2640
4337+
Y = 2112
4338+
PlaceSceneObject = Deployment
4339+
CopyOf = Base.rte/Infantry Grenadier
4340+
Position = Vector
4341+
X = 2460
4342+
Y = 2208
4343+
PlaceSceneObject = Deployment
4344+
CopyOf = Base.rte/Infantry Engineer
4345+
Position = Vector
4346+
X = 12
4347+
Y = 1896
4348+
PlaceSceneObject = Deployment
4349+
CopyOf = Base.rte/Infantry Engineer
4350+
Position = Vector
4351+
X = 324
4352+
Y = 1944
4353+
PlaceSceneObject = Deployment
4354+
CopyOf = Base.rte/Infantry Heavy
4355+
Position = Vector
4356+
X = 2713.2
4357+
Y = 2304.6
4358+
PlaceSceneObject = Deployment
4359+
CopyOf = Base.rte/Infantry Light
4360+
Position = Vector
4361+
X = 4140
4362+
Y = 2004
4363+
PlaceSceneObject = Deployment
4364+
CopyOf = Base.rte/Infantry Light
4365+
Position = Vector
4366+
X = 3900.6
4367+
Y = 1812
4368+
PlaceSceneObject = Deployment
4369+
CopyOf = Base.rte/Infantry Heavy
4370+
Position = Vector
4371+
X = 3768
4372+
Y = 2148
4373+
PlaceSceneObject = Deployment
4374+
CopyOf = Base.rte/Infantry Heavy
4375+
Position = Vector
4376+
X = 4211.4
4377+
Y = 1572.6
43084378
AddArea = Area
43094379
AddBox = Box
43104380
Corner = Vector

‎Data/Missions.rte/Scenes/Bessor Split Bunker.ini

Lines changed: 118 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,22 @@ AddScene = Scene
8888
Position = Vector
8989
X = 1824
9090
Y = 1308
91-
PlacedByPlayer = 0
9291
Team = 1
92+
PlacedByPlayer = 0
9393
PlaceSceneObject = TerrainObject
9494
CopyOf = Base.rte/Door A
9595
Position = Vector
9696
X = 2232
9797
Y = 1308
98-
PlacedByPlayer = 0
9998
Team = 1
99+
PlacedByPlayer = 0
100100
PlaceSceneObject = TerrainObject
101101
CopyOf = Base.rte/Door A
102102
Position = Vector
103103
X = 2016
104104
Y = 1500
105-
PlacedByPlayer = 0
106105
Team = 1
106+
PlacedByPlayer = 0
107107
PlaceSceneObject = TerrainObject
108108
CopyOf = Base.rte/L-Junction D
109109
Position = Vector
@@ -415,8 +415,8 @@ AddScene = Scene
415415
Position = Vector
416416
X = 2016
417417
Y = 1668
418-
PlacedByPlayer = 0
419418
Team = 1
419+
PlacedByPlayer = 0
420420
PlaceSceneObject = TerrainObject
421421
CopyOf = Base.rte/Wall Left A
422422
Position = Vector
@@ -614,8 +614,8 @@ AddScene = Scene
614614
Position = Vector
615615
X = 1248
616616
Y = 1392
617-
PlacedByPlayer = 0
618617
Team = 1
618+
PlacedByPlayer = 0
619619
PlaceSceneObject = TerrainObject
620620
CopyOf = Base.rte/L-Junction D
621621
Position = Vector
@@ -867,8 +867,8 @@ AddScene = Scene
867867
Position = Vector
868868
X = 1296
869869
Y = 1968
870-
PlacedByPlayer = 0
871870
Team = 1
871+
PlacedByPlayer = 0
872872
PlaceSceneObject = TerrainObject
873873
CopyOf = Base.rte/Ceiling A
874874
Position = Vector
@@ -2287,12 +2287,6 @@ AddScene = Scene
22872287
X = 2400
22882288
Y = 1608
22892289
PlacedByPlayer = 0
2290-
PlaceSceneObject = TerrainObject
2291-
CopyOf = Base.rte/Left Concrete Barrier
2292-
Position = Vector
2293-
X = 2808
2294-
Y = 1320
2295-
PlacedByPlayer = 0
22962290
PlaceSceneObject = TerrainObject
22972291
CopyOf = Base.rte/Right Concrete Barrier
22982292
Position = Vector
@@ -2611,6 +2605,12 @@ AddScene = Scene
26112605
X = 2880
26122606
Y = 1344
26132607
PlacedByPlayer = 0
2608+
PlaceSceneObject = TerrainObject
2609+
CopyOf = Base.rte/Left Concrete Barrier
2610+
Position = Vector
2611+
X = 2808
2612+
Y = 1320
2613+
PlacedByPlayer = 0
26142614
PlaceSceneObject = TerrainObject
26152615
CopyOf = Base.rte/Down-Left Concrete Corner
26162616
Position = Vector
@@ -2814,8 +2814,8 @@ AddScene = Scene
28142814
Position = Vector
28152815
X = 624
28162816
Y = 1536
2817-
PlacedByPlayer = 0
28182817
Team = 1
2818+
PlacedByPlayer = 0
28192819
PlaceSceneObject = TerrainObject
28202820
CopyOf = Base.rte/End B
28212821
Position = Vector
@@ -3170,6 +3170,111 @@ AddScene = Scene
31703170
X = 1776
31713171
Y = 2172
31723172
PlacedByPlayer = 0
3173+
PlaceSceneObject = Deployment
3174+
CopyOf = Base.rte/Infantry Brain
3175+
Position = Vector
3176+
X = 1296
3177+
Y = 1992
3178+
PlaceSceneObject = Deployment
3179+
CopyOf = Base.rte/Infantry Heavy
3180+
Position = Vector
3181+
X = 1416
3182+
Y = 2064
3183+
PlaceSceneObject = Deployment
3184+
CopyOf = Base.rte/Infantry Light
3185+
Position = Vector
3186+
X = 1584
3187+
Y = 2112
3188+
PlaceSceneObject = Deployment
3189+
CopyOf = Base.rte/Infantry CQB
3190+
Position = Vector
3191+
X = 1608
3192+
Y = 1920
3193+
PlaceSceneObject = Deployment
3194+
CopyOf = Base.rte/Infantry Light
3195+
Position = Vector
3196+
X = 1943.4
3197+
Y = 1728
3198+
PlaceSceneObject = Deployment
3199+
CopyOf = Base.rte/Infantry Sniper
3200+
Position = Vector
3201+
X = 2448
3202+
Y = 1632
3203+
PlaceSceneObject = Deployment
3204+
CopyOf = Base.rte/Infantry Light
3205+
Position = Vector
3206+
X = 1512.6
3207+
Y = 1440
3208+
PlaceSceneObject = Deployment
3209+
CopyOf = Base.rte/Infantry Engineer
3210+
Position = Vector
3211+
X = 1104
3212+
Y = 1560
3213+
PlaceSceneObject = Deployment
3214+
CopyOf = Base.rte/Infantry Engineer
3215+
Position = Vector
3216+
X = 1200
3217+
Y = 1560
3218+
PlaceSceneObject = Deployment
3219+
CopyOf = Base.rte/Infantry Sniper
3220+
Position = Vector
3221+
X = 5052
3222+
Y = 1452
3223+
PlaceSceneObject = Deployment
3224+
CopyOf = Base.rte/Infantry Light
3225+
Position = Vector
3226+
X = 1271.4
3227+
Y = 1092
3228+
PlaceSceneObject = Deployment
3229+
CopyOf = Base.rte/Infantry Sniper
3230+
Position = Vector
3231+
X = 2556
3232+
Y = 972
3233+
PlaceSceneObject = Deployment
3234+
CopyOf = Base.rte/Infantry Sniper
3235+
Position = Vector
3236+
X = 1704
3237+
Y = 948
3238+
PlaceSceneObject = Deployment
3239+
CopyOf = Base.rte/Infantry Sniper
3240+
Position = Vector
3241+
X = 780
3242+
Y = 816
3243+
PlaceSceneObject = Deployment
3244+
CopyOf = Base.rte/Infantry Sniper
3245+
Position = Vector
3246+
X = 2855.4
3247+
Y = 1344
3248+
PlaceSceneObject = Deployment
3249+
CopyOf = Base.rte/Infantry Light
3250+
Position = Vector
3251+
X = 2400.6
3252+
Y = 1344
3253+
PlaceSceneObject = Deployment
3254+
CopyOf = Base.rte/Infantry Light
3255+
Position = Vector
3256+
X = 1608
3257+
Y = 1344
3258+
PlaceSceneObject = Deployment
3259+
CopyOf = Base.rte/Infantry CQB
3260+
Position = Vector
3261+
X = 1680
3262+
Y = 1512
3263+
PlaceSceneObject = Deployment
3264+
CopyOf = Base.rte/Infantry Grenadier
3265+
Position = Vector
3266+
X = 1872.6
3267+
Y = 1512
3268+
PlaceSceneObject = Deployment
3269+
CopyOf = Base.rte/Infantry Light
3270+
Position = Vector
3271+
X = 1536
3272+
Y = 1728
3273+
PlaceSceneObject = Deployment
3274+
CopyOf = Base.rte/Infantry Light
3275+
Position = Vector
3276+
X = 1489.2
3277+
Y = 1632
31733278
AddArea = Area
31743279
AddBox = Box
31753280
Corner = Vector

‎Data/Missions.rte/Scenes/Bessor Split Bunker.preview.png

-76 Bytes
Loading

0 commit comments

Comments
 (0)