diff --git a/sc2/content/comm/syreen/syreen.ts b/sc2/content/comm/syreen/syreen.ts index 637bbd303..85fc1400b 100644 --- a/sc2/content/comm/syreen/syreen.ts +++ b/sc2/content/comm/syreen/syreen.ts @@ -105,35 +105,21 @@ #(GOODBYE_BEFORE_AMBUSH) #(what_about_us) #(ABOUT_US) 3315 -#(MORE_COMFORTABLE0) -#(MORE_COMFORTABLE1) +#(MORE_COMFORTABLE) 2900,2200 #(in_the_spirit) -#(OK_SPIRIT0) 3635,3405 -#(OK_SPIRIT1) -#(OK_SPIRIT2) -#(OK_SPIRIT3) +#(OK_SPIRIT) 3635,3200,3900,2400,2500 #(what_in_mind) -#(SOMETHING_LIKE_THIS0) 5658 -#(SOMETHING_LIKE_THIS1) -#(SOMETHING_LIKE_THIS2) -#(SOMETHING_LIKE_THIS3) +#(SOMETHING_LIKE_THIS) 5658,4000,8000,6000,6000 #(hands_off) -#(OK_WONT_USE_HANDS0) 6009,2293 -#(OK_WONT_USE_HANDS1) -#(OK_WONT_USE_HANDS2) -#(OK_WONT_USE_HANDS3) +#(OK_WONT_USE_HANDS) 6009,2293,6000,2700,3000 #(why_lights_off) -#(LIGHTS_OFF_BECAUSE0) -#(LIGHTS_OFF_BECAUSE1) -#(LIGHTS_OFF_BECAUSE2) -#(LIGHTS_OFF_BECAUSE3) +#(LIGHTS_OFF_BECAUSE) 5500,2000,2700 #(evil_monster) #(NOT_EVIL_MONSTER) 5147,5738,3275,761 #(disease) #(JUST_RELAX) #(what_happens_if_i_touch_this) -#(THIS_HAPPENS0) 1543,1772,1272,1492,1953 -#(THIS_HAPPENS1) +#(THIS_HAPPENS) 1543,1772,1272,1492,1953 #(are_you_sure_this_is_ok) #(YES_SURE) 2774,2674 #(boy_they_never_taught) diff --git a/sc2/content/comm/syreen/syreen.txt b/sc2/content/comm/syreen/syreen.txt index fe29559d4..b90448174 100755 --- a/sc2/content/comm/syreen/syreen.txt +++ b/sc2/content/comm/syreen/syreen.txt @@ -565,64 +565,51 @@ I guess what I mean is... What about us, Talana? I'm afraid our duties will keep us apart, Captain But for now, at least, there's this... -#(MORE_COMFORTABLE0) syree058.ogg +#(MORE_COMFORTABLE) syree058.ogg That's more like it... now -#(MORE_COMFORTABLE1) -, let me help you off with this +let me help you off with this yes... now aren't you a lot more comfortable? #(in_the_spirit) I see! Well, in the spirit of interspecies communication, let me just say, COWABUNGA! -#(OK_SPIRIT0) syree059.ogg +#(OK_SPIRIT) syree059.ogg Oooh! Say that word again! It makes me feel so excited! It makes me want to do something nice for you -#(OK_SPIRIT1) like this... -#(OK_SPIRIT2) and this... -#(OK_SPIRIT3) and especially, this! #(what_in_mind) Hey... what have you got in mind here? -#(SOMETHING_LIKE_THIS0) syree060.ogg +#(SOMETHING_LIKE_THIS) syree060.ogg Well to start off, I thought we'd do something like this unless your species isn't limber enough -#(SOMETHING_LIKE_THIS1) and then I thought we could move on to something a bit more like... Mmmm... this. -#(SOMETHING_LIKE_THIS2) and after you had recovered, I thought this might be fun! -#(SOMETHING_LIKE_THIS3) and if you're still conscious, I thought we could try this even though I've never done it before! #(hands_off) Hey! Hands off lady! I'm not THAT kind of Captain. -#(OK_WONT_USE_HANDS0) syree061.ogg +#(OK_WONT_USE_HANDS) syree061.ogg Oh, Captain... I would never think of doing something unpleasant to you quite the opposite in fact. But if you want me to keep my hands off... I can use other... things... -#(OK_WONT_USE_HANDS1) -...like this over here... -#(OK_WONT_USE_HANDS2) +like this over here... and this right here... -#(OK_WONT_USE_HANDS3) and this right about here. #(why_lights_off) Ahh... why are the lights off? -#(LIGHTS_OFF_BECAUSE0) syree062.ogg +#(LIGHTS_OFF_BECAUSE) syree062.ogg Because, my darling, if the light was on, I couldn't do this... -#(LIGHTS_OFF_BECAUSE1) or this... -#(LIGHTS_OFF_BECAUSE2) or this... -#(LIGHTS_OFF_BECAUSE3) or, umm... this. #(evil_monster) @@ -644,15 +631,12 @@ Just relax, my silly human Captain. Let me take care of everything. #(what_happens_if_i_touch_this) Hmmm... what happens if I do this? -#(THIS_HAPPENS0) syree065.ogg +#(THIS_HAPPENS) syree065.ogg ...mmm MMMm!... -Oh, - -#(THIS_HAPPENS1) -! MMMmm!!... +Ohh!... +MMMmm!!... ...MMMMMmmmmmm!!!... -...Mmmmm does that answer your question? #(are_you_sure_this_is_ok) @@ -684,8 +668,8 @@ and come here!... (...quite a good bit later...) #(SEX_GOODBYE) syree070.ogg -Goodbye Captain, darling... we each have our jobs to do now -you must go! +Goodbye Captain, darling... we each have our jobs to do +now you must go! But you will remain always in my mind and heart and deep within me, I know that someday, when all this madness has come to an end we will be together like this... again. diff --git a/sc2/src/sc2code/comm/syreen/strings.h b/sc2/src/sc2code/comm/syreen/strings.h index fa7ed440f..832cc7608 100644 --- a/sc2/src/sc2code/comm/syreen/strings.h +++ b/sc2/src/sc2code/comm/syreen/strings.h @@ -129,35 +129,21 @@ enum GOODBYE_BEFORE_AMBUSH, what_about_us, ABOUT_US, - MORE_COMFORTABLE0, - MORE_COMFORTABLE1, + MORE_COMFORTABLE, in_the_spirit, - OK_SPIRIT0, - OK_SPIRIT1, - OK_SPIRIT2, - OK_SPIRIT3, + OK_SPIRIT, what_in_mind, - SOMETHING_LIKE_THIS0, - SOMETHING_LIKE_THIS1, - SOMETHING_LIKE_THIS2, - SOMETHING_LIKE_THIS3, + SOMETHING_LIKE_THIS, hands_off, - OK_WONT_USE_HANDS0, - OK_WONT_USE_HANDS1, - OK_WONT_USE_HANDS2, - OK_WONT_USE_HANDS3, + OK_WONT_USE_HANDS, why_lights_off, - LIGHTS_OFF_BECAUSE0, - LIGHTS_OFF_BECAUSE1, - LIGHTS_OFF_BECAUSE2, - LIGHTS_OFF_BECAUSE3, + LIGHTS_OFF_BECAUSE, evil_monster, NOT_EVIL_MONSTER, disease, JUST_RELAX, what_happens_if_i_touch_this, - THIS_HAPPENS0, - THIS_HAPPENS1, + THIS_HAPPENS, are_you_sure_this_is_ok, YES_SURE, boy_they_never_taught, diff --git a/sc2/src/sc2code/comm/syreen/syreenc.c b/sc2/src/sc2code/comm/syreen/syreenc.c index 8580e2db5..46dad1da5 100644 --- a/sc2/src/sc2code/comm/syreen/syreenc.c +++ b/sc2/src/sc2code/comm/syreen/syreenc.c @@ -189,34 +189,7 @@ FriendlyExit (RESPONSE_REF R) else { if (PLAYER_SAID (R, hands_off)) - { - NPCPhrase (OK_WONT_USE_HANDS0); - NPCPhrase (OK_WONT_USE_HANDS1); - NPCPhrase (OK_WONT_USE_HANDS2); - NPCPhrase (OK_WONT_USE_HANDS3); - - syreen_desc.AlienTextTemplate.align = ALIGN_RIGHT; - syreen_desc.AlienTextTemplate.baseline.x = SIS_SCREEN_WIDTH - TEXT_X_OFFS; - AlienTalkSegue (1); - - syreen_desc.AlienTextTemplate.baseline.x = SIS_TEXT_WIDTH * 3 / 4; - syreen_desc.AlienTextTemplate.baseline.y = 120 * 3 / 4; - AlienTalkSegue (2); - - syreen_desc.AlienTextTemplate.baseline.x = SIS_TEXT_WIDTH * 2 / 4; - syreen_desc.AlienTextTemplate.baseline.y = 120 * 2 / 4; - AlienTalkSegue (3); - - syreen_desc.AlienTextTemplate.baseline.x = SIS_TEXT_WIDTH * 1 / 4; - syreen_desc.AlienTextTemplate.baseline.y = 120 * 1 / 4; - AlienTalkSegue ((COUNT)~0); - - syreen_desc.AlienTextTemplate.baseline.x = - TEXT_X_OFFS + (SIS_TEXT_WIDTH >> 1); - syreen_desc.AlienTextTemplate.baseline.y = 0; - syreen_desc.AlienTextTemplate.align = ALIGN_CENTER; - syreen_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16; - } + NPCPhrase (OK_WONT_USE_HANDS); else if (PLAYER_SAID (R, not_much_more_to_say)) NPCPhrase (THEN_STOP_TALKING); NPCPhrase (LATER); @@ -238,68 +211,14 @@ static void Sex (RESPONSE_REF R) { if (PLAYER_SAID (R, in_the_spirit)) - { - NPCPhrase (OK_SPIRIT0); - NPCPhrase (OK_SPIRIT1); - NPCPhrase (OK_SPIRIT2); - NPCPhrase (OK_SPIRIT3); - - syreen_desc.AlienTextTemplate.align = ALIGN_LEFT; - syreen_desc.AlienTextTemplate.baseline.x = TEXT_X_OFFS; - AlienTalkSegue (1); - - syreen_desc.AlienTextTemplate.baseline.x = SIS_TEXT_WIDTH * 1 / 4; - syreen_desc.AlienTextTemplate.baseline.y = 120 * 1 / 4; - AlienTalkSegue (2); - - syreen_desc.AlienTextTemplate.baseline.x = SIS_TEXT_WIDTH * 2 / 4; - syreen_desc.AlienTextTemplate.baseline.y = 120 * 2 / 4; - AlienTalkSegue (3); - - syreen_desc.AlienTextTemplate.baseline.x = SIS_TEXT_WIDTH * 3 / 4; - syreen_desc.AlienTextTemplate.baseline.y = 120 * 3 / 4; - AlienTalkSegue ((COUNT)~0); - - syreen_desc.AlienTextTemplate.baseline.x = - TEXT_X_OFFS + (SIS_TEXT_WIDTH >> 1); - syreen_desc.AlienTextTemplate.baseline.y = 0; - syreen_desc.AlienTextTemplate.align = ALIGN_CENTER; - syreen_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16; - } + NPCPhrase (OK_SPIRIT); else if (PLAYER_SAID (R, what_in_mind)) - { - NPCPhrase (SOMETHING_LIKE_THIS0); - NPCPhrase (SOMETHING_LIKE_THIS1); - NPCPhrase (SOMETHING_LIKE_THIS2); - NPCPhrase (SOMETHING_LIKE_THIS3); - - syreen_desc.AlienTextTemplate.align = ALIGN_LEFT; - syreen_desc.AlienTextTemplate.baseline.x = TEXT_X_OFFS; - AlienTalkSegue (1); - - syreen_desc.AlienTextTemplate.baseline.y = 120 * 3 / 4; - AlienTalkSegue (2); - - syreen_desc.AlienTextTemplate.align = ALIGN_RIGHT; - syreen_desc.AlienTextTemplate.baseline.x = SIS_SCREEN_WIDTH - TEXT_X_OFFS; - AlienTalkSegue (3); - - syreen_desc.AlienTextTemplate.baseline.y = 0; - AlienTalkSegue ((COUNT)~0); - - syreen_desc.AlienTextTemplate.baseline.x = - TEXT_X_OFFS + (SIS_TEXT_WIDTH >> 1); - syreen_desc.AlienTextTemplate.baseline.y = 0; - syreen_desc.AlienTextTemplate.align = ALIGN_CENTER; - syreen_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16; - } + NPCPhrase (SOMETHING_LIKE_THIS); else if (PLAYER_SAID (R, disease)) NPCPhrase (JUST_RELAX); else if (PLAYER_SAID (R, what_happens_if_i_touch_this)) { - NPCPhrase (THIS_HAPPENS0); - NPCPhrase (GLOBAL_PLAYER_NAME); - NPCPhrase (THIS_HAPPENS1); + NPCPhrase (THIS_HAPPENS); DISABLE_PHRASE (what_happens_if_i_touch_this); } @@ -341,9 +260,7 @@ Foreplay (RESPONSE_REF R) NPCPhrase (HERES_REWARD); else NPCPhrase (ABOUT_US); - NPCPhrase (MORE_COMFORTABLE0); - NPCPhrase (GLOBAL_PLAYER_NAME); - NPCPhrase (MORE_COMFORTABLE1); + NPCPhrase (MORE_COMFORTABLE); AlienTalkSegue (1); XFormPLUT (GetColorMapAddress ( SetAbsColorMapIndex (CommData.AlienColorMap, 1) @@ -354,30 +271,7 @@ Foreplay (RESPONSE_REF R) } else if (PLAYER_SAID (R, why_lights_off)) { - NPCPhrase (LIGHTS_OFF_BECAUSE0); - NPCPhrase (LIGHTS_OFF_BECAUSE1); - NPCPhrase (LIGHTS_OFF_BECAUSE2); - NPCPhrase (LIGHTS_OFF_BECAUSE3); - - AlienTalkSegue (1); - syreen_desc.AlienTextWidth >>= 1; - syreen_desc.AlienTextTemplate.baseline.x = - TEXT_X_OFFS + (SIS_TEXT_WIDTH >> 2); - syreen_desc.AlienTextTemplate.baseline.y = 50; - AlienTalkSegue (2); - syreen_desc.AlienTextTemplate.baseline.x = - (TEXT_X_OFFS + (SIS_TEXT_WIDTH >> 1)) - + (SIS_TEXT_WIDTH >> 2); - AlienTalkSegue (3); - syreen_desc.AlienTextTemplate.baseline.x = - TEXT_X_OFFS + (SIS_TEXT_WIDTH >> 1); - syreen_desc.AlienTextTemplate.baseline.y = 90; - syreen_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16; - AlienTalkSegue ((COUNT)~0); - - syreen_desc.AlienTextTemplate.baseline.x = - TEXT_X_OFFS + (SIS_TEXT_WIDTH >> 1); - syreen_desc.AlienTextTemplate.baseline.y = 0; + NPCPhrase (LIGHTS_OFF_BECAUSE); DISABLE_PHRASE (why_lights_off); }