From 00caf44ef1e9e037dae6e8d3b857bed97de9854f Mon Sep 17 00:00:00 2001
From: LucasDelvallet <lucas.delvallet@hotmail.fr>
Date: Fri, 6 Mar 2015 14:28:33 +0100
Subject: [PATCH] Added removeQuestProgress Reward

---
 AndorsTrailEdit/js/legacyimport.js          |  4 ++--
 AndorsTrailEdit/partials/edit_dialogue.html | 11 +++++++++++
 AndorsTrailEdit/partials/edit_quest.html    |  2 --
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/AndorsTrailEdit/js/legacyimport.js b/AndorsTrailEdit/js/legacyimport.js
index d4b92eb75..37aeea11d 100644
--- a/AndorsTrailEdit/js/legacyimport.js
+++ b/AndorsTrailEdit/js/legacyimport.js
@@ -7,7 +7,7 @@ var ATEditor = (function(ATEditor, model, FieldList, _) {
 				+ "hasAbilityEffect|boostMaxHP|boostMaxAP|moveCostPenalty|attackCost|attackChance|criticalChance|criticalMultiplier|attackDamage_Min|attackDamage_Max|blockChance|damageResistance|"
 				+ "];"
 			);
-		model.quests.legacyFieldList = new FieldList("[id|name|showInLog|stages[progress|logText|rewardExperience|removeQuestProgress|finishesQuest|]|];");
+		model.quests.legacyFieldList = new FieldList("[id|name|showInLog|stages[progress|logText|rewardExperience|finishesQuest|]|];");
 		model.items.legacyFieldList = new FieldList("[id|iconID|name|category|displaytype|hasManualPrice|baseMarketCost|"
 				+ "hasEquipEffect|equip_boostMaxHP|equip_boostMaxAP|equip_moveCostPenalty|equip_attackCost|equip_attackChance|equip_criticalChance|equip_criticalMultiplier|equip_attackDamage_Min|equip_attackDamage_Max|equip_blockChance|equip_damageResistance|equip_conditions[condition|magnitude|]|"
 				+ "hasUseEffect|use_boostHP_Min|use_boostHP_Max|use_boostAP_Min|use_boostAP_Max|use_conditionsSource[condition|magnitude|duration|chance|]|"
@@ -94,7 +94,7 @@ var ATEditor = (function(ATEditor, model, FieldList, _) {
 	
 	
 	function convertQuest(obj) {
-		// [id|name|showInLog|stages[progress|logText|rewardExperience|removeQuestProgress|finishesQuest|]|];
+		// [id|name|showInLog|stages[progress|logText|rewardExperience|finishesQuest|]|];
 		return obj;
 	}
 	
diff --git a/AndorsTrailEdit/partials/edit_dialogue.html b/AndorsTrailEdit/partials/edit_dialogue.html
index 45a9c49b3..8c0ddb895 100644
--- a/AndorsTrailEdit/partials/edit_dialogue.html
+++ b/AndorsTrailEdit/partials/edit_dialogue.html
@@ -31,6 +31,7 @@
 				<label for="rewardType">Reward Type:</label>
 				<select class="field" id="rewardType" ng-model="reward.rewardType">
 					<option value="questProgress">Quest progress</option>
+					<option value="removeQuestProgress">Remove Quest progress</option>
 					<option value="dropList">Droplist</option>
 					<option value="skillIncrease">Skill increase</option>
 					<option value="actorCondition">Actor condition</option>
@@ -74,6 +75,16 @@
 					<input type="text" size="3" id="rewardvalue" class="field at-input-quantity" ng-model="reward.value" />
 				</div>
 			</div>
+			<div ng-show="reward.rewardType=='removeQuestProgress'">
+				<div class="fieldWithLabel">
+					<label for="rewardID">Quest ID:</label>
+					<input type="text" size="30" id="rewardID" class="field at-input-id" ng-model="reward.rewardID" />
+				</div>
+				<div class="fieldWithLabel">
+					<label for="rewardvalue">Stage:</label>
+					<input type="text" size="3" id="rewardvalue" class="field at-input-quantity" ng-model="reward.value" />
+				</div>
+			</div>
 			<div ng-show="reward.rewardType=='dropList'">
 				<div class="fieldWithLabel">
 					<label for="rewardID">Droplist ID:</label>
diff --git a/AndorsTrailEdit/partials/edit_quest.html b/AndorsTrailEdit/partials/edit_quest.html
index 85c5ef813..62d736965 100644
--- a/AndorsTrailEdit/partials/edit_quest.html
+++ b/AndorsTrailEdit/partials/edit_quest.html
@@ -22,7 +22,6 @@
 				<th><span class="hint  hint--top" data-hint="This number will not be displayed to the player. Must be some unique number for this quest though. Prefer values from 10-100.">Progress</span></th>
 				<th>Logtext</th>
 				<th><span class="hint  hint--top" data-hint="Reaching this quest stage gives this much experience">Experience</span></th>
-				<th><span class="hint  hint--top" data-hint="Finishing this stage will get you back to a specified progress">Remove quest progress</span></th>
 				<th>Finishes quest</th>
 				<th></th>
 			</tr></thead>
@@ -31,7 +30,6 @@
 					<td><input type="text" size="3" ng-model="stage.progress" class="at-input-stat"/></td>
 					<td><textarea rows="2" cols="40" ng-model="stage.logText"></textarea></td>
 					<td><input type="text" size="7" ng-model="stage.rewardExperience" class="at-input-stat"/></td>
-					<td><input type="text" size="7" ng-model="stage.removeQuestProgress" class="at-input-stat"/></td>
 					<td><input type="checkbox" ng-model="stage.finishesQuest" ng-true-value="1" ng-false-value="0" /></td>
 					<td><a ng-click="removeQuestStage(stage)" class="btn btn-mini" title="Remove row"><i class="icon-trash"></i></a></td>
 				</tr>