Bugfixes

javelin/JavelinApp.java

@@ -145,14 +145,15 @@ public class JavelinApp extends QuestApp {
 						Incursion.getsafeincursion(foes);
 			}
 		}
-		if (fight.hide() && Squad.active.hide(foes)) {
-			return;
-		}
 		/* TODO enable in Dungeon as well, debug */
-		if (Dungeon.active == null && fight.canbribe()
-				&& Squad.active.bribe(foes)) {
-			fight.bribe();
-			return;
+		if (Dungeon.active == null) {
+			if (fight.hide() && Squad.active.hide(foes)) {
+				return;
+			}
+			if (fight.canbribe() && Squad.active.bribe(foes)) {
+				fight.bribe();
+				return;
+			}
 		}
 		JavelinApp.preparebattle(new GeneratedFight(foes));
 		final BattleScreen battleScreen =

javelin/controller/exception/battle/EndBattle.java

@@ -43,7 +43,7 @@ public class EndBattle extends BattleEvent {
 		}
 		for (final Combatant dead : BattleMap.dead) {
 			for (final Combatant original : originalteam) {
-				if (dead.id == original.id) {
+				if (dead.equals(original)) {
 					updatehp(dead, original);
 					break;
 				}
@@ -73,10 +73,10 @@ public class EndBattle extends BattleEvent {
 		for (Combatant active : BattleMap.dead) {
 			for (final Combatant original : new ArrayList<Combatant>(
 					originalteam)) {
-				if (active.toString().equals(original.toString())) {
+				if (active.equals(original)) {
 					if (Combatant.DEADATHP < active.hp && active.hp <= 0) {
 						original.hp = 1;
-					} else if (BattleMap.victory && !revive(original)) {
+					} else if (!BattleMap.victory || !revive(original)) {
 						lastkilled = original;
 						originalteam.remove(original);
 						Squad.active.equipment.remove(original.toString());

javelin/controller/fight/Siege.java

@@ -36,7 +36,7 @@ public class Siege implements Fight {
 	public List<Combatant> getmonsters(int teamel) {
 		ArrayList<Combatant> clones = new ArrayList<Combatant>(place.garrison);
 		for (int i = 0; i < clones.size(); i++) {
-			clones.set(0, clones.get(0).clonedeeply());
+			clones.set(i, clones.get(i).clonedeeply());
 		}
 		return clones;
 	}