Merge pull request #28 from TeamSpen210/dev

Release some bugfixes

sdk_content/maps/instances/p2editor_clean/elevator_entrance_quiet.vmf

@@ -1,8 +1,8 @@
 versioninfo
 {
 	"editorversion" "400"
-	"editorbuild" "5685"
-	"mapversion" "889"
+	"editorbuild" "6432"
+	"mapversion" "891"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -38,7 +38,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "889"
+	"mapversion" "891"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -122,82 +122,6 @@ world
 		}
 	}
 	solid
-	{
-		"id" "124957"
-		side
-		{
-			"id" "24209"
-			"plane" "(-2560 2048 1536) (1024 2048 1536) (1024 -2048 1536)"
-			"material" "TOOLS/TOOLSSKIP"
-			"uaxis" "[1 0 0 0] 0.25"
-			"vaxis" "[0 -1 0 0] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "24210"
-			"plane" "(-2560 -2048 -1536) (1024 -2048 -1536) (1024 2048 -1536)"
-			"material" "TOOLS/TOOLSSKIP"
-			"uaxis" "[1 0 0 0] 0.25"
-			"vaxis" "[0 -1 0 0] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "24211"
-			"plane" "(-2560 2048 1536) (-2560 -2048 1536) (-2560 -2048 -1536)"
-			"material" "TOOLS/TOOLSSKIP"
-			"uaxis" "[0 1 0 0] 0.25"
-			"vaxis" "[0 0 -1 0] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "24212"
-			"plane" "(1024 2048 -1536) (1024 -2048 -1536) (1024 -2048 1536)"
-			"material" "TOOLS/TOOLSSKIP"
-			"uaxis" "[0 1 0 0] 0.25"
-			"vaxis" "[0 0 -1 0] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "24213"
-			"plane" "(1024 2048 1536) (-2560 2048 1536) (-2560 2048 -1536)"
-			"material" "TOOLS/TOOLSSKIP"
-			"uaxis" "[1 0 0 0] 0.25"
-			"vaxis" "[0 0 -1 0] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "24214"
-			"plane" "(1024 -2048 -1536) (-2560 -2048 -1536) (-2560 -2048 1536)"
-			"material" "TOOLS/TOOLSSKIP"
-			"uaxis" "[1 0 0 0] 0.25"
-			"vaxis" "[0 0 -1 0] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		editor
-		{
-			"color" "0 201 238"
-			"visgroupshown" "1"
-			"visgroupautoshown" "1"
-		}
-	}
-	solid
 	{
 		"id" "123361"
 		side
@@ -20712,26 +20636,6 @@ entity
 	}
 }
 entity
-{
-	"id" "36316"
-	"classname" "logic_auto"
-	"file" "instances/p2editor_clean/global_ents.vmf"
-	"spawnflags" "1"
-	connections
-	{
-		"OnMapSpawn" "global_entsinstance:environment_testchamber;Trigger0-1"
-	}
-	"origin" "-1760 1200 568"
-	editor
-	{
-		"color" "220 220 220"
-		"groupid" "36312"
-		"visgroupshown" "1"
-		"visgroupautoshown" "1"
-		"logicalpos" "[0 500]"
-	}
-}
-entity
 {
 	"id" "93390"
 	"classname" "func_detail"
@@ -24444,8 +24348,8 @@ cameras
 	"activecamera" "0"
 	camera
 	{
-		"position" "[495.612 1059.05 586.658]"
-		"look" "[479.995 1010.99 548.846]"
+		"position" "[750.886 -2834.53 1013.78]"
+		"look" "[735.685 -2786.61 975.619]"
 	}
 	camera
 	{

sdk_content/maps/instances/p2editor_clean/global_ents.vmf

@@ -2,7 +2,7 @@ versioninfo
 {
 	"editorversion" "400"
 	"editorbuild" "6432"
-	"mapversion" "230"
+	"mapversion" "233"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -56,7 +56,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "230"
+	"mapversion" "233"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -2893,8 +2893,8 @@ world
 entity
 {
 	"id" "7976"
-	"classname" "filter_activator_class"
-	"filterclass" "prop_energy_ball"
+	"classname" "filter_combineball_type"
+	"balltype" "3"
 	"Negated" "0"
 	"targetname" "@filter_pellet"
 	"origin" "-176 -16 16"
@@ -2908,55 +2908,6 @@ entity
 	}
 }
 entity
-{
-	"id" "7623"
-	"classname" "filter_activator_class"
-	"filterclass" "RocketSentry_Missile"
-	"Negated" "Allow entities that match criteria"
-	"targetname" "@filter_rockets"
-	"origin" "-80 64 16"
-	editor
-	{
-		"color" "220 30 220"
-		"visgroupshown" "1"
-		"visgroupautoshown" "1"
-		"logicalpos" "[0 0]"
-	}
-}
-entity
-{
-	"id" "7625"
-	"classname" "point_template"
-	"spawnflags" "2"
-	"targetname" "@RocketSentry_Missile_Template"
-	"Template01" "@RocketSentry_Missile"
-	"origin" "-64 64 16"
-	editor
-	{
-		"color" "220 30 220"
-		"visgroupshown" "1"
-		"visgroupautoshown" "1"
-		"logicalpos" "[0 1000]"
-	}
-}
-entity
-{
-	"id" "7627"
-	"classname" "rocket_turret_projectile"
-	"angles" "0 0 0"
-	"renderamt" "255"
-	"rendercolor" "255 255 255"
-	"targetname" "@RocketSentry_Missile"
-	"origin" "-64 64 16"
-	editor
-	{
-		"color" "220 30 220"
-		"visgroupshown" "1"
-		"visgroupautoshown" "1"
-		"logicalpos" "[0 1500]"
-	}
-}
-entity
 {
 	"id" "7251"
 	"classname" "ambient_generic"
@@ -2969,6 +2920,7 @@ entity
 	"lforate" "0"
 	"lfotype" "0"
 	"message" "VFX.NeuroToxinLp"
+	"null" "-----------------------"
 	"pitch" "100"
 	"pitchstart" "100"
 	"preset" "0"
@@ -3280,6 +3232,7 @@ hidden
 		"classname" "ambient_generic"
 		"health" "10"
 		"message" "Sphere.BlipSmall"
+		"null" "-----------------------"
 		"pitch" "100"
 		"pitchstart" "100"
 		"radius" "1250"
@@ -4647,6 +4600,8 @@ entity
 	"PerformanceMode" "0"
 	"physdamagescale" "0.1"
 	"pressuredelay" "0"
+	"renderamt" "255"
+	"rendercolor" "255 255 255"
 	"shadowcastdist" "0"
 	"shadowdepthnocache" "0"
 	"skin" "0"
@@ -6454,6 +6409,7 @@ entity
 	"classname" "ambient_generic"
 	"health" "10"
 	"message" "music.pti_b1_001"
+	"null" "-----------------------"
 	"pitch" "100"
 	"pitchstart" "100"
 	"radius" "1250"
@@ -6697,8 +6653,8 @@ cameras
 	"activecamera" "0"
 	camera
 	{
-		"position" "[-163.922 3.27829 88.7318]"
-		"look" "[-171.96 -15.8512 29.1466]"
+		"position" "[-112.266 23.4089 58.3569]"
+		"look" "[-74.7204 57.2151 20.5612]"
 	}
 	camera
 	{