This commit is contained in:
parent
1484830356
commit
a36c7d3f9e
9 changed files with 39 additions and 7 deletions
|
@ -186,6 +186,7 @@ actors/SKELETALFISH.SBK
|
||||||
actors/SPIDERCRAB.SBK
|
actors/SPIDERCRAB.SBK
|
||||||
actors/SPIKEYANENOME.SBK
|
actors/SPIKEYANENOME.SBK
|
||||||
actors/STOMPER.SBK
|
actors/STOMPER.SBK
|
||||||
|
actors/SHELL.SBK
|
||||||
|
|
||||||
actors/SHARKSUB.SBK
|
actors/SHARKSUB.SBK
|
||||||
actors/MOTHERJELLYFISH.SBK
|
actors/MOTHERJELLYFISH.SBK
|
||||||
|
|
|
@ -111,7 +111,8 @@ platform_src := platform \
|
||||||
pfallnor \
|
pfallnor \
|
||||||
praft \
|
praft \
|
||||||
plantern \
|
plantern \
|
||||||
pbgeyser
|
pbgeyser \
|
||||||
|
pleaf
|
||||||
|
|
||||||
hazard_src := hazard \
|
hazard_src := hazard \
|
||||||
hfalling \
|
hfalling \
|
||||||
|
|
|
@ -113,7 +113,7 @@ ACTOR_NPC := BarnacleBoy Krusty Squidward Gary Sandy Patrick MermaidMan
|
||||||
ACTOR_ENEMY := Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil Eyeball \
|
ACTOR_ENEMY := Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil Eyeball \
|
||||||
Flamingskull FlyingDutchman Ghost HermitCrab IronDogFish Lrgjellyfish \
|
Flamingskull FlyingDutchman Ghost HermitCrab IronDogFish Lrgjellyfish \
|
||||||
PuffaFish Sharkman Skeletalfish SpiderCrab SpikeyAnenome Stomper \
|
PuffaFish Sharkman Skeletalfish SpiderCrab SpikeyAnenome Stomper \
|
||||||
SharkSub Motherjellyfish SeaSnake
|
SharkSub Motherjellyfish SeaSnake Shell
|
||||||
|
|
||||||
# Boogermonster GiantWorm Jellyfish2 Motherjellyfish Nautilus Neptune SeaSnake SharkSub
|
# Boogermonster GiantWorm Jellyfish2 Motherjellyfish Nautilus Neptune SeaSnake SharkSub
|
||||||
|
|
||||||
|
|
|
@ -929,7 +929,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
||||||
},
|
},
|
||||||
|
|
||||||
{ // NPC_SHELL
|
{ // NPC_SHELL
|
||||||
ACTORS_SPIDERCRAB_SBK,
|
ACTORS_SHELL_SBK,
|
||||||
0,
|
0,
|
||||||
NPC_SENSOR_NONE,
|
NPC_SENSOR_NONE,
|
||||||
NPC_MOVEMENT_STATIC,
|
NPC_MOVEMENT_STATIC,
|
||||||
|
|
|
@ -60,8 +60,8 @@ void CNpcCircularSawHazard::render()
|
||||||
{
|
{
|
||||||
SVECTOR rotation;
|
SVECTOR rotation;
|
||||||
rotation.vx = 0;
|
rotation.vx = 0;
|
||||||
rotation.vy = m_rotation;
|
rotation.vy = 0;
|
||||||
rotation.vz = 0;
|
rotation.vz = m_rotation;
|
||||||
|
|
||||||
VECTOR scale;
|
VECTOR scale;
|
||||||
scale.vx = ONE;
|
scale.vx = ONE;
|
||||||
|
|
|
@ -119,7 +119,7 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
|
||||||
},
|
},
|
||||||
|
|
||||||
{ // NPC_FALLING_PLATFORM
|
{ // NPC_FALLING_PLATFORM
|
||||||
4,
|
3,
|
||||||
128,
|
128,
|
||||||
true,
|
true,
|
||||||
DAMAGE__NONE,
|
DAMAGE__NONE,
|
||||||
|
@ -310,6 +310,18 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
|
||||||
NPC_PLATFORM_TIMER_NONE,
|
NPC_PLATFORM_TIMER_NONE,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{ // NPC_LEAF_PLATFORM
|
||||||
|
3,
|
||||||
|
128,
|
||||||
|
true,
|
||||||
|
DAMAGE__NONE,
|
||||||
|
0,
|
||||||
|
4,
|
||||||
|
NPC_PLATFORM_INFINITE_LIFE,
|
||||||
|
4,
|
||||||
|
NPC_PLATFORM_TIMER_NONE,
|
||||||
|
},
|
||||||
|
|
||||||
{ // NPC_PLAYER_BUBBLE_PLATFORM
|
{ // NPC_PLAYER_BUBBLE_PLATFORM
|
||||||
3,
|
3,
|
||||||
128,
|
128,
|
||||||
|
@ -327,7 +339,7 @@ CNpcPlatform::NPC_PLATFORM_UNIT_TYPE CNpcPlatform::mapEditConvertTable[NPC_PLATF
|
||||||
{
|
{
|
||||||
NPC_BUBBLE_PLATFORM,
|
NPC_BUBBLE_PLATFORM,
|
||||||
NPC_LINEAR_PLATFORM,
|
NPC_LINEAR_PLATFORM,
|
||||||
NPC_FALLING_PLATFORM,
|
NPC_LEAF_PLATFORM,
|
||||||
NPC_CIRCULAR_PLATFORM,
|
NPC_CIRCULAR_PLATFORM,
|
||||||
NPC_COLLAPSING_BUBBLE_PLATFORM,
|
NPC_COLLAPSING_BUBBLE_PLATFORM,
|
||||||
NPC_FISH_HOOK_PLATFORM,
|
NPC_FISH_HOOK_PLATFORM,
|
||||||
|
|
|
@ -123,6 +123,9 @@
|
||||||
#include "platform\pbgeyser.h"
|
#include "platform\pbgeyser.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __PLATFORM_PLEAF_H__
|
||||||
|
#include "platform\pleaf.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
@ -287,6 +290,12 @@ CNpcPlatform *CNpcPlatform::Create(sThingPlatform *ThisPlatform)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case NPC_LEAF_PLATFORM:
|
||||||
|
{
|
||||||
|
platform = new ("leaf platform") CNpcLeafPlatform;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
ASSERT( 0 );
|
ASSERT( 0 );
|
||||||
|
|
|
@ -76,6 +76,7 @@ public:
|
||||||
NPC_VERTICAL_OILDRUM_PLATFORM,
|
NPC_VERTICAL_OILDRUM_PLATFORM,
|
||||||
NPC_LANTERN_PLATFORM,
|
NPC_LANTERN_PLATFORM,
|
||||||
NPC_BUBBLE_GEYSER_GENERATOR,
|
NPC_BUBBLE_GEYSER_GENERATOR,
|
||||||
|
NPC_LEAF_PLATFORM,
|
||||||
NPC_PLAYER_BUBBLE_PLATFORM,
|
NPC_PLAYER_BUBBLE_PLATFORM,
|
||||||
NPC_PLATFORM_TYPE_MAX,
|
NPC_PLATFORM_TYPE_MAX,
|
||||||
};
|
};
|
||||||
|
|
|
@ -1253,6 +1253,14 @@ SOURCE=..\..\..\source\platform\platform.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\..\..\source\platform\pleaf.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\..\..\source\platform\pleaf.h
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\..\..\source\platform\plinear.cpp
|
SOURCE=..\..\..\source\platform\plinear.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
Loading…
Add table
Reference in a new issue