OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-21 10:58:12 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Refactor player combat round methods

Browse Source
This commit is contained in:
Oskar Wiksten
2013-08-08 00:34:18 +02:00
parent 96d451ffbe
commit 9c78b6a2ec
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
View File

@@ -240,7 +240,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
exitCombat(true);
return;
}
if (!playerHasApLeft()) beginMonsterTurn(false);
if (!playerHasApLeft()) endPlayerTurn();
}
private void continueTurn() {
if (world.model.uiSelections.isPlayersCombatTurn) return;
@@ -270,7 +270,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
private void fleeingFailed() {
combatActionListeners.onPlayerFailedFleeing();
beginMonsterTurn(false);
endPlayerTurn();
}
private final Handler monsterTurnHandler = new Handler() {
@@ -288,7 +288,10 @@ public final class CombatController implements VisualEffectCompletedCallback {
}
}
public void beginMonsterTurn(boolean isFirstRound) {
public void endPlayerTurn() {
beginMonsterTurn(false);
}
private void beginMonsterTurn(boolean isFirstRound) {
controllers.actorStatsController.setActorMinAP(world.model.player);
world.model.uiSelections.isPlayersCombatTurn = false;
for (MonsterSpawnArea a : world.model.currentMap.spawnAreas) {

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
View File

@@ -72,7 +72,7 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
endTurnButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
c.beginMonsterTurn(false);
c.endPlayerTurn();
}
});
Button fleeButton = (Button) findViewById(R.id.combatview_flee);