sigonasr2/Seasons-Of-Loneliness
1
0
Fork 0
generated from sigonasr2/CPlusPlusProjectTemplate
Code Issues Pull Requests Projects Releases Wiki Activity

Correct battle logic errors

Browse Source 
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
This commit is contained in:
sigonasr2 2022-09-01 20:35:10 -05:00
parent 6e6a1eb32c
commit 158e717517
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SeasonsOfLoneliness.cpp
View File

@ -1456,7 +1456,7 @@ public:
int TARGET_COORDS_X=CURRENT_ENCOUNTER.x+WIDTH/32/2; int TARGET_COORDS_X=CURRENT_ENCOUNTER.x+WIDTH/32/2;
int TARGET_COORDS_Y=CURRENT_ENCOUNTER.y+HEIGHT/32/2; int TARGET_COORDS_Y=CURRENT_ENCOUNTER.y+HEIGHT/32/2;
if (PLAYER_COORDS[0]==TARGET_COORDS_X&&PLAYER_COORDS[1]==TARGET_COORDS_Y if (PLAYER_COORDS[0]==TARGET_COORDS_X&&PLAYER_COORDS[1]==TARGET_COORDS_Y
&&BATTLE_PLAYER_COORDS.x==CURRENT_ENCOUNTER.playerX&&BATTLE_PLAYER_COORDS.y==CURRENT_ENCOUNTER.playerY) { &&BATTLE_PLAYER_COORDS.x==CURRENT_ENCOUNTER.x+CURRENT_ENCOUNTER.playerX&&BATTLE_PLAYER_COORDS.y==CURRENT_ENCOUNTER.y+CURRENT_ENCOUNTER.playerY) {
BATTLE_STATE = battle::PLAYER_SELECTION; BATTLE_STATE = battle::PLAYER_SELECTION;
clearPixelEffect(); clearPixelEffect();
EFFECT_TIMER = 0; EFFECT_TIMER = 0;
@ -1631,6 +1631,8 @@ public:
} }
} }
if (EFFECT_TIMER==120) { if (EFFECT_TIMER==120) {
EFFECT_TIMER=0;
clearPixelEffect();
BATTLE_REASON_CODE=-1; BATTLE_REASON_CODE=-1;
BATTLE_STATE=battle::DAMAGE_RESOLUTION; BATTLE_STATE=battle::DAMAGE_RESOLUTION;
} }
@ -1653,6 +1655,10 @@ public:
BATTLE_CARD_SELECTION_IND=0; BATTLE_CARD_SELECTION_IND=0;
PLAYER_SELECTED_TARGET=-1; PLAYER_SELECTED_TARGET=-1;
BATTLE_STATE=battle::NONE; BATTLE_STATE=battle::NONE;
PLAYER_COORDS[0]=BATTLE_PLAYER_COORDS.x;
PLAYER_COORDS[1]=BATTLE_PLAYER_COORDS.y;
clearSeeds();
clearTrees();
performCropUpdate(8); performCropUpdate(8);
if (FOOD_REGEN_TURNS>0) { if (FOOD_REGEN_TURNS>0) {
FOOD_REGEN_TURNS=0; FOOD_REGEN_TURNS=0;
@ -1675,13 +1681,9 @@ public:
break; break;
} }
} }
PLAYER_COORDS[0]=CURRENT_ENCOUNTER.x+BATTLE_PLAYER_COORDS.x;
PLAYER_COORDS[1]=CURRENT_ENCOUNTER.y+BATTLE_PLAYER_COORDS.y;
BATTLE_STATE=battle::WAIT_TURN_ANIMATION; BATTLE_STATE=battle::WAIT_TURN_ANIMATION;
PIXEL_EFFECT_TRANSPARENCY=0; PIXEL_EFFECT_TRANSPARENCY=0;
EFFECT_TIMER=0; EFFECT_TIMER=0;
clearSeeds();
clearTrees();
} }
} }
}break; }break;

BIN
Seasons_of_Loneliness
View File

Binary file not shown.