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

Merge branch 'master' into stoutford_tests

Browse Source
This commit is contained in:
Zukero
2017-08-21 14:41:10 +02:00
parent f23b5ee738 d15e15a897
commit 75238bbcdf
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndorsTrail/res/layout/heroinfo_inventory.xml
View File

@@ -41,7 +41,7 @@
android:orientation="vertical"
android:gravity="left"
>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"

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

@@ -55,9 +55,14 @@ public final class CombatController implements VisualEffectCompletedCallback {
public void exitCombat(boolean pickupLootBags) {
setCombatSelection(null, null);
world.model.uiSelections.isInCombat = false;
combatTurnListeners.onCombatEnded();
world.model.uiSelections.selectedPosition = null;
world.model.uiSelections.selectedMonster = null;
endOfCombatRound();
if (world.model.player.isDead()) {
controllers.gameRoundController.resetRoundTimers();
} else {
endOfCombatRound();
}
if (pickupLootBags && totalExpThisFight > 0) {
controllers.itemController.lootMonsterBags(killedMonsterBags, totalExpThisFight);
} else {
@@ -557,7 +562,6 @@ public final class CombatController implements VisualEffectCompletedCallback {
}
public void endOfCombatRound() {
combatTurnListeners.onCombatEnded();
world.model.worldData.tickWorldTime();
controllers.gameRoundController.resetRoundTimers();
controllers.actorStatsController.applyConditionsToPlayer(world.model.player, false);