#4448: Make futbols respawn if falling into goo.

CHANGELOG.md

@@ -23,6 +23,7 @@
 * Fix P1 ceiling Obs Room (light hole) and Large Obs Room not actually producing light.
 * Make P1 Track Platform 'bottom grate' match the shape of the platform.
 * #4446: Fix piston movement sounds looping forever.
+* #4448: Futbols will now respawn if falling into goo.
 
 ------------------------------------------
 

packages/futbol/items/futbol/editoritems.txt

@@ -55,7 +55,6 @@
 				"EntityCount"	"5"
 				}
 			"futbol"        "instances/BEE2/clean/items/futbol/futbol.vmf"
-			"respawn"       "instances/BEE2/clean/items/futbol/respawn.vmf"
 			"spawner"       "instances/BEE2/clean/items/futbol/spawner.vmf"
 			}
 
@@ -74,14 +73,6 @@
 				"out_unlock" "instance:trig;OnEndTouchAll"
 				}
 			}
-		"Outputs"
-			{
-			"CONNECTION_STANDARD"
-				{
-				"Activate"		"instance:trig;OnStartTouchAll"
-				"Deactivate"	"instance:trig;OnEndTouchAll"
-				}
-			}
 		"OccupiedVoxels"
 			{
 			"Voxel"

packages/futbol/items/futbol/vbsp_config.cfg

@@ -39,15 +39,6 @@
 					"Offset" "%OFFSET%"
 					}
 				}
-			// If set to respawn, add those outputs.
-			"Condition"
-				{
-				"instvar" "$disable_autorespawn = 1"
-				"Result"
-					{
-					"AddOverlay" "instances/bee2/clean/items/futbol/respawn.vmf"
-					}
-				}
 			"Condition"
 				{
 				// If we have input or respawn, add the spawner.

packages/futbol/resources/instances/clean/items/futbol/common.vmf

@@ -1,8 +1,8 @@
 versioninfo
 {
 	"editorversion" "400"
-	"editorbuild" "8419"
-	"mapversion" "89"
+	"editorbuild" "9672"
+	"mapversion" "93"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -14,13 +14,13 @@ viewsettings
 	"bSnapToGrid" "1"
 	"bShowGrid" "1"
 	"bShowLogicalGrid" "0"
-	"nGridSpacing" "2"
+	"nGridSpacing" "8"
 	"bShow3DGrid" "0"
 }
 world
 {
 	"id" "1"
-	"mapversion" "91"
+	"mapversion" "93"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -29,14 +29,33 @@ world
 	"skyname" "sky_black_nofog"
 }
 entity
+{
+	"id" "1492"
+	"classname" "logic_auto"
+	"angles" "0 0 0"
+	"spawnflags" "1"
+	connections
+	{
+		"OnMapSpawn" "trigEnable0.1-1"
+	}
+	"origin" "-16 0 -32"
+	editor
+	{
+		"color" "0 100 250"
+		"visgroupshown" "1"
+		"visgroupautoshown" "1"
+		"comments" "Enable the trigger via input, so it detects futbols pre-placed in the spawner."
+		"logicalpos" "[0 0]"
+	}
+}
+entity
 {
 	"id" "1460"
 	"classname" "trigger_multiple"
 	"filtername" "@filter_futbol"
 	"origin" "-16 0 -16"
-	"solid" "6"
 	"spawnflags" "4104"
-	"StartDisabled" "0"
+	"StartDisabled" "1"
 	"targetname" "trig"
 	"wait" "0.1"
 	connections
@@ -180,6 +199,9 @@ entity
 	"cspinup" "0"
 	"fadeinsecs" "0"
 	"fadeoutsecs" "0"
+	"haddons_enabled" "-1"
+	"haddons_infrange" "-1"
+	"haddons_mode" "-1"
 	"health" "10"
 	"lfomodpitch" "0"
 	"lfomodvol" "0"
@@ -213,6 +235,9 @@ entity
 	"cspinup" "0"
 	"fadeinsecs" "0"
 	"fadeoutsecs" "0"
+	"haddons_enabled" "-1"
+	"haddons_infrange" "-1"
+	"haddons_mode" "-1"
 	"health" "10"
 	"lfomodpitch" "0"
 	"lfomodvol" "0"
@@ -246,6 +271,9 @@ entity
 	"cspinup" "0"
 	"fadeinsecs" "0"
 	"fadeoutsecs" "0"
+	"haddons_enabled" "-1"
+	"haddons_infrange" "-1"
+	"haddons_mode" "-1"
 	"health" "5"
 	"lfomodpitch" "0"
 	"lfomodvol" "0"

packages/futbol/resources/instances/clean/items/futbol/futbol.vmf

@@ -1,8 +1,8 @@
 versioninfo
 {
 	"editorversion" "400"
-	"editorbuild" "8419"
-	"mapversion" "3"
+	"editorbuild" "9672"
+	"mapversion" "9"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -20,7 +20,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "3"
+	"mapversion" "9"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -29,12 +29,75 @@ world
 	"skyname" "sky_black_nofog"
 }
 entity
+{
+	"id" "15"
+	"classname" "comp_kv_setter"
+	"angles" "0 0 0"
+	"ctrl_type" "0"
+	"ctrl_value" "$disable_autorespawn"
+	"invert" "0"
+	"kv_value_mode" "legacy"
+	"kv_value_pos" "-16 -16 0"
+	"mode" "kv"
+	"target" "futbol"
+	connections
+	{
+		"OnBreak" "rl_spawnTrigger0-1"
+		"OnIgnite" "rl_spawnTrigger0-1"
+		"OnTakeDamage" "rl_spawnTrigger0-1"
+		"OnOutOfWorld" "rl_spawnTrigger0-1"
+		"OnFizzled" "rl_spawnTrigger0-1"
+	}
+	"origin" "-16 -16 0"
+	editor
+	{
+		"color" "0 137 174"
+		"visgroupshown" "1"
+		"visgroupautoshown" "1"
+		"comments" "If respawning is enabled, add various outputs for that."
+		"logicalpos" "[0 1000]"
+	}
+}
+entity
+{
+	"id" "52"
+	"classname" "comp_scriptvar_setter"
+	"angles" "0 0 0"
+	"const" "function(){EntFireByHandle(self,`Break`,``,0,null,null)}"
+	"ctrl_type" "0"
+	"ctrl_value" "$disable_autorespawn"
+	"mode" "const"
+	"origin" "-16 16 0"
+	"target" "futbol"
+	"variable" "FellInGoo"
+	connections
+	{
+		"OnBreak" "rl_spawnTrigger0-1"
+		"OnIgnite" "rl_spawnTrigger0-1"
+		"OnTakeDamage" "rl_spawnTrigger0-1"
+		"OnOutOfWorld" "rl_spawnTrigger0-1"
+		"OnFizzled" "rl_spawnTrigger0-1"
+	}
+	editor
+	{
+		"color" "0 179 156"
+		"visgroupshown" "1"
+		"visgroupautoshown" "1"
+		"comments" "If respawning is enabled, add a function definition to allow respawning."
+		"logicalpos" "[0 1000]"
+	}
+}
+entity
 {
 	"id" "7"
 	"classname" "comp_kv_setter"
+	"angles" "0 0 0"
+	"ctrl_value" "1"
 	"invert" "0"
 	"kv_name" "angles"
 	"kv_value_global" "0 0 0"
+	"kv_value_mode" "global"
+	"kv_value_pos" "-16 0 8"
 	"mode" "kv"
 	"target" "futbol"
 	"origin" "-16 0 8"
@@ -59,9 +122,9 @@ entity
 	"fademindist" "-1"
 	"fadescale" "1"
 	"forcetoenablemotion" "0"
-	"inertiaScale" "1.0"
 	"massScale" "0"
 	"minhealthdmg" "0"
+	"model" "models/props/futbol.mdl"
 	"nodamageforces" "0"
 	"PerformanceMode" "0"
 	"physdamagescale" "0.1"