From f37209b515e637a4fe9810aaf1cf83a089d47abb Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 2 May 2001 22:49:59 +0000 Subject: [PATCH] --- data/DataCache.scr | 19 ++++- data/Scripts/ch1l1_02.scr | 12 +-- data/translations/text.dat | 82 +++++++++++++++++-- makefile.gaz | 5 +- makefile.gfx | 8 +- source/friend/fdata.cpp | 15 +++- source/friend/fkrusty.cpp | 57 ++++++++++++- source/friend/fkrusty.h | 6 ++ source/friend/fpatrick.cpp | 30 +++---- source/friend/fpatrick.h | 6 ++ source/friend/friend.cpp | 18 ++-- source/friend/friend.h | 3 +- source/friend/fsandy.h | 2 + source/friend/fsquid.cpp | 31 +++++++ source/friend/fsquid.h | 5 ++ source/game/convo.cpp | 36 ++++++++ source/game/convo.h | 1 + source/game/game.cpp | 3 +- source/level/level.cpp | 19 +++++ source/level/level.h | 4 + tools/MapEdit/actor.ini | 32 ++++---- .../spongebob project/spongebob project.dsp | 80 ++++++++++++++++++ 22 files changed, 403 insertions(+), 71 deletions(-) diff --git a/data/DataCache.scr b/data/DataCache.scr index 3e6f81352..63c78fca7 100644 --- a/data/DataCache.scr +++ b/data/DataCache.scr @@ -2,8 +2,22 @@ } sprites/sprites.spr -scripts/test.dat -scripts/speechtest.dat +scripts/ch1l1_01.dat +scripts/ch1l1_02.dat +scripts/ch1l2_01.dat +scripts/ch1l2_02.dat +scripts/ch1l2_03.dat +scripts/ch1l4_01.dat +scripts/ch1l4_02.dat +scripts/ch2l1_01.dat +scripts/ch2l1_02.dat +scripts/ch2l2_01.dat +scripts/ch2l2_02.dat +scripts/ch3l3_01.dat +scripts/ch3l3_02.dat +scripts/ch4l3_01.dat +scripts/ch4l3_02.dat + translations/swe.dat translations/dut.dat translations/ita.dat @@ -149,6 +163,7 @@ actors/KRUSTY.SBK actors/SQUIDWARD.SBK actors/GARY.SBK actors/SANDY.SBK +actors/PATRICK.SBK actors/ANENOME.SBK actors/BABYOCTOPUS.SBK diff --git a/data/Scripts/ch1l1_02.scr b/data/Scripts/ch1l1_02.scr index b138243bc..a8a772ef4 100644 --- a/data/Scripts/ch1l1_02.scr +++ b/data/Scripts/ch1l1_02.scr @@ -6,16 +6,12 @@ #include data/scripts/defs/trans.scr +_setText(CHAR_SQUIDWARD,STR__INGAME__CH1__L1__SQUIDWARD2); +_setResponseOptions(QUESTION_OK); do { - _setText(CHAR_SQUIDWARD,STR__INGAME__CH1__L1__SQUIDWARD2); - _setResponseOptions(QUESTION_OK); - do - { - pause; - } - while(_getResponse()==ANSWER_NONE); + pause; } -while(_getResponse()!=ANSWER_YES); +while(_getResponse()==ANSWER_NONE); stop; diff --git a/data/translations/text.dat b/data/translations/text.dat index 8d68e78e7..f4da3380a 100644 --- a/data/translations/text.dat +++ b/data/translations/text.dat @@ -123,14 +123,86 @@ eng=GAME OVER! ; --------------------------------------------------------------- ; Chapter 1 - Level 1 - Test -[STR__INGAME__SANDY__TEST1] -eng=Ahhh, ere we are at Bikini Bottom.. and today we will be following my favourite creature Spongebob SquarePants on his adventures around Bikini Bottom in his search for the Best Birthday Present ever, for his best friend in the whole of Bikini Bottom, Patrick. -[STR__INGAME__SANDY__TEST2] -eng=Hold on there little square dude if you want to defend yourself you need to do this!!!! -[STR__INGAME__SPONGEBOB__TEST3] +;[STR__INGAME__SANDY__TEST1] +;eng=Ahhh, ere we are at Bikini Bottom.. and today we will be following my favourite creature Spongebob SquarePants on his adventures around Bikini Bottom in his search for the Best Birthday Present ever, for his best friend in the whole of Bikini Bottom, Patrick. +;[STR__INGAME__SANDY__TEST2] +;eng=Hold on there little square dude if you want to defend yourself you need to do this!!!! +;[STR__INGAME__SPONGEBOB__TEST3] +;eng=Did that make sense..? + + +[STR__INGAME__GENERIC__CHECK1] eng=Did that make sense..? +Chapter 1 - Level 1 - 01 +[STR__INGAME__CH1__L1__SPONGEY1] +eng=Hi Squidward !!! Ready for another great day together, friend? +[STR__INGAME__CH1__L1__SQUIDWARD1] +eng=Today's Sunday, SpongeBob. Forget the Krusty Krab. Hey moron, why don't you take your net and go waste somebody else's time! + +Chapter 1 - Level 1 - 02 +[STR__INGAME__CH1__L1__SQUIDWARD2] +eng=Look SpongeBob, I told you, use your net and GO FISH! + + +Chapter 1 - Level 2 - 01 +[STR__INGAME__CH1__L2__SANDY1] +eng=Take that you ' ya sorry ol' clam. Y'all need to learn some manners! Hold on there little square dude if you want to defend yourself you need to do this!!!! + +Chapter 1 - Level 2 - 02 +[STR__INGAME__CH1__L2__SANDY2] +eng=I like you Spongebob. We're tighter than bark on a tree. Why don't y'all borrow my diving hat so your head can stay water logged. + +Chapter 1 - Level 2 - 03 +[STR__INGAME__CH1__L2__SANDY3] +eng=SpongeBob you silly 'ol sponge, try using your helmet!!! + + +Chapter 1 - Level 4 - 01 +[STR__INGAME__CH1__L4__KRUSTY1] +eng=Spongebob!!! Argh! Where have you been hiding, boy? Take these'ere glasses, lad. You got to see the jellyfish before you can catch'em. + +Chapter 1 - Level 4 - 02 +[STR__INGAME__CH1__L4__KRUSTY2] +eng=Spongebob!!! Put yer glasses on lad or I won't let you work during yer vacation! + + +Chapter 2 - Level 1 - 01 +[STR__INGAME__CH2__L1__KRUSTY1] +eng=Spongebob!!! Now listen Boy! I'm countin' on ya to use this ere coral blower to make your way around Bikini Bottom!!! And watch out for that scurvy Plankton he is up to his old tricks again!!! + +Chapter 2 - Level 1 - 02 +[STR__INGAME__CH2__L1__KRUSTY2] +eng=Use the Coral Blower me boy! Blast away! + + +Chapter 2 - Level 2 - 01 +[STR__INGAME__CH2__L2__PATRICK1] +eng=Hey SpongeBob. I got an extra balloon for my birthday. Want it? Ooooo, you're floating away! Hey, where'd my balloon go? SpongeBob! + +Chapter 2 - Level 2 - 02 +[STR__INGAME__CH2__L2__PATRICK2] +eng=Here best pal you can still use my balloon!!! Happy Birthday to me! + + +Chapter 3 - Level 3 - 01 +[STR__INGAME__CH3__L3__PATRICK1] +eng=DA DA DA DA DA DUM DUM DUM DUM (The blue Danube) Here you go Spongebob! One bubblewand dipped and ready to go!!!! Up, down and all around! I don't know what that means. + +Chapter 3 - Level 3 - 02 +[STR__INGAME__CH3__L3__PATRICK2] +eng=Spongebob , Here you go...another bubblewand dipped and ready to go!!!! (beat) I did it again. + + +Chapter 2 - Level 1 - 01 +[STR__INGAME__CH4__L3__KRUSTY1] +eng=Spongebob!!! Now listen Boy! There are dangerous surfaces that none shall pass unless they have squeaky boots. I happen to have a pair. You can owe me. + +Chapter 2 - Level 1 - 02 +[STR__INGAME__CH4__L3__KRUSTY2] +eng=I ain't telling you again lad! Wear your boots and you'll go far! Argh! + ; --------------------------------------------------------------- ; Pause menu ; --------------------------------------------------------------- diff --git a/makefile.gaz b/makefile.gaz index a712f29f1..4c239de16 100644 --- a/makefile.gaz +++ b/makefile.gaz @@ -84,7 +84,10 @@ enemy_src := npc \ friend_src := friend \ fdata \ fgary \ - fsquid + fsquid \ + fsandy \ + fkrusty \ + fpatrick platform_src := platform \ platdata \ diff --git a/makefile.gfx b/makefile.gfx index aac93fd11..023d7de98 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -108,8 +108,8 @@ ACTOR_MAKEFILE_DIR := $(TEMP_BUILD_DIR)/actor ACTOR_DIRS_TO_MAKE := $(ACTOR_MAKEFILE_DIR) $(ACTOR_OUT_DIR) ACTOR_SPONGEBOB := SpongeBob SpongeBob_CoralBlower SpongeBob_JellyLauncher SpongeBob_Net -ACTOR_NPC := BarnacleBoy Krusty Squidward Gary Sandy -# MermaidMan Patrick Plankton +ACTOR_NPC := BarnacleBoy Krusty Squidward Gary Sandy Patrick +# MermaidMan Plankton ACTOR_ENEMY := Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil Eyeball \ Flamingskull FlyingDutchman Ghost HermitCrab IronDogFish Lrgjellyfish \ @@ -497,8 +497,8 @@ GFX_DATA_OUT += $(MUSIC_ALL_OUT) #---------------------------------------------------------------------------- # Script stuff.. #---------------------------------------------------------------------------- -SCRIPTS_LIST := test \ - speechtest +SCRIPTS_LIST := ch1l1_01 ch1l1_02 ch1l2_01 ch1l2_02 ch1l2_03 ch1l4_01 ch1l4_02 \ + ch2l1_01 ch2l1_02 ch2l2_01 ch2l2_02 ch3l3_01 ch3l3_02 ch4l3_01 ch4l3_02 SCRIPTS_IN_DIR := $(GAME_DATA_DIR)/scripts diff --git a/source/friend/fdata.cpp b/source/friend/fdata.cpp index 3ad543752..4413864b4 100644 --- a/source/friend/fdata.cpp +++ b/source/friend/fdata.cpp @@ -27,6 +27,15 @@ #include #endif +#ifndef __ANIM_SANDY_HEADER__ +#include +#endif + +#ifndef __ANIM_PATRICK_HEADER__ +#include +#endif + + CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] = { { // NPC_FRIEND_BARNACLE_BOY @@ -50,7 +59,7 @@ CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] = }, { // NPC_FRIEND_KRUSTY - ACTORS_CLAM_SBK, + ACTORS_KRUSTY_SBK, true, 3, 128, @@ -70,7 +79,7 @@ CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] = }, { // NPC_FRIEND_PATRICK - ACTORS_CLAM_SBK, + ACTORS_PATRICK_SBK, true, 3, 128, @@ -80,7 +89,7 @@ CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] = }, { // NPC_FRIEND_SANDY_CHEEKS - ACTORS_CLAM_SBK, + ACTORS_SANDY_SBK, true, 3, 128, diff --git a/source/friend/fkrusty.cpp b/source/friend/fkrusty.cpp index 23f8b8dee..9a8bf5a3c 100644 --- a/source/friend/fkrusty.cpp +++ b/source/friend/fkrusty.cpp @@ -19,6 +19,10 @@ #include "utils\utils.h" #endif +#ifndef __LEVEL_LEVEL_H__ +#include "level\level.h" +#endif + #ifndef __GAME_CONVO_H__ #include "game\convo.h" #endif @@ -32,7 +36,26 @@ void CNpcKrustyFriend::postInit() { - m_conversation = SCRIPTS_CH1L4_01_DAT; + switch( CLevel::getCurrentChapter() ) + { + case 4: + { + m_conversation = SCRIPTS_CH4L3_01_DAT; + break; + } + + case 2: + { + m_conversation = SCRIPTS_CH2L1_01_DAT; + break; + } + + default: + { + m_conversation = SCRIPTS_CH1L4_01_DAT; + break; + } + } } //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -45,9 +68,37 @@ void CNpcKrustyFriend::startConderversation() { CConversation::trigger( m_conversation ); - if ( m_conversation == SCRIPTS_CH1L4_01_DAT ) + switch( CLevel::getCurrentChapter() ) { - m_conversation = SCRIPTS_CH1L4_02_DAT; + case 4: + { + if ( m_conversation == SCRIPTS_CH4L3_01_DAT ) + { + m_conversation = SCRIPTS_CH4L3_02_DAT; + } + + break; + } + + case 2: + { + if ( m_conversation == SCRIPTS_CH2L1_01_DAT ) + { + m_conversation = SCRIPTS_CH2L1_02_DAT; + } + + break; + } + + default: + { + if ( m_conversation == SCRIPTS_CH1L4_01_DAT ) + { + m_conversation = SCRIPTS_CH1L4_02_DAT; + } + + break; + } } } } diff --git a/source/friend/fkrusty.h b/source/friend/fkrusty.h index a2af10a05..2add8486d 100644 --- a/source/friend/fkrusty.h +++ b/source/friend/fkrusty.h @@ -20,6 +20,12 @@ class CNpcKrustyFriend : public CNpcFriend { +public: + virtual void postInit(); +protected: + virtual void startConderversation(); + + FileEquate m_conversation; }; #endif \ No newline at end of file diff --git a/source/friend/fpatrick.cpp b/source/friend/fpatrick.cpp index e7485a4c7..1889bb48b 100644 --- a/source/friend/fpatrick.cpp +++ b/source/friend/fpatrick.cpp @@ -34,20 +34,20 @@ extern int s_globalLevelSelectThing; void CNpcPatrickFriend::postInit() { - switch( s_globalLevelSelectThing ) + /*switch( CLevel::getCurrentChapter() ) { - /*case 5: - { - m_conversation = SCRIPTS_CH2L1_01_DAT; - break; - }*/ + case 3: + {*/ + m_conversation = SCRIPTS_CH3L3_01_DAT; + /*break; + } default: { m_conversation = SCRIPTS_CH2L2_01_DAT; break; } - } + }*/ } //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -60,17 +60,17 @@ void CNpcPatrickFriend::startConderversation() { CConversation::trigger( m_conversation ); - switch( s_globalLevelSelectThing ) + /*switch( CLevel::getCurrentChapter() ) { - /*case 5: - { - if ( m_conversation == SCRIPTS_CH2L1_01_DAT ) + case 3: + {*/ + if ( m_conversation == SCRIPTS_CH3L3_01_DAT ) { - m_conversation = SCRIPTS_CH2L1_02_DAT; + m_conversation = SCRIPTS_CH3L3_02_DAT; } - break; - }*/ + /*break; + } default: { @@ -81,7 +81,7 @@ void CNpcPatrickFriend::startConderversation() break; } - } + }*/ } } } \ No newline at end of file diff --git a/source/friend/fpatrick.h b/source/friend/fpatrick.h index 2860b6979..003bd8617 100644 --- a/source/friend/fpatrick.h +++ b/source/friend/fpatrick.h @@ -20,6 +20,12 @@ class CNpcPatrickFriend : public CNpcFriend { +public: + virtual void postInit(); +protected: + virtual void startConderversation(); + + FileEquate m_conversation; }; #endif \ No newline at end of file diff --git a/source/friend/friend.cpp b/source/friend/friend.cpp index ed633e59b..c266387f4 100644 --- a/source/friend/friend.cpp +++ b/source/friend/friend.cpp @@ -23,10 +23,6 @@ #include "system\vid.h" #endif -#ifndef __GAME_CONVO_H__ -#include "game\convo.h" -#endif - #ifndef __UTILS_HEADER__ #include "utils\utils.h" #endif @@ -182,6 +178,12 @@ void CNpcFriend::init( DVECTOR initPos ) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +void CNpcFriend::postInit() +{ +} + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + void CNpcFriend::shutdown() { //m_spriteBank->dump(); delete m_spriteBank; @@ -277,12 +279,4 @@ void CNpcFriend::collidedWith( CThing *_thisThing ) void CNpcFriend::startConderversation() { // I am 'avin a fayg - - if ( m_data[this->m_type].canTalk ) - { - if( !CConversation::isActive() ) - { - CConversation::trigger( SCRIPTS_SPEECHTEST_DAT ); - } - } } \ No newline at end of file diff --git a/source/friend/friend.h b/source/friend/friend.h index 7d84fbd90..390a63610 100644 --- a/source/friend/friend.h +++ b/source/friend/friend.h @@ -39,6 +39,7 @@ public: void init(); void init( DVECTOR initPos ); + virtual void postInit(); void shutdown(); virtual void think(int _frames); void render(); @@ -74,7 +75,7 @@ protected: static NPC_FRIEND_UNIT_TYPE mapEditConvertTable[NPC_FRIEND_UNIT_TYPE_MAX]; - void startConderversation(); + virtual void startConderversation(); virtual void collidedWith(CThing *_thisThing); diff --git a/source/friend/fsandy.h b/source/friend/fsandy.h index 0daab63dd..4e6d2c528 100644 --- a/source/friend/fsandy.h +++ b/source/friend/fsandy.h @@ -20,6 +20,8 @@ class CNpcSandyFriend : public CNpcFriend { +protected: + virtual void startConderversation(); }; #endif \ No newline at end of file diff --git a/source/friend/fsquid.cpp b/source/friend/fsquid.cpp index 9e26dc376..9de090d85 100644 --- a/source/friend/fsquid.cpp +++ b/source/friend/fsquid.cpp @@ -19,11 +19,24 @@ #include "utils\utils.h" #endif +#ifndef __GAME_CONVO_H__ +#include "game\convo.h" +#endif + #ifndef __ANIM_SQUIDWARD_HEADER__ #include #endif +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +void CNpcSquidwardFriend::postInit() +{ + m_conversation = SCRIPTS_CH1L1_01_DAT; +} + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + void CNpcSquidwardFriend::think( int _frames ) { CNpcThing::think(_frames); @@ -60,4 +73,22 @@ void CNpcSquidwardFriend::think( int _frames ) m_animPlaying = true; m_frame = 0; } +} + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +void CNpcSquidwardFriend::startConderversation() +{ + if ( m_data[this->m_type].canTalk ) + { + if( !CConversation::isActive() ) + { + CConversation::trigger( m_conversation ); + + if ( m_conversation == SCRIPTS_CH1L1_01_DAT ) + { + m_conversation = SCRIPTS_CH1L1_02_DAT; + } + } + } } \ No newline at end of file diff --git a/source/friend/fsquid.h b/source/friend/fsquid.h index 00124e274..a7d38742d 100644 --- a/source/friend/fsquid.h +++ b/source/friend/fsquid.h @@ -22,6 +22,11 @@ class CNpcSquidwardFriend : public CNpcFriend { public: virtual void think(int _frames); + virtual void postInit(); +protected: + virtual void startConderversation(); + + FileEquate m_conversation; }; #endif \ No newline at end of file diff --git a/source/game/convo.cpp b/source/game/convo.cpp index 1c562a0b0..fe55b5197 100644 --- a/source/game/convo.cpp +++ b/source/game/convo.cpp @@ -426,5 +426,41 @@ void CConversation::dumpConversationScripts() } +/*---------------------------------------------------------------------- + Function: + Purpose: + Params: + Returns: + ---------------------------------------------------------------------- */ +void CConversation::registerConversationLevelScripts(int level) +{ + switch( level ) + { + case 0: + { + CConversation::registerConversationScript(SCRIPTS_CH1L1_01_DAT); + CConversation::registerConversationScript(SCRIPTS_CH1L1_02_DAT); + + // temporary + //CConversation::registerConversationScript(SCRIPTS_CH1L2_01_DAT); + //CConversation::registerConversationScript(SCRIPTS_CH1L2_02_DAT); + //CConversation::registerConversationScript(SCRIPTS_CH1L2_03_DAT); + //CConversation::registerConversationScript(SCRIPTS_CH1L4_01_DAT); + //CConversation::registerConversationScript(SCRIPTS_CH1L4_02_DAT); + //CConversation::registerConversationScript(SCRIPTS_CH2L1_01_DAT); + //CConversation::registerConversationScript(SCRIPTS_CH2L1_02_DAT); + //CConversation::registerConversationScript(SCRIPTS_CH2L2_01_DAT); + //CConversation::registerConversationScript(SCRIPTS_CH2L2_02_DAT); + //CConversation::registerConversationScript(SCRIPTS_CH3L3_01_DAT); + //CConversation::registerConversationScript(SCRIPTS_CH3L3_02_DAT); + CConversation::registerConversationScript(SCRIPTS_CH4L3_01_DAT); + CConversation::registerConversationScript(SCRIPTS_CH4L3_02_DAT); + break; + } + + default: + break; + } +} /*=========================================================================== end */ diff --git a/source/game/convo.h b/source/game/convo.h index ac1047911..4ae4ba0ab 100644 --- a/source/game/convo.h +++ b/source/game/convo.h @@ -43,6 +43,7 @@ public: static void think(int _frames); static void render(); + static void registerConversationLevelScripts(int level); static void registerConversationScript(FileEquate _feScript); static void trigger(FileEquate _feScript); static int isActive(); diff --git a/source/game/game.cpp b/source/game/game.cpp index 39d8d6e06..e4d3fec4a 100644 --- a/source/game/game.cpp +++ b/source/game/game.cpp @@ -297,7 +297,7 @@ void CGameScene::initLevel() CThingManager::init(); CConversation::init(); - CConversation::registerConversationScript(SCRIPTS_SPEECHTEST_DAT); // Register one script for testing.. + CConversation::registerConversationLevelScripts( s_globalLevelSelectThing ); s_levelFinished=false; Level.init(s_globalLevelSelectThing); @@ -337,6 +337,7 @@ void CGameScene::initLevel() CNpcFriend *friendNpc; friendNpc=CNpcFriend::Create(ThisActor); friendNpc->setLayerCollision( Level.getCollisionLayer() ); + friendNpc->postInit(); } break; diff --git a/source/level/level.cpp b/source/level/level.cpp index ad162cd15..157f052a7 100644 --- a/source/level/level.cpp +++ b/source/level/level.cpp @@ -46,6 +46,9 @@ #include "enemy\npc.h" #include "gfx\actor.h" +/*****************************************************************************/ +extern int s_globalLevelSelectThing; + /*****************************************************************************/ sLvlTab LvlTable[]= { @@ -425,4 +428,20 @@ sLayerHdr *layer; } +/*****************************************************************************/ +/*****************************************************************************/ +/*****************************************************************************/ +int CLevel::getCurrentChapter() +{ + return( LvlTable[s_globalLevelSelectThing].Chapter ); +} + +/*****************************************************************************/ +/*****************************************************************************/ +/*****************************************************************************/ +int CLevel::getCurrentChapterLevel() +{ + return( LvlTable[s_globalLevelSelectThing].Level ); +} + /*****************************************************************************/ diff --git a/source/level/level.h b/source/level/level.h index 8e75d2939..4a1dc8e47 100644 --- a/source/level/level.h +++ b/source/level/level.h @@ -34,6 +34,10 @@ public: void setCameraCentre(DVECTOR _pos) {MapPos=_pos;} static DVECTOR getCameraPos() {return MapPos;} static DVECTOR getPlayerSpawnPos() {return s_playerSpawnPos;} + + static int getCurrentChapter(); + static int getCurrentChapterLevel(); + int getActorCount() {return ActorCount;} sThingActor **getActorList() {return ActorList;} int getPlatformCount() {return PlatformCount;} diff --git a/tools/MapEdit/actor.ini b/tools/MapEdit/actor.ini index bcd0f4ee8..15964b770 100644 --- a/tools/MapEdit/actor.ini +++ b/tools/MapEdit/actor.ini @@ -57,23 +57,23 @@ AttackStrength=0 #Health=0 #AttackStrength=0 -#[Patrick] -#Gfx=..\..\graphics\characters\ -#WayPoints=0 -#Speed=0 -#TurnRate=0 -#Collision=0 -#Health=0 -#AttackStrength=0 +[Patrick] +Gfx=..\..\graphics\characters\patrick\render\psx\patrick_idlebreathe0000.bmp +WayPoints=0 +Speed=0 +TurnRate=0 +Collision=0 +Health=0 +AttackStrength=0 -#[Sandy] -#Gfx=..\..\graphics\characters\ -#WayPoints=0 -#Speed=0 -#TurnRate=0 -#Collision=0 -#Health=0 -#AttackStrength=0 +[Sandy] +Gfx=..\..\graphics\characters\sandy\render\psx\sandy_idle0000.bmp +WayPoints=0 +Speed=0 +TurnRate=0 +Collision=0 +Health=0 +AttackStrength=0 [Squidward] Gfx=..\..\graphics\characters\Squidward\render\psx\Squidward_idlebreathe0000.bmp diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp index 600dc361b..b07023459 100644 --- a/users/paul/spongebob project/spongebob project.dsp +++ b/users/paul/spongebob project/spongebob project.dsp @@ -417,6 +417,10 @@ SOURCE=..\..\..\source\friend\fgary.h # End Source File # Begin Source File +SOURCE=..\..\..\source\friend\fkrusty.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\source\friend\fkrusty.h # End Source File # Begin Source File @@ -425,6 +429,10 @@ SOURCE=..\..\..\source\friend\fmman.h # End Source File # Begin Source File +SOURCE=..\..\..\source\friend\fpatrick.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\source\friend\fpatrick.h # End Source File # Begin Source File @@ -437,6 +445,10 @@ SOURCE=..\..\..\source\friend\friend.h # End Source File # Begin Source File +SOURCE=..\..\..\source\friend\fsandy.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\source\friend\fsandy.h # End Source File # Begin Source File @@ -1701,6 +1713,66 @@ SOURCE=..\..\..\data\scripts\defs\trans.scr # End Group # Begin Source File +SOURCE=..\..\..\data\Scripts\ch1l1_01.scr +# End Source File +# Begin Source File + +SOURCE=..\..\..\data\Scripts\ch1l1_02.scr +# End Source File +# Begin Source File + +SOURCE=..\..\..\data\Scripts\ch1l2_01.scr +# End Source File +# Begin Source File + +SOURCE=..\..\..\data\Scripts\ch1l2_02.scr +# End Source File +# Begin Source File + +SOURCE=..\..\..\data\Scripts\ch1l2_03.scr +# End Source File +# Begin Source File + +SOURCE=..\..\..\data\Scripts\ch1l4_01.scr +# End Source File +# Begin Source File + +SOURCE=..\..\..\data\Scripts\ch1l4_02.scr +# End Source File +# Begin Source File + +SOURCE=..\..\..\data\Scripts\ch2l1_01.scr +# End Source File +# Begin Source File + +SOURCE=..\..\..\data\Scripts\ch2l1_02.scr +# End Source File +# Begin Source File + +SOURCE=..\..\..\data\Scripts\ch2l2_01.scr +# End Source File +# Begin Source File + +SOURCE=..\..\..\data\Scripts\ch2l2_02.scr +# End Source File +# Begin Source File + +SOURCE=..\..\..\data\Scripts\ch3l3_01.scr +# End Source File +# Begin Source File + +SOURCE=..\..\..\data\Scripts\ch3l3_02.scr +# End Source File +# Begin Source File + +SOURCE=..\..\..\data\Scripts\ch4l3_01.scr +# End Source File +# Begin Source File + +SOURCE=..\..\..\data\Scripts\ch4l3_02.scr +# End Source File +# Begin Source File + SOURCE=..\..\..\data\scripts\speechtest.scr # End Source File # Begin Source File @@ -1792,10 +1864,18 @@ SOURCE=..\..\..\out\USA\include\ACTOR_LRGJELLYFISH_Anim.h # End Source File # Begin Source File +SOURCE=..\..\..\out\USA\include\ACTOR_PATRICK_Anim.h +# End Source File +# Begin Source File + SOURCE=..\..\..\out\USA\include\ACTOR_PUFFAFISH_Anim.h # End Source File # Begin Source File +SOURCE=..\..\..\out\USA\include\ACTOR_SANDY_Anim.h +# End Source File +# Begin Source File + SOURCE=..\..\..\out\USA\include\ACTOR_SHARKMAN_Anim.h # End Source File # Begin Source File