|
|
|
@ -804,6 +804,7 @@ goes on a very long time, I hope you can understand this is only for testing pur |
|
|
|
|
CURRENT_TURN=-i-1; |
|
|
|
|
BATTLE_STATE=BattleState::SELECT_ACTION; |
|
|
|
|
BATTLE_SELECTION_CURSOR=0; |
|
|
|
|
POWER_GRADE_CURSOR[-CURRENT_TURN-1]=0; |
|
|
|
|
done=true; |
|
|
|
|
break; |
|
|
|
|
} else { |
|
|
|
@ -838,9 +839,11 @@ goes on a very long time, I hope you can understand this is only for testing pur |
|
|
|
|
PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove=nullptr; |
|
|
|
|
PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->atb=0; |
|
|
|
|
BATTLE_STATE=BattleState::WAIT; |
|
|
|
|
CURRENT_TURN=-99; |
|
|
|
|
} else { |
|
|
|
|
BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove=nullptr; |
|
|
|
|
BATTLE_ENCOUNTER->objs[CURRENT_TURN]->atb=0; |
|
|
|
|
BATTLE_STATE=BattleState::WAIT; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}break; |
|
|
|
@ -1743,7 +1746,7 @@ goes on a very long time, I hope you can understand this is only for testing pur |
|
|
|
|
} else { |
|
|
|
|
label=to_wstring(BATTLE_ENCOUNTER->objs[CURRENT_TURN]->obj->name)+L" uses "+to_wstring(BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove->name)+L" "+((BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove->grade!=0)?std::wstring(1,BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove->grade):L""); |
|
|
|
|
} |
|
|
|
|
//DrawFancyStringDecal({2,2},Wrap(label,ScreenWidth()-2,false,{2,2}),WHITE,{2,2});
|
|
|
|
|
DrawFancyStringDecal({2,2},Wrap(label,ScreenWidth()-2,false,{2,2}),WHITE,{2,2}); |
|
|
|
|
} |
|
|
|
|
if (BATTLE_STATE!=BattleState::MOVE_CAMERA) { |
|
|
|
|
SetDrawTarget(layer::INTERFACE); |
|
|
|
@ -2384,21 +2387,21 @@ goes on a very long time, I hope you can understand this is only for testing pur |
|
|
|
|
std::vector<Entity*>{ |
|
|
|
|
new Entity(new Object( |
|
|
|
|
NPC1_4,"Test Obj",{20,48},ANIMATIONS["player.png"],{2,2},GREEN), |
|
|
|
|
ㅎ 70,ㅎ 70,ㅍ 10,ㅍ 10,아 14,std::array<int,4>{0,0,0,0},0,std::vector<Battle::Move*>{ |
|
|
|
|
ㅎ 70,ㅎ 70,ㅍ 10,ㅍ 10,아 14,std::array<int,4>{0,0,0,0},5,std::vector<Battle::Move*>{ |
|
|
|
|
MOVELIST[BattleMoveName::TESTMOVE1], |
|
|
|
|
MOVELIST[BattleMoveName::TESTMOVE2], |
|
|
|
|
MOVELIST[BattleMoveName::TESTMOVE3], |
|
|
|
|
}), |
|
|
|
|
new Entity(new Object( |
|
|
|
|
NPC1_4,"Test Obj 2",{40,64},ANIMATIONS["player.png"],{2,2},GREEN), |
|
|
|
|
ㅎ 70,ㅎ 70,ㅍ 10,ㅍ 10,아 14,std::array<int,4>{0,0,0,0},0,std::vector<Battle::Move*>{ |
|
|
|
|
ㅎ 70,ㅎ 70,ㅍ 10,ㅍ 10,아 14,std::array<int,4>{0,0,0,0},5,std::vector<Battle::Move*>{ |
|
|
|
|
MOVELIST[BattleMoveName::TESTMOVE1], |
|
|
|
|
MOVELIST[BattleMoveName::TESTMOVE2], |
|
|
|
|
MOVELIST[BattleMoveName::TESTMOVE3], |
|
|
|
|
}), |
|
|
|
|
new Entity(new Object( |
|
|
|
|
NPC1_4,"Test Obj 3",{60,24},ANIMATIONS["player.png"],{2,2},GREEN), |
|
|
|
|
ㅎ 70,ㅎ 70,ㅍ 10,ㅍ 10,아 14,std::array<int,4>{0,0,0,0},0,std::vector<Battle::Move*>{ |
|
|
|
|
ㅎ 70,ㅎ 70,ㅍ 10,ㅍ 10,아 14,std::array<int,4>{0,0,0,0},5,std::vector<Battle::Move*>{ |
|
|
|
|
MOVELIST[BattleMoveName::TESTMOVE1], |
|
|
|
|
MOVELIST[BattleMoveName::TESTMOVE2], |
|
|
|
|
MOVELIST[BattleMoveName::TESTMOVE3], |
|
|
|
|