Version 4.34.0

packages/bee1/pellets/info.txt

@@ -33,6 +33,16 @@
 		"Tooltip" "Make High Energy Pellets pass through Gratings."
 		"Tooltip" "让高能弹丸穿过光栅。" [lang_zh]
 		}
+	"Widget"
+		{
+		"ID"	  "RefreshTime"
+		"Label"   "Portal Refresh Time"
+		"Type"    "Timer"
+		"Default" "6"
+		"Min"     "3"
+		"Max"     "30"
+		"Tooltip" "When pellets pass through a portal, the time remaining before they explode will be to at least this many seconds. Does not apply to infinite launchers."
+		}
 	}
 
 "Item"
@@ -58,13 +68,6 @@
 			"BEE2_OVERGROWN"
 				{
 				"Base"  "BEE2_CLEAN"
-				"Replace"
-					{
-					"PACK_PELLET_LAUNCHER_INF_CLEAN" "PACK_PELLET_LAUNCHER_INF_DIRTY"
-					// We don't need to pack anything specific for normal launchers -
-					// it's just the (included) dirty model.
-					"PACK_PELLET_LAUNCHER_CLEAN"     ""
-					}
 				"Instances"
 					{
 					"bee2_inf"  "instances/BEE2/over/items/BEE/hep/emitter_inf.vmf"

packages/bee1/pellets/items/launcher.cfg

@@ -33,29 +33,39 @@
 					"Enable_Cmd"    "launcher,CallScriptFunction,inp_on,0.00,-1"
 					"Disable_Cmd"   "launcher,CallScriptFunction,inp_off,0.00,-1"
 					}
-				}
-			"Condition"
-				{
-				"InstVar" "$start_enabled 1"
-				"Result"
+				"Condition"
 					{
-					"GlobalInput"
+					"InstVar" "$start_enabled 1"
+					"Result"
 						{
-						"Input"  "CallScriptFunction"
-						"Target" "launcher"
-						"Param"  "invert"
+						"GlobalInput"
+							{
+							"Input"  "CallScriptFunction"
+							"Target" "launcher"
+							"Param"  "invert"
+							}
 						}
 					}
 				}
-			"ElseCondition"
+			"Else" // Timed Pellet
 				{
-				"InstVar" "$start_enabled 1"
-				"Result"
+				"GetItemConfig" 
+					{ 
+					"ID"        "BEE_PELLET" 
+					"Name"      "RefreshTime" 
+					"Default"   "6"
+					"ResultVar" "$refresh_time" 
+					}
+				"Condition"
 					{
-					"GlobalInput"
+					"InstVar" "$start_enabled 1"
+					"Result"
 						{
-						"Target" "launcher"
-						"Input"  "Enable"
+						"GlobalInput"
+							{
+							"Target" "launcher"
+							"Input"  "Enable"
+							}
 						}
 					}
 				}

packages/bee1/pellets/items/launcher/vbsp_config.cfg

@@ -1,40 +1,16 @@
 "Conditions"
 	{
-	"Condition"
-		{
-		"instance"	"<ITEM_HIGH_ENERGY_PELLET_EMITTER:weighted_white>"
-		"Result"
-			{
-			"TemplateBrush"
-				{
-				"ID"    "BEE_HEP_EMITTER_BASE_CLEAN"
-				"force" "white"
-				}
-			}
-		}
-	"Condition"
-		{
-		"instance"	"<ITEM_HIGH_ENERGY_PELLET_EMITTER:weighted_black>"
-		"Result"
-			{
-			"TemplateBrush"
-				{
-				"ID"    "BEE_HEP_EMITTER_BASE_CLEAN"
-				"force" "black"
-				}
-			}
-		}
-
 	"Condition"
 		{
 		"instance"	"<ITEM_HIGH_ENERGY_PELLET_EMITTER>"
 		"Result"
 			{
-			"Pack" "PACK_PELLET"
-			"AddOverlay"
+			"TemplateBrush"
 				{
-				"file" "instances/BEE2/clean/items/BEE/hep/emitter_common.vmf"
+				"ID"       "BEE_HEP_EMITTER_BASE_CLEAN"
+				"colorVar" "<editor>" // ItemButtonFloor
 				}
+			"AddOverlay" "instances/BEE2/clean/items/BEE/hep/emitter_common.vmf"
 			}
 		"Condition"
 			{
@@ -46,14 +22,11 @@
 			"Result"
 				{
 				"Changeinstance" "<ITEM_HIGH_ENERGY_PELLET_EMITTER:bee2_inf>"
-				"PACK" "PACK_PELLET_LAUNCHER_INF_CLEAN"
-				"PACK" "PACK_PELLET_LAUNCHER_INF"
 				}
 			"Else"
 				{
 				"Changeinstance" "<ITEM_HIGH_ENERGY_PELLET_EMITTER:bee2_norm>"
-				"PACK" "PACK_PELLET_LAUNCHER_CLEAN"
 				}
 			}
 		}
-	}
+	}

packages/bee1/pellets/resources/instances/clean/items/BEE/hep/catcher_perm.vmf

@@ -1,8 +1,8 @@
 versioninfo
 {
 	"editorversion" "400"
-	"editorbuild" "7378"
-	"mapversion" "131"
+	"editorbuild" "7335"
+	"mapversion" "132"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -20,7 +20,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "131"
+	"mapversion" "132"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -80,7 +80,7 @@ entity
 	"origin" "-48 0 -48"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "0 100 250"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 500]"
@@ -274,6 +274,7 @@ entity
 	"rendercolor" "255 255 255"
 	"SetBodyGroup" "0"
 	"skin" "0"
+	"skinset" "0"
 	"solid" "0"
 	"spawnflags" "0"
 	"StartDisabled" "0"

packages/bee1/pellets/resources/instances/clean/items/BEE/hep/catcher_timed.vmf

@@ -1,8 +1,8 @@
 versioninfo
 {
 	"editorversion" "400"
-	"editorbuild" "7378"
-	"mapversion" "143"
+	"editorbuild" "7335"
+	"mapversion" "144"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -26,7 +26,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "143"
+	"mapversion" "144"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -125,7 +125,7 @@ entity
 	"origin" "-16 -48 -48"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "200 200 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 3500]"
@@ -148,7 +148,7 @@ entity
 	"origin" "-48 0 -48"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "0 100 250"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 500]"
@@ -342,6 +342,7 @@ entity
 	"rendercolor" "255 255 255"
 	"SetBodyGroup" "0"
 	"skin" "0"
+	"skinset" "0"
 	"solid" "0"
 	"spawnflags" "0"
 	"StartDisabled" "0"

packages/bee1/pellets/resources/instances/clean/items/BEE/hep/emitter_inf.vmf

@@ -1,8 +1,8 @@
 versioninfo
 {
 	"editorversion" "400"
-	"editorbuild" "7552"
-	"mapversion" "201"
+	"editorbuild" "7335"
+	"mapversion" "204"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -20,7 +20,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "201"
+	"mapversion" "204"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -77,6 +77,7 @@ entity
 	"renderamt" "255"
 	"rendercolor" "255 255 255"
 	"skin" "0"
+	"skinset" "0"
 	"solid" "0"
 	"targetname" "LauncherProp"
 	"origin" "0 -1.90735e-006 -56"

packages/bee1/pellets/resources/instances/clean/items/BEE/hep/emitter_norm.vmf

@@ -1,8 +1,8 @@
 versioninfo
 {
 	"editorversion" "400"
-	"editorbuild" "7552"
-	"mapversion" "123"
+	"editorbuild" "7335"
+	"mapversion" "129"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -20,7 +20,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "123"
+	"mapversion" "129"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -40,10 +40,10 @@ entity
 	"ballrespawntime" "1"
 	"balltype" "0"
 	"maxspeed" "$speed"
-	"MinLifeAfterPortal" "6"
+	"MinLifeAfterPortal" "$refresh_time"
 	"minspeed" "$speed"
 	"origin" "0 0 -16"
-	"spawnflags" "4096"
+	"spawnflags" "0"
 	"targetname" "launcher"
 	connections
 	{
@@ -97,6 +97,7 @@ entity
 	"renderamt" "255"
 	"rendercolor" "255 255 255"
 	"skin" "0"
+	"skinset" "0"
 	"solid" "0"
 	"targetname" "mdl"
 	"origin" "0 -1.90735e-006 -56"
@@ -113,14 +114,10 @@ entity
 	"id" "307"
 	"classname" "func_instance_parms"
 	"parm1" "$start_enabled boolean 0"
-	"parm2" "$timer_delay integer"
-	"parm3" "$lifetime integer"
-	"parm4" "$lifetime$timer_delay integer"
-	"parm5" "$respawntime string 1"
-	"parm6" "$speed integer 500"
-	"parm7" "$life_after_portaltransition integer 6"
-	"parm8" "$connectioncount integer 0"
-	"parm9" "$disable_autorespawn boolean 0"
+	"parm2" "$disable_autorespawn boolean 1"
+	"parm3" "$speed integer 500"
+	"parm4" "$timer_delay integer 5"
+	"parm5" "$refresh_time float 6"
 	"origin" "48 16 -32"
 	editor
 	{

packages/bee1/pellets/resources/instances/over/items/bee/hep/catcher_perm.vmf

@@ -1,8 +1,8 @@
 versioninfo
 {
 	"editorversion" "400"
-	"editorbuild" "7378"
-	"mapversion" "134"
+	"editorbuild" "7335"
+	"mapversion" "135"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -20,7 +20,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "134"
+	"mapversion" "135"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -274,6 +274,7 @@ entity
 	"rendercolor" "255 255 255"
 	"SetBodyGroup" "0"
 	"skin" "0"
+	"skinset" "0"
 	"solid" "0"
 	"spawnflags" "0"
 	"StartDisabled" "0"

packages/bee1/pellets/resources/instances/over/items/bee/hep/catcher_timed.vmf

@@ -1,8 +1,8 @@
 versioninfo
 {
 	"editorversion" "400"
-	"editorbuild" "7378"
-	"mapversion" "144"
+	"editorbuild" "7335"
+	"mapversion" "145"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -26,7 +26,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "144"
+	"mapversion" "145"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -342,6 +342,7 @@ entity
 	"rendercolor" "255 255 255"
 	"SetBodyGroup" "0"
 	"skin" "1"
+	"skinset" "1"
 	"solid" "0"
 	"spawnflags" "0"
 	"StartDisabled" "0"