Revert "Merge branch 'beyond-all-reason:master' into master"

This reverts commit 5ecd0ec, reversing changes made to 2863be9.
Tharsy · May 14, 2024 · 1ed4dfc · 1ed4dfc
1 parent 5ecd0ec
commit 1ed4dfc
Show file tree

Hide file tree

Showing 130 changed files with 527 additions and 2,993 deletions.
diff --git a/bitmaps/loadpictures/manual/donations.jpg → bitmaps/loadpictures/donations.jpg b/bitmaps/loadpictures/manual/donations.jpg → bitmaps/loadpictures/donations.jpg
diff --git a/effects/cannons.lua b/effects/cannons.lua
@@ -598,60 +598,6 @@ local definitions = {
       		},
     	},
 	},
-  ["starfire_arty"] = {
-		flame = {
-            air                = true,
-            class              = [[CBitmapMuzzleFlame]],
-            count              = 1,
-            ground             = true,
-            underwater         = true,
-            water              = true,
-            properties = {
-                colormap           = [[0.35 0.45 0.45 0.015   0.5 0.5 0.5 0.015   0.7 0.7 0.7 0.015   0 0 0 0.015]],
-                dir                = [[dir]],
-                frontoffset        = 0, --0.04
-                fronttexture       = [[glow]], --glow
-                length             = -5,
-                sidetexture        = [[shot]],
-                size               = 2.2,
-                sizegrowth         = -0.18,
-                ttl                = 6,
-                --rotParams          = [[0 , 0, -180 r360]],
-                useairlos          = true,
-                castShadow         = true,
-            },
-        },
-        sparks = {
-			air                = true,
-			class              = [[CSimpleParticleSystem]],
-			count              = 1,
-			ground             = true,
-			water              = true,
-			underwater         = true,
-			properties = {
-				airdrag            = 0.67,
-				colormap           = [[0.9 0.95 0.97 0.017   0.6 0.65 0.7 0.017   0 0 0 0]],
-				directional        = true,
-				emitrot            = 25,
-				emitrotspread      = 30,
-				emitvector         = [[0, 1, 0]],
-				gravity            = [[0, -0.15, 0]],
-				numparticles       = 1,
-				particlelife       = 2,
-				particlelifespread = 1,
-				particlesize       = 10,
-				particlesizespread = 5,
-				particlespeed      = 1.5,
-				particlespeedspread = 2.0,
-				pos                = [[0, 0, 0]],
-				sizegrowth         = 1,
-				sizemod            = 0.4,
-				texture            = [[gunshotglow]],
-				useairlos          = true,
-				castShadow         = true,
-      		},
-    	},
-	},
 
 }
 

diff --git a/effects/unitsmokes.lua b/effects/unitsmokes.lua
@@ -11,7 +11,7 @@ return {
                  delay              = [[0 r300]],
                  explosiongenerator = [[custom:smokegen-part]],
                  pos                = [[-2 r4, 0 r5, -2 r4]],
-                 alwaysvisible      = false,
+                 --alwaysvisible      = true,
             },
     },
   },
@@ -43,7 +43,7 @@ return {
            texture            = [[smoke-anim]],
            animParams         = [[8,6,50 r50]],
            rotParams          = [[-16 r16, -8 r8, -180 r360]],
-           useairlos          = false,
+           useairlos          = true,
            castShadow         = true,
          },
     },
@@ -93,7 +93,7 @@ return {
            texture            = [[smoke-ice-anim]],
            animParams         = [[8,8,60 r40]],
            rotParams          = [[-4 r8, -6 r12, -180 r360]],
-           useairlos          = false,
+           useairlos          = true,
            castShadow         = true,
          },
     },
@@ -143,7 +143,7 @@ return {
            texture            = [[smoke-beh-anim]],
            animParams         = [[8,8,50 r50]],
            rotParams          = [[-16 r16, -8 r8, -180 r360]],
-           useairlos          = false,
+           useairlos          = true,
            castShadow         = true,
          },
     },
@@ -177,7 +177,7 @@ return {
            sizegrowth         = 0.09,
            sizemod            = 1,
            texture            = [[dirt]],
-           useairlos          = false,
+           useairlos          = true,
          },
     },
   },
@@ -207,7 +207,7 @@ return {
            sizegrowth         = 0.08,
            sizemod            = 1,
            texture            = [[dirt]],
-           useairlos          = false,
+           useairlos          = true,
          },
     },
        fire = {
@@ -235,7 +235,7 @@ return {
            sizegrowth         = -0.05,
            sizemod            = 0.9,
            texture            = [[dirt]],
-           useairlos          = false,
+           useairlos          = true,
          },
        },
        fireglow = {
@@ -263,7 +263,7 @@ return {
            sizegrowth         = -0.5,
            sizemod            = 1,
            texture            = [[glow]],
-           useairlos          = false,
+           useairlos          = true,
          },
        },
   },
@@ -293,7 +293,7 @@ return {
            sizegrowth         = -0.05,
            sizemod            = 0.9,
            texture            = [[flame]],
-           useairlos          = false,
+           useairlos          = true,
          },
        },
        fireglow = {
@@ -321,7 +321,7 @@ return {
            sizegrowth         = -0.5,
            sizemod            = 1,
            texture            = [[glow2]],
-           useairlos          = false,
+           useairlos          = true,
          },
        },
   },

diff --git a/gamedata/alldefs_post.lua b/gamedata/alldefs_post.lua
@@ -239,7 +239,6 @@ function UnitDef_Post(name, uDef)
 
 		if modOptions.evocom then	
 			if uDef.customparams.isevocom or uDef.customparams.iscommander then
-				uDef.customparams.combatradius = 0
 				if uDef.power then
 					uDef.power = uDef.power/modOptions.evocomxpmultiplier 
 				else
@@ -256,25 +255,15 @@ function UnitDef_Post(name, uDef)
 				uDef.customparams.evolution_announcement_size = 18.5
 				uDef.customparams.evolution_target = "corcomlvl2"
 				uDef.customparams.evolution_condition = "timer"
-				elseif name == "legcomlvl2" then
-					uDef.energymake = 50
-					uDef.metalmake = 3
 				elseif name == "legcomlvl3" then
 				uDef.customparams.evolution_announcement = "Legion commanders have upgraded to level 4"
-				uDef.energymake = 75
-				uDef.metalmake = 5
 				elseif name == "legcomlvl4" then
 				uDef.customparams.evolution_announcement = "Legion commanders have upgraded to level 5"
 				uDef.customparams.evolution_announcement_size = 18.5
 				uDef.customparams.evolution_target = "legcomlvl5"
 				uDef.customparams.evolution_condition = "timer"
 				uDef.customparams.workertimeboost = 5
 				uDef.customparams.wtboostunittype = "MOBILE"
-				uDef.energymake = 125
-				uDef.metalmake = 9
-				uDef.customparams.inheritxpratemultiplier = 0.5
-        		uDef.customparams.childreninheritxp = "DRONE BOTCANNON"
-        		uDef.customparams.parentsinheritxp = "MOBILEBUILT DRONE BOTCANNON"
 				end
 			end
 		end

diff --git a/gamedata/armordefs.lua b/gamedata/armordefs.lua
@@ -66,7 +66,6 @@ local armorDefs = {
 		"armdrag",
 		"armfort",
 		"cordrag",
-		"legdrag",
 		"corfort",
 		"scavdrag",
 		"scavfort",
@@ -207,7 +206,6 @@ local armorDefs = {
 		"cormakr",
 		"cormart",
 		"cormaw",
-		"legdtr",
 		"cormex",
 		"cormh",
 		"cormist",
@@ -349,7 +347,6 @@ local armorDefs = {
 		"armamb",
 		"armguard",
 		"corpun",
-		"legcluster",
 		"cortoast",
 		"armanni",
 		"cordoom",
@@ -363,7 +360,6 @@ local armorDefs = {
 		"armuwadves",
 		"armuwadvms",
 		"corerad",
-		"leglupara",
 		"coruwadves",
 		"coruwadvms",
 
@@ -586,6 +582,12 @@ local armorDefs = {
 
 	raptor =
 	{
+		"raptor_queen_veryeasy",
+		"raptor_queen_easy",
+		"raptor_queen_normal",
+		"raptor_queen_hard",
+		"raptor_queen_veryhard",
+		"raptor_queen_epic",
 		"raptor_land_swarmer_basic_t2_v1",
 		"raptor_land_swarmer_basic_t2_v2",
 		"raptor_land_swarmer_basic_t2_v3",
@@ -636,15 +638,6 @@ local armorDefs = {
 		"raptor_hive",
 		"raptor_antinuke",
 	},
-	raptorqueen =
-	{
-		"raptor_queen_veryeasy",
-		"raptor_queen_easy",
-		"raptor_queen_normal",
-		"raptor_queen_hard",
-		"raptor_queen_veryhard",
-		"raptor_queen_epic",
-	},
 }
 
 -- add scavenger variants

diff --git a/gamedata/icontypes.lua b/gamedata/icontypes.lua
@@ -2099,10 +2099,6 @@ local icontypes = {
 		bitmap = "icons/bot_worker.png",
 		size = 0.99749994
 	},
-	legcluster = {
-		bitmap = "icons/def_t1_arty.png",
-		size = 1.1500000
-	},
 	legcom = {
 		bitmap = "icons/legcom.png",
 		size = 1.60000002
@@ -2247,18 +2243,10 @@ local icontypes = {
 		bitmap = "icons/factory_bot.png",
 		size = 1.52250004
 	},
-	legdtr = {
-		bitmap = "icons/wall_0.4.png",
-		size = 0.41999999
-	},
 	leglob = {
 		bitmap = "icons/bot_plasma_t1.png",
 		size = 0.80000001
 	},
-	leglupara = {
-		bitmap = "icons/aa_flak_t15.png",
-		size = 1.3
-	},
 	legmed = {
 		bitmap = "icons/corban_1.6.png",
 		size = 1.85

diff --git a/gamedata/scavengers/unitdef_post.lua b/gamedata/scavengers/unitdef_post.lua
@@ -8,15 +8,13 @@ local function scavUnitDef_Post(name, uDef)
 
  	-- replaced uniticons
 	if uDef.buildpic then
-		--Spring.Echo("FILEEXISTS", VFS.FileExists("unitpics/scavengers/"..uDef.buildpic))
 		--local nonScavName = string.sub(uDef.unitname, 1, string.len(uDef.unitname)-5)
 		if (not string.find(uDef.buildpic, "scavengers"))
 		and (not string.find(uDef.buildpic, "raptor"))
 		and (not string.find(uDef.buildpic, "critters"))
 		and (not string.find(uDef.buildpic, "lootboxes"))
 		and (not string.find(uDef.buildpic, "other"))
-		and (not string.find(uDef.buildpic, "alternative"))
-		and (VFS.FileExists("unitpics/scavengers/"..uDef.buildpic)) then
+		and (not string.find(uDef.buildpic, "alternative")) then
 			uDef.buildpic = "scavengers/"..uDef.buildpic
 		end
 	end
@@ -84,13 +82,13 @@ local function scavUnitDef_Post(name, uDef)
 
 
 	-- Remove wrecks of units you shouldn't be able to capture
-	-- if uDef.featuredefs and uDef.corpse and (uDef.buildoptions or (not uDef.canmove)) then
-	-- 	if uDef.corpse == "DEAD" and uDef.featuredefs.heap then
-	-- 		uDef.corpse = "HEAP"
-	-- 	elseif uDef.corpse then
-	-- 		uDef.corpse = nil
-	-- 	end
-	-- end
+	if uDef.featuredefs and uDef.corpse and (uDef.buildoptions or (not uDef.canmove)) then
+		if uDef.corpse == "DEAD" and uDef.featuredefs.heap then
+			uDef.corpse = "HEAP"
+		elseif uDef.corpse then
+			uDef.corpse = nil
+		end
+	end
 
 	-- Set autoheal of scav units
 	if uDef.health then
@@ -126,9 +124,6 @@ local function scavUnitDef_Post(name, uDef)
 	 		if uDef.builddistance then
 	 			uDef.builddistance = uDef.builddistance * 2
 	 		end
-			if uDef.workertime then
-				uDef.workertime = uDef.workertime * 4
-			end
 	 	end
 	end
 

diff --git a/gamedata/unitdefs_post.lua b/gamedata/unitdefs_post.lua
@@ -3,8 +3,9 @@ VFS.Include("gamedata/alldefs_post.lua")
 VFS.Include("gamedata/post_save_to_customparams.lua")
 local system = VFS.Include("gamedata/system.lua")
 
-local scavengersEnabled = false
+local scavengersEnabled = true
 if Spring.GetTeamList then
+	scavengersEnabled = false
 	local teamList = Spring.GetTeamList()
 	for _, teamID in ipairs(teamList) do
 		local luaAI = Spring.GetTeamLuaAI(teamID)
@@ -13,7 +14,7 @@ if Spring.GetTeamList then
 		end
 	end
 end
-if Spring.GetModOptions().ruins == "enabled" or Spring.GetModOptions().forceallunits == true then
+if Spring.GetModOptions().ruins == "enabled" then
 	scavengersEnabled = true
 end
 

diff --git a/icons/aa_flak_t15.png b/icons/aa_flak_t15.png
diff --git a/icons/def_t1_impulse.png b/icons/def_t1_impulse.png
diff --git a/icons/inverted/corthermite.png b/icons/inverted/corthermite.png
diff --git a/language/de/features.json b/language/de/features.json
@@ -29,9 +29,9 @@
 			"mushroomsPurple": "Lilane Pilze",
 			"obelisk": "Obelisk von Seth",
 			"peyote": "Peyote",
-			"crystalSmall": "Kleiner Kristall ",
-			"crystalMedium": "Mittelgroßer Kristall",
-			"crystalLarge": "Großer Kristall",
+			"pilha_crystal1": "Kleiner Kristall",
+			"pilha_crystal2": "Mittelgroßer Kristall",
+			"pilha_crystal3": "Großer Kristall",
 			"pipe1.0": "Rohr 1.0",
 			"pipe2.0": "Rohr 2.0",
 			"pipe3.0": "Rohr 3.0",
@@ -48,9 +48,6 @@
 			"thermalregulator": "Wärmeregler",
 			"pthornclump": "Eine sehr trockene und spröde Pflanze",
 			"rock": "Fels",
-			"rockBarren": "Kahler Felsen",
-			"rockMossy": "Moosiger Felsen",
-			"rockSnowy": "Verschneiter Felsen",
 			"slrockcl1": "Felsformation",
 			"statueEasterIsland": "Osterinselstatue",
 			"streetlamp_1": "Große Straßenlaterne",

diff --git a/language/en/tips.json b/language/en/tips.json
@@ -67,10 +67,10 @@
 			"teamDownLastCommander": "Warning: Your team is down to its last commander.",
 			"youHaveLastCommander": "Warning: You have the last commander.",
 			"chooseStartLoc": "Choose your starting location",
-			"gameStarted": "Battle started",
-			"battleEnded": "Battle ended",
-			"gamePaused": "Paused",
-			"gameUnpaused": "Unpaused",
+			"gameStarted": "battle started",
+			"battleEnded": "battle ended",
+			"gamePaused": "paused",
+			"gameUnpaused": "unpaused",
 			"playerDisconnected": "A player has disconnected",
 			"playerAdded": "A player has been added to the game",
 			"playerResigned": "A player has resigned",