From b41fffee4464649eabcd0f2a36c696be75d5730b Mon Sep 17 00:00:00 2001
From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Tue, 27 Aug 2013 23:04:16 +0200
Subject: [PATCH] Content editor: Add support for giveItem,createTimer and
 timerElapsed in convs

---
 AndorsTrailEdit/partials/edit_dialogue.html | 29 +++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/AndorsTrailEdit/partials/edit_dialogue.html b/AndorsTrailEdit/partials/edit_dialogue.html
index 770776baa..999ba3532 100644
--- a/AndorsTrailEdit/partials/edit_dialogue.html
+++ b/AndorsTrailEdit/partials/edit_dialogue.html
@@ -35,6 +35,8 @@
 					<option value="skillIncrease">Skill increase</option>
 					<option value="actorCondition">Actor condition</option>
 					<option value="alignmentChange">Alignment/faction change</option>
+					<option value="giveItem">Item</option>
+					<option value="createTimer">Create timer</option>
 				</select>
 			</div>
 			<div ng-show="reward.rewardType=='questProgress'">
@@ -79,6 +81,22 @@
 					<input type="text" size="3" id="rewardvalue" class="field at-input-quantity" ng-model="reward.value" />
 				</div>
 			</div>
+			<div ng-show="reward.rewardType=='giveItem'">
+				<div class="fieldWithLabel">
+					<label for="rewardID" >Item 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">Quantity:</label>
+					<input type="text" size="3" id="rewardvalue" class="field at-input-quantity" ng-model="reward.value" />
+				</div>
+			</div>
+			<div ng-show="reward.rewardType=='createTimer'">
+				<div class="fieldWithLabel">
+					<label for="rewardID"><span class="hint  hint--top" data-hint="Can be any unique string really, just something to refer to this timer in some reply requirement.">Timer ID:</span></label>
+					<input type="text" size="30" id="rewardID" class="field at-input-id" ng-model="reward.rewardID" />
+				</div>
+			</div>
 			<button ng-click="removeReward(phrase, reward)" class="btn pull-right" title="Remove reward"><i class="icon-trash"></i> Remove reward</button>
 			<div class="clearfix"></div>
 		</div>
@@ -173,6 +191,7 @@
 					<option value="wear">Worn equipment</option>
 					<option value="skillLevel">Skill level</option>
 					<option value="killedMonster">Killed monster</option>
+					<option value="timerElapsed">Timer elapsed</option>
 				</select>
 			</div>
 			<div ng-show="require.requireType=='questProgress'">
@@ -231,6 +250,16 @@
 					<input type="text" size="3" id="requirevalue" class="field at-input-quantity" ng-model="require.value" />
 				</div>
 			</div>
+			<div ng-show="require.requireType=='timerElapsed'">
+				<div class="fieldWithLabel">
+					<label for="requireID">Timer ID:</label>
+					<input type="text" size="30" id="requireID" class="field at-input-id" ng-model="require.requireID" />
+				</div>
+				<div class="fieldWithLabel">
+					<label for="requirevalue">Number of rounds:</label>
+					<input type="text" size="3" id="requirevalue" class="field at-input-quantity" ng-model="require.value" />
+				</div>
+			</div>
 			<button ng-click="removeRequirement(reply, require)" class="btn pull-right" title="Remove requirement"><i class="icon-trash"></i> Remove requirement</button>
 			<div class="clearfix"></div>
 		</div>