Skip to content

Commit 25db895

Browse files
ScarylePooScarylePoo
committed
This is the first divergence from Evo and likely the last commit
1 parent 94fc76b commit 25db895

36 files changed

+1116
-464
lines changed

‎Gamedata/alldefs_post.lua‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,9 @@ function ModOptions_Post (UnitDefs, WeaponDefs)
359359

360360
-- Set building Hitpoints
361361
-- Ateran
362-
if unitDef.customparams and unitDef.customparams.factionname == "ateran" then
362+
if unitDef.customparams and unitDef.customparams.factionname == "ateran"
363+
or unitDef.customparams and unitDef.customparams.factionname == "Federation of Kala"
364+
or unitDef.customparams and unitDef.customparams.factionname == "Loz Alliance" then
363365
if unitDef.customparams then
364366
if unitDef.customparams.unittype == "building" then
365367
unitDef.maxdamage = unitDef.buildcostmetal * 5

‎Gamedata/morph_defs.lua‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,22 @@ local timeToBuild_eflakturret = energyCost_eflakturret / 10
8989
-- energycost = time * rate
9090
-- time = energycost / rate
9191

92+
--Loz Commander Upgrades
93+
94+
local energyCost_lozcommander_up1 = 60 * 10
95+
local timeToBuild_lozcommander_up1 = energyCost_lozcommander_up1 / 10
96+
97+
local energyCost_lozcommander_up2 = 180 * 25
98+
local timeToBuild_lozcommander_up2 = energyCost_lozcommander_up2 / 25
99+
100+
local energyCost_lozcommander_up3 = 300 * 50
101+
local timeToBuild_lozcommander_up3 = energyCost_lozcommander_up3 / 50
102+
103+
local energyCost_lozcommander_up4 = 480 * 100
104+
local timeToBuild_lozcommander_up4 = energyCost_lozcommander_up4 / 100
105+
106+
--
107+
92108
local energyCost_emetalextractor_up1 = 60 * 2
93109
local timeToBuild_emetalextractor_up1 = energyCost_emetalextractor_up1 / 2
94110

@@ -126,6 +142,63 @@ local energyCost_karganneth = 0
126142
local timeToBuild_karganneth = 10
127143

128144
local morphDefs = {
145+
146+
--lozcommander
147+
148+
lozcommander = {
149+
{
150+
into = 'lozcommander_up1',
151+
time = timeToBuild_lozcommander_up1,
152+
cmdname = [[Tech 1]],
153+
energy = energyCost_lozcommander_up1,
154+
metal = 0,
155+
text = 'Evolve Tech 1 with upgraded weapons and armor',
156+
},
157+
},
158+
159+
lozcommander_up1 = {
160+
{
161+
into = 'lozcommander_up2',
162+
time = timeToBuild_lozcommander_up2,
163+
cmdname = [[Tech 2]],
164+
energy = energyCost_lozcommander_up2,
165+
metal = 0,
166+
text = 'Evolve Tech 2 with upgraded weapons and armor',
167+
require = [[tech1]],
168+
},
169+
},
170+
171+
lozcommander_up2 = {
172+
{
173+
into = 'lozcommander_up3',
174+
time = timeToBuild_lozcommander_up3,
175+
cmdname = [[Tech 3]],
176+
energy = energyCost_lozcommander_up3,
177+
metal = 0,
178+
text = 'Evolve Tech 3 with upgraded weapons and armor',
179+
require = [[tech2]],
180+
},
181+
},
182+
183+
lozcommander_up3 = {
184+
{
185+
into = 'lozcommander_up4',
186+
time = timeToBuild_lozcommander_up4,
187+
cmdname = [[Tech 3
188+
BattleMech]],
189+
energy = energyCost_lozcommander_up4,
190+
metal = 0,
191+
text = 'Evolve into a BattleMech with Devestating weapons and armor',
192+
require = [[tech3]],
193+
},
194+
},
195+
196+
--
197+
198+
199+
200+
201+
129202
ecommander = {
130203
{
131204
into = 'ecommanderhealer',

‎Gamedata/movedefs_classes.lua‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,21 @@ local moveDefs = {
489489
allowRawMovement=true,
490490
flowMapping=flowMappingToggle,
491491
},
492+
COMMANDERTANK6 = {
493+
footprintx=6,
494+
footprintz=6,
495+
maxslope=47,
496+
crushstrength=20,
497+
maxwaterdepth=5000,
498+
maxwaterslope=255,
499+
badwaterslope=255,
500+
depthModParams = genericDepthmodParams,
501+
minwaterdepth=10,
502+
heatmod=unitHeat,
503+
slopemod=4,
504+
allowRawMovement=true,
505+
flowMapping=flowMappingToggle,
506+
},
492507
COMMANDERTANKAI4 = {
493508
footprintx=4,
494509
footprintz=4,

‎Gamedata/unitdefs_pre.lua‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Shared.buildListFed = {
5454
[[esilo]],
5555
[[escoutdrone]],
5656
[[fedengineer]],
57-
[[eorb]],
57+
[[fedorb]],
5858
[[ehbotkarganneth]],
5959
[[eallterranarchid]],
6060
[[ekrow]],
@@ -83,20 +83,21 @@ Shared.buildListLoz = {
8383
[[esilo]],
8484
[[escoutdrone]],
8585
[[lozengineer]],
86-
[[eorb]],
86+
[[lozorb]],
8787
[[eamphibleveler]],
8888
[[elacerator]],
8989
[[ekrow]],
9090
-- [[ecommander]],
9191
}
9292

93-
Shared.eorb = {
94-
[[ehbotengineer]],
95-
[[eamphibleveler]],
96-
[[ehbotkarganneth]],
97-
[[eallterranarchid]],
98-
[[elacerator]],
99-
[[ekrow]],
93+
Shared.fedOrb = {
94+
[[fedorb]],
95+
[[fedengineer]],
96+
}
97+
98+
Shared.lozOrb = {
99+
[[lozorb]],
100+
[[lozengineer]],
100101
}
101102

102103
Shared.buildListeCommanderFactory = {

‎LuaUI/Images/lozcommander.png‎

34.3 KB
Loading

‎LuaUI/Widgets_Evo/gui_faction_change.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ function widget:DrawWorld()
196196
glTexture('LuaUI/Images/ecommander.png')
197197
glBeginEnd(GL_QUADS, QuadVerts, tsx, spGetGroundHeight(tsx, tsz), tsz, 80)
198198
elseif spGetTeamRulesParam(teamID, 'startUnit') == lozcomDefID then
199-
glTexture('LuaUI/Images/zarm.png')
199+
glTexture('LuaUI/Images/lozcommander.png')
200200
glBeginEnd(GL_QUADS, QuadVerts, tsx, spGetGroundHeight(tsx, tsz), tsz, 64)
201201
end
202202
end
@@ -266,7 +266,7 @@ function GenerateFactionChangeList()
266266
glColor(1, 1, 1, 1)
267267
glTexture('LuaUI/Images/ecommander.png')
268268
glTexRect(12*widgetScale, 17*widgetScale, 52*widgetScale, 59*widgetScale)
269-
glTexture('LuaUI/Images/zarm.png')
269+
glTexture('LuaUI/Images/lozcommander.png')
270270
glTexRect(76*widgetScale, 20*widgetScale, 116*widgetScale, 60*widgetScale)
271271
glTexture(false)
272272

‎LuaUI/Widgets_Evo/snd_ambientSoundPlayer.lua‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ function widget:GameFrame(n)
5151
end
5252
elseif myFaction == "Loz Alliance" then
5353
if n == 1 then
54-
Spring.PlaySoundFile("LuaUI/Sounds/ambient/zaalambient.wav", 0.33, 'ui')
54+
Spring.PlaySoundFile("LuaUI/Sounds/ambient/ambient-stereo-short.wav", 0.33, 'ui')
5555
elseif (n % 50) == 4 then
56-
Spring.PlaySoundFile("LuaUI/Sounds/ambient/zaalambient.wav", 0.33, 'ui')
56+
Spring.PlaySoundFile("LuaUI/Sounds/ambient/ambient-stereo-short.wav", 0.33, 'ui')
5757
end
58-
elseif myFaction == "pattern" then
58+
elseif myFaction == "zaal" then
5959
if n == 1 then
60-
Spring.PlaySoundFile("LuaUI/Sounds/ambient/ambient-stereo-short.wav", 0.33, 'ui')
60+
Spring.PlaySoundFile("LuaUI/Sounds/ambient/zaalambient.wav", 0.33, 'ui')
6161
elseif (n % 50) == 4 then
62-
Spring.PlaySoundFile("LuaUI/Sounds/ambient/ambient-stereo-short.wav", 0.33, 'ui')
62+
Spring.PlaySoundFile("LuaUI/Sounds/ambient/zaalambient.wav", 0.33, 'ui')
6363
end
6464
end
6565

‎LuaUI/Widgets_Evo/unit_air_allways_fly.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function widget:GetInfo()
99
license = "GNU GPL, v2 or later",
1010
version = 1,
1111
layer = 5,
12-
enabled = true -- loaded by default?
12+
enabled = false -- loaded by default?
1313
}
1414
end
1515

‎LuaUI/Widgets_Evo/unit_automaticFightCommand.lua‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,30 @@ local hmsz = Game.mapSizeZ/2
2828
--------------------------------------------------------------------------------
2929
--------------------------------------------------------------------------------
3030

31-
local targetUnits = {eorb = true, eorb_up1 = true, eorb_up2 = true, eorb_up3 = true, ehbotengineer = true, ehbotengineer_turret = true, zarm = true, ztenticle = true}
31+
local targetUnits = {
32+
eorb = true,
33+
eorb_up1 = true,
34+
eorb_up2 = true,
35+
eorb_up3 = true,
36+
ehbotengineer = true,
37+
ehbotengineer_turret = true,
38+
zarm = true,
39+
ztenticle = true,
40+
fedengineer = true,
41+
lozengineer = true,
42+
fedorb = true,
43+
lozorb = true,
44+
fedcommander = true
45+
fedcommander_up1 = true,
46+
fedcommander_up2 = true,
47+
fedcommander_up3 = true,
48+
fedcommander_up4 = true,
49+
lozcommander = true,
50+
lozcommander_up1 = true,
51+
lozcommander_up2 = true,
52+
lozcommander_up3 = true,
53+
lozcommander_up4 = true
54+
}
3255

3356
local function IsTargetUnit(ud)
3457
return ud and targetUnits[ud.name]

‎Objects3D/eallterrheavy2.s3o‎

-144 KB
Binary file not shown.

0 commit comments

Comments
 (0)