From 4c55c5c2a7e596f7ccff2b3eb191303cf6f8fadd Mon Sep 17 00:00:00 2001
From: "Nut.andor" <nut.andor@posteo.de>
Date: Sat, 20 Jul 2024 00:09:47 +0200
Subject: [PATCH] better error message

---
 .../resource/parsers/WorldMapParser.java      |  5 ++--
 .../conversationlist_stoutford_combined.json  |  3 ++-
 AndorsTrail/res/raw/droplists_ratdom.json     | 26 -------------------
 3 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
index 5a050e829..8a7b55d04 100644
--- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
+++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
@@ -24,11 +24,12 @@ public final class WorldMapParser {
 	}
 
 	private static void read(XmlResourceParser xrp, final MapCollection maps, final TranslationLoader translationLoader) {
+		String s = "";
 		try {
 			int eventType;
 			while ((eventType = xrp.next()) != XmlResourceParser.END_DOCUMENT) {
 				if (eventType == XmlResourceParser.START_TAG) {
-					String s = xrp.getName();
+					s = xrp.getName();
 					if (s.equals("segment")) {
 						WorldMapSegment segment = parseSegment(xrp, maps, translationLoader);
 						maps.worldMapSegments.put(segment.name, segment);
@@ -37,7 +38,7 @@ public final class WorldMapParser {
 			}
 			xrp.close();
 		} catch (Exception e) {
-			L.log("Error reading worldmap: " + e.toString());
+			L.log("Error reading worldmap: " + s + e.toString());
 		}
 	}
 
diff --git a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
index 59edc70b0..e758b7f26 100644
--- a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
+++ b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
@@ -11819,7 +11819,8 @@
         "message":"No, unfortunately not. Maybe try my colleague in Fallhaven?",
         "replies":[
             {
-                "text":"Sigh - well, thanks."
+                "text":"Sigh - well, thanks.",
+                "nextPhraseID":"X"
             }
         ]
     }
diff --git a/AndorsTrail/res/raw/droplists_ratdom.json b/AndorsTrail/res/raw/droplists_ratdom.json
index c58781810..40bd414c4 100644
--- a/AndorsTrail/res/raw/droplists_ratdom.json
+++ b/AndorsTrail/res/raw/droplists_ratdom.json
@@ -925,31 +925,5 @@
                 }
             }
         ]
-    },
-    {
-        "id":"ratdom_618_loot1",
-        "items":[
-            {
-                "itemID":"gold",
-                "chance":"100",
-                "quantity":{
-                    "min":200,
-                    "max":400
-                }
-            }
-        ]
-    },
-    {
-        "id":"ratdom_618_loot2",
-        "items":[
-            {
-                "itemID":"ratdom_parchment",
-                "chance":"100",
-                "quantity":{
-                    "min":1,
-                    "max":1
-                }
-            }
-        ]
     }
 ]
\ No newline at end of file