From 903564a037766dab044473cd8661b93cfc97fddc Mon Sep 17 00:00:00 2001
From: Zukero <kpochat@gmail.com>
Date: Mon, 10 Aug 2015 17:25:04 +0200
Subject: [PATCH] Fixed blocking & crashing bugs in shortcut_lodar. Boosted
 debug values to cope with swarm of Hirathils.

---
 AndorsTrail/res/raw/conversationlist_lodar.json   | 15 ++++++++++-----
 .../res/raw/conversationlist_shortcut_lodar.json  |  1 -
 AndorsTrail/res/raw/itemlist_shortcut_lodar.json  |  9 +++++++++
 AndorsTrail/res/values/loadresources.xml          |  1 +
 .../rpg/AndorsTrail/activity/DebugInterface.java  |  8 ++++----
 5 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 AndorsTrail/res/raw/itemlist_shortcut_lodar.json

diff --git a/AndorsTrail/res/raw/conversationlist_lodar.json b/AndorsTrail/res/raw/conversationlist_lodar.json
index ba4d840a8..b4facb677 100644
--- a/AndorsTrail/res/raw/conversationlist_lodar.json
+++ b/AndorsTrail/res/raw/conversationlist_lodar.json
@@ -2067,11 +2067,16 @@
             }
         ],
         "rewards":[
-            {
-                "value":1,
-                "rewardID":"vial_activation",
-                "rewardType":"giveItem"
-            }
+        	{
+            	"value":1,
+            	"rewardID":"vial_activation",
+            	"rewardType":"giveItem"
+        	},
+        	{
+        	    "value":30,
+    	        "rewardID":"shortcut_lodar",
+	            "rewardType":"questProgress"
+        	}
         ]
     },
     {
diff --git a/AndorsTrail/res/raw/conversationlist_shortcut_lodar.json b/AndorsTrail/res/raw/conversationlist_shortcut_lodar.json
index 8fa8b1fdd..cd60ec70b 100644
--- a/AndorsTrail/res/raw/conversationlist_shortcut_lodar.json
+++ b/AndorsTrail/res/raw/conversationlist_shortcut_lodar.json
@@ -49,7 +49,6 @@
         ]
     },
     {
-        "message":"",
         "id":"sign_lodar_shortcut_5",
         "replies":[
             {
diff --git a/AndorsTrail/res/raw/itemlist_shortcut_lodar.json b/AndorsTrail/res/raw/itemlist_shortcut_lodar.json
new file mode 100644
index 000000000..f54bf67e4
--- /dev/null
+++ b/AndorsTrail/res/raw/itemlist_shortcut_lodar.json
@@ -0,0 +1,9 @@
+[
+  {
+    "id": "vial_activation",
+    "name": "Lodar's activation vial",
+    "displaytype": "quest",
+    "iconID": "items_tometik1:20",
+    "category": "pot"
+  }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml
index 579c3c018..06b784d45 100644
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -36,6 +36,7 @@
 		<item>@raw/itemlist_v0611_3</item>
 		<item>@raw/itemlist_v070</item>
 		<item>@raw/itemlist_v070_questitems</item>
+		<item>@raw/itemlist_shortcut_lodar</item>
 	</array>
 
 	<array name="loadresource_droplists">
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
index b5ca1e062..45d86e2ea 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
@@ -33,10 +33,10 @@ public final class DebugInterface {
 			new DebugButton("dmg", new OnClickListener() {
 				@Override
 				public void onClick(View arg0) {
-					world.model.player.damagePotential.set(99, 99);
-					world.model.player.attackChance = 200;
+					world.model.player.damagePotential.set(500, 500);
+					world.model.player.attackChance = 500;
 					world.model.player.attackCost = 1;
-					showToast(mainActivity, "DEBUG: damagePotential=99, chance=200%, cost=1", Toast.LENGTH_SHORT);
+					showToast(mainActivity, "DEBUG: damagePotential=500, chance=500%, cost=1", Toast.LENGTH_SHORT);
 				}
 			})
 			/*,new DebugButton("dmg=1", new OnClickListener() {
@@ -90,7 +90,7 @@ public final class DebugInterface {
 			,new DebugButton("hp", new OnClickListener() {
 				@Override
 				public void onClick(View arg0) {
-					world.model.player.baseTraits.maxHP = 200;
+					world.model.player.baseTraits.maxHP = 500;
 					world.model.player.health.max = world.model.player.baseTraits.maxHP;
 					controllerContext.actorStatsController.setActorMaxHealth(world.model.player);
 					world.model.player.conditions.clear();