removed modoption comwreck metal and globallos

beyond-all-reason · May 19, 2019 · 63b4c2a · 63b4c2a
1 parent 0b5b587
commit 63b4c2a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 39 deletions.
diff --git a/features/xmascomwreck.lua b/features/xmascomwreck.lua
@@ -1,8 +1,3 @@
-local wreck_metal = 2500
-if (Spring.GetModOptions) then
-    wreck_metal = Spring.GetModOptions().comm_wreck_metal or 2500
-end
-
 return {
    xmascomwreck = {
        blocking = true,
@@ -18,7 +13,7 @@ return {
        footprintz = 2,
        height = 20,
        hitdensity = 100,
-       metal = wreck_metal,
+       metal = 2500,
        object = "gingerbread",
        reclaimable = true,
        seqnamereclamate = "TREE1RECLAMATE",

diff --git a/gamedata/unbaconfigs/stats.lua b/gamedata/unbaconfigs/stats.lua
@@ -29,7 +29,7 @@ MoveSpeed = {1.25,1.225,1.20,1.175,1.15,1.125,1.1,1.075,1.05,1.025,1}
 --RESOURCES PRODUCTION
 EnergyMake = {0,50,75,125,175,225,300,400,600,1000,2000}
 MetalMake = {0,2,5,8,12,15,30,40,50,100,200}
-WreckMetal = {0.7, 0.9, 1.2, 1.5, 1.8, 2.2, 2.5, 3, 4, 6, 8} -- wreck metal = WreckMetal[level] * Spring.GetModOptions().comm_wreck_metal or 2500
+WreckMetal = {0.7, 0.9, 1.2, 1.5, 1.8, 2.2, 2.5, 3, 4, 6, 8}
 
 -- SHIELDS/ARMOR/HEALS
 ShieldPower = {1000,1250,1500,2000,2500,3000,4000,5000,6000,8000,10000}

diff --git a/luarules/gadgets/game_globallos.lua b/luarules/gadgets/game_globallos.lua
diff --git a/modoptions.lua b/modoptions.lua
@@ -291,26 +291,6 @@ local options={
        desc="Beyond All Reason - Gameplay Enhancements: Miscellaneous",
        type="section",
     },
-
-	{
-		key    = 'comm_wreck_metal',
-		name   = 'Commander Wreck Metal',
-		desc   = 'Sets the amount of metal left by a destroyed Commander.',
-		type   = 'number',
-		section= 'bar_enhancements_misc',
-		def    = 2500,
-		min    = 0,
-		max    = 5000,
-		step   = 1,
-	},
-	{
-		key = 'globallos',
-		name = 'Full visibility',
-		desc = 'No fog of war, everyone can see the entire map.',
-		type = 'bool',
-		section = 'bar_enhancements_misc',
-		def = false,
-	},
 -- Chicken Defense Options
 	{
 		key    = 'chicken_defense_options',