diff --git a/makefile.gaz b/makefile.gaz index 8af81566f..eb8976933 100644 --- a/makefile.gaz +++ b/makefile.gaz @@ -357,7 +357,8 @@ triggers_src := trigger \ twinddown \ twindleft \ twindright \ - toilgeyser + toilgeyser \ + tspeech utils_src := utils \ diff --git a/source/triggers/trigger.cpp b/source/triggers/trigger.cpp index 5b5bbc377..61fdf055a 100644 --- a/source/triggers/trigger.cpp +++ b/source/triggers/trigger.cpp @@ -159,6 +159,10 @@ #include "triggers\tboss.h" #endif +#ifndef __TRIGGERS_TSPEECH_H__ +#include "triggers\tspeech.h" +#endif + #ifndef __GAME_GAME_H__ #include "game\game.h" #endif @@ -350,6 +354,79 @@ CTrigger *trigger; case TRIGGER_SECRET_AREA: trigger = (CSecretAreaTrigger*)new("SecretAreaTrigger") CSecretAreaTrigger(); break; + + case TRIGGER_SPEECH_FIRST_NET: + { + trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger(); + CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger; + speechTrigger->setData(0); + break; + } + + case TRIGGER_SPEECH_FIRST_CORAL: + { + trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger(); + CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger; + speechTrigger->setData(0); + break; + } + + case TRIGGER_SPEECH_GARY_CH2L1: + { + trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger(); + CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger; + speechTrigger->setData(0); + break; + } + + case TRIGGER_SPEECH_BREAK_FLOOR: + { + trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger(); + CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger; + speechTrigger->setData(0); + break; + } + + case TRIGGER_SPEECH_BUBBLE_GEYSER: + { + trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger(); + CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger; + speechTrigger->setData(0); + break; + } + + case TRIGGER_SPEECH_RISING_PLATFORM: + { + trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger(); + CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger; + speechTrigger->setData(0); + break; + } + + case TRIGGER_SPEECH_FIRST_BUBBLE: + { + trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger(); + CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger; + speechTrigger->setData(0); + break; + } + + case TRIGGER_SPEECH_USE_BUBBLE: + { + trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger(); + CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger; + speechTrigger->setData(0); + break; + } + + case TRIGGER_SPEECH_WEIGHT: + { + trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger(); + CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger; + speechTrigger->setData(0); + break; + } + default: trigger=NULL; } diff --git a/source/triggers/trigger.h b/source/triggers/trigger.h index 6340f2b3b..e5491060d 100644 --- a/source/triggers/trigger.h +++ b/source/triggers/trigger.h @@ -58,6 +58,15 @@ enum TRIGGER_TYPE TRIGGER_OIL_GEYSER, TRIGGER_BOSS_ARENA, TRIGGER_SECRET_AREA, + TRIGGER_SPEECH_FIRST_NET, + TRIGGER_SPEECH_FIRST_CORAL, + TRIGGER_SPEECH_GARY_CH2L1, + TRIGGER_SPEECH_BREAK_FLOOR, + TRIGGER_SPEECH_BUBBLE_GEYSER, + TRIGGER_SPEECH_RISING_PLATFORM, + TRIGGER_SPEECH_FIRST_BUBBLE, + TRIGGER_SPEECH_USE_BUBBLE, + TRIGGER_SPEECH_WEIGHT, // Code based triggers TRIGGER_PLATFORM, diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini index 59adc23b9..3b86c684b 100644 --- a/tools/Data/bin/MkLevel.ini +++ b/tools/Data/bin/MkLevel.ini @@ -166,6 +166,15 @@ WindRight=31 OilGeyser=32 BossArena=33 SecretArea=34 +SpeechFirstNet=35 +SpeechFirstCoral=36 +SpeechGaryCh2L1=37 +SpeechBreakFloor=38 +SpeechBubbleGeyser=39 +SpeechRisingPlatform=40 +SpeechFirstBubble=41 +SpeechUseBubble=42 +SpeechWeight=43 ################################################ # FX diff --git a/tools/MapEdit/trigger.ini b/tools/MapEdit/trigger.ini index 0f5477207..36ea835c7 100644 --- a/tools/MapEdit/trigger.ini +++ b/tools/MapEdit/trigger.ini @@ -76,3 +76,21 @@ HasBox=1 [BossArena] [SecretArea] + +[SpeechFirstNet] + +[SpeechFirstCoral] + +[SpeechGaryCh2L1] + +[SpeechBreakFloor] + +[SpeechBubbleGeyser] + +[SpeechRisingPlatform] + +[SpeechFirstBubble] + +[SpeechUseBubble] + +[SpeechWeight] diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp index 891442dab..00a6bfcd6 100644 --- a/users/paul/spongebob project/spongebob project.dsp +++ b/users/paul/spongebob project/spongebob project.dsp @@ -2481,6 +2481,14 @@ SOURCE=..\..\..\source\triggers\tsleftemit.h # End Source File # Begin Source File +SOURCE=..\..\..\source\triggers\tspeech.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\triggers\tspeech.h +# End Source File +# Begin Source File + SOURCE=..\..\..\source\triggers\tsrightemit.cpp # End Source File # Begin Source File