diff --git a/source/platform/platdata.cpp b/source/platform/platdata.cpp index ac75926da..b653e06d7 100644 --- a/source/platform/platdata.cpp +++ b/source/platform/platdata.cpp @@ -204,6 +204,34 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] = NPC_PLATFORM_TIMER_NONE, }, + { // NPC_OILDRUM_PLATFORM + ACTORS_CLAM_SBK, + ANIM_CLAM_SIDESNAP, + 2, + 128, + true, + DAMAGE__NONE, + 0, + 4, + NPC_PLATFORM_INFINITE_LIFE, + 4, + NPC_PLATFORM_TIMER_NONE, + }, + + { // NPC_CRATE_PLATFORM + ACTORS_CLAM_SBK, + ANIM_CLAM_SIDESNAP, + 4, + 128, + true, + DAMAGE__NONE, + 0, + 4, + NPC_PLATFORM_INFINITE_LIFE, + 4, + NPC_PLATFORM_TIMER_NONE, + }, + { // NPC_PLAYER_BUBBLE_PLATFORM ACTORS_CLAM_SBK, ANIM_CLAM_SIDESNAP, @@ -234,5 +262,7 @@ CNpcPlatform::NPC_PLATFORM_UNIT_TYPE CNpcPlatform::mapEditConvertTable[NPC_PLATF NPC_FISH_HOOK_2_PLATFORM, NPC_BRANCH_PLATFORM, NPC_SEESAW_PLATFORM, + NPC_OILDRUM_PLATFORM, + NPC_CRATE_PLATFORM, NPC_PLAYER_BUBBLE_PLATFORM, }; diff --git a/source/platform/platform.cpp b/source/platform/platform.cpp index 37e6eaa92..0eec0ab01 100644 --- a/source/platform/platform.cpp +++ b/source/platform/platform.cpp @@ -173,6 +173,8 @@ CNpcPlatform *CNpcPlatform::Create(sThingPlatform *ThisPlatform) break; } + case NPC_OILDRUM_PLATFORM: + case NPC_CRATE_PLATFORM: case NPC_FALLING_PLATFORM: { platform = new ("falling platform") CNpcFallingPlatform; diff --git a/source/platform/platform.h b/source/platform/platform.h index ce5591119..e7cda2d20 100644 --- a/source/platform/platform.h +++ b/source/platform/platform.h @@ -55,6 +55,8 @@ public: NPC_FISH_HOOK_2_PLATFORM, NPC_BRANCH_PLATFORM, NPC_SEESAW_PLATFORM, + NPC_OILDRUM_PLATFORM, + NPC_CRATE_PLATFORM, NPC_PLAYER_BUBBLE_PLATFORM, NPC_PLATFORM_TYPE_MAX, }; diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini index 89efffaa5..09a65770d 100644 --- a/tools/Data/bin/MkLevel.ini +++ b/tools/Data/bin/MkLevel.ini @@ -90,7 +90,8 @@ CoasterCar=9 Seesaw=12 GhostTrain=9 Barrel=2 -Crate=2 +OilDrum=13 +Crate=14 #Loveboat=9 #Wooden