Remove quest "lodar13_rest" from questlog if player attacks both parties

AndorsTrail/res/raw/conversationlist_aulowenn.json

@@ -33,6 +33,34 @@
   },
   {
     "id": "aulowenn_atk",
+    "replies": [
+      {
+        "requires": {
+          "progress": "lodar13_rest:30"
+        },
+        "nextPhraseID": "aulowenn_atk1"
+      },
+      {
+        "nextPhraseID": "aulowenn_atk0"
+      }
+    ]
+  },
+  {
+    "id": "aulowenn_atk1",
+    "rewards": [
+      {
+        "rewardID": "lodar13_rest",
+        "value": 65
+      }
+    ],
+    "replies": [
+      {
+        "nextPhraseID": "aulowenn_atk0"
+      }
+    ]
+  },
+  {
+    "id": "aulowenn_atk0",
     "rewards": [
       {
         "rewardID": "lodar13_rest",
@@ -42,7 +70,7 @@
     "replies": [
       {
         "nextPhraseID": "F",
-        "text": "Attack"
+        "text": "Attack!"
       }
     ],
     "message": "For Feygard!"
@@ -426,7 +454,7 @@
     "id": "aulowenn_tq3",
     "replies": [
       {
-        "text": "Attack",
+        "text": "You will be no match for me.",
         "nextPhraseID": "aulowenn_atk"
       },
       {
@@ -440,7 +468,7 @@
     "id": "aulowenn_tq4",
     "replies": [
       {
-        "text": "Attack",
+        "text": "You will be no match for me.",
         "nextPhraseID": "aulowenn_atk"
       },
       {

AndorsTrail/res/raw/conversationlist_tiqui.json

@@ -46,6 +46,34 @@
   },
   {
     "id": "tiqui_atk",
+    "replies": [
+      {
+        "requires": {
+          "progress": "lodar13_rest:31"
+        },
+        "nextPhraseID": "tiqui_atk1"
+      },
+      {
+        "nextPhraseID": "tiqui_atk0"
+      }
+    ]
+  },
+  {
+    "id": "tiqui_atk1",
+    "rewards": [
+      {
+        "rewardID": "lodar13_rest",
+        "value": 65
+      }
+    ],
+    "replies": [
+      {
+        "nextPhraseID": "tiqui_atk0"
+      }
+    ]
+  },
+  {
+    "id": "tiqui_atk0",
     "rewards": [
       {
         "rewardID": "lodar13_rest",

AndorsTrail/res/raw/questlist_v070_lodar.json

@@ -150,6 +150,11 @@
         "finishesQuest": 1,
         "progress": 60,
         "rewardExperience": 3000
+      },
+      {
+        "logText": "I will not be able to resolve the conflict between Aulowenn and her attacker.",
+        "finishesQuest": 1,
+        "progress": 65
       }
     ]
   }

AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java

@@ -97,6 +97,12 @@ public final class LegacySavegameFormatReaderForPlayer {
 		if (fileversion <= 30) {
 			player.baseTraits.attackCost = Player.DEFAULT_PLAYER_ATTACKCOST;
 		}
+
+		if (fileversion <= 37) {
+			if (player.hasExactQuestProgress("lodar13_rest", 30) && player.hasExactQuestProgress("lodar13_rest", 31)) {
+				player.addQuestProgress(new QuestProgress("lodar13_rest", 65));
+			}
+		}
 	}
 	
 	public static int getExpectedNumberOfSkillpointsForLevel(int level) {

AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java

@@ -161,7 +161,7 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
 		updateAttackMoveButtonText();
 	}
 
-	public void show() {
+	private void show() {
 		updateStatus();
 		setVisibility(View.VISIBLE);
     	bringToFront();
@@ -170,7 +170,7 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
     	}
 	}
 
-	public void hide() {
+	private void hide() {
 		if (preferences.enableUiAnimations) {
 			startAnimation(hideAnimation);
 		} else {