Resize all units to 50%

Remove patterns
EvolutionRTS · Jan 24, 2022 · 3303d63 · 3303d63
1 parent a0a8189
commit 3303d63
Show file tree

Hide file tree

Showing 171 changed files with 204 additions and 2,750 deletions.
diff --git a/Gamedata/alldefs_post.lua b/Gamedata/alldefs_post.lua
@@ -167,6 +167,14 @@ function UnitDef_Post(name, uDef)
 	if uDef.usegrounddecal == true and uDef.customparams and uDef.customparams.customgrounddecal ~= true then
 		if uDef.customparams and uDef.customparams.factionname == "ateran" then
 			uDef.buildinggrounddecaltype = "groundplate.dds"
+			--Make decals sizing easy
+			if uDef.footprintx ~= nil and uDef.footprintz ~= nil then
+				uDef.buildinggrounddecalsizex = uDef.footprintx + 2
+				uDef.buildinggrounddecalsizey = uDef.footprintz + 2
+				uDef.buildinggrounddecaldecayspeed = 0.9
+			else
+				Spring.Echo("[AllDefsPost] " .. uDef.name .. " Does not have it's footprint defined")
+			end
 		end
 		if uDef.customparams and uDef.customparams.factionname == "zaal" then
 			uDef.buildinggrounddecaltype = "zgroundtexture2.dds"
@@ -194,7 +202,14 @@ function UnitDef_Post(name, uDef)
 		VFS.Include("gamedata/scavengers/unitdef_post.lua")
 		uDef = scav_Udef_Post(name, uDef)
 	end
-	
+
+	--------------------------------------------------------------------------------
+	--------------------------------------------------------------------------------
+	-- Use per piece collision volumes
+	-- !Potentially very expensive!
+	-- I'm using this to save myself a boatload of time
+	uDef.usePieceCollisionVolumes = false
+
 end
 
 --------------------------------------------------------------------------------

diff --git a/Gamedata/movedefs_classes.lua b/Gamedata/movedefs_classes.lua
@@ -129,6 +129,22 @@ local moveDefs = {
 
 --hBot--
 
+   HOVERHBOT2 = {
+      footprintx=2,
+      footprintz=2,
+      maxslope=90,
+      maxwaterdepth=10,
+      maxwaterslope=255,
+      badwaterslope=255,
+      crushstrength=20,
+	  depthModParams = genericDepthmodParams,
+	  minwaterdepth=10,
+	  heatmod=unitHeat,
+	  slopemod=3,
+	  allowRawMovement=true,
+	  flowMapping=flowMappingToggle,
+   },
+
    HOVERHBOT3 = {
       footprintx=3,
       footprintz=3,
@@ -214,6 +230,20 @@ local moveDefs = {
 
 --All Terrain--
 
+   ALLTERRTANK2 = {
+      footprintx=2,
+      footprintz=2,
+      maxslope=90,
+      maxwaterdepth=30,
+      crushstrength=20,
+	  depthModParams = genericDepthmodParams,
+	  minwaterdepth=10,
+	  heatmod=unitHeat,
+	  slopemod=4,
+	  allowRawMovement=true,
+	  flowMapping=flowMappingToggle,
+   },
+
    ALLTERRTANK3 = {
       footprintx=3,
       footprintz=3,

diff --git a/LuaRules/Gadgets/scavengers/Configs/EvoRTS/UnitLists/factories.lua b/LuaRules/Gadgets/scavengers/Configs/EvoRTS/UnitLists/factories.lua
@@ -5,7 +5,6 @@ Factories = {
 	"ehbotfac",
 	"eairplant",
 	"zhatch",
-	"xklab",
 }
 
 FactoriesExcludedUnits = {

diff --git a/LuaRules/Gadgets/scavengers/Configs/EvoRTS/UnitLists/land.lua b/LuaRules/Gadgets/scavengers/Configs/EvoRTS/UnitLists/land.lua
@@ -4,8 +4,6 @@ T0LandUnits = {
 	"ehbotpeewee",
 	"elighttank3",
 	"zlightswarm",
-	"xskulk",
-	"xflea",
 }
 
 T1LandUnits = {
@@ -29,12 +27,6 @@ T1LandUnits = {
 	"eartytank_saturation",
 	"zmedswarm",
 	"zpyro",
-	"xskulk",
-	"xflea",
-	"xcrasher",
-	"xhammer",
-	"xrocko",
-	"xwarrior",
 }
 
 T2LandUnits = {
@@ -48,10 +40,6 @@ T2LandUnits = {
 	"emissiletank",
 	"zskirmisher",
 	"zassault",
-	"xcrasher",
-	"xhammer",
-	"xrocko",
-	"xwarrior",
 }
 
 T3LandUnits = {

diff --git a/LuaRules/Gadgets/scavengers/Configs/EvoRTS/UnitLists/staticunits.lua b/LuaRules/Gadgets/scavengers/Configs/EvoRTS/UnitLists/staticunits.lua
@@ -20,7 +20,6 @@ StockpilingUnitNames = {
 
 NukingUnitNames = {
 	"esilo",
-	"xnukesilo",
 }
 
 BeaconCaptureExcludedUnits = {
@@ -32,16 +31,13 @@ BeaconDefenceStructuresT0 = {
 	"elightturret2",
 	"elightturret2",
 	"ehbotpeewee_turret",
-	"xllt",
 }
 
 BeaconDefenceStructuresT1 = {
 	"elightturret2",
 	"eheavyturret2",
 	"ehbotpeewee_turret",
 	"ehbotthud_turret",
-	"xllt",
-	"xrocketturret",
 }
 
 BeaconDefenceStructuresT2 = {
@@ -50,7 +46,6 @@ BeaconDefenceStructuresT2 = {
 	"ehbotrocko_turret",
 	"ehbotsniper_turret",
 	"ehbotthud_turret",
-	"xrocketturret",
 }
 
 BeaconDefenceStructuresT3 = {
@@ -69,16 +64,13 @@ StartboxDefenceStructuresT0 = {
 	"elightturret2",
 	"elightturret2",
 	"ehbotpeewee_turret",
-	"xllt",
 }
 
 StartboxDefenceStructuresT1 = {
 	"elightturret2",
 	"eheavyturret2",
 	"ehbotpeewee_turret",
 	"ehbotthud_turret",
-	"xllt",
-	"xrocketturret",
 }
 
 StartboxDefenceStructuresT2 = {
@@ -87,7 +79,6 @@ StartboxDefenceStructuresT2 = {
 	"ehbotrocko_turret",
 	"ehbotsniper_turret",
 	"ehbotthud_turret",
-	"xrocketturret",
 }
 
 StartboxDefenceStructuresT3 = {
@@ -115,16 +106,13 @@ StartboxDefenceStructuresT0Sea = {
 	"elightturret2",
 	"elightturret2",
 	"ehbotpeewee_turret",
-	"xllt",
 }
 
 StartboxDefenceStructuresT1Sea = {
 	"elightturret2",
 	"eheavyturret2",
 	"ehbotpeewee_turret",
 	"ehbotthud_turret",
-	"xllt",
-	"xrocketturret",
 }
 
 StartboxDefenceStructuresT2Sea = {
@@ -133,7 +121,6 @@ StartboxDefenceStructuresT2Sea = {
 	"ehbotrocko_turret",
 	"ehbotsniper_turret",
 	"ehbotthud_turret",
-	"xrocketturret",
 }
 
 StartboxDefenceStructuresT3Sea = {

diff --git a/LuaRules/Gadgets/unit_supply_requirement.lua b/LuaRules/Gadgets/unit_supply_requirement.lua
@@ -37,7 +37,7 @@ local PRIVATE = {private = true}
 --------------------------------------------------------------------------------
 -- Configuration
 
-local SUPPLY_CAP = tonumber(Spring.GetModOptions().supplycap) or 400
+local SUPPLY_CAP = tonumber(Spring.GetModOptions().supplycap) or 1000000 -- !!!SREMEMBER TO CHANGE THIS SETTING IN gui_resourceBar.lua !!!
 local INTRINSIC_SUPPLY = tonumber(Spring.GetModOptions().intrinsicsupply) or 10
 
 --------------------------------------------------------------------------------

diff --git a/LuaUI/Widgets_Evo/gui_faction_change.lua b/LuaUI/Widgets_Evo/gui_faction_change.lua
@@ -58,7 +58,6 @@ local spGetSpectatingState = Spring.GetSpectatingState
 
 local aterancomDefID = UnitDefNames.ecommander.id
 local zaalcomDefID = UnitDefNames.zarm.id
-local patterncomDefID = UnitDefNames.xcommander.id
 
 local commanderDefID = spGetTeamRulesParam(myTeamID, 'startUnit')
 local amNewbie = (spGetTeamRulesParam(myTeamID, 'isNewbie') == 1)
@@ -199,9 +198,6 @@ function widget:DrawWorld()
 			elseif spGetTeamRulesParam(teamID, 'startUnit') == zaalcomDefID then
 				glTexture('LuaUI/Images/zarm.png')
 				glBeginEnd(GL_QUADS, QuadVerts, tsx, spGetGroundHeight(tsx, tsz), tsz, 64)
-			elseif spGetTeamRulesParam(teamID, 'startUnit') == patterncomDefID then
-				glTexture('LuaUI/Images/xcommander.png')
-				glBeginEnd(GL_QUADS, QuadVerts, tsx, spGetGroundHeight(tsx, tsz), tsz, 64)
 			end
 		end
 	end
@@ -272,16 +268,13 @@ function GenerateFactionChangeList()
 	glTexRect(12*widgetScale, 17*widgetScale, 52*widgetScale, 59*widgetScale)
 	glTexture('LuaUI/Images/zarm.png')
 	glTexRect(76*widgetScale, 20*widgetScale, 116*widgetScale, 60*widgetScale)
-	-- glTexture('LuaUI/Images/xcommander.png')
-	-- glTexRect(140*widgetScale, 20*widgetScale, 180*widgetScale, 60*widgetScale)
 	glTexture(false)
 
 		-- Text
 	font:Begin()
 	font:Print('Choose Your Faction', 96*widgetScale, 64*widgetScale, 11.5*widgetScale, 'ocd')
 	font:Print('Ateran', 32*widgetScale, 4*widgetScale, 12*widgetScale, 'ocd')
 	font:Print('Zaal', 96*widgetScale, 4*widgetScale, 12*widgetScale, 'ocd')
-	-- font:Print('Pattern(WIP)', 160*widgetScale, 4*widgetScale, 12*widgetScale, 'ocd')
 	font:End()
 end
 

diff --git a/LuaUI/Widgets_Evo/gui_resourceBar.lua b/LuaUI/Widgets_Evo/gui_resourceBar.lua
@@ -41,7 +41,7 @@ local maxBasicIncome = Spring.GetModOptions().maxbasicincome or 15
 -- resource bars: ON means the bars show percentage, OFF means they simply change color depending on state
 local progressBars = true
 
-local maxSupply = tonumber(Spring.GetModOptions().supplycap) or 400
+local maxSupply = tonumber(Spring.GetModOptions().supplycap) or 1000000
 
 -- internal settings, do not touch
 local white = "\255\255\255\255"
@@ -521,9 +521,18 @@ function generateDisplayList2()
 				supplyAvailableColor = green
 			end
 
-			supplyStr = supplyUsedColor .. su .. white .. "/" .. supplyAvailableColor .. sm .. " "
+			if sm > 999 then
+				supplyStr = supplyUsedColor .. su .. white .. "/" .. supplyAvailableColor .. "∞" .. " "
+			else
+				supplyStr = supplyUsedColor .. su .. white .. "/" .. supplyAvailableColor .. sm .. " "
+			end
+
 		else
-			supplyStr = white .. su .. "/" .. sm .. " (" .. orange .. "±" .. tostring(sm - su) .. white .. "/" .. green .. maxSupply .. white .. ") "
+			if sm > 999 then
+				supplyStr = white .. su .. "/" .. "∞" .. " (" .. orange .. "±" .. tostring(sm - su) .. white .. "/" .. green .. "∞" .. white .. ") "
+			else
+				supplyStr = white .. su .. "/" .. sm .. " (" .. orange .. "±" .. tostring(sm - su) .. white .. "/" .. green .. maxSupply .. white .. ") "
+			end
 		end
 		font2:Begin()
 		font2:Print(supplyStr, supplyOffset+supplyBarWidth, textOffsetY, FontSize, "onr")

diff --git a/ModOptions.lua b/ModOptions.lua
@@ -241,10 +241,10 @@ local options= {
 		desc   = 'Determines the maximum army supply that is allowed.',
 		type   = 'number',
 		section= 'supplyoptions',
-		def    = 400,
-		min    = 0,
-		max    = 400,
-		step   = 1,  -- quantization is aligned to the def value
+		def    = 1000000,
+		min    = 50,
+		max    = 1000000,
+		step   = 50,  -- quantization is aligned to the def value
 		-- (step <= 0) means that there is no quantization
 	},
 	{

diff --git a/Objects3D/eairemp.s3o b/Objects3D/eairemp.s3o
diff --git a/Objects3D/eairplant3.s3o b/Objects3D/eairplant3.s3o
diff --git a/Objects3D/eallterrassault.s3o b/Objects3D/eallterrassault.s3o
diff --git a/Objects3D/eallterrfac2.s3o b/Objects3D/eallterrfac2.s3o
diff --git a/Objects3D/eallterrheavy2.s3o b/Objects3D/eallterrheavy2.s3o
diff --git a/Objects3D/eallterrlight2.s3o b/Objects3D/eallterrlight2.s3o
diff --git a/Objects3D/eallterrmed2.s3o b/Objects3D/eallterrmed2.s3o
diff --git a/Objects3D/eallterrriot2.s3o b/Objects3D/eallterrriot2.s3o
diff --git a/Objects3D/eallterrshield.s3o b/Objects3D/eallterrshield.s3o
diff --git a/Objects3D/eamphibaa.s3o b/Objects3D/eamphibaa.s3o
diff --git a/Objects3D/eamphibarty2.s3o b/Objects3D/eamphibarty2.s3o
diff --git a/Objects3D/eamphibbuggy2.s3o b/Objects3D/eamphibbuggy2.s3o
diff --git a/Objects3D/eamphibfac2.s3o b/Objects3D/eamphibfac2.s3o
diff --git a/Objects3D/eamphibmedtank2.s3o b/Objects3D/eamphibmedtank2.s3o
diff --git a/Objects3D/eamphibriot2.s3o b/Objects3D/eamphibriot2.s3o
diff --git a/Objects3D/eamphibrock4.s3o b/Objects3D/eamphibrock4.s3o
diff --git a/Objects3D/eartytank2.s3o b/Objects3D/eartytank2.s3o
diff --git a/Objects3D/ebarricade3.s3o b/Objects3D/ebarricade3.s3o
diff --git a/Objects3D/ebomber2-small.s3o b/Objects3D/ebomber2-small.s3o
diff --git a/Objects3D/ebox_small.s3o b/Objects3D/ebox_small.s3o
diff --git a/Objects3D/edrone2.s3o b/Objects3D/edrone2.s3o
diff --git a/Objects3D/efighter2-small.s3o b/Objects3D/efighter2-small.s3o
diff --git a/Objects3D/efusion2.s3o b/Objects3D/efusion2.s3o
diff --git a/Objects3D/egeothermal2.s3o b/Objects3D/egeothermal2.s3o
diff --git a/Objects3D/egunship3-small.s3o b/Objects3D/egunship3-small.s3o
diff --git a/Objects3D/ehbotengineer2.s3o b/Objects3D/ehbotengineer2.s3o
diff --git a/Objects3D/ehbotengineer_turret.s3o b/Objects3D/ehbotengineer_turret.s3o
diff --git a/Objects3D/ehbotfac.s3o b/Objects3D/ehbotfac.s3o
diff --git a/Objects3D/ehbotkarganneth.s3o b/Objects3D/ehbotkarganneth.s3o
diff --git a/Objects3D/ehbotkarganneth_turret.s3o b/Objects3D/ehbotkarganneth_turret.s3o
diff --git a/Objects3D/ehbotpeewee2.s3o b/Objects3D/ehbotpeewee2.s3o
diff --git a/Objects3D/ehbotpeewee_turret.s3o b/Objects3D/ehbotpeewee_turret.s3o
diff --git a/Objects3D/ehbotrocko.s3o b/Objects3D/ehbotrocko.s3o
diff --git a/Objects3D/ehbotrocko_turret.s3o b/Objects3D/ehbotrocko_turret.s3o
diff --git a/Objects3D/ehbotsniper.s3o b/Objects3D/ehbotsniper.s3o
diff --git a/Objects3D/ehbotsniper_turret.s3o b/Objects3D/ehbotsniper_turret.s3o
diff --git a/Objects3D/ehbotthud.s3o b/Objects3D/ehbotthud.s3o
diff --git a/Objects3D/ehbotthud_turret.s3o b/Objects3D/ehbotthud_turret.s3o
diff --git a/Objects3D/eheavytank4.s3o b/Objects3D/eheavytank4.s3o
diff --git a/Objects3D/eheavyturret3.s3o b/Objects3D/eheavyturret3.s3o
diff --git a/Objects3D/ehoverfactory.s3o b/Objects3D/ehoverfactory.s3o
diff --git a/Objects3D/ejammer3.s3o b/Objects3D/ejammer3.s3o
diff --git a/Objects3D/elaserbattery.s3o b/Objects3D/elaserbattery.s3o
diff --git a/Objects3D/elighttank4.s3o b/Objects3D/elighttank4.s3o
diff --git a/Objects3D/elightturret3.s3o b/Objects3D/elightturret3.s3o
diff --git a/Objects3D/emaker3.s3o b/Objects3D/emaker3.s3o
diff --git a/Objects3D/emine.s3o b/Objects3D/emine.s3o
diff --git a/Objects3D/emissiletank2.s3o b/Objects3D/emissiletank2.s3o
diff --git a/Objects3D/eorb4.s3o b/Objects3D/eorb4.s3o
diff --git a/Objects3D/epowerplant3x3.s3o b/Objects3D/epowerplant3x3.s3o
diff --git a/Objects3D/eradar3_large.s3o b/Objects3D/eradar3_large.s3o
diff --git a/Objects3D/eradar3_small.s3o b/Objects3D/eradar3_small.s3o
diff --git a/Objects3D/eriottank3.s3o b/Objects3D/eriottank3.s3o
diff --git a/Objects3D/escout2.s3o b/Objects3D/escout2.s3o
diff --git a/Objects3D/estorage2.s3o b/Objects3D/estorage2.s3o
diff --git a/Objects3D/etransport2-small.s3o b/Objects3D/etransport2-small.s3o
diff --git a/Scripts/ehoverfac.bos b/Scripts/ehoverfac.bos
@@ -38,28 +38,6 @@ SmokeUnit(healthpercent, sleeptime, smoketype)
 	}
 }
 
-setSFXoccupy(setSFXoccupy_argument)
-{
-terraintype = setSFXoccupy_argument;
-
-                if(terraintype == 2)
-      {
-                move base to y-axis [-5] speed [50];
-                }
-      else
-      {
-                move base to y-axis [-5] speed [50];
-                }
-                if(terraintype == 4)
-      {
-                move base to y-axis [-5] speed [50];
-                }
-      else
-      {
-                move base to y-axis [-5] speed [50];
-                }
-}
-
 buildingfx()
 {
    while( TRUE )

diff --git a/Scripts/ehoverfac.cob b/Scripts/ehoverfac.cob
diff --git a/UnitTextures/afaction_normals.dds b/UnitTextures/afaction_normals.dds
diff --git a/UnitTextures/afaction_tex1.dds b/UnitTextures/afaction_tex1.dds
diff --git a/UnitTextures/afaction_tex2.dds b/UnitTextures/afaction_tex2.dds
diff --git a/Units-Configs-Basedefs/basedefs/air/eairemp_basedef.lua b/Units-Configs-Basedefs/basedefs/air/eairemp_basedef.lua
@@ -22,8 +22,8 @@ unitDef                    = {
 	energyStorage                = 0,
 	energyUse                    = 0,
 	explodeAs                    = "smallExplosionGenericBlue",
-	footprintX                   = 4,
-	footprintZ                   = 4,
+	footprintX                   = 2,
+	footprintZ                   = 2,
 	hoverAttack                  = false,
 	floater                      = true,
 	iconType                     = "scout",

diff --git a/Units-Configs-Basedefs/basedefs/air/eairplant_basedef.lua b/Units-Configs-Basedefs/basedefs/air/eairplant_basedef.lua
@@ -18,8 +18,8 @@ unitDef                         = {
 	energyMake                        = 0,
 	explodeAs                         = "hugeBuildingExplosionGenericRed",
 	floater			                  = true,
-	footprintX                        = 18,
-	footprintZ                        = 18,
+	footprintX                        = 9,
+	footprintZ                        = 9,
 	iconType                          = "factory",
 	idleAutoHeal                      = .5,
 	idleTime                          = 2200,

diff --git a/Units-Configs-Basedefs/basedefs/air/ebomber_basedef.lua b/Units-Configs-Basedefs/basedefs/air/ebomber_basedef.lua
@@ -22,8 +22,8 @@ unitDef                    = {
 	energyStorage                = 0,
 	energyUse                    = 0,
 	explodeAs                    = "largeExplosionGeneric",
-	footprintX                   = 4,
-	footprintZ                   = 4,
+	footprintX                   = 2,
+	footprintZ                   = 2,
 	floater                      = true,
 	hoverAttack                  = false,
 	iconType                     = "air_bomb",

diff --git a/Units-Configs-Basedefs/basedefs/air/edrone_basedef.lua b/Units-Configs-Basedefs/basedefs/air/edrone_basedef.lua
@@ -27,8 +27,8 @@ unitDef                    = {
 	flareDropVector              = "0 0 -1",
 	flareefficieny               = "0.3",
 	flareReload                  = 3,
-	footprintX                   = 3,
-	footprintZ                   = 3,
+	footprintX                   = 2,
+	footprintZ                   = 2,
 	hoverAttack                  = true,
 	iconType                     = "drone",
 	idleAutoHeal                 = .5,

diff --git a/Units-Configs-Basedefs/basedefs/air/efighter_basedef.lua b/Units-Configs-Basedefs/basedefs/air/efighter_basedef.lua
@@ -23,8 +23,8 @@ unitDef                    = {
 	energyUse                    = 0,
 	explodeAs                    = "mediumExplosionGenericWhite",
 	floater                      = true,
-	footprintX                   = 3,
-	footprintZ                   = 3,
+	footprintX                   = 2,
+	footprintZ                   = 2,
 	hoverAttack                  = false,
 	iconType                     = "air_lit",
 	idleAutoHeal                 = .5,

diff --git a/Units-Configs-Basedefs/basedefs/air/eraider_basedef.lua b/Units-Configs-Basedefs/basedefs/air/eraider_basedef.lua
@@ -22,8 +22,8 @@ unitDef                    = {
 	energyStorage                = 0,
 	energyUse                    = 0,
 	explodeAs                    = "smallExplosionGenericBlue",
-	footprintX                   = 4,
-	footprintZ                   = 4,
+	footprintX                   = 2,
+	footprintZ                   = 2,
 	hoverAttack                  = false,
 	floater                      = true,
 	iconType                     = "scout",

diff --git a/Units-Configs-Basedefs/basedefs/air/escout_basedef.lua b/Units-Configs-Basedefs/basedefs/air/escout_basedef.lua
@@ -21,8 +21,8 @@ unitDef                    = {
 	energyStorage                = 0,
 	energyUse                    = 0,
 	explodeAs                    = "smallExplosionGenericBlue",
-	footprintX                   = 4,
-	footprintZ                   = 4,
+	footprintX                   = 2,
+	footprintZ                   = 2,
 	hoverAttack                  = true,
 	floater                      = true,
 	iconType                     = "scout",