Skip to content

Commit

Permalink
WipeGameOver.o 100%
Browse files Browse the repository at this point in the history
  • Loading branch information
shibbo committed Sep 23, 2024
1 parent a559220 commit f57d4a8
Show file tree
Hide file tree
Showing 9 changed files with 148 additions and 41 deletions.
34 changes: 17 additions & 17 deletions csv/Screen.csv
Original file line number Diff line number Diff line change
Expand Up @@ -2974,23 +2974,23 @@ isWipeOut__8WipeFadeCFv,WipeFade.o,Screen.a,true
__dt__8WipeFadeFv,WipeFade.o,Screen.a,true
getWipeType__14WipeLayoutBaseCFv,WipeFade.o,Screen.a,true
getWipeName__14WipeLayoutBaseCFv,WipeFade.o,Screen.a,true
__ct__12WipeGameOverFv,WipeGameOver.o,Screen.a,false
init__12WipeGameOverFRC12JMapInfoIter,WipeGameOver.o,Screen.a,false
kill__12WipeGameOverFv,WipeGameOver.o,Screen.a,false
wipe__12WipeGameOverFl,WipeGameOver.o,Screen.a,false
forceClose__12WipeGameOverFv,WipeGameOver.o,Screen.a,false
forceOpen__12WipeGameOverFv,WipeGameOver.o,Screen.a,false
isOpen__12WipeGameOverCFv,WipeGameOver.o,Screen.a,false
isClose__12WipeGameOverCFv,WipeGameOver.o,Screen.a,false
isWipeIn__12WipeGameOverCFv,WipeGameOver.o,Screen.a,false
isWipeOut__12WipeGameOverCFv,WipeGameOver.o,Screen.a,false
__dt__12WipeGameOverFv,WipeGameOver.o,Screen.a,false
__sinit_\WipeGameOver_cpp,WipeGameOver.o,Screen.a,false
__ct__Q215NrvWipeGameOver16WipeGameOverWaitFv,WipeGameOver.o,Screen.a,false
__ct__Q215NrvWipeGameOver18WipeGameOverActiveFv,WipeGameOver.o,Screen.a,false
execute__Q215NrvWipeGameOver18WipeGameOverActiveCFP5Spine,WipeGameOver.o,Screen.a,false
execute__Q215NrvWipeGameOver16WipeGameOverWaitCFP5Spine,WipeGameOver.o,Screen.a,false
getWipeType__12WipeGameOverCFv,WipeGameOver.o,Screen.a,false
__ct__12WipeGameOverFv,WipeGameOver.o,Screen.a,true
init__12WipeGameOverFRC12JMapInfoIter,WipeGameOver.o,Screen.a,true
kill__12WipeGameOverFv,WipeGameOver.o,Screen.a,true
wipe__12WipeGameOverFl,WipeGameOver.o,Screen.a,true
forceClose__12WipeGameOverFv,WipeGameOver.o,Screen.a,true
forceOpen__12WipeGameOverFv,WipeGameOver.o,Screen.a,true
isOpen__12WipeGameOverCFv,WipeGameOver.o,Screen.a,true
isClose__12WipeGameOverCFv,WipeGameOver.o,Screen.a,true
isWipeIn__12WipeGameOverCFv,WipeGameOver.o,Screen.a,true
isWipeOut__12WipeGameOverCFv,WipeGameOver.o,Screen.a,true
__dt__12WipeGameOverFv,WipeGameOver.o,Screen.a,true
__sinit_\WipeGameOver_cpp,WipeGameOver.o,Screen.a,true
__ct__Q215NrvWipeGameOver16WipeGameOverWaitFv,WipeGameOver.o,Screen.a,true
__ct__Q215NrvWipeGameOver18WipeGameOverActiveFv,WipeGameOver.o,Screen.a,true
execute__Q215NrvWipeGameOver18WipeGameOverActiveCFP5Spine,WipeGameOver.o,Screen.a,true
execute__Q215NrvWipeGameOver16WipeGameOverWaitCFP5Spine,WipeGameOver.o,Screen.a,true
getWipeType__12WipeGameOverCFv,WipeGameOver.o,Screen.a,true
__ct__14WipeHolderBaseFUlPCc,WipeHolderBase.o,Screen.a,false
setCurrent__14WipeHolderBaseFPCc,WipeHolderBase.o,Screen.a,false
wipe__14WipeHolderBaseFPCcl,WipeHolderBase.o,Screen.a,false
Expand Down
2 changes: 1 addition & 1 deletion data/Game.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"schemaVersion": 1,
"label": "Game",
"message": "16.6%",
"message": "16.623%",
"color": "blue"
}
2 changes: 1 addition & 1 deletion data/json/Screen.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"schemaVersion": 1,
"label": "Screen",
"message": "8.921%",
"message": "9.224%",
"color": "yellow"
}
2 changes: 1 addition & 1 deletion docs/PROGRESS.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
| [RhythmLib](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/RhythmLib.md) | 1.2661566868900025% |
| [Ride](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Ride.md) | 6.181993549748319% |
| [Scene](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Scene.md) | 19.62025316455696% |
| [Screen](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen.md) | 8.92150072527214% |
| [Screen](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen.md) | 9.224677547926767% |
| [Speaker](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Speaker.md) | 54.75241889584519% |
| [System](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/System.md) | 14.730098411770436% |
| [Util](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Util.md) | 10.090099514848767% |
Expand Down
2 changes: 1 addition & 1 deletion docs/lib/Game/Screen.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
| [TitleSequenceProduct.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen/TitleSequenceProduct.md) | 0.0% | 0 / 31 | 0.0% | :x:
| [WaterCameraFilter.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen/WaterCameraFilter.md) | 0.0% | 0 / 17 | 0.0% | :x:
| [WipeFade.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen/WipeFade.md) | 76.22377622377621% | 14 / 15 | 93.33333333333333% | :eight_pointed_black_star:
| [WipeGameOver.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen/WipeGameOver.md) | 0.0% | 0 / 17 | 0.0% | :x:
| [WipeGameOver.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen/WipeGameOver.md) | 100.0% | 17 / 17 | 100.0% | :white_check_mark:
| [WipeHolderBase.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen/WipeHolderBase.md) | 0.0% | 0 / 13 | 0.0% | :x:
| [WipeKoopa.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen/WipeKoopa.md) | 0.0% | 0 / 19 | 0.0% | :x:
| [WipeRing.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen/WipeRing.md) | 0.0% | 0 / 28 | 0.0% | :x:
Expand Down
36 changes: 18 additions & 18 deletions docs/lib/Game/Screen/WipeGameOver.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@
| :white_check_mark: | Function is completed.


# 0 / 17 Completed -- (0.0%)
# 17 / 17 Completed -- (100.0%)
# WipeGameOver.o
| Symbol | Decompiled? |
| ------------- | ------------- |
| `__ct__12WipeGameOverFv` | :x: |
| `init__12WipeGameOverFRC12JMapInfoIter` | :x: |
| `kill__12WipeGameOverFv` | :x: |
| `wipe__12WipeGameOverFl` | :x: |
| `forceClose__12WipeGameOverFv` | :x: |
| `forceOpen__12WipeGameOverFv` | :x: |
| `isOpen__12WipeGameOverCFv` | :x: |
| `isClose__12WipeGameOverCFv` | :x: |
| `isWipeIn__12WipeGameOverCFv` | :x: |
| `isWipeOut__12WipeGameOverCFv` | :x: |
| `__dt__12WipeGameOverFv` | :x: |
| `__sinit_\WipeGameOver_cpp` | :x: |
| `__ct__Q215NrvWipeGameOver16WipeGameOverWaitFv` | :x: |
| `__ct__Q215NrvWipeGameOver18WipeGameOverActiveFv` | :x: |
| `execute__Q215NrvWipeGameOver18WipeGameOverActiveCFP5Spine` | :x: |
| `execute__Q215NrvWipeGameOver16WipeGameOverWaitCFP5Spine` | :x: |
| `getWipeType__12WipeGameOverCFv` | :x: |
| `__ct__12WipeGameOverFv` | :white_check_mark: |
| `init__12WipeGameOverFRC12JMapInfoIter` | :white_check_mark: |
| `kill__12WipeGameOverFv` | :white_check_mark: |
| `wipe__12WipeGameOverFl` | :white_check_mark: |
| `forceClose__12WipeGameOverFv` | :white_check_mark: |
| `forceOpen__12WipeGameOverFv` | :white_check_mark: |
| `isOpen__12WipeGameOverCFv` | :white_check_mark: |
| `isClose__12WipeGameOverCFv` | :white_check_mark: |
| `isWipeIn__12WipeGameOverCFv` | :white_check_mark: |
| `isWipeOut__12WipeGameOverCFv` | :white_check_mark: |
| `__dt__12WipeGameOverFv` | :white_check_mark: |
| `__sinit_\WipeGameOver_cpp` | :white_check_mark: |
| `__ct__Q215NrvWipeGameOver16WipeGameOverWaitFv` | :white_check_mark: |
| `__ct__Q215NrvWipeGameOver18WipeGameOverActiveFv` | :white_check_mark: |
| `execute__Q215NrvWipeGameOver18WipeGameOverActiveCFP5Spine` | :white_check_mark: |
| `execute__Q215NrvWipeGameOver16WipeGameOverWaitCFP5Spine` | :white_check_mark: |
| `getWipeType__12WipeGameOverCFv` | :white_check_mark: |
23 changes: 23 additions & 0 deletions include/Game/Screen/WipeGameOver.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#pragma once

#include "Game/Screen/WipeLayoutBase.hpp"

class WipeGameOver : public WipeLayoutBase {
public:
WipeGameOver();

virtual ~WipeGameOver();
virtual void init(const JMapInfoIter&);
virtual void kill();
virtual void wipe(s32);
virtual void forceClose();
virtual void forceOpen();
virtual bool isOpen() const;
virtual bool isClose() const;
virtual bool isWipeIn() const;
virtual bool isWipeOut() const;
virtual s32 getWipeType() const;

inline void exeActive();
inline void exeWait();
};
4 changes: 2 additions & 2 deletions include/Game/Screen/WipeRing.hpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#pragma once

#include "Game/Screen/LayoutActor.hpp"
#include "Game/Screen/WipeLayoutBase.hpp"

class WipeRing : public LayoutActor {
class WipeRing : public WipeLayoutBase {
public:
WipeRing(bool, const char*);

Expand Down
84 changes: 84 additions & 0 deletions source/Game/Screen/WipeGameOver.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
#include "Game/Screen/WipeGameOver.hpp"
#include "Game/LiveActor/Nerve.hpp"
#include "Game/Util.hpp"

namespace NrvWipeGameOver {
NERVE_DECL_EXE(WipeGameOverActive, WipeGameOver, Active);
NERVE_DECL_EXE(WipeGameOverWait, WipeGameOver, Wait);

INIT_NERVE(WipeGameOverWait);
INIT_NERVE(WipeGameOverActive);
}; // namespace NrvWipeGameOver

WipeGameOver::WipeGameOver() : WipeLayoutBase("ゲームオーバー") {}

void WipeGameOver::init(const JMapInfoIter& rIter) {
initNerve(&NrvWipeGameOver::WipeGameOverWait::sInstance);
initLayoutManager("GameOver", 1);
}

void WipeGameOver::kill() {
LayoutActor::kill();
setNerve(&NrvWipeGameOver::WipeGameOverWait::sInstance);
}

void WipeGameOver::wipe(s32 a1) {
if (!isNerve(&NrvWipeGameOver::WipeGameOverActive::sInstance)) {
appear();
MR::hideLayout(this);
setNerve(&NrvWipeGameOver::WipeGameOverActive::sInstance);
}
}

void WipeGameOver::forceClose() {
wipe(-1);
}

void WipeGameOver::forceOpen() {
MR::hideLayout(this);
kill();
}

bool WipeGameOver::isOpen() const {
bool ret = false;
if (MR::isDead(this) || isNerve(&NrvWipeGameOver::WipeGameOverWait::sInstance)) {
ret = true;
}

return ret;
}

bool WipeGameOver::isClose() const {
bool ret = false;
if (isNerve(&NrvWipeGameOver::WipeGameOverActive::sInstance) && MR::isAnimStopped(this, 0)) {
ret = true;
}
return ret;
}

bool WipeGameOver::isWipeIn() const {
return false;
}

bool WipeGameOver::isWipeOut() const {
bool ret = false;
if (isNerve(&NrvWipeGameOver::WipeGameOverActive::sInstance) && !MR::isAnimStopped(this, 0)) {
ret = true;
}
return ret;
}

WipeGameOver::~WipeGameOver() {}

void WipeGameOver::exeActive() {
if (MR::isFirstStep(this)) {
MR::showLayout(this);
MR::startAnim(this, "GameOver", 0);
}
}

void WipeGameOver::exeWait() {}

s32 WipeGameOver::getWipeType() const {
return 2;
}

0 comments on commit f57d4a8

Please sign in to comment.