Skip to content

Commit 94fc76b

Browse files
ScarylePooScarylePoo
committed
Separate factions
Create new engineer for f2 Alter Movement characteristics
1 parent f647df4 commit 94fc76b

File tree

26 files changed

+1251
-114
lines changed

26 files changed

+1251
-114
lines changed

‎Gamedata/alldefs_post.lua‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,14 @@ function UnitDef_Post(name, uDef)
191191
uDef.shownanospray = false
192192
end
193193

194+
--------------------------------------------------------------------------------
195+
-------------------------------------------------------------------------------- Make units unable to be built in the water
196+
if uDef.maxwaterdepth then
197+
uDef.maxwaterdepth = 25
198+
end
199+
if uDef.floater then
200+
uDef.floater = false
201+
end
194202
--------------------------------------------------------------------------------
195203
--------------------------------------------------------------------------------
196204
-- Turn off Chicken Egg drops
@@ -300,7 +308,11 @@ function WeaponDef_Post(name, wDef)
300308
wDef.energypershot = math.floor(wDef.damage.default * 0.05 * wDef.projectiles * ((wDef.areaofeffect * 0.001) + 1) * wDef.range^0.25 * 0.5 * 10 + 0.5) * 0.1
301309
end
302310

303-
311+
--------------------------------------------------------------------------------
312+
-------------------------------------------------------------------------------- Turn off waterweapons
313+
if wDef.waterweapon then
314+
wDef.waterweapon = false
315+
end
304316
--------------------------------------------------------------------------------
305317
--------------------------------------------------------------------------------
306318
-- Disable Friendly Fire Completely

‎Gamedata/movedefs_classes.lua‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ flowMappingToggle = true
88

99
local genericDepthmodParams = {
1010
minHeight = 0,
11-
maxHeight = 5000,
12-
maxScale = 1.25,
11+
maxHeight = 25,
12+
maxScale = 2,
1313
quadraticCoeff = 0,
1414
linearCoeff = 0, -- deprecates "depthMod"
15-
constantCoeff = 1.25,
15+
constantCoeff = 2,
1616
}
1717

1818
local amphibDepthmodParams = {
1919
minHeight = 0,
20-
maxHeight = 5000,
21-
maxScale = 1,
20+
maxHeight = 25,
21+
maxScale = 2,
2222
quadraticCoeff = 0,
2323
linearCoeff = 0, -- deprecates "depthMod"
24-
constantCoeff = 1,
24+
constantCoeff = 2,
2525
}
2626

2727
local moveDefs = {
@@ -32,7 +32,7 @@ local moveDefs = {
3232
footprintx=2,
3333
footprintz=2,
3434
maxslope=30,
35-
maxwaterdepth=10,
35+
maxwaterdepth=25,
3636
maxwaterslope=255,
3737
badwaterslope=255,
3838
crushstrength=20,
@@ -48,7 +48,7 @@ local moveDefs = {
4848
footprintx=3,
4949
footprintz=3,
5050
maxslope=30,
51-
maxwaterdepth=10,
51+
maxwaterdepth=25,
5252
maxwaterslope=255,
5353
badwaterslope=255,
5454
crushstrength=20,
@@ -64,7 +64,7 @@ local moveDefs = {
6464
footprintx=4,
6565
footprintz=4,
6666
maxslope=30,
67-
maxwaterdepth=10,
67+
maxwaterdepth=25,
6868
maxwaterslope=255,
6969
badwaterslope=255,
7070
crushstrength=20,
@@ -80,7 +80,7 @@ local moveDefs = {
8080
footprintx=5,
8181
footprintz=5,
8282
maxslope=30,
83-
maxwaterdepth=10,
83+
maxwaterdepth=25,
8484
maxwaterslope=255,
8585
badwaterslope=255,
8686
crushstrength=20,
@@ -96,7 +96,7 @@ local moveDefs = {
9696
footprintx=6,
9797
footprintz=6,
9898
maxslope=30,
99-
maxwaterdepth=10,
99+
maxwaterdepth=25,
100100
maxwaterslope=255,
101101
badwaterslope=255,
102102
crushstrength=20,
@@ -111,7 +111,7 @@ local moveDefs = {
111111
ORBHOVERTANK6 = {
112112
footprintx=6,
113113
footprintz=6,
114-
maxslope=30,
114+
maxslope=47,
115115
maxwaterdepth=5000,
116116
maxwaterslope=255,
117117
badwaterslope=255,
@@ -132,8 +132,8 @@ local moveDefs = {
132132
HOVERHBOT2 = {
133133
footprintx=2,
134134
footprintz=2,
135-
maxslope=90,
136-
maxwaterdepth=10,
135+
maxslope=47,
136+
maxwaterdepth=25,
137137
maxwaterslope=255,
138138
badwaterslope=255,
139139
crushstrength=20,
@@ -148,8 +148,8 @@ local moveDefs = {
148148
HOVERHBOT3 = {
149149
footprintx=3,
150150
footprintz=3,
151-
maxslope=90,
152-
maxwaterdepth=10,
151+
maxslope=47,
152+
maxwaterdepth=25,
153153
maxwaterslope=255,
154154
badwaterslope=255,
155155
crushstrength=20,
@@ -164,8 +164,8 @@ local moveDefs = {
164164
HOVERHBOT4 = {
165165
footprintx=4,
166166
footprintz=4,
167-
maxslope=90,
168-
maxwaterdepth=10,
167+
maxslope=47,
168+
maxwaterdepth=25,
169169
maxwaterslope=255,
170170
badwaterslope=255,
171171
crushstrength=20,
@@ -180,8 +180,8 @@ local moveDefs = {
180180
HOVERHBOT5 = {
181181
footprintx=5,
182182
footprintz=5,
183-
maxslope=90,
184-
maxwaterdepth=10,
183+
maxslope=47,
184+
maxwaterdepth=25,
185185
maxwaterslope=255,
186186
badwaterslope=255,
187187
crushstrength=20,
@@ -196,8 +196,8 @@ local moveDefs = {
196196
HOVERHBOT6 = {
197197
footprintx=6,
198198
footprintz=6,
199-
maxslope=90,
200-
maxwaterdepth=10,
199+
maxslope=47,
200+
maxwaterdepth=25,
201201
maxwaterslope=255,
202202
badwaterslope=255,
203203
crushstrength=20,
@@ -212,8 +212,8 @@ local moveDefs = {
212212
HOVERHBOT8 = {
213213
footprintx=8,
214214
footprintz=8,
215-
maxslope=90,
216-
maxwaterdepth=10,
215+
maxslope=47,
216+
maxwaterdepth=25,
217217
maxwaterslope=255,
218218
badwaterslope=255,
219219
crushstrength=20,
@@ -233,7 +233,7 @@ local moveDefs = {
233233
ALLTERRTANK2 = {
234234
footprintx=2,
235235
footprintz=2,
236-
maxslope=90,
236+
maxslope=47,
237237
maxwaterdepth=30,
238238
crushstrength=20,
239239
depthModParams = genericDepthmodParams,
@@ -247,7 +247,7 @@ local moveDefs = {
247247
ALLTERRTANK3 = {
248248
footprintx=3,
249249
footprintz=3,
250-
maxslope=90,
250+
maxslope=47,
251251
maxwaterdepth=30,
252252
crushstrength=20,
253253
depthModParams = genericDepthmodParams,
@@ -261,7 +261,7 @@ local moveDefs = {
261261
ALLTERRTANK4 = {
262262
footprintx=4,
263263
footprintz=4,
264-
maxslope=90,
264+
maxslope=47,
265265
maxwaterdepth=30,
266266
crushstrength=20,
267267
depthModParams = genericDepthmodParams,
@@ -275,7 +275,7 @@ local moveDefs = {
275275
ALLTERRTANK5 = {
276276
footprintx=5,
277277
footprintz=5,
278-
maxslope=90,
278+
maxslope=47,
279279
maxwaterdepth=30,
280280
crushstrength=20,
281281
depthModParams = genericDepthmodParams,
@@ -289,7 +289,7 @@ local moveDefs = {
289289
ALLTERRTANK6 = {
290290
footprintx=6,
291291
footprintz=6,
292-
maxslope=90,
292+
maxslope=47,
293293
maxwaterdepth=30,
294294
crushstrength=20,
295295
depthModParams = genericDepthmodParams,
@@ -325,7 +325,7 @@ local moveDefs = {
325325
footprintx=2,
326326
footprintz=2,
327327
maxslope=30,
328-
maxwaterdepth=10,
328+
maxwaterdepth=25,
329329
maxwaterslope=26,
330330
badwaterslope=26,
331331
crushstrength=20,
@@ -458,7 +458,7 @@ local moveDefs = {
458458
EXPERIMENTALTANK12 = {
459459
footprintx=12,
460460
footprintz=12,
461-
maxslope=90,
461+
maxslope=47,
462462
maxwaterdepth=80,
463463
crushstrength=100,
464464
depthModParams = genericDepthmodParams,
@@ -477,7 +477,7 @@ local moveDefs = {
477477
COMMANDERTANK4 = {
478478
footprintx=4,
479479
footprintz=4,
480-
maxslope=90,
480+
maxslope=47,
481481
crushstrength=20,
482482
maxwaterdepth=5000,
483483
maxwaterslope=255,
@@ -494,7 +494,7 @@ local moveDefs = {
494494
footprintz=4,
495495
maxslope=30,
496496
crushstrength=20,
497-
maxwaterdepth=10,
497+
maxwaterdepth=25,
498498
maxwaterslope=255,
499499
badwaterslope=255,
500500
depthModParams = genericDepthmodParams,

‎Gamedata/sidedata.lua‎

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,54 @@
11
local sideData = {
2+
-- [1] = {
3+
-- name = 'Ateran',
4+
-- startunit = 'ecommander',
5+
-- startunitai = 'ecommanderai',
6+
-- uiSets = {
7+
-- Main = {0.40, 0.20, 0.70, 1},
8+
-- Trim = {1.00, 0.80, 0.00, 1},
9+
-- Rank = {1.00, 0.90, 0.50, 1},
10+
-- },
11+
-- },
12+
-- [2] = {
13+
-- name = 'Zaal',
14+
-- startunit = 'zarm',
15+
-- startunitai = 'zarm',
16+
-- uiSets = {
17+
-- Main = {0.40, 0.20, 0.70, 1},
18+
-- Trim = {1.00, 0.80, 0.00, 1},
19+
-- Rank = {1.00, 0.90, 0.50, 1},
20+
-- },
21+
-- },
22+
-- [3] = {
23+
-- name = 'Pattern',
24+
-- startunit = 'xcommander',
25+
-- startunitai = 'xcommander',
26+
-- uiSets = {
27+
-- Main = {0.40, 0.20, 0.70, 1},
28+
-- Trim = {1.00, 0.80, 0.00, 1},
29+
-- Rank = {1.00, 0.90, 0.50, 1},
30+
-- },
31+
-- },
32+
233
[1] = {
3-
name = 'Ateran',
4-
startunit = 'ecommander',
5-
startunitai = 'ecommanderai',
34+
name = 'Federation of Kala',
35+
startunit = 'fedcommander',
36+
startunitai = 'fedcommanderai',
637
uiSets = {
738
Main = {0.40, 0.20, 0.70, 1},
839
Trim = {1.00, 0.80, 0.00, 1},
940
Rank = {1.00, 0.90, 0.50, 1},
1041
},
1142
},
1243
[2] = {
13-
name = 'Zaal',
14-
startunit = 'zarm',
15-
startunitai = 'zarm',
44+
name = 'Loz Alliance',
45+
startunit = 'fedcommander',
46+
startunitai = 'fedcommanderai',
1647
uiSets = {
1748
Main = {0.40, 0.20, 0.70, 1},
1849
Trim = {1.00, 0.80, 0.00, 1},
1950
Rank = {1.00, 0.90, 0.50, 1},
2051
},
2152
},
22-
-- [3] = {
23-
-- name = 'Pattern',
24-
-- startunit = 'xcommander',
25-
-- startunitai = 'xcommander',
26-
-- uiSets = {
27-
-- Main = {0.40, 0.20, 0.70, 1},
28-
-- Trim = {1.00, 0.80, 0.00, 1},
29-
-- Rank = {1.00, 0.90, 0.50, 1},
30-
-- },
31-
-- },
3253
}
3354
return sideData

0 commit comments

Comments
 (0)