Merge branch 'master' of https://github.com/ampreeT/SourceCoop

ampreeT · Nov 24, 2024 · 1ed54f5 · 1ed54f5
2 parents cc3dcb1 + e0a67fb
commit 1ed54f5
Show file tree

Hide file tree

Showing 9 changed files with 468 additions and 194 deletions.
diff --git a/edt/bms/bm_c1a0a.edt b/edt/bms/bm_c1a0a.edt
@@ -31,7 +31,7 @@
 		// HEV checkpoint.
 		"add"
 		{
-			"classname"		"logic_auto"
+			"classname"		"logic_relay"
 			"targetname"	"HEV_checkpoint"
 		}
 		// suit pickup - fire outputs only once
@@ -53,7 +53,7 @@
 				{
 					"output" "OnPlayerPickup"
 					"target" "HEV_checkpoint"
-					"input" "FireUser1"
+					"input" "Trigger"
 					"delay" "0"
 					"timestofire" "1"
 				}
@@ -130,7 +130,7 @@
 			"origin"	"925 4450 415"
 			"angles"	"12.5 -90.0 0.0"
 			"triggerid"	"HEV_checkpoint"
-			"output"	"OnUser1"
+			"output"	"OnTrigger"
 			"bringall"	"1"
 		}
 		"elevatorroom"

diff --git a/edt/bms/bm_c1a0b.edt b/edt/bms/bm_c1a0b.edt
@@ -35,11 +35,35 @@
 		{
 			"classname" "logic_auto"
 			"hammerid" "1864584"
+			// remove keyboard animation
+			"outputs"
+			{
+				"remove"
+				{
+					"output"	"OnMapSpawn"
+					"target"	"SCI32_Generator_ss1"
+					"input"		"BeginSequence"
+				}
+			}
 			"functions"
 			{
 				"delay_output" "OnMapSpawn"
 			}
 		}
+		// play keyboard animation immediately
+		"add"
+		{
+			"classname"		"logic_auto"
+			"outputs"
+			{
+				"add"
+				{
+					"output"	"OnMapSpawn"
+					"target"	"SCI32_Generator_ss1"
+					"input"		"BeginSequence"
+				}
+			}
+		}
 		// remove trigger which calls spawn elevator up and closes doors
 		"delete"
 		{

diff --git a/edt/bms/bm_c1a1a.edt b/edt/bms/bm_c1a1a.edt
@@ -18,6 +18,16 @@
 		{
 			"targetname"	"global_newgame_spawner_suit"
 		}
+		// don't know why this is not in the level
+		"add"
+		{
+			"classname"				"env_message"
+			"targetname"			"intro_title_custom"
+			"spawnflags"			"0"
+			"messagevolume"			"10"
+			"messageattenuation"	"0"
+			"message"				"CHAPTER3_TITLE"
+		}
 		"modify"
 		{
 			"classname" "logic_auto"
@@ -29,6 +39,13 @@
 					"target" "!player"
 					"input" "SetHealth"
 				}
+				"add"
+				{
+					"output"	"OnMapSpawn"
+					"target"	"intro_title_custom"
+					"input"		"ShowMessage"
+					"delay"		"0.75"
+				}
 			}
 		}
 		// delay map start

diff --git a/edt/bms/bm_c1a2a.edt b/edt/bms/bm_c1a2a.edt
@@ -7,13 +7,47 @@
 	"intro_type" "none"
 	"equipment"
 	{
-		"lookup"
-		{
-			"targetname" "items_at_start"
-		}
+		"item"	"item_suit"
+		"item"	"item_weapon_crowbar"
+		"item"	"item_weapon_glock"
+		"item"	"item_ammo_glock"
+		"item"	"item_ammo_glock"
+		"item"	"item_ammo_glock"
+		"item"	"item_battery"
+		"item"	"item_battery"
+		"item"	"item_weapon_frag"
 	}
 	"entity"
 	{
+		// delete world starting equipment
+		"delete"
+		{
+			"targetname" "items_at_start"
+		}
+		// delay backup timer vent explosion to game start
+		"modify"
+		{
+			"classname"		"logic_timer"
+			"targetname"	"backup_timer"
+			"set"
+			{
+				"StartDisabled"	"1"
+			}
+		}
+		"add"
+		{
+			"classname"		"logic_auto"
+			"targetname"	"backup_timer_delay"
+			"outputs"
+			{
+				"add"
+				{
+					"output"	"OnMapSpawn"
+					"target"	"backup_timer"
+					"input"		"Enable"
+				}
+			}
+		}
 		// delay map start
 		"modify"
 		{
@@ -141,5 +175,12 @@
 			"origin"	"160 -112 16"
 			"angles"	"0 90 0"
 		}
+		"shotgun_pickup"
+		{
+			"origin"	"-2390 -1650 10"
+			"angles"	"5 55 0"
+			"triggerid"	"relay_headcrabscare"
+			"output"	"OnTrigger"
+		}
 	}
 }