Merge pull request #2808 from ChrisFloofyKitsune/floofy/taming-the-sh…

…enanigans

taming the shenanigans

gamedata/armordefs.lua

@@ -484,6 +484,7 @@ local armorDefs = {
 		"legphoenix",
 		"legstronghold",
 		"legwhisper",
+		"critter_gull",
 	},
 	shields = {
 		"armgate",

luarules/gadgets/gaia_critters.lua

@@ -181,7 +181,7 @@ local function randomPatrolInCircle(unitID, circle, minWaterDepth)	-- only defin
 end
 
 local function setGaiaUnitSpecifics(unitID)
-	if false then
+	if Spring.GetModOptions().april1extra ~= true then
 		Spring.SetUnitNeutral(unitID, true)
 		Spring.SetUnitNoSelect(unitID, true)
 		Spring.SetUnitStealth(unitID, true)

luarules/gadgets/game_critter_spawner.lua

@@ -10,9 +10,9 @@ function gadget:GetInfo()
     }
 end
 
---if true then
---    return
---end
+if Spring.GetModOptions().april1extra ~= true then
+	return false
+end
 
 
 local initialUnits = {}
@@ -71,8 +71,8 @@ function gadget:UnitCreated(unitID, unitDefID, teamID, builderID)
         if teamID == gaiaID and string.find(UnitDefs[unitDefID].name, "critter_") then --rough double check, this should be only critters anyway
             initialUnits[unitDefID] = unitDefID
         end
-    
-		
+
+
     end
 end
 
@@ -111,6 +111,6 @@ function gadget:FeatureDestroyed(featureID, allyTeamID)
         end
 
 
-        
+
     end
 end

luarules/gadgets/game_easter_eggs.lua

@@ -10,12 +10,12 @@ function gadget:GetInfo()
     }
 end
 
---if true then
---    return -- kill it for now
---end
+if Spring.GetModOption("easterEggHunt") ~= true then
+	return false
+end
 
 if not gadgetHandler:IsSyncedCode() then
-    return
+    return false
 end
 
 local colors = {"pink","white","red", "blue", "darkgreen", "purple", "green", "yellow", "darkred", "acidgreen"}
@@ -72,4 +72,4 @@ function gadget:GameFrame(frame)
             end
         end
     end
-end
+end

luarules/gadgets/unit_on_create_fix.lua

@@ -11,11 +11,11 @@ function gadget:GetInfo()
 end
 
 if Spring.GetModOptions().april1 ~= true then
-	return
+	return false
 end
 
 if not gadgetHandler:IsSyncedCode() then
-	return
+	return false
 end
 
 local needsFixing,s = {},1
@@ -50,4 +50,4 @@ function gadget:UnitCreated(unitID, unitDefID, teamID, builderID)
 			end
 		end
 	end
-end
+end

modoptions.lua

@@ -998,13 +998,32 @@ local options = {
 	{
 		key		= "april1",
 		name	= "tomfooleryMode",
-		desc	= "turns toms into fools or something",
+		desc	= "turns toms into fools or something (hats only)",
 		type	= "bool",
 		def		= true,
 		hidden	= false,
 		section	= "options_extra",
 	},
 
+	{
+		key		= "april1extra",
+		name	= "extraTomfooleryMode",
+		desc	= "turns toms into fools or something (critters rise up!)",
+		type	= "bool",
+		def		= false,
+		hidden	= false,
+		section	= "options_extra",
+	},
+
+	{
+		key		= "easterEggHunt",
+		name	= "Easter Eggs Hunt",
+		desc	= "Easter Eggs are spawned around the map! Time to go on an Easter Egg hunt! (5 metal 50 energy per)",
+		type	= "bool",
+		def		= true,
+		section	= "options_extra",
+	},
+
     {
         key 	= "map_waterlevel",
         name 	= "Water Level",