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

Merge branch 'production'

Browse Source 
Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
This commit is contained in:
Oskar Wiksten
2012-07-24 13:48:33 +02:00
parent c623d28723 e3d4900887
commit 3a91b49cda
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -257,9 +257,10 @@ public final class CombatController implements VisualEffectCompletedCallback {
}
private boolean playerHasApLeft() {
if (model.player.ap.current >= model.player.useItemCost) return true;
if (model.player.ap.current >= model.player.combatTraits.attackCost) return true;
if (model.player.ap.current >= model.player.actorTraits.moveCost) return true;
final Player player = model.player;
if (player.hasAPs(player.useItemCost)) return true;
if (player.hasAPs(player.combatTraits.attackCost)) return true;
if (player.hasAPs(player.actorTraits.moveCost)) return true;
return false;
}
private void playerActionCompleted() {
@@ -267,7 +268,9 @@ public final class CombatController implements VisualEffectCompletedCallback {
if (!playerHasApLeft()) beginMonsterTurn(false);
}
private void continueTurn() {
if (!playerHasApLeft()) handleNextMonsterAction();
if (model.uiSelections.isPlayersCombatTurn) return;
if (playerHasApLeft()) return;
handleNextMonsterAction();
}
private void executeCombatMove(final Coord dest) {
@@ -304,6 +307,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
public void beginMonsterTurn(boolean isFirstRound) {
model.player.ap.current = 0;
model.uiSelections.isPlayersCombatTurn = false;
for (MonsterSpawnArea a : model.currentMap.spawnAreas) {
for (Monster m : a.monsters) {
m.setMaxAP();
@@ -315,7 +319,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
private Monster determineNextMonster(Monster previousMonster) {
if (previousMonster != null) {
if (previousMonster.useAPs(previousMonster.combatTraits.attackCost)) return previousMonster;
if (previousMonster.hasAPs(previousMonster.combatTraits.attackCost)) return previousMonster;
}
for (MonsterSpawnArea a : model.currentMap.spawnAreas) {
@@ -323,7 +327,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
if (!m.isAgressive()) continue;
if (m.rectPosition.isAdjacentTo(model.player.position)) {
if (m.useAPs(m.combatTraits.attackCost)) return m;
if (m.hasAPs(m.combatTraits.attackCost)) return m;
}
}
}
@@ -338,6 +342,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
endMonsterTurn();
return;
}
currentActiveMonster.useAPs(currentActiveMonster.combatTraits.attackCost);
context.mainActivity.combatview.updateTurnInfo(currentActiveMonster);
Resources r = context.mainActivity.getResources();
@@ -403,6 +408,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
private void newPlayerTurn(boolean isFirstRound) {
model.player.setMaxAP();
if (!isFirstRound) context.gameRoundController.onNewPlayerRound();
model.uiSelections.isPlayersCombatTurn = true;
updateTurnInfo();
}
private void updateTurnInfo() {

1
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java
View File

@@ -11,6 +11,7 @@ import com.gpl.rpg.AndorsTrail.util.Coord;
public final class InterfaceData {
public boolean isMainActivityVisible = false;
public boolean isInCombat = false;
public boolean isPlayersCombatTurn = false;
public Monster selectedMonster;
public Coord selectedPosition;
public String selectedTabHeroInfo = "";

3
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Actor.java
View File

@@ -51,6 +51,9 @@ public class Actor {
ap.subtract(cost, false);
return true;
}
public boolean hasAPs(int cost) {
return ap.current >= cost;
}
public boolean hasCondition(final String conditionTypeID) {
for (ActorCondition c : conditions) {