Fix duplicate quote pack IDs, rearrange some lines

BEEmod · Apr 3, 2024 · 849033a · 849033a
1 parent 88c8bff
commit 849033a
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 48 deletions.
diff --git a/packages/styles/oldAp/voice/cave_80s.cfg b/packages/styles/oldAp/voice/cave_80s.cfg
@@ -90,6 +90,7 @@
 			
 			"Line_SP"
 				{
+				"ID"    "WELCOME_APERTURE"
 				"Name"  "Welcome to Aperture Science"
 				"Trans" "Cave Johnson: Welcome to the enrichment center. [cough]"
 				
@@ -98,6 +99,7 @@
 				}
 			"Line_COOP"
 				{
+				"ID"    "MANDATORY_TESTS"
 				"Name"  "Test Participation Is Mandatory"
 				"Trans" "Cave Johnson: Since making test participation mandatory for all employees, the quality of our test subjects has risen dramatically. Employee retention, however, has not."
 				"Trans" "Cave Johnson: [cough] As a result, you may have heard we're gonna phase out human testing. There's still a few things left to wrap up, though."

diff --git a/packages/styles/oldAp/voice/glados_vault.cfg b/packages/styles/oldAp/voice/glados_vault.cfg
@@ -454,11 +454,10 @@
 				"Trans"		"GLaDOS: Enjoy this next test. I'm going to go to the surface. It's a beautiful day out. Yesterday I saw a deer. If you solve this next test, maybe I'll let you ride an elevator all the way up to the break room, and I'll tell you about the time I saw a deer again."
 				"Choreo"	"scenes/npc/glados/sp_a2_ricochet01.vcd"
 				}
-
-			"Line_COOP"
+			"Line_Robot"
 				{
 				"Name"		"Build Bridges Out Of Tears"
-				"ID"		"LIGHT_BRIDGE_1"
+				"ID"		"LIGHT_BRIDGE_BUILDING"
 				"Trans"		"GLaDOS: This is a bridge-building exercise. The humans were miserable at this, mostly because you can't build bridges out of tears."
 				"Choreo"	"scenes/npc/glados/mp_coop_catapult_2.vcd"
 				}
@@ -570,8 +569,9 @@
 			"Name"		"Sendificator"
 			"Line_Robot"
 				{
+				// This is duplicated to raise it in priority.
 				"Name"      "Deadly Lasers"
-				"ID"        "LASER_1"
+				"ID"        "SENDIFICATOR_LASER"
 				"Trans"     "GLaDOS: Please proceed into the next test chamber."
 				"Trans"     "GLaDOS: Which involves deadly lasers and how test subjects react when locked in a room with deadly lasers."
 				"Choreo"
@@ -643,18 +643,18 @@
 			"Has"		"Deadly"
 			"Priority"	"2"
 			"Name"		"Deadly"
-			"Line_SP"
+			"Line_Human"
 				{
 				"Name"		"Nerve To Call It Broken"
-				"ID"		"DEADLY_1"
+				"ID"		"DEADLY_BROKEN"
 				"Trans"		"GLaDOS: Congratulations. Your ability to complete this test proves the humans wrong. They described it as impossible, deadly, cruel, and one test subject even had the nerve to call it broken."
 				"Choreo"	"scenes/npc/glados/mp_coop_wall_block03.vcd"
 				}
 
-			"Line_COOP"
+			"Line_Robot"
 				{
 				"Name"	"You Can Just Keep Trying"
-				"ID"	"DEADLY_1"
+				"ID"	"DEADLY_KEEP_TRYING"
 				"Trans"	"GLaDOS: Congratulations. Your ability to complete this test proves the humans wrong. They described it as impossible, deadly, cruel, and one test subject even had the nerve to call it broken."
 				"Trans"	"GLaDOS: Of course the humans only had one try at it, you can just keep trying."
 				"File"	"clean/exit_deadly_coop.vmf"

diff --git a/packages/styles/overgrown/voice/announcer_apoc.cfg b/packages/styles/overgrown/voice/announcer_apoc.cfg
@@ -247,34 +247,41 @@
 				"Trans"		"Announcer: Before re-entering a relaxation vault at the conclusion of testing, please take a moment to write down the results of your test. An Aperture Science Reintegration Associate will revive you for an interview when society has been rebuilt."
 				"Choreo"	"npc/announcer/prehub20.vcd"
 			}
-
-
+
 			"Line"
 				{
 				"Name"		"Evacuation Preparation"
 				"ID"		"EXIT_GEN_EVAC"
 				"Trans"		"Announcer: Please prepare for emergency evacuation."
 				"Choreo"	"npc/announcer/evacuationmisc01.vcd"
 				}
-
-			"Line_SP"
+
+			"Line"
+				{
+				"Name"		"Restrooms Unlocked"
+				"ID"		"EXIT_RESTROOMS"
+				"Trans"		"Announcer: By completing all test courses, you have achieved Level C security clearance. You may now access all testing courses and three of Aperture Science's 176 restrooms."
+				"Choreo"	"npc/announcer/mp_hub_return07.vcd"
+				}
+
+			"Line"
 				{
 				"Name"		"Technical Difficulties"
 				"ID"		"EXIT_GEN_TECH_DIFF"
 				"Trans"		"Announcer: Good!"
 				"Trans"		"Announcer: Because of the technical difficulties we are currently experiencing, your test environment is unsupervised."
 				"Choreo"	"ann_apoc/exit_tech_diff.vmf"
 				}
-				
-			"Line_COOP"
+
+			"Line"
 				{
 				"Name"		"Personality Construct Voltage"
 				"ID"		"EXIT_GEN_VOLTAGE"
 				"Trans"		"Announcer: Well done! The Enrichment Center reminds you that although circumstances may appear bleak, you are not alone. All Aperture Science personality constructs will remain functional in apocalyptic, low power environments of as few as 1.1 volts."
 				"Choreo"	"npc/announcer/testchamber03.vcd"
 				}
 			}
-		
+
 		"Quote"
 			{
 			"Priority"	"1"
@@ -314,13 +321,6 @@
 				"Trans"		"Announcer: Good. This completes the gymnastic portion of your mandatory physical and mental wellness exercise."
 				"Choreo"	"npc/announcer/openingexercise04.vcd"
 				}
-			"Line_COOP"
-				{
-				"Name"		"Restrooms Unlocked"
-				"ID"		"EXIT_BLUEGEL"
-				"Trans"		"Announcer: By completing all test courses, you have achieved Level C security clearance. You may now access all testing courses and three of Aperture Science's 176 restrooms."
-				"Choreo"	"npc/announcer/mp_hub_return07.vcd"
-				}
 			}
 
 		"Quote"
@@ -335,7 +335,7 @@
 				"Trans"		"Announcer: Good. If you feel that a lethal military android has not respected your rights as detailed in the Laws of Robotics, please note it on your self-reporting form. A future Aperture Science Entitlement Associate will initiate the appropriate grievance-filing paperwork."
 				"Choreo"	"npc/announcer/testchamber06.vcd"
 				}
-			"Line_SP"
+			"Line"
 				{
 				"Name"		"Animal Kings"
 				"ID"		"EXIT_ANIMAL_KING"

diff --git a/packages/styles/p1_style/voice/p1_glados.cfg b/packages/styles/p1_style/voice/p1_glados.cfg
@@ -117,7 +117,7 @@
 			"Line"
 				{
 				"Name" 		"Cube Calibration"
-				"ID"		"BALL_BUTTON_LONG"
+				"ID"		"CUBE_BUTTON"
 				"Trans"		"Weighted Cubes calibrated."
 
 				"Target"	"@voice_cube_button_pressed"
@@ -206,7 +206,7 @@
 			"Line_Human"
 				{
 				"Name"	"Fizzlers and Lump-Of-Coal Failure"
-				"ID"	"PAINT_FIZZ"
+				"ID"	"PAINT_FIZZ_HUMAN"
 				"Trans"	"This next test involves emancipation grills. Remember? I told you about them in the last test area, that did not have one."
 				"Trans"	"While I was out investigating, I found a fascinating new test element. It's never been used for human testing because, apparently, contact with it causes heart failure. The literature doesn't mention anything about lump-of-coal failure, though, so you should be fine."
 				"Choreo"
@@ -218,7 +218,7 @@
 			"Line_Robot"
 				{
 				"Name"		"Fizzlers"
-				"ID"		"PAINT_FIZZ"
+				"ID"		"PAINT_FIZZ_ROBOT"
 				"Trans"		"This next test involves emancipation grills. Remember? I told you about them in the last test area, that did not have one."
 				"Choreo"	"scenes/npc/glados/sp_a2_fizzler_intro01.vcd"
 				}
@@ -303,14 +303,14 @@
 			"Line_Human"
 				{
 				"Name"		"Made From Natural Light"
-				"ID"		"LIGHT_BRIDGE_1"
+				"ID"		"LIGHT_BRIDGE_HUMAN_1"
 				"Trans"		"These bridges are made from natural light that I pump in from the surface. If you rubbed your cheek on one, it would be like standing outside with the sun shining on your face. It would also set your hair on fire, so don't actually do it."
 				"Choreo"	"scenes/npc/glados/sp_a2_bridge_intro01.vcd"
 				}
 			"Line_Robot"
 				{
 				"Name"		"Build Bridges Out Of Tears"
-				"ID"		"LIGHT_BRIDGE_1"
+				"ID"		"LIGHT_BRIDGE_COOP_1"
 				"Trans"		"This is a bridge-building exercise. The humans were miserable at this, mostly because you can't build bridges out of tears."
 				"Choreo"	"npc/glados/mp_coop_catapult_2.vcd"
 				}
@@ -386,18 +386,6 @@
 					"3" "scenes/npc/glados/sp_paint_jump_trampoline_entry01.vcd"
 					}
 				}
-			"Line_Robot"
-				{
-				"Name"	"Deadly Lasers"
-				"ID"	"SENDIFICATOR_1"
-				"Trans"	"Please proceed into the next test chamber."
-				"Trans"	"Which involves deadly lasers and how test subjects react when locked in a room with deadly lasers."
-				"Choreo"
-					{
-					"1" "scenes/npc/glados/coop_test_chamber_both15.vcd"
-					"2" "scenes/npc/glados/sp_laser_redirect_intro_entry03.vcd"
-					}
-				}
 			}
 
 		"Quote"
@@ -431,18 +419,18 @@
 			{
 			"Priority"	"0"
 			"Name"		"Generic"
-			"Line_SP"
+			"Line"
 				{	
 				"Name"		"You Are a Horrible Person"
-				"ID"		"GENERIC_EXIT"
+				"ID"		"GENERIC_EXIT_1"
 
 				"Trans"		"I have the results of the last chamber: You are a horrible person. That's what it says: A horrible person. We weren't even testing for that." 
 				"Choreo"	"npc/glados/sp_laser_powered_lift_completion01.vcd"
 				}
 			"Line_COOP"
 				{
 				"Name" 	"History Will Only Remember One Of You"
-				"ID"		"GENERIC_EXIT"
+				"ID"		"GENERIC_EXIT_COOP"
 				"Trans" 	"Excellent. Although great science is always the result of collaboration, keep in mind that, like Albert Einstein and his cousin Terry, history will only remember one of you."
 				"choreo"	"scenes/npc/glados/botcoop_competition01.vcd"
 				}

diff --git a/packages/valve/clean_style/voice/clean.cfg b/packages/valve/clean_style/voice/clean.cfg
@@ -338,7 +338,7 @@
 			"Line_Robot"
 				{
 				"Name"      "Excellent Ball Placement, Robots"
-				"ID"        "BALL_BUTTON_PRESSED_PROBO"
+				"ID"        "BALL_BUTTON_PRESSED_ROBO"
 				"Trans"     "GLaDOS: You did an excellent job placing the edgeless safety cube in the receptacle, you should be very - oh wait."
 				"Trans"     "GLaDOS: That's right. You're not humans."
 				"Trans"     "GLaDOS: I can drop the fake praise."
@@ -698,9 +698,10 @@
 			"Name"      "Sendificator"
 			"Line_Robot"
 				{
+				// This is duplicated to raise it in priority.
 				"Name"      "Deadly Lasers"
-				"ID"        "LASER_1"
-				"Trans"     "Please proceed into the next test chamber."
+				"ID"        "SENDIFICATOR_LASER"
+				"Trans"     "GLaDOS: Please proceed into the next test chamber."
 				"Trans"     "GLaDOS: Which involves deadly lasers and how test subjects react when locked in a room with deadly lasers."
 				"Choreo"
 					{
@@ -823,15 +824,15 @@
 			"Line_SP"
 				{
 				"Name"      "Nerve To Call It Broken"
-				"ID"        "DEADLY_1"
+				"ID"        "DEADLY_EXIT_SP"
 				"Trans"     "GLaDOS: Congratulations. Your ability to complete this test proves the humans wrong. They described it as impossible, deadly, cruel, and one test subject even had the nerve to call it broken."
 				"Choreo"    "scenes/npc/glados/mp_coop_wall_block03.vcd"
 				}
 
 			"Line_COOP"
 				{
 				"Name"      "You Can Just Keep Trying"
-				"ID"        "DEADLY_1"
+				"ID"        "DEADLY_EXIT_COOP"
 				"Trans"     "GLaDOS: Congratulations. Your ability to complete this test proves the humans wrong. They described it as impossible, deadly, cruel, and one test subject even had the nerve to call it broken."
 				"Trans"     "GLaDOS: Of course the humans only had one try at it, you can just keep trying."
 				"Choreo"