diff --git a/data/DataCache.scr b/data/DataCache.scr index c3c9ce565..2799e5263 100644 --- a/data/DataCache.scr +++ b/data/DataCache.scr @@ -73,14 +73,15 @@ scripts/c5l2_celebrate.dat scripts/c5l3_celebrate.dat scripts/c5l4_celebrate.dat -scripts/triggerspeech_firstnet.dat -scripts/triggerspeech_firstcoral.dat -scripts/triggerspeech_garych2l1.dat -scripts/triggerspeech_bubblegeyser.dat -scripts/triggerspeech_firstbubble.dat -scripts/triggerspeech_breakfloor.dat -scripts/triggerspeech_usebubble.dat -scripts/triggerspeech_weight.dat +scripts/triggerspeech_151.dat +scripts/triggerspeech_152.dat +scripts/triggerspeech_153.dat +scripts/triggerspeech_154.dat +scripts/triggerspeech_155.dat +scripts/triggerspeech_156.dat +scripts/triggerspeech_157.dat +scripts/triggerspeech_158.dat +scripts/triggerspeech_159.dat translations/swe.dat translations/dut.dat diff --git a/data/translations/text.dat b/data/translations/text.dat index 22b8dac88..b54fc6a2b 100644 --- a/data/translations/text.dat +++ b/data/translations/text.dat @@ -461,22 +461,24 @@ eng=I got it! Well, celebration time is over! Now back to Bikini Bottom to add t ; Speech trigger texts ; --------------------------------------------------------------- -[STR__INGAME__TRIGGERSPEECH_FIRSTNET] -eng=Hey, I can use this net to catch jellyfish and throw them at those annoying critters. -[STR__INGAME__TRIGGERSPEECH_FIRSTCORAL] -eng=With this coral blower, I can suck up all of those sea shells laying around, and use them to break up the rock walls. -[STR__INGAME__TRIGGERSPEECH_GARYCH2L1] -eng=Hmmmm, using the coral blower on those rocks up there should cover up those spikes! -[STR__INGAME__TRIGGERSPEECH_BUBBLEGEYSER] +[STR__INGAME__TRIGGERSPEECH_151] +eng=Hey, I can use this net to catch jellyfish and throw them at those annoying critters! +[STR__INGAME__TRIGGERSPEECH_152] +eng=With this coral blower, I can suck up all those sea shells laying around, and use them to break the rock walls! +[STR__INGAME__TRIGGERSPEECH_153] +eng=Hmmmm, using the coral blower on those rocks up there should cover up those spikes! Then Gary Can Walk over them. Te-heee-hee! +[STR__INGAME__TRIGGERSPEECH_154] +eng=The floor doesn’t look too stable. A good ol' butt bounce should do the trick. +[STR__INGAME__TRIGGERSPEECH_155] eng=Bubbles! Hey, I wonder if I can jump on them... -[STR__INGAME__TRIGGERSPEECH_FIRSTBUBBLE] +[STR__INGAME__TRIGGERSPEECH_156] +eng=This scale should help me get Gary across... +[STR__INGAME__TRIGGERSPEECH_157] eng=I can make bubbles! And what do you know, I can jump on them! -[STR__INGAME__TRIGGERSPEECH_BREAKFLOOR] -eng=The floor doesn’t look too stable. A good ol butt bounce should do the trick. -[STR__INGAME__TRIGGERSPEECH_USEBUBBLE] +[STR__INGAME__TRIGGERSPEECH_158] eng=A few bubbles should get me up there... -[STR__INGAME__TRIGGERSPEECH_WEIGHT] -eng=I cant't lift that.. hmmmm. those pulleys should do the trick. +[STR__INGAME__TRIGGERSPEECH_159] +eng=I cant't lift that.. hmmmm. Those pulleys should do the trick. diff --git a/source/game/convo.cpp b/source/game/convo.cpp index 17bd6aac5..b87e34af1 100644 --- a/source/game/convo.cpp +++ b/source/game/convo.cpp @@ -248,15 +248,15 @@ const sSpeechTable SpeechTable[]= {SPEECH_148,-1}, {SPEECH_149,-1}, {SPEECH_150,-1}, -{SPEECH_151,SCRIPTS_TRIGGERSPEECH_FIRSTNET_DAT}, -{SPEECH_152,SCRIPTS_TRIGGERSPEECH_FIRSTCORAL_DAT}, -{SPEECH_153,SCRIPTS_TRIGGERSPEECH_GARYCH2L1_DAT}, -{SPEECH_154,SCRIPTS_TRIGGERSPEECH_BREAKFLOOR_DAT}, -{SPEECH_155,SCRIPTS_TRIGGERSPEECH_BUBBLEGEYSER_DAT}, -{SPEECH_156,-1}, -{SPEECH_157,SCRIPTS_TRIGGERSPEECH_USEBUBBLE_DAT}, -{SPEECH_158,SCRIPTS_TRIGGERSPEECH_FIRSTBUBBLE_DAT}, -{SPEECH_159,SCRIPTS_TRIGGERSPEECH_WEIGHT_DAT}, +{SPEECH_151,STR__INGAME__TRIGGERSPEECH_151}, +{SPEECH_152,STR__INGAME__TRIGGERSPEECH_152}, +{SPEECH_153,STR__INGAME__TRIGGERSPEECH_153}, +{SPEECH_154,STR__INGAME__TRIGGERSPEECH_154}, +{SPEECH_155,STR__INGAME__TRIGGERSPEECH_155}, +{SPEECH_156,STR__INGAME__TRIGGERSPEECH_156}, +{SPEECH_157,STR__INGAME__TRIGGERSPEECH_157}, +{SPEECH_158,STR__INGAME__TRIGGERSPEECH_158}, +{SPEECH_159,STR__INGAME__TRIGGERSPEECH_159}, }; const int SpeechTableSize=sizeof(SpeechTable)/sizeof(sSpeechTable); @@ -773,7 +773,7 @@ void CConversation::registerConversationLevelScripts(int level) { case 1: { - registerConversationScript(SCRIPTS_TRIGGERSPEECH_FIRSTNET_DAT); + registerConversationScript(SCRIPTS_TRIGGERSPEECH_151_DAT); // firstnet registerConversationScript(SCRIPTS_CH1L1_01_DAT); registerConversationScript(SCRIPTS_CH1L1_02_DAT); registerConversationScript(SCRIPTS_C1L1_CELEBRATE_DAT); @@ -816,8 +816,8 @@ void CConversation::registerConversationLevelScripts(int level) { case 1: { - registerConversationScript(SCRIPTS_TRIGGERSPEECH_FIRSTCORAL_DAT); - registerConversationScript(SCRIPTS_TRIGGERSPEECH_GARYCH2L1_DAT); + registerConversationScript(SCRIPTS_TRIGGERSPEECH_152_DAT); // firstcoral + registerConversationScript(SCRIPTS_TRIGGERSPEECH_153_DAT); // garych2l1 registerConversationScript(SCRIPTS_CH2L1_01_DAT); registerConversationScript(SCRIPTS_CH2L1_02_DAT); registerConversationScript(SCRIPTS_C2L1_CELEBRATE_DAT); @@ -826,7 +826,7 @@ void CConversation::registerConversationLevelScripts(int level) case 2: { - registerConversationScript(SCRIPTS_TRIGGERSPEECH_BUBBLEGEYSER_DAT); + registerConversationScript(SCRIPTS_TRIGGERSPEECH_155_DAT); // bubblegeyser registerConversationScript(SCRIPTS_CH2L2_01_DAT); registerConversationScript(SCRIPTS_CH2L2_02_DAT); registerConversationScript(SCRIPTS_C2L2_CELEBRATE_DAT); @@ -835,7 +835,7 @@ void CConversation::registerConversationLevelScripts(int level) case 3: { - registerConversationScript(SCRIPTS_TRIGGERSPEECH_FIRSTBUBBLE_DAT); + registerConversationScript(SCRIPTS_TRIGGERSPEECH_157_DAT); // firstbubble registerConversationScript(SCRIPTS_C2L3_CELEBRATE_DAT); break; } @@ -859,7 +859,7 @@ void CConversation::registerConversationLevelScripts(int level) { case 1: { - registerConversationScript(SCRIPTS_TRIGGERSPEECH_BREAKFLOOR_DAT); + registerConversationScript(SCRIPTS_TRIGGERSPEECH_154_DAT); // breakfloor registerConversationScript(SCRIPTS_CH4L3_01_DAT); registerConversationScript(SCRIPTS_CH4L3_02_DAT); registerConversationScript(SCRIPTS_C3L1_CELEBRATE_DAT); @@ -875,7 +875,7 @@ void CConversation::registerConversationLevelScripts(int level) case 3: { - registerConversationScript(SCRIPTS_TRIGGERSPEECH_USEBUBBLE_DAT); + registerConversationScript(SCRIPTS_TRIGGERSPEECH_158_DAT); // usebubble registerConversationScript(SCRIPTS_CH3L3_01_DAT); registerConversationScript(SCRIPTS_CH3L3_02_DAT); registerConversationScript(SCRIPTS_C3L3_CELEBRATE_DAT); @@ -958,20 +958,9 @@ void CConversation::registerConversationLevelScripts(int level) break; } - default: - break; - } - - break; - } - - case 6: - { - switch ( CLevel::getCurrentChapterLevel() ) - { case 5: { - registerConversationScript(SCRIPTS_TRIGGERSPEECH_WEIGHT_DAT); + registerConversationScript(SCRIPTS_TRIGGERSPEECH_159_DAT); // weight break; } diff --git a/source/triggers/tspeech.cpp b/source/triggers/tspeech.cpp index a476d1c77..59618b14a 100644 --- a/source/triggers/tspeech.cpp +++ b/source/triggers/tspeech.cpp @@ -37,15 +37,15 @@ #ifdef __SPEECH_TRIGGERS_AS_CONVERSATIONS__ int CSpeechTrigger::s_speechRef[9] = { - SCRIPTS_TRIGGERSPEECH_FIRSTNET_DAT,//SPEECH_151, - SCRIPTS_TRIGGERSPEECH_FIRSTCORAL_DAT,//SPEECH_152, - SCRIPTS_TRIGGERSPEECH_GARYCH2L1_DAT,//SPEECH_153, - SCRIPTS_TRIGGERSPEECH_BREAKFLOOR_DAT,//SPEECH_154, - SCRIPTS_TRIGGERSPEECH_BUBBLEGEYSER_DAT,//SPEECH_155, - 0,//SPEECH_156, - SCRIPTS_TRIGGERSPEECH_USEBUBBLE_DAT,//SPEECH_157, - SCRIPTS_TRIGGERSPEECH_FIRSTBUBBLE_DAT,//SPEECH_158, - SCRIPTS_TRIGGERSPEECH_WEIGHT_DAT,//SPEECH_159, + SCRIPTS_TRIGGERSPEECH_151_DAT, + SCRIPTS_TRIGGERSPEECH_152_DAT, + SCRIPTS_TRIGGERSPEECH_153_DAT, + SCRIPTS_TRIGGERSPEECH_154_DAT, + SCRIPTS_TRIGGERSPEECH_155_DAT, + SCRIPTS_TRIGGERSPEECH_156_DAT, + SCRIPTS_TRIGGERSPEECH_157_DAT, + SCRIPTS_TRIGGERSPEECH_158_DAT, + SCRIPTS_TRIGGERSPEECH_159_DAT, }; #else int CSpeechTrigger::s_speechRef[9] = diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp index d2af1fdcd..d0829da9f 100644 --- a/users/paul/spongebob project/spongebob project.dsp +++ b/users/paul/spongebob project/spongebob project.dsp @@ -2956,35 +2956,39 @@ SOURCE=..\..\..\data\scripts\fma_plankton.scr # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\..\data\scripts\triggerspeech_breakfloor.scr +SOURCE=..\..\..\data\scripts\triggerspeech_151.scr # End Source File # Begin Source File -SOURCE=..\..\..\data\scripts\triggerspeech_bubblegeyser.scr +SOURCE=..\..\..\data\scripts\triggerspeech_152.scr # End Source File # Begin Source File -SOURCE=..\..\..\data\scripts\triggerspeech_firstbubble.scr +SOURCE=..\..\..\data\scripts\triggerspeech_153.scr # End Source File # Begin Source File -SOURCE=..\..\..\data\scripts\triggerspeech_firstcoral.scr +SOURCE=..\..\..\data\scripts\triggerspeech_154.scr # End Source File # Begin Source File -SOURCE=..\..\..\data\scripts\triggerspeech_firstnet.scr +SOURCE=..\..\..\data\scripts\triggerspeech_155.scr # End Source File # Begin Source File -SOURCE=..\..\..\data\scripts\triggerspeech_garych2l1.scr +SOURCE=..\..\..\data\scripts\triggerspeech_156.scr # End Source File # Begin Source File -SOURCE=..\..\..\data\scripts\triggerspeech_usebubble.scr +SOURCE=..\..\..\data\scripts\triggerspeech_157.scr # End Source File # Begin Source File -SOURCE=..\..\..\data\scripts\triggerspeech_weight.scr +SOURCE=..\..\..\data\scripts\triggerspeech_158.scr +# End Source File +# Begin Source File + +SOURCE=..\..\..\data\scripts\triggerspeech_159.scr # End Source File # End Group # End Group