Skip to content

Commit

Permalink
Separate factions
Browse files Browse the repository at this point in the history 
Create new engineer for f2
Alter Movement characteristics
  • Loading branch information
@ForbodingAngel
ForbodingAngel committed Feb 28, 2022
1 parent f647df4 commit 94fc76b
Show file tree
Hide file tree
Showing 26 changed files with 1,251 additions and 114 deletions.
14 changes: 13 additions & 1 deletion Gamedata/alldefs_post.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,14 @@ function UnitDef_Post(name, uDef)
uDef.shownanospray = false
end

--------------------------------------------------------------------------------
-------------------------------------------------------------------------------- Make units unable to be built in the water
if uDef.maxwaterdepth then
uDef.maxwaterdepth = 25
end
if uDef.floater then
uDef.floater = false
end
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-- Turn off Chicken Egg drops
Expand Down Expand Up @@ -300,7 +308,11 @@ function WeaponDef_Post(name, wDef)
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
end


--------------------------------------------------------------------------------
-------------------------------------------------------------------------------- Turn off waterweapons
if wDef.waterweapon then
wDef.waterweapon = false
end
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-- Disable Friendly Fire Completely
Expand Down
66 changes: 33 additions & 33 deletions Gamedata/movedefs_classes.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ flowMappingToggle = true

local genericDepthmodParams = {
minHeight = 0,
maxHeight = 5000,
maxScale = 1.25,
maxHeight = 25,
maxScale = 2,
quadraticCoeff = 0,
linearCoeff = 0, -- deprecates "depthMod"
constantCoeff = 1.25,
constantCoeff = 2,
}

local amphibDepthmodParams = {
minHeight = 0,
maxHeight = 5000,
maxScale = 1,
maxHeight = 25,
maxScale = 2,
quadraticCoeff = 0,
linearCoeff = 0, -- deprecates "depthMod"
constantCoeff = 1,
constantCoeff = 2,
}

local moveDefs = {
Expand All @@ -32,7 +32,7 @@ local moveDefs = {
footprintx=2,
footprintz=2,
maxslope=30,
maxwaterdepth=10,
maxwaterdepth=25,
maxwaterslope=255,
badwaterslope=255,
crushstrength=20,
Expand All @@ -48,7 +48,7 @@ local moveDefs = {
footprintx=3,
footprintz=3,
maxslope=30,
maxwaterdepth=10,
maxwaterdepth=25,
maxwaterslope=255,
badwaterslope=255,
crushstrength=20,
Expand All @@ -64,7 +64,7 @@ local moveDefs = {
footprintx=4,
footprintz=4,
maxslope=30,
maxwaterdepth=10,
maxwaterdepth=25,
maxwaterslope=255,
badwaterslope=255,
crushstrength=20,
Expand All @@ -80,7 +80,7 @@ local moveDefs = {
footprintx=5,
footprintz=5,
maxslope=30,
maxwaterdepth=10,
maxwaterdepth=25,
maxwaterslope=255,
badwaterslope=255,
crushstrength=20,
Expand All @@ -96,7 +96,7 @@ local moveDefs = {
footprintx=6,
footprintz=6,
maxslope=30,
maxwaterdepth=10,
maxwaterdepth=25,
maxwaterslope=255,
badwaterslope=255,
crushstrength=20,
Expand All @@ -111,7 +111,7 @@ local moveDefs = {
ORBHOVERTANK6 = {
footprintx=6,
footprintz=6,
maxslope=30,
maxslope=47,
maxwaterdepth=5000,
maxwaterslope=255,
badwaterslope=255,
Expand All @@ -132,8 +132,8 @@ local moveDefs = {
HOVERHBOT2 = {
footprintx=2,
footprintz=2,
maxslope=90,
maxwaterdepth=10,
maxslope=47,
maxwaterdepth=25,
maxwaterslope=255,
badwaterslope=255,
crushstrength=20,
Expand All @@ -148,8 +148,8 @@ local moveDefs = {
HOVERHBOT3 = {
footprintx=3,
footprintz=3,
maxslope=90,
maxwaterdepth=10,
maxslope=47,
maxwaterdepth=25,
maxwaterslope=255,
badwaterslope=255,
crushstrength=20,
Expand All @@ -164,8 +164,8 @@ local moveDefs = {
HOVERHBOT4 = {
footprintx=4,
footprintz=4,
maxslope=90,
maxwaterdepth=10,
maxslope=47,
maxwaterdepth=25,
maxwaterslope=255,
badwaterslope=255,
crushstrength=20,
Expand All @@ -180,8 +180,8 @@ local moveDefs = {
HOVERHBOT5 = {
footprintx=5,
footprintz=5,
maxslope=90,
maxwaterdepth=10,
maxslope=47,
maxwaterdepth=25,
maxwaterslope=255,
badwaterslope=255,
crushstrength=20,
Expand All @@ -196,8 +196,8 @@ local moveDefs = {
HOVERHBOT6 = {
footprintx=6,
footprintz=6,
maxslope=90,
maxwaterdepth=10,
maxslope=47,
maxwaterdepth=25,
maxwaterslope=255,
badwaterslope=255,
crushstrength=20,
Expand All @@ -212,8 +212,8 @@ local moveDefs = {
HOVERHBOT8 = {
footprintx=8,
footprintz=8,
maxslope=90,
maxwaterdepth=10,
maxslope=47,
maxwaterdepth=25,
maxwaterslope=255,
badwaterslope=255,
crushstrength=20,
Expand All @@ -233,7 +233,7 @@ local moveDefs = {
ALLTERRTANK2 = {
footprintx=2,
footprintz=2,
maxslope=90,
maxslope=47,
maxwaterdepth=30,
crushstrength=20,
depthModParams = genericDepthmodParams,
Expand All @@ -247,7 +247,7 @@ local moveDefs = {
ALLTERRTANK3 = {
footprintx=3,
footprintz=3,
maxslope=90,
maxslope=47,
maxwaterdepth=30,
crushstrength=20,
depthModParams = genericDepthmodParams,
Expand All @@ -261,7 +261,7 @@ local moveDefs = {
ALLTERRTANK4 = {
footprintx=4,
footprintz=4,
maxslope=90,
maxslope=47,
maxwaterdepth=30,
crushstrength=20,
depthModParams = genericDepthmodParams,
Expand All @@ -275,7 +275,7 @@ local moveDefs = {
ALLTERRTANK5 = {
footprintx=5,
footprintz=5,
maxslope=90,
maxslope=47,
maxwaterdepth=30,
crushstrength=20,
depthModParams = genericDepthmodParams,
Expand All @@ -289,7 +289,7 @@ local moveDefs = {
ALLTERRTANK6 = {
footprintx=6,
footprintz=6,
maxslope=90,
maxslope=47,
maxwaterdepth=30,
crushstrength=20,
depthModParams = genericDepthmodParams,
Expand Down Expand Up @@ -325,7 +325,7 @@ local moveDefs = {
footprintx=2,
footprintz=2,
maxslope=30,
maxwaterdepth=10,
maxwaterdepth=25,
maxwaterslope=26,
badwaterslope=26,
crushstrength=20,
Expand Down Expand Up @@ -458,7 +458,7 @@ local moveDefs = {
EXPERIMENTALTANK12 = {
footprintx=12,
footprintz=12,
maxslope=90,
maxslope=47,
maxwaterdepth=80,
crushstrength=100,
depthModParams = genericDepthmodParams,
Expand All @@ -477,7 +477,7 @@ local moveDefs = {
COMMANDERTANK4 = {
footprintx=4,
footprintz=4,
maxslope=90,
maxslope=47,
crushstrength=20,
maxwaterdepth=5000,
maxwaterslope=255,
Expand All @@ -494,7 +494,7 @@ local moveDefs = {
footprintz=4,
maxslope=30,
crushstrength=20,
maxwaterdepth=10,
maxwaterdepth=25,
maxwaterslope=255,
badwaterslope=255,
depthModParams = genericDepthmodParams,
Expand Down
53 changes: 37 additions & 16 deletions Gamedata/sidedata.lua
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,54 @@
local sideData = {
-- [1] = {
-- name = 'Ateran',
-- startunit = 'ecommander',
-- startunitai = 'ecommanderai',
-- uiSets = {
-- Main = {0.40, 0.20, 0.70, 1},
-- Trim = {1.00, 0.80, 0.00, 1},
-- Rank = {1.00, 0.90, 0.50, 1},
-- },
-- },
-- [2] = {
-- name = 'Zaal',
-- startunit = 'zarm',
-- startunitai = 'zarm',
-- uiSets = {
-- Main = {0.40, 0.20, 0.70, 1},
-- Trim = {1.00, 0.80, 0.00, 1},
-- Rank = {1.00, 0.90, 0.50, 1},
-- },
-- },
-- [3] = {
-- name = 'Pattern',
-- startunit = 'xcommander',
-- startunitai = 'xcommander',
-- uiSets = {
-- Main = {0.40, 0.20, 0.70, 1},
-- Trim = {1.00, 0.80, 0.00, 1},
-- Rank = {1.00, 0.90, 0.50, 1},
-- },
-- },

[1] = {
name = 'Ateran',
startunit = 'ecommander',
startunitai = 'ecommanderai',
name = 'Federation of Kala',
startunit = 'fedcommander',
startunitai = 'fedcommanderai',
uiSets = {
Main = {0.40, 0.20, 0.70, 1},
Trim = {1.00, 0.80, 0.00, 1},
Rank = {1.00, 0.90, 0.50, 1},
},
},
[2] = {
name = 'Zaal',
startunit = 'zarm',
startunitai = 'zarm',
name = 'Loz Alliance',
startunit = 'fedcommander',
startunitai = 'fedcommanderai',
uiSets = {
Main = {0.40, 0.20, 0.70, 1},
Trim = {1.00, 0.80, 0.00, 1},
Rank = {1.00, 0.90, 0.50, 1},
},
},
-- [3] = {
-- name = 'Pattern',
-- startunit = 'xcommander',
-- startunitai = 'xcommander',
-- uiSets = {
-- Main = {0.40, 0.20, 0.70, 1},
-- Trim = {1.00, 0.80, 0.00, 1},
-- Rank = {1.00, 0.90, 0.50, 1},
-- },
-- },
}
return sideData
Loading

0 comments on commit 94fc76b

Please sign in to comment.