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

Fix speed grid movement values and made so the centered movement option does not consume a turn

Browse Source 
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
This commit is contained in:
sigonasr2 2022-10-17 20:21:41 -05:00
parent 50d725ee7e
commit fca95e62d2
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
C++ProjectTemplate
View File

Binary file not shown.

24
main.cpp
View File

@ -760,7 +760,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
//DisplayMessageBox("Not implemented yet.");
BATTLE_STATE=BattleState::MOVE_SELECT;
SELECTED_MOVE_SQUARE={0,0};
PopulateMovementGrid(PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->obj->GetPosWithOrigin(),PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->speed/2);
PopulateMovementGrid(PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->obj->GetPosWithOrigin(),CalculateSpeedGridMovementAmount(PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->speed));
}break;
case 5:{ //Run selected.
DisplayMessageBox("Not implemented yet.");
@ -1045,9 +1045,13 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
}
escapeDown:
if (ACTIONKEYPRESSED) {
BATTLE_ENCOUNTER->playerPos[-CURRENT_TURN-1]=(BATTLE_ENCOUNTER->playerPos[-CURRENT_TURN-1]/32+SELECTED_MOVE_SQUARE)*32;
BATTLE_STATE=BattleState::MOVE_CAMERA;
PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->atb=400;
if (SELECTED_MOVE_SQUARE.x==0&&SELECTED_MOVE_SQUARE.y==0) {
BATTLE_STATE=BattleState::SELECT_ACTION;
} else {
BATTLE_ENCOUNTER->playerPos[-CURRENT_TURN-1]=(BATTLE_ENCOUNTER->playerPos[-CURRENT_TURN-1]/32+SELECTED_MOVE_SQUARE)*32;
BATTLE_STATE=BattleState::MOVE_CAMERA;
PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->atb=400;
}
}
}break;
case BattleState::ITEM_SELECT:{
@ -3822,7 +3826,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
void PopulateMovementGrid(vd2d pos,int range) {
vi2d gridCenter = (vi2d)pos/32*32;
MOVEMENT_GRID.clear();
CheckGrid(0,0,gridCenter-cameraPos,range);
CheckGrid(0,0,gridCenter-cameraPos,std::min(8,range));
}
vi2d grid(int x, int y) {
@ -4457,6 +4461,16 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
}
}
}
int CalculateSpeedGridMovementAmount(int spd) {
const std::array<int,8> spdRequirements={0,6,10,18,28,40,60,100};
for (int i=7;i>=0;i--) {
if (spd>spdRequirements[i]) {
return i+1;
}
}
return 1;
}
};
int main()