HatchWaterPlanet 100%

csv/MapObj.csv

@@ -2271,19 +2271,19 @@ execute__Q222NrvGreenCaterpillarBig31GreenCaterpillarBigNrvEndAdjustCFP5Spine,Gr
 execute__Q222NrvGreenCaterpillarBig26GreenCaterpillarBigNrvRestCFP5Spine,GreenCaterpillarBig.o,MapObj.a,true
 execute__Q222NrvGreenCaterpillarBig29GreenCaterpillarBigNrvWriggleCFP5Spine,GreenCaterpillarBig.o,MapObj.a,true
 execute__Q222NrvGreenCaterpillarBig26GreenCaterpillarBigNrvHideCFP5Spine,GreenCaterpillarBig.o,MapObj.a,true
-__ct__16HatchWaterPlanetFPCc,HatchWaterPlanet.o,MapObj.a,false
-init__16HatchWaterPlanetFRC12JMapInfoIter,HatchWaterPlanet.o,MapObj.a,false
-control__16HatchWaterPlanetFv,HatchWaterPlanet.o,MapObj.a,false
-exeOpen__16HatchWaterPlanetFv,HatchWaterPlanet.o,MapObj.a,false
-exeWaitAfterOpen__16HatchWaterPlanetFv,HatchWaterPlanet.o,MapObj.a,false
-__dt__16HatchWaterPlanetFv,HatchWaterPlanet.o,MapObj.a,false
-__sinit_\HatchWaterPlanet_cpp,HatchWaterPlanet.o,MapObj.a,false
-__ct__Q219NrvHatchWaterPlanet23HatchWaterPlanetNrvWaitFv,HatchWaterPlanet.o,MapObj.a,false
-__ct__Q219NrvHatchWaterPlanet23HatchWaterPlanetNrvOpenFv,HatchWaterPlanet.o,MapObj.a,false
-__ct__Q219NrvHatchWaterPlanet32HatchWaterPlanetNrvWaitAfterOpenFv,HatchWaterPlanet.o,MapObj.a,false
-execute__Q219NrvHatchWaterPlanet32HatchWaterPlanetNrvWaitAfterOpenCFP5Spine,HatchWaterPlanet.o,MapObj.a,false
-execute__Q219NrvHatchWaterPlanet23HatchWaterPlanetNrvOpenCFP5Spine,HatchWaterPlanet.o,MapObj.a,false
-execute__Q219NrvHatchWaterPlanet23HatchWaterPlanetNrvWaitCFP5Spine,HatchWaterPlanet.o,MapObj.a,false
+__ct__16HatchWaterPlanetFPCc,HatchWaterPlanet.o,MapObj.a,true
+init__16HatchWaterPlanetFRC12JMapInfoIter,HatchWaterPlanet.o,MapObj.a,true
+control__16HatchWaterPlanetFv,HatchWaterPlanet.o,MapObj.a,true
+exeOpen__16HatchWaterPlanetFv,HatchWaterPlanet.o,MapObj.a,true
+exeWaitAfterOpen__16HatchWaterPlanetFv,HatchWaterPlanet.o,MapObj.a,true
+__dt__16HatchWaterPlanetFv,HatchWaterPlanet.o,MapObj.a,true
+__sinit_\HatchWaterPlanet_cpp,HatchWaterPlanet.o,MapObj.a,true
+__ct__Q219NrvHatchWaterPlanet23HatchWaterPlanetNrvWaitFv,HatchWaterPlanet.o,MapObj.a,true
+__ct__Q219NrvHatchWaterPlanet23HatchWaterPlanetNrvOpenFv,HatchWaterPlanet.o,MapObj.a,true
+__ct__Q219NrvHatchWaterPlanet32HatchWaterPlanetNrvWaitAfterOpenFv,HatchWaterPlanet.o,MapObj.a,true
+execute__Q219NrvHatchWaterPlanet32HatchWaterPlanetNrvWaitAfterOpenCFP5Spine,HatchWaterPlanet.o,MapObj.a,true
+execute__Q219NrvHatchWaterPlanet23HatchWaterPlanetNrvOpenCFP5Spine,HatchWaterPlanet.o,MapObj.a,true
+execute__Q219NrvHatchWaterPlanet23HatchWaterPlanetNrvWaitCFP5Spine,HatchWaterPlanet.o,MapObj.a,true
 __ct__18HeavensDoorDemoObjFPCc,HeavensDoorDemoObj.o,MapObj.a,false
 init__18HeavensDoorDemoObjFRC12JMapInfoIter,HeavensDoorDemoObj.o,MapObj.a,false
 exeAppear__18HeavensDoorDemoObjFv,HeavensDoorDemoObj.o,MapObj.a,false

data/json/MapObj.json

@@ -1,6 +1,6 @@
 {
 	"schemaVersion": 1,
 	"label": "MapObj",
-	"message": "13.71933%",
+	"message": "13.84101%",
 	"color": "tan"
 }

data/percent.json

@@ -1,6 +1,6 @@
 {
 	"schemaVersion": 1,
 	"label": "decompiled",
-	"message": "7.504548240348161%",
+	"message": "7.527168606798098%",
 	"color": "blue"
 }

docs/PROGRESS.md

@@ -12,7 +12,7 @@
 | [Gravity](https://github.com/shibbo/Petari/blob/master/docs/lib/Gravity.md) | 56.286937028734464% |
 | [LiveActor](https://github.com/shibbo/Petari/blob/master/docs/lib/LiveActor.md) | 36.855693868142005% |
 | [Map](https://github.com/shibbo/Petari/blob/master/docs/lib/Map.md) | 11.757933634152229% |
-| [MapObj](https://github.com/shibbo/Petari/blob/master/docs/lib/MapObj.md) | 13.719331454305298% |
+| [MapObj](https://github.com/shibbo/Petari/blob/master/docs/lib/MapObj.md) | 13.8410175872864% |
 | [NameObj](https://github.com/shibbo/Petari/blob/master/docs/lib/NameObj.md) | 26.039161800068705% |
 | [NPC](https://github.com/shibbo/Petari/blob/master/docs/lib/NPC.md) | 0.7591369440774989% |
 | [Player](https://github.com/shibbo/Petari/blob/master/docs/lib/Player.md) | 0.14184156212575486% |

docs/lib/MapObj.md

@@ -121,7 +121,7 @@
 | GravityLight.o | 0.0% | 0 / 8 | 0.0% | :x: 
 | GravityLightRoad.o | 0.0% | 0 / 21 | 0.0% | :x: 
 | GreenCaterpillarBig.o | 100.0% | 31 / 31 | 100.0% | :white_check_mark: 
-| HatchWaterPlanet.o | 0.0% | 0 / 13 | 0.0% | :x: 
+| HatchWaterPlanet.o | 100.0% | 13 / 13 | 100.0% | :white_check_mark: 
 | HeavensDoorDemoObj.o | 0.0% | 0 / 18 | 0.0% | :x: 
 | HipDropMoveObj.o | 100.0% | 20 / 20 | 100.0% | :white_check_mark: 
 | HipDropRock.o | 0.0% | 0 / 15 | 0.0% | :x: 
@@ -3167,19 +3167,19 @@
 # HatchWaterPlanet.o
 | Symbol | Decompiled? |
 | ------------- | ------------- |
-| __ct__16HatchWaterPlanetFPCc | :x: |
-| init__16HatchWaterPlanetFRC12JMapInfoIter | :x: |
-| control__16HatchWaterPlanetFv | :x: |
-| exeOpen__16HatchWaterPlanetFv | :x: |
-| exeWaitAfterOpen__16HatchWaterPlanetFv | :x: |
-| __dt__16HatchWaterPlanetFv | :x: |
-| __sinit_\HatchWaterPlanet_cpp | :x: |
-| __ct__Q219NrvHatchWaterPlanet23HatchWaterPlanetNrvWaitFv | :x: |
-| __ct__Q219NrvHatchWaterPlanet23HatchWaterPlanetNrvOpenFv | :x: |
-| __ct__Q219NrvHatchWaterPlanet32HatchWaterPlanetNrvWaitAfterOpenFv | :x: |
-| execute__Q219NrvHatchWaterPlanet32HatchWaterPlanetNrvWaitAfterOpenCFP5Spine | :x: |
-| execute__Q219NrvHatchWaterPlanet23HatchWaterPlanetNrvOpenCFP5Spine | :x: |
-| execute__Q219NrvHatchWaterPlanet23HatchWaterPlanetNrvWaitCFP5Spine | :x: |
+| __ct__16HatchWaterPlanetFPCc | :white_check_mark: |
+| init__16HatchWaterPlanetFRC12JMapInfoIter | :white_check_mark: |
+| control__16HatchWaterPlanetFv | :white_check_mark: |
+| exeOpen__16HatchWaterPlanetFv | :white_check_mark: |
+| exeWaitAfterOpen__16HatchWaterPlanetFv | :white_check_mark: |
+| __dt__16HatchWaterPlanetFv | :white_check_mark: |
+| __sinit_\HatchWaterPlanet_cpp | :white_check_mark: |
+| __ct__Q219NrvHatchWaterPlanet23HatchWaterPlanetNrvWaitFv | :white_check_mark: |
+| __ct__Q219NrvHatchWaterPlanet23HatchWaterPlanetNrvOpenFv | :white_check_mark: |
+| __ct__Q219NrvHatchWaterPlanet32HatchWaterPlanetNrvWaitAfterOpenFv | :white_check_mark: |
+| execute__Q219NrvHatchWaterPlanet32HatchWaterPlanetNrvWaitAfterOpenCFP5Spine | :white_check_mark: |
+| execute__Q219NrvHatchWaterPlanet23HatchWaterPlanetNrvOpenCFP5Spine | :white_check_mark: |
+| execute__Q219NrvHatchWaterPlanet23HatchWaterPlanetNrvWaitCFP5Spine | :white_check_mark: |
 
 
 # HeavensDoorDemoObj.o

include/Game/MapObj/HatchWaterPlanet.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "Game/LiveActor/LiveActor.h"
+
+class HatchWaterPlanet : public LiveActor {
+public:
+    HatchWaterPlanet(const char *);
+
+    virtual ~HatchWaterPlanet();
+    virtual void init(const JMapInfoIter &);
+    virtual void control();
+
+    void exeOpen();
+    void exeWaitAfterOpen();
+
+    LodCtrl* mPlanetLODCtrl;            // _8C
+    CollisionParts* mCollisionParts;    // _90
+};
+
+namespace NrvHatchWaterPlanet {
+    NERVE(HatchWaterPlanetNrvWait);
+    NERVE(HatchWaterPlanetNrvOpen);
+    NERVE(HatchWaterPlanetNrvWaitAfterOpen);  
+};

source/Game/MapObj/HatchWaterPlanet.cpp

@@ -0,0 +1,83 @@
+#include "Game/MapObj/HatchWaterPlanet.h"
+#include "Game/LiveActor/LodCtrl.h"
+
+HatchWaterPlanet::HatchWaterPlanet(const char *pName) : LiveActor(pName) {
+    mPlanetLODCtrl = NULL;
+    mCollisionParts = NULL;
+}
+
+void HatchWaterPlanet::init(const JMapInfoIter &rIter) {
+    MR::initDefaultPos(this, rIter);
+    initModelManagerWithAnm("HatchWaterPlanet", NULL, false);
+    MR::connectToScenePlanet(this);
+    initHitSensor(1);
+    MR::addBodyMessageSensorMapObj(this);
+    MR::initCollisionParts(this, "HatchWaterPlanetBefore", getSensor(NULL), NULL);
+    mCollisionParts = MR::createCollisionPartsFromLiveActor(this, "HatchWaterPlanetAfter", getSensor(NULL), (MR::CollisionScaleType)2);
+    MR::invalidateCollisionParts(mCollisionParts);
+    initEffectKeeper(0, NULL, false);
+    initSound(4, false);
+    if (MR::tryRegisterDemoCast(this, rIter)) {
+        MR::registerDemoActionNerve(this, &NrvHatchWaterPlanet::HatchWaterPlanetNrvOpen::sInstance, NULL);
+    }
+
+    MR::setClippingTypeSphereContainsModelBoundingBox(this, 100.0f);
+    MR::setClippingFarMax(this);
+    mPlanetLODCtrl = MR::createLodCtrlPlanet(this, rIter, -1.0f, -1);
+    mPlanetLODCtrl->invalidate();
+    initNerve(&NrvHatchWaterPlanet::HatchWaterPlanetNrvWait::sInstance);
+    makeActorAppeared();
+}
+
+void HatchWaterPlanet::control() {
+    mPlanetLODCtrl->update();
+}
+
+void HatchWaterPlanet::exeOpen() {
+    if (MR::isFirstStep(this)) {
+        MR::startBck(this, "HatchWaterPlanet", NULL);
+        MR::startBtk(this, "HatchWaterPlanet");
+        MR::startBck(mPlanetLODCtrl->_14, "HatchWaterPlanetLow", NULL);
+        MR::setBckFrameAndStop(mPlanetLODCtrl->_14, 1.0f);
+        MR::startSound(this, "SE_OJ_HATCH_WATER_PNT_ST", -1, -1);
+    }
+
+    MR::startLevelSound(this, "SE_OJ_LV_HATCH_WATER_PNT_OP", -1, -1, -1);
+
+    if (MR::isBckStopped(this)) {
+        MR::startSound(this, "SE_OJ_HATCH_WATER_PNT_ED", -1, -1);
+        MR::startSystemSE("SE_SY_READ_RIDDLE_S", -1, -1);
+        setNerve(&NrvHatchWaterPlanet::HatchWaterPlanetNrvWaitAfterOpen::sInstance);
+    }
+}
+
+void HatchWaterPlanet::exeWaitAfterOpen() {
+    if (MR::isFirstStep(this)) {
+        MR::invalidateCollisionParts(this);
+        MR::validateCollisionParts(mCollisionParts);
+    }
+}
+
+HatchWaterPlanet::~HatchWaterPlanet() {
+
+}
+
+namespace NrvHatchWaterPlanet {
+    INIT_NERVE(HatchWaterPlanetNrvWait);
+    INIT_NERVE(HatchWaterPlanetNrvOpen);
+    INIT_NERVE(HatchWaterPlanetNrvWaitAfterOpen);
+
+    void HatchWaterPlanetNrvWaitAfterOpen::execute(Spine *pSpine) const {
+        HatchWaterPlanet* planet = reinterpret_cast<HatchWaterPlanet*>(pSpine->mExecutor);
+        planet->exeWaitAfterOpen();
+    }
+
+    void HatchWaterPlanetNrvOpen::execute(Spine *pSpine) const {
+        HatchWaterPlanet* planet = reinterpret_cast<HatchWaterPlanet*>(pSpine->mExecutor);
+        planet->exeOpen();
+    }
+
+    void HatchWaterPlanetNrvWait::execute(Spine *pSpine) const {
+
+    }
+};