Fixed the scripts to respect the "..." convention.

Whitespace at the beginnings and ends of dialogue lines are significant; this update should give them the proper semantics. Also better synchronizes the .txt files with their controlling strings.h files. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@123 8092fc87-c524-0410-9efc-e669fe64eaf9
2002-10-15 10:45:17 +00:00
parent d6bbe8f2df
commit cc22b00e17
10 changed files with 51 additions and 27 deletions
@@ -153,8 +153,8 @@ When I Present Them With The Twisted Wreckage Of Your Ship And Your Many Charred
 #(CAME_FROM) ilwra023.wav
 Since You Will Soon Be Dead, I Will Gladly Explain.
 We Have Spent Many Years Gleefully Preying On The Pkunk.
-They Are A Pitiful, Easily-killed Species...
-And We Would Have Continued In This Divine Worship Of Dogar And Kazon...
+They Are A Pitiful, Easily-killed Species
+And We Would Have Continued In This Divine Worship Of Dogar And Kazon
 But We Required Additional Crew Members And Repairs To Our Cloaking Device.
 So We Departed The Giclas Constellation And Set Course For Home.
 But Before We Had Reached Our Region Of Space, We Detected The Passage Of A Nearby Vessel - The Ur-Quan Drone.
@@ -242,7 +242,7 @@ What do you want from us this time?
 Never mind, we don't want to know.

 #(HELLO_HATE_YOU_3) melno034.wav
-We will hate you forever 
+We will hate you forever.
 It is no use coming back here in the hopes that we will ever change our minds.
 We won't!

@@ -233,9 +233,9 @@ I am surprised!
 Oh well. Now is for *fun time*, not worrying.

 #(NEUTRAL_HOMEWORLD_HELLO_4)	orz028.wav
-Again you have come to my *house*. It is the same time. Why are 
-you coming? Do you always the *slow time*? I am surprised! Oh 
-well. Now is for *fun time*, not worrying.
+Again you have come to my *house*. It is the same time.
+Why are you coming? Do you always the *slow time*? I am surprised!
+Oh well. Now is for *fun time*, not worrying.

 #(NEUTRAL_SPACE_HELLO_1)	orz029.wav
 Hello extremely! I hope you like to *Play*.
@@ -31,14 +31,14 @@ Seekers of the deepest truths, askers of interesting and significant questions.
 Even now a question of great transcendental significance comes unbidden to our minds.
 Who are you and what do you want?'

-#(NEUTRAL_SPACE_HELLO_2)	pkunk002.wav
+#(NEUTRAL_SPACE_HELLO_3)	pkunk002.wav
 Greetings and various apropos felicitations!  We are Pkunk.
 Hatchlings of light, spritual soul beings of the vast cosmic oneness
 wayfarers on the river of destiny, students of the mystical dimensions
 purveyors of blissful love, birdlike manifestations of glorious light energies from the astral plane.
 How about yourselves?

-#(NEUTRAL_SPACE_HELLO_3)	pkunk003.wav
+#(NEUTRAL_SPACE_HELLO_2)	pkunk003.wav
 Do not be frightened.  We are powerful creatures, yes
 but we could not hurt you anymore than we could squish the helpless Pootworm.
 We love the Pootworm.  We are one with the Pootworm.  We are one with you.
@@ -58,11 +58,11 @@ release yourself to tears of joy!
 Go. Go now, young one. Go quickly!

 #(FRIENDLY_SPACE_HELLO_1)	pkunk005.wav
-Whoopdy Dee and Trolly Bazoo!  What a good day I am having.  First 
-my nest mate surprises me with extra fat and spicy grubs for
-earlymeal, and then I am complimented on my fine display of
-ceremonial tongs.  To top it off, I encounter the human friend, loved
-by all Pkunk.  Can things get any better?
+Whoopdy Dee and Trolly Bazoo!  What a good day I am having.
+First, my nest mate surprises me with extra fat and spicy grubs for earlymeal
+and then I am complimented on my fine display of ceremonial tongs.
+To top it off, I encounter the human friend, loved by all Pkunk.
+Can things get any better?

 #(FRIENDLY_SPACE_HELLO_2)	pkunk006.wav
 The stars are in auspicious alignment, the various significant moons
@@ -193,7 +193,7 @@ Captain
 #(HEAVY_LOAD_F1) 
 , you are to be commended. Keep up the good work!

-#(HEAVY_LOAD_G0 ) starb044.wav
+#(HEAVY_LOAD_G0) starb044.wav
 More fuel for the fire, eh, Captain 
 #(HEAVY_LOAD_G1) 
 ?  That last load should keep it blazing!
@@ -47,9 +47,13 @@ When multiple records are used to define a single speech line (as
 often happens when they say your name, for instance), only the first
 line has an audio file associated with it.

-Lines that do not end in a punctuation mark have a "..." added to the
-end of them by the communications code - keep that in mind when
-debugging the subtitles.
+Lines that do not end in a punctuation mark or a space have a "..."
+added to the end of them by the communications code.  If the previous
+line had "..." appended to it and this line does not START with a
+space, this line will have "..." prepended to it.  The "scriptcheck"
+tool looks for all cases where "..." does not occur in midsentence.
+When editing the script files, check your intended results against
+this.

 The .h files (src/sc2code/comm)
 -------------------------------
@@ -64,6 +68,11 @@ the enum (though it would be reasonably straightforward to generate
 the strings.h files from the .txt files) The values of the enum are
 used in the {racec}.c files in the same directory.

+The scriptcheck utility also checks for proper correlation between the
+.h file and the associated .txt file.  It assumes that one enum value
+is listed per line, and that the general format of the file matches
+the current one.
+
 Types of script bugs
 --------------------

@@ -274,7 +274,22 @@ enum
 	name_40,
 	name_41,
 	ENUMERATE_ONE,
-	END_LIST_WITH_AND = ENUMERATE_ONE + 16
+	ENUMERATE_TWO,
+	ENUMERATE_THREE,
+	ENUMERATE_FOUR,
+	ENUMERATE_FIVE,
+	ENUMERATE_SIX,
+	ENUMERATE_SEVEN,
+	ENUMERATE_EIGHT,
+	ENUMERATE_NINE,
+	ENUMERATE_TEN,
+	ENUMERATE_ELEVEN,
+	ENUMERATE_TWELVE,
+	ENUMERATE_THIRTEEN,
+	ENUMERATE_FOURTEEN,
+	ENUMERATE_FIFTEEN,
+	ENUMERATE_SIXTEEN,
+	END_LIST_WITH_AND
 };

 #endif /* _STRINGS_H */
@@ -21,7 +21,7 @@

 enum
 {
-	null_phrase,
+	NULL_PHRASE,
 	killed_fwiffo,
 	POOR_FWIFFO,
 	fwiffo_fine,