diff --git a/sc2/content/comm/slyland/slyland.ts b/sc2/content/comm/slyland/slyland.ts index 376cb38a0..6aed5af35 100644 --- a/sc2/content/comm/slyland/slyland.ts +++ b/sc2/content/comm/slyland/slyland.ts @@ -31,6 +31,7 @@ #(THIS_IS_PROBE_3) #(THIS_IS_PROBE_40) #(THIS_IS_PROBE_41) +#(THIS_IS_PROBE_42) #(why_attack_1) #(why_attack_2) #(why_attack_3) diff --git a/sc2/content/comm/slyland/slyland.txt b/sc2/content/comm/slyland/slyland.txt index b2a43f6f5..2e6ef52dc 100755 --- a/sc2/content/comm/slyland/slyland.txt +++ b/sc2/content/comm/slyland/slyland.txt @@ -11,13 +11,13 @@ DO NOT FEAR. WE SHALL NOT HARM YOU. THIS IS PROBE 2418-B, ON A PEACEFUL MISSION. #(WE_COME_IN_PEACE_5) slyla004.ogg -WE ARE NON-HOSTILE AND SEEK TO ESTABLISH FRIENDLY RELATIONS. +WE ARE NOT HOSTILE AND SEEK TO ESTABLISH FRIENDLY RELATIONS WITH YOUR SPECIES. #(WE_COME_IN_PEACE_6) slyla005.ogg WE WISH TO LEARN MORE ABOUT YOU. PLEASE TRANSMIT DATA. #(WE_COME_IN_PEACE_7) slyla006.ogg -THIS PROBE IS NON-HOSTILE. DO NOT ATTACK. +THIS PROBE IS NOT HOSTILE. DO NOT ATTACK. #(WE_COME_IN_PEACE_8) slyla007.ogg WE COME IN PEACE. @@ -38,7 +38,7 @@ Prepare to be annihilated! THIS PROBE IS PROGRAMMED TO DEFEND AGAINST HOSTILE BEHAVIOR. #(PROGRAMMED_TO_DEFEND_2) slyla009.ogg -SURVIVAL SUB-SYSTEM ACTIVATED. WEAPONS ENGAGED. +SURVIVAL SYSTEM SUBROUTINE HAS BEEN ACTIVATED. WEAPONS ENGAGED. #(PROGRAMMED_TO_DEFEND_3) slyla010.ogg ENACTING THIRD LAW. @@ -67,7 +67,7 @@ ACCORDING TO INTERNAL MONITORS THERE ARE NO MALFUNCTIONS. #(NOMINAL_FUNCTION_3) slyla014.ogg I WILL INITIATE SYSTEMS CHECK LEVEL FOUR. CHECKING... CHECKING... CHECKING... -SYSTEMS CHECK LEVEL FOUR REPORTS FULL FUNCTIONALITY. +SYSTEMS CHECK LEVEL FOUR REPORTS NO ABNORMALITIES OR MALFUNCTIONS. #(NOMINAL_FUNCTION_4) slyla015.ogg ALL SYSTEMS REPORT NOMINAL FUNCTION. @@ -91,12 +91,15 @@ THIS IS PROBE 2418-B. WE ARE ON A PEACEFUL MISSION OF EXPLORATION. THIS IS PROBE 2418-B. WE SEEK TO MAKE FRIENDLY CONTACT WITH ALIEN LIFE FORMS. #(THIS_IS_PROBE_3) slyla018.ogg -THIS IS PROBE 2418-B. WE REPLICATE SO THAT WE MAY EXPAND THE SCOPE OF OUR MISSION. +THIS IS PROBE 2418-B. WE REPLICATE SO THAT WE MAY EXPAND THE SCOPE OF MISSION. #(THIS_IS_PROBE_40) slyla019.ogg -THIS IS PROBE 2418-B. COORDINATES ARE: +THIS IS PROBE 2418-B. -#(THIS_IS_PROBE_41) +#(THIS_IS_PROBE_41) slyla030.ogg +COORDINATES ARE: + +#(THIS_IS_PROBE_42) . #(why_attack_1) @@ -127,7 +130,7 @@ DATA GATHERING CONTACTING ALIEN LIFE FORMS IN PEACEFUL MANNER. #(PEACEFUL_MISSION_3) slyla022.ogg -PRESENT REPLICATION STATUS +REPLICATION STATUS EIGHT REPLICATIONS NEXT REPLICATION 85 PERCENT COMPLETE ESTIMATED REPLICATIONS SINCE DEPARTURE FROM POINT OF ORIGIN @@ -154,16 +157,16 @@ Goodbye and good riddance. Are you going to let me leave in peace this time? #(GOODBYE_1) slyla024.ogg -END CONTACT SUB-SEQUENCE. +ENDING ALIEN CONTACT SUBROUTINE. #(GOODBYE_2) slyla025.ogg -END CONTACT SUB-SEQUENCE. +ENDING ALIEN CONTACT SUBROUTINE. #(GOODBYE_3) slyla026.ogg -END CONTACT SUB-SEQUENCE. +ENDING ALIEN CONTACT SUBROUTINE. #(GOODBYE_4) slyla027.ogg -END CONTACT SUB-SEQUENCE. +ENDING ALIEN CONTACT SUBROUTINE. #(HOSTILE) slyla028.ogg PRIORITY OVER-RIDE. NEW BEHAVIOR DICTATED. @@ -174,5 +177,3 @@ ENGAGING SELF-DESTRUCTION CIRCUITRY. #(destruct_code) Transmit destruct sequence! - - diff --git a/sc2/content/comm/slyland/slyland030.ogg b/sc2/content/comm/slyland/slyland030.ogg new file mode 100644 index 000000000..c71c807bc Binary files /dev/null and b/sc2/content/comm/slyland/slyland030.ogg differ diff --git a/sc2/src/sc2code/comm/slyland/slyland.c b/sc2/src/sc2code/comm/slyland/slyland.c index 703b87a56..107743555 100644 --- a/sc2/src/sc2code/comm/slyland/slyland.c +++ b/sc2/src/sc2code/comm/slyland/slyland.c @@ -19,6 +19,7 @@ #include "comm/commall.h" #include "comm/slyland/resinst.h" #include "comm/slyland/strings.h" +#include "options.h" #include "battle.h" #include "setup.h" @@ -259,6 +260,13 @@ CombatIsInevitable (RESPONSE_REF R) else if (PLAYER_SAID (R, we_are_us)) { NumVisits = GET_GAME_STATE (SLYLANDRO_PROBE_ID); + if (NumVisits == 3 && !optSubtitles) + { + /* If playing without subtitles, don't use the + * last item in the conversation tree, which mentions + * coordinates which can't be spoken. */ + NumVisits--; + } switch (NumVisits++) { case 0: @@ -273,8 +281,9 @@ CombatIsInevitable (RESPONSE_REF R) case 3: { NPCPhrase (THIS_IS_PROBE_40); - NPCPhrase (GLOBAL_PLAYER_LOCATION); NPCPhrase (THIS_IS_PROBE_41); + NPCPhrase (GLOBAL_PLAYER_LOCATION); + NPCPhrase (THIS_IS_PROBE_42); --NumVisits; break; diff --git a/sc2/src/sc2code/comm/slyland/strings.h b/sc2/src/sc2code/comm/slyland/strings.h index 468c5ca02..9e8c7476e 100644 --- a/sc2/src/sc2code/comm/slyland/strings.h +++ b/sc2/src/sc2code/comm/slyland/strings.h @@ -55,6 +55,7 @@ enum THIS_IS_PROBE_3, THIS_IS_PROBE_40, THIS_IS_PROBE_41, + THIS_IS_PROBE_42, why_attack_1, why_attack_2, why_attack_3,