feygard_1 with hash bug

This reverts commit 718886ba3a.

AndorsTrail/app/src/main/AndroidManifest.xml

@@ -3,8 +3,8 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="68"
-	android:versionName="0.8.4"
+	android:versionCode="73"
+	android:versionName="0.8.7"
 	android:installLocation="auto"
 	>
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java

@@ -24,15 +24,15 @@ public final class AndorsTrailApplication extends Application {
 	public static final boolean DEVELOPMENT_DEBUGRESOURCES = false;
 	public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false;
 	public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false;
-	public static final boolean DEVELOPMENT_DEBUGBUTTONS = false;
+	public static final boolean DEVELOPMENT_DEBUGBUTTONS = true;
 	public static final boolean DEVELOPMENT_FASTSPEED = false;
-	public static final boolean DEVELOPMENT_VALIDATEDATA = false;
-	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
-	public static final String CURRENT_VERSION_DISPLAY = "0.8.4";
+	public static final boolean DEVELOPMENT_VALIDATEDATA = true;
+	public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
+	public static final String CURRENT_VERSION_DISPLAY = "0.8.7";
 	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
 	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED || !IS_RELEASE_VERSION;
 	public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999;
-	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 68;
+	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 73;
 
 	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
 	private WorldContext world = new WorldContext();

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java

@@ -78,7 +78,7 @@ public final class AndorsTrailPreferences {
 			dest.dpadTransparency = Integer.parseInt(prefs.getString("dpadtransparency", Integer.toString(DPAD_TRANSPARENCY_50_PERCENT)));
 			dest.dpadMinimizeable = prefs.getBoolean("dpadMinimizeable", true);
 			dest.optimizedDrawing = prefs.getBoolean("optimized_drawing", false);
-			dest.highQualityFilters = prefs.getBoolean("high_quality_filters", true);
+			dest.highQualityFilters = prefs.getBoolean("high_quality_filters", false);
 			dest.enableUiAnimations = prefs.getBoolean("enableUiAnimations", true);
 			dest.displayOverwriteSavegame = Integer.parseInt(prefs.getString("display_overwrite_savegame", Integer.toString(CONFIRM_OVERWRITE_SAVEGAME_ALWAYS)));
 			dest.quickslotsPosition = Integer.parseInt(prefs.getString("quickslots_placement", Integer.toString(QUICKSLOTS_POSITION_HORIZONTAL_CENTER_BOTTOM)));

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/Constants.java

@@ -7,7 +7,7 @@ import com.gpl.rpg.AndorsTrail.util.ConstRange;
 import com.gpl.rpg.AndorsTrail.util.Range;
 
 public final class Constants {
-	public static final int PERCENT_EXP_LOST_WHEN_DIED = 30;
+	public static final int PERCENT_EXP_LOST_WHEN_DIED = 20;
 	public static final int LEVELUP_EFFECT_HEALTH = 5;
 	public static final int LEVELUP_EFFECT_ATK_CH = 5;
 	public static final int LEVELUP_EFFECT_ATK_DMG = 1;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/actor/Player.java

@@ -111,7 +111,7 @@ public final class Player extends Actor {
 		baseTraits.criticalSkill = 0;
 		baseTraits.criticalMultiplier = 1;
 		baseTraits.damagePotential.set(1, 1);
-		baseTraits.blockChance = 0;
+		baseTraits.blockChance = 9;
 		baseTraits.damageResistance = 0;
 		baseTraits.useItemCost = 5;
 		baseTraits.reequipCost = 5;

AndorsTrail/play/listings/en-US/full-description.txt

@@ -21,6 +21,46 @@ Visit our forums on www.andorstrail.com for help, hints, tips and general discus
 
 Changelog:
 
+v0.8.5
+New quest 'Ratdom' with 139 new maps and 2 sub quests
+The loss of XP in case of death is now 20% instead of 30%
+Having raw meat cooked
+Translation updates and many minor bug fixes and enhancements
+
+v0.8.4.1
+Export/Import: The worldmap, which consists of many small png files, is handled now as a zip file.
+Translation updates and many minor bug fixes and map enhancements
+
+v0.8.3
+New quest "The Dead are Walking" with 38 new maps
+Export/Import function for savegames
+
+v0.8.2
+Fix of a lost traveler in certain conditions
+Support of older mobiles again
+
+v0.8.1
+New city Sullengard
+71 new maps and 6 new quests
+Monster kill count
+Controller support
+Translations updated
+Engine changes to support actual Android Studio
+
+v0.7.17
+Fix of unloadable savegames in certain conditions
+
+v0.7.16
+New quest 'Delivery'
+Fix of Killed-by-Kamelio bug, postman bug and typos
+Translations updated (Chinese 99%)
+
+v0.7.15
+Fix of a notification crash bug
+Fix of missing scout and of a non disappearing Ortholion and Ehrenfest in certain conditions
+Various small changes and bug fixes
+Translations updated
+
 v0.7.14
 2 new quests:
 "Climbing up is forbidden"

AndorsTrail/play/listings/en-US/whatsnew.txt

@@ -1,7 +1,107 @@
 I put both (release notes + forum announcement) into this source, so it will be easier to maintain them parallel:
 
 
-APK 68 (0.8.4)  Mostly harmless
+APK 72 (0.8.6.1)  Another Ratdom bug fix
+
+Release notes
+=============
+* Fixed: Not able to complete quest "More rats!"
+* Translation updates
+
+
+Forum announcement  //2023-05-21
+==================
+Hello adventurers,
+
+we had to create another bug fix version (v0.8.6.1)
+
+[list]In certain cases the quest "More rats!" could not be completed.
+[/list]
+
+
+Here is is the link on our server: [url]https://andorstrail.com/static/AndorsTrail_v0.8.7.apk[/url]
+Google Play, F-Droid and Itch will follow soon.
+
+
+
+APK 71 (0.8.6)  Ratdom bug fixes
+
+Release notes
+=============
+* Missing chest content fixed
+* Translation updates and other minor bug fixes
+
+
+Forum announcement  //2023-05-14
+==================
+Hello adventurers,
+
+we have another new version for you (v0.8.6)
+
+[list]The chests near Flora's fountain are filled now, the crash is fixed.
+[/list]
+
+[list]Clevred now offers his help with the four wells with endless patience.[/list]
+
+[list]And some fixes of minor bugs and updates of the translations (Chinese is 100% again 8)).[/list]
+
+
+Here is is the link on our server: [url]https://andorstrail.com/static/AndorsTrail_v0.8.6.apk[/url]
+Google Play, F-Droid and Itch will follow soon.
+
+
+
+APK 70 (0.8.5)  Ratdom
+
+Release notes
+=============
+* The new Ratdom area with 3 quests and 139 new maps
+* Translation updates and many minor bug fixes and enhancements
+
+
+Forum announcement  //2023-01-29
+==================
+Hello adventurers,
+	
+we have another new version for you (v0.8.5 Ratdom)
+
+[list]We have a huge new area with 139 new maps and 3 new quests:
+A big quest in a rat world and two other small quests you will find on your way.
+
+This section is more for high-level players: the quests Lodar, Charwood, Colonel Lutarc and the starter quests Prohibited Substance and Rat Infestation are mandatory.
+Do you have these and also 9000 gold pieces with you, then you can dive into the new adventure.
+Just go home and take a nap - it's not really going to be refreshing...
+
+You will find many new maps arranged as a maze. This area looks and feels different than the rest of Andor's path. It will also be a challenge for the high-level players who just run through new areas with no effort.
+(The scope took a long time to create, so don't expect to finish it in a few hours.)
+
+A rat named Clevred will accompany you even though you don't see it. It's small enough to hide in your pocket or carry around. But he will talk to you, sometimes randomly, sometimes giving advice.
+[/list]
+
+[list]The loss of XP in case of death is now 20% instead of 30%[/list]
+
+[list]It is now possible to have your raw meat cooked by Gison's son Gael and in Remgard.[/list]
+
+[list]We added the new Polished ring of the Protector in Remgard, and flipped the places of sale of the Guardian and Protector rings.[/list]
+
+[list]Several other adjustments, not worth to list them all here[/list]
+
+[list]And as always, we've fixed some minor bugs and updated the translations.[/list]
+
+
+Here is is the link on our server: [url]https://andorstrail.com/static/AndorsTrail_v0.8.5.apk[/url]
+Google Play, F-Droid and Itch will follow soon.
+
+Have fun!
+
+
+PS
+I might be too harsh, so we added an early exit to the quest so you can come out and complete the quest even if you didn't actually reach the end.
+
+
+
+
+APK 69 (0.8.4.1)  //Mostly harmless
 
 Release notes
 =============
@@ -13,7 +113,7 @@ Forum announcement  //2023-01-29
 ==================
 Hello fellow adventurers,
 
-Here is the actual release v0.8.4 with bugfixes, translations and little enhancements:
+Here is the actual release v0.8.4.1 with bugfixes, translations and little enhancements:
 
 [list]The export/import is enhanced: The worldmap, which consists of many small png files, is handled now as a zip file. This is more convenient and much quicker.[/list]
 
@@ -23,7 +123,7 @@ Here is the actual release v0.8.4 with bugfixes, translations and little enhance
 
 [list]And as always we actualized the translations[/list]
 
-Here is is the link on our server: [url]https://andorstrail.com/static/AndorsTrail_v0.8.4.apk[/url]
+Here is is the link on our server: [url]https://andorstrail.com/static/AndorsTrail_v0.8.4.1.apk[/url]
 Google Play, F-Droid and Itch will follow soon.
 
 Have fun!
@@ -31,6 +131,9 @@ Have fun!
 
 
 
+APK 68 (0.8.4)  //Mostly harmless (unneeded files - immediatly replaced by 69)
+
+
 APK 67 (0.8.3)  //Haunted Forest  2022-11-04
 
 Release notes (Google/Itch)

AndorsTrail/res/raw/conversationlist_crossglen.json

@@ -6,6 +6,23 @@
             {
                 "text":"Please show me your wares.",
                 "nextPhraseID":"S"
+            },
+            {
+                "text":"Do you have a pickaxe by chance?",
+                "nextPhraseID":"ratdom_audir",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"ratdom_quest",
+                        "value":80
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"ratdom_quest",
+                        "value":82,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_feygard_1.json

@@ -0,0 +1,246 @@
+[
+    {
+        "id":"guynmart_fog",
+        "message":"You can't get through this dense fog here."
+    },
+    {
+        "id":"feygard_fogmonster9",
+        "message":"Me and my brothers watch over the ruler of the swamp.",
+        "replies":[
+            {
+                "text":"Not for long, your brothers have left the area already. Attack!",
+                "nextPhraseID":"F",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"feygard_fog",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"feygard_fog",
+                        "value":2
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"feygard_fog",
+                        "value":3
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"feygard_fog",
+                        "value":4
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"feygard_fog",
+                        "value":5
+                    }
+                ]
+            },
+            {
+                "text":"So I'm going to have to talk to your brothers.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"feygard_fogmonster1_check",
+        "replies":[
+            {
+                "nextPhraseID":"feygard_fogmonster1_check_1",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"feygard_fogmonster1",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"feygard_fog",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"feygard_fogmonster1_check_1",
+        "message":"As soon as you lower your weapon, the fog begins to vanish.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"feygard_fog",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"feygard_fogmonster2_check",
+        "replies":[
+            {
+                "nextPhraseID":"feygard_fogmonster2_check_1",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"feygard_fogmonster2",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"feygard_fog",
+                        "value":2,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"feygard_fogmonster2_check_1",
+        "message":"As soon as you lower your weapon, the fog begins to vanish.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"feygard_fog",
+                "value":2
+            }
+        ]
+    },
+    {
+        "id":"feygard_fogmonster3_check",
+        "replies":[
+            {
+                "nextPhraseID":"feygard_fogmonster3_check_1",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"feygard_fogmonster3",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"feygard_fog",
+                        "value":3,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"feygard_fogmonster3_check_1",
+        "message":"As soon as you lower your weapon, the fog begins to vanish.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"feygard_fog",
+                "value":3
+            }
+        ]
+    },
+    {
+        "id":"feygard_fogmonster4_check",
+        "replies":[
+            {
+                "nextPhraseID":"feygard_fogmonster4_check_1",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"feygard_fogmonster4",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"feygard_fog",
+                        "value":4,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"feygard_fogmonster4_check_1",
+        "message":"As soon as you lower your weapon, the fog begins to vanish.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"feygard_fog",
+                "value":4
+            }
+        ]
+    },
+    {
+        "id":"feygard_fogmonster5_check",
+        "replies":[
+            {
+                "nextPhraseID":"feygard_fogmonster5_check_1",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"feygard_fogmonster5",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"feygard_fog",
+                        "value":5,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"feygard_fogmonster5_check_1",
+        "message":"As soon as you lower your weapon, the fog begins to vanish.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"feygard_fog",
+                "value":5
+            }
+        ]
+    },
+    {
+        "id":"feygard_swamp_sign",
+        "message":"Go away - while you still can!"
+    },
+    {
+        "id":"guynmart_roadguard_12",
+        "message":"The fog over there is very dangerous.",
+        "replies":[
+            {
+                "text":"Which fog? Do you ever look up?",
+                "nextPhraseID":"guynmart_roadguard_30"
+            }
+        ]
+    },
+    {
+        "id":"guynmart_roadguard_30",
+        "message":"Oh ... Forget it. I feel rather stupid now. Bye.",
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"guynmart_roadguard",
+                "mapName":"guynmart_wood_13"
+            }
+        ]
+    },
+    {
+        "id":"swamp_witch",
+        "message":"A child!? I haven't had anything tender to eat in a long time.",
+        "replies":[
+            {
+                "text":"But hard to digest... Attack!",
+                "nextPhraseID":"F"
+            }
+        ]
+    },
+    {
+        "id":"swamphut_oven",
+        "message":"Certainly these two mighty ovens were responsible for the thick fog outside."
+    }
+]

AndorsTrail/res/raw/conversationlist_fungi_panic.json

@@ -2414,7 +2414,7 @@
     },
     {
         "id":"achieve_road_10",
-        "message":"This must be the great Duleian Road! I have heard so much of it - and now I am really here!",
+        "message":"This must be the great Duleian Road! I have heard so much about it - and now I am really here!",
         "rewards":[
             {
                 "rewardType":"questProgress",

AndorsTrail/res/raw/conversationlist_gison.json

@@ -1659,6 +1659,10 @@
             {
                 "text":"To each his own, I guess.",
                 "nextPhraseID":"gael_20_5"
+            },
+            {
+                "text":"Cooked meat? Who cooks your meat?",
+                "nextPhraseID":"gael_cook"
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_gorwath.json

@@ -290,7 +290,7 @@
     },
     {
         "id":"gorwath_exit",
-        "message":"I will go now and prepare a present for lovely Arensia.",
+        "message":"I will go now and prepare a present for lovely Arensia. When we get married, you will of course be invited.",
         "replies":[
             {
                 "text":"OK. Bye.",
@@ -300,12 +300,16 @@
     },
     {
         "id":"gorwath_exit_1",
-        "message":"And when we get married, you will of course be invited.",
+        "message":"Before we go our separate ways, please take this ring that I found behind those haystacks over there.",
         "rewards":[
             {
                 "rewardType":"removeSpawnArea",
                 "rewardID":"gorwath",
                 "mapName":"crossglen"
+            },
+            {
+                "rewardType":"dropList",
+                "rewardID":"gorwath_dl"
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_guynmart2_npc.json

@@ -78,12 +78,36 @@
             {
                 "text":"Oh? Is it the fog that is the problem?",
                 "nextPhraseID":"guynmart_roadguard_20"
+            },
+            {
+                "text":"Why?",
+                "nextPhraseID":"guynmart_roadguard_12",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"feygard_fog",
+                        "value":1
+                    }
+                ]
             }
         ]
     },
     {
         "id":"guynmart_roadguard_20",
-        "message":"Yes. Several men already got lost and never reappeared. There is no way through."
+        "message":"Yes. Several men already got lost and never reappeared. There is no way through.",
+        "replies":[
+            {
+                "text":"But ... which fog?",
+                "nextPhraseID":"guynmart_roadguard_30",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"feygard_fog",
+                        "value":1
+                    }
+                ]
+            }
+        ]
     },
     {
         "id":"guynmart_farmer_10",

AndorsTrail/res/raw/conversationlist_haunted_forest.json

@@ -463,7 +463,7 @@
     },
     {
         "id":"haunted_forest_discovery_script_10",
-        "message":"As you enter this dark place, you suspect that you are getting closer to the sounds heard by Gabriel as the moaning is much loader now.",
+        "message":"As you enter this dark place, you suspect that you are getting closer to the sounds heard by Gabriel as the moaning is much louder now.",
         "rewards":[
             {
                 "rewardType":"questProgress",
@@ -599,7 +599,7 @@
     },
     {
         "id":"road5_daw_20",
-        "message":"Now you begin to notice that the moaning heard by Gabriel is a little loader here.",
+        "message":"Now you begin to notice that the moaning heard by Gabriel is a little louder here.",
         "replies":[
             {
                 "text":"I must be getting closer to the source. It's time to press on.",

AndorsTrail/res/raw/conversationlist_kendelow.json

@@ -52,6 +52,10 @@
             {
                 "text":"Are there any rooms available?",
                 "nextPhraseID":"kendelow_room_1"
+            },
+            {
+                "text":"Actually, I am wondering if it would be possible if I could cook some meat in your kitchen?",
+                "nextPhraseID":"kendelow_meat"
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_mikhail.json

@@ -2,6 +2,16 @@
     {
         "id":"mikhail_start_select",
         "replies":[
+            {
+                "nextPhraseID":"ratdom_mikhail",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"ratdom_nondisplay",
+                        "value":1
+                    }
+                ]
+            },
             {
                 "nextPhraseID":"mikhail_start_select2",
                 "requires":[
@@ -555,6 +565,16 @@
         "replies":[
             {
                 "text":"OK, I understand. I can rest here if I get hurt, and I should check my inventory for useful items.",
+                "nextPhraseID":"mikhail_rats_start3a"
+            }
+        ]
+    },
+    {
+        "id":"mikhail_rats_start3a",
+        "message":"One more thing: Look at that basket on the floor over there. It belongs to Andor and he might have left something useful inside.",
+        "replies":[
+            {
+                "text":"N",
                 "nextPhraseID":"mikhail_default"
             }
         ]

AndorsTrail/res/raw/conversationlist_omi2.json

@@ -6587,7 +6587,7 @@
                 "nextPhraseID":"X"
             },
             {
-                "text":"May the shadow be with your soul.",
+                "text":"May the Shadow be with your soul.",
                 "nextPhraseID":"elm3_corpse_3b"
             }
         ]

AndorsTrail/res/raw/conversationlist_omicronrg9.json

@@ -5145,7 +5145,7 @@
     },
     {
         "id":"umar_guild04_21",
-        "message":"Fortunately, one of my men found one of his drunk men and had a short talk with him before he bleed to death.",
+        "message":"Fortunately, one of my men found one of his drunk men and had a short talk with him before he bled to death.",
         "replies":[
             {
                 "text":"What did he say?",

AndorsTrail/res/raw/conversationlist_sullengard.json

@@ -45,10 +45,10 @@
     },
     {
         "id":"loneford13_pitchfork",
-        "message":"A new pitchfork pinned in this haystack.",
+        "message":"A new pitchfork is pinned in this haystack.",
         "replies":[
             {
-                "text":"Time to prove that I'm a son of farmer!",
+                "text":"Time to prove that I'm the child of farmer!",
                 "nextPhraseID":"loneford13_pitchfork_selector2",
                 "requires":[
                     {
@@ -107,7 +107,7 @@
         "message":"After several minutes of intense pulling you finally pull out the new pitchfork from the haystack.",
         "replies":[
             {
-                "text":"I'm the son of a farmer!",
+                "text":"I'm a child of a farmer!",
                 "nextPhraseID":"X"
             },
             {
@@ -4135,15 +4135,27 @@
                 "nextPhraseID":"parents_argue_10",
                 "requires":[
                     {
-                        "requireType":"questLatestProgress",
+                        "requireType":"questProgress",
                         "requireID":"andor",
                         "value":100
                     },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"andor",
+                        "value":110,
+                        "negate":true
+                    },
                     {
                         "requireType":"questProgress",
                         "requireID":"sullengard_hidden",
                         "value":26,
                         "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"ratdom_nondisplay",
+                        "value":1,
+                        "negate":true
                     }
                 ]
             }
@@ -6815,7 +6827,7 @@
     },
     {
         "id":"sullengard_town_clerk_10",
-        "message":"If you are here about a tax complaint or a land dispute, then please sign in and I well get to you momentarily."
+        "message":"If you are here about a tax complaint or a land dispute, then please sign in and I will get to you momentarily."
     },
     {
         "id":"sullengard_godrey_10a",

AndorsTrail/res/raw/droplists_feygard_1.json

@@ -0,0 +1,36 @@
+[
+    {
+        "id":"feygard_fogmonster",
+        "items":[
+            {
+                "itemID":"gem5",
+                "chance":"100",
+                "quantity":{
+                    "min":10,
+                    "max":20
+                }
+            }
+        ]
+    },
+    {
+        "id":"loot_swamphut",
+        "items":[
+            {
+                "itemID":"gem5",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":100,
+                    "max":200
+                }
+            }
+        ]
+    }
+]

AndorsTrail/res/raw/droplists_ratdom.json

@@ -0,0 +1,955 @@
+[
+    {
+        "id":"container_gold_200_500",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":200,
+                    "max":500
+                }
+            }
+        ]
+    },
+    {
+        "id":"container_gold_3_10",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":3,
+                    "max":10
+                }
+            },
+            {
+                "itemID":"club3",
+                "chance":"5",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"container_gold_30_200",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":30,
+                    "max":200
+                }
+            },
+            {
+                "itemID":"club3",
+                "chance":"5",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"container_rock_1",
+        "items":[
+            {
+                "itemID":"rock",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"club3",
+                "chance":"5",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"drop_ratdom_gruil",
+        "items":[
+            {
+                "itemID":"gem1",
+                "chance":"50",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"drop_ratdom_kriih",
+        "items":[
+            {
+                "itemID":"gem1",
+                "chance":"50",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":200,
+                    "max":500
+                }
+            },
+            {
+                "itemID":"boots_coward",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"daggr_curv",
+                "chance":"50",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"stiletto",
+                "chance":"25",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"drink_lowyn3",
+                "chance":"50",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"drop_ratdom_mara",
+        "items":[
+            {
+                "itemID":"bread",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
+    },
+    {
+        "id":"drop_ratdom_tharal",
+        "items":[
+            {
+                "itemID":"health_minor2",
+                "chance":"50",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_531_loot1",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":200,
+                    "max":400
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_531_loot2",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"50",
+                "quantity":{
+                    "min":10,
+                    "max":40
+                }
+            },
+            {
+                "itemID":"gem2",
+                "chance":"50",
+                "quantity":{
+                    "min":2,
+                    "max":4
+                }
+            },
+            {
+                "itemID":"gem3",
+                "chance":"50",
+                "quantity":{
+                    "min":2,
+                    "max":4
+                }
+            },
+            {
+                "itemID":"gem5",
+                "chance":"50",
+                "quantity":{
+                    "min":2,
+                    "max":4
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_567_loot1",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":200,
+                    "max":400
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_567_loot2",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"50",
+                "quantity":{
+                    "min":10,
+                    "max":40
+                }
+            },
+            {
+                "itemID":"gem2",
+                "chance":"50",
+                "quantity":{
+                    "min":2,
+                    "max":4
+                }
+            },
+            {
+                "itemID":"gem3",
+                "chance":"50",
+                "quantity":{
+                    "min":2,
+                    "max":4
+                }
+            },
+            {
+                "itemID":"gem5",
+                "chance":"50",
+                "quantity":{
+                    "min":2,
+                    "max":4
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_616_loot1",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":50,
+                    "max":100
+                }
+            }
+        ]
+    },
+    {
+        "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
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_artefact",
+        "items":[
+            {
+                "itemID":"ratdom_artefact",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_bone_collector_container",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":3,
+                    "max":10
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_bone_collector_container2",
+        "items":[
+            {
+                "itemID":"gem2",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_drop_compass_bwm",
+        "items":[
+            {
+                "itemID":"ratdom_compass_bwm",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_drop_compass_tour",
+        "items":[
+            {
+                "itemID":"ratdom_compass_tour",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_ff_guard",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":2,
+                    "max":9
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_ff_guard_loot1",
+        "items":[
+            {
+                "itemID":"sullengrad_finest",
+                "chance":"100",
+                "quantity":{
+                    "min":20,
+                    "max":30
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_ff_guard_loot2",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":120,
+                    "max":330
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_fraedro",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":200,
+                    "max":500
+                }
+            },
+            {
+                "itemID":"ratdom_fraedro_key",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_goldhunter_drop",
+        "items":[
+            {
+                "itemID":"ratdom_rat_skelett_leg",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":30,
+                    "max":200
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_king_rah",
+        "items":[
+            {
+                "itemID":"ratdom_rat_sword",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_kriih",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":200,
+                    "max":500
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_librarian",
+        "items":[
+            {
+                "itemID":"ratdom_torch",
+                "chance":"50",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"50",
+                "quantity":{
+                    "min":30,
+                    "max":80
+                }
+            },
+            {
+                "itemID":"ratdom_book",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_library_container",
+        "items":[
+            {
+                "itemID":"ratdom_rat_skelett_back",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_maze_mole",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":5
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_maze_mole_food",
+        "items":[
+            {
+                "itemID":"ratdom_maze_mole_food",
+                "chance":"66",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"33",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_mz_center",
+        "items":[
+            {
+                "itemID":"gem1",
+                "chance":"50",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":10,
+                    "max":30
+                }
+            },
+            {
+                "itemID":"ratdom_rat_skelett_leg",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_rat_pub_owner",
+        "items":[
+            {
+                "itemID":"snake_meat_cooked",
+                "chance":"100",
+                "quantity":{
+                    "min":5,
+                    "max":10
+                }
+            },
+            {
+                "itemID":"guynmart_wine",
+                "chance":"100",
+                "quantity":{
+                    "min":5,
+                    "max":5
+                }
+            },
+            {
+                "itemID":"charwood_cheddar",
+                "chance":"100",
+                "quantity":{
+                    "min":2,
+                    "max":2
+                }
+            },
+            {
+                "itemID":"ferm-garlic",
+                "chance":"80",
+                "quantity":{
+                    "min":1,
+                    "max":3
+                }
+            },
+            {
+                "itemID":"mead",
+                "chance":"100",
+                "quantity":{
+                    "min":5,
+                    "max":5
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_skeleton_gold",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":50,
+                    "max":120
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_startitems2",
+        "items":[
+            {
+                "itemID":"bone",
+                "chance":"100",
+                "quantity":{
+                    "min":2,
+                    "max":10
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_drop_torch",
+        "items":[
+            {
+                "itemID":"ratdom_torch",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_troll",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"60",
+                "quantity":{
+                    "min":1,
+                    "max":5
+                }
+            },
+            {
+                "itemID":"club3",
+                "chance":"5",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_troll_loot_1",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":1000,
+                    "max":5000
+                }
+            },
+            {
+                "itemID":"gem2",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":3
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_troll_loot_2",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":1000,
+                    "max":5000
+                }
+            },
+            {
+                "itemID":"gem1",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":3
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_troll_9",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":1000,
+                    "max":5000
+                }
+            },
+            {
+                "itemID":"club3",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_uglybrute",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":50
+                }
+            },
+            {
+                "itemID":"club3",
+                "chance":"75",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_rat_warden",
+        "items":[
+            {
+                "itemID":"ratdom_compass_tour",
+                "chance":"100",
+                "quantity":{
+                    "min":5,
+                    "max":5
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_rat_warden2",
+        "items":[
+            {
+                "itemID":"ratdom_compass_tour",
+                "chance":"100",
+                "quantity":{
+                    "min":5,
+                    "max":5
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":5
+                }
+            }
+        ]
+    },
+    {
+        "id":"ratdom_water_container",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":80,
+                    "max":200
+                }
+            }
+        ]
+    },
+    {
+        "id":"well_water",
+        "items":[
+            {
+                "itemID":"well_water",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":3
+                }
+            }
+        ]
+    },
+    {
+        "id":"whootibarfag",
+        "items":[
+            {
+                "itemID":"ratdom_compass_bwm",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"ratdom_torch",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":5
+                }
+            },
+            {
+                "itemID":"handcarved_snowball",
+                "chance":"100",
+                "quantity":{
+                    "min":100,
+                    "max":150
+                }
+            }
+        ]
+    },
+    {
+        "id":"one_cooked_meat",
+        "items":[
+            {
+                "itemID":"meat_cooked",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"five_cooked_meat",
+        "items":[
+            {
+                "itemID":"meat_cooked",
+                "chance":"100",
+                "quantity":{
+                    "min":5,
+                    "max":5
+                }
+            }
+        ]
+    },
+    {
+        "id":"ten_cooked_meat",
+        "items":[
+            {
+                "itemID":"meat_cooked",
+                "chance":"100",
+                "quantity":{
+                    "min":10,
+                    "max":10
+                }
+            }
+        ]
+    },
+    {
+        "id":"twenty_cooked_meat",
+        "items":[
+            {
+                "itemID":"meat_cooked",
+                "chance":"100",
+                "quantity":{
+                    "min":20,
+                    "max":20
+                }
+            }
+        ]
+    },
+    {
+        "id":"gorwath_dl",
+        "items":[
+            {
+                "itemID":"kids_ring",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "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
+                }
+            }
+        ]
+    }
+]

AndorsTrail/res/raw/droplists_stoutford_combined.json

@@ -635,7 +635,7 @@
                 }
             },
             {
-                "itemID":"ring_guardian",
+                "itemID":"ring_protector",
                 "chance":"100",
                 "quantity":{
                     "min":1,