sigonasr2/SeasonI
1
0
Fork 0
generated from sigonasr2/CPlusPlusProjectTemplate
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Rolling counter wait time needs to be reset

Browse Source 
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
This commit is contained in:
sigonasr2 2022-10-14 00:54:11 -05:00
parent 50b678211b
commit 145db14bb3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
C++ProjectTemplate
View File

Binary file not shown.

5
main.cpp
View File

@ -354,7 +354,6 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
messageBoxLoad=true; messageBoxLoad=true;
messageBoxVisible=true; messageBoxVisible=true;
HEALING_OVERWORLD_SINGLE_MEMBER=false; HEALING_OVERWORLD_SINGLE_MEMBER=false;
GAME_STATE=GameState::OVERWORLD_GRADE_MENU;
castingMember->selectedMove=nullptr; castingMember->selectedMove=nullptr;
} }
} }
@ -1232,6 +1231,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
Battle::Move*move=BATTLE_MOVELIST_DISPLAY[OVERWORLD_POWER_SELECTION_CURSOR[OVERWORLD_POWER_SELECTION_MEMBER]][OVERWORLD_POWER_GRADE_CURSOR]; Battle::Move*move=BATTLE_MOVELIST_DISPLAY[OVERWORLD_POWER_SELECTION_CURSOR[OVERWORLD_POWER_SELECTION_MEMBER]][OVERWORLD_POWER_GRADE_CURSOR];
PARTY_MEMBER_STATS[PARTY_MEMBER_ID[OVERWORLD_POWER_SELECTION_MEMBER]]->SubtractPP(move->PPCost); PARTY_MEMBER_STATS[PARTY_MEMBER_ID[OVERWORLD_POWER_SELECTION_MEMBER]]->SubtractPP(move->PPCost);
DisplayMessageBox(PARTY_MEMBER_OBJ[OVERWORLD_POWER_SELECTION_MEMBER]->name+" begins to cast "+move->GetPowerName()+".\n"); DisplayMessageBox(PARTY_MEMBER_OBJ[OVERWORLD_POWER_SELECTION_MEMBER]->name+" begins to cast "+move->GetPowerName()+".\n");
GAME_STATE=GameState::OVERWORLD_GRADE_MENU;
} }
}break; }break;
case GameState::EDITOR:{ case GameState::EDITOR:{
@ -1504,7 +1504,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
} }
if (BATTLE_ENCOUNTER!=nullptr&&BATTLE_STATE!=BattleState::MOVE_CAMERA&&BATTLE_STATE!=BattleState::MOVE_CAMERA_BACK||OverworldMenuOpen()) { if (BATTLE_ENCOUNTER!=nullptr&&BATTLE_STATE!=BattleState::MOVE_CAMERA&&BATTLE_STATE!=BattleState::MOVE_CAMERA_BACK||OverworldMenuOpen()&&GAME_STATE!=GameState::OVERWORLD_TARGET_MENU) {
SetDrawTarget(layer::INTERFACE); SetDrawTarget(layer::INTERFACE);
vi2d screenShakeOffset = {0,0}; vi2d screenShakeOffset = {0,0};
if (BATTLE_ENCOUNTER!=nullptr) { if (BATTLE_ENCOUNTER!=nullptr) {
@ -3082,6 +3082,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->_SetDirectPP(PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->GetTargetPP()); PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->_SetDirectPP(PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->GetTargetPP());
} }
BATTLE_STATE=BattleState::ENEMY_SPOILS; BATTLE_STATE=BattleState::ENEMY_SPOILS;
BATTLE_ROLLING_COUNTER_WAITTIME=0;
} }
CURRENT_TURN=-99; CURRENT_TURN=-99;