Android Gradle Plugin upgrade

Currently translated at 84.5% (14245 of 16850 strings)

AndorsTrail/app/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
+
     compileSdkVersion 34
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.gpl.rpg.AndorsTrail"
@@ -63,11 +63,18 @@ task cleanup(type: Delete) {
 afterEvaluate {
     project.tasks.copyRes.dependsOn project.tasks.copyResValuesIn
 
+    mapReleaseSourceSetPaths.dependsOn project.tasks.copyRes
+    generateReleaseResources.dependsOn project.tasks.copyRes
+
+    generateDebugResources.dependsOn project.tasks.copyRes
+    mapDebugSourceSetPaths.dependsOn project.tasks.copyRes
     mergeDebugResources.dependsOn project.tasks.copyRes
     extractDeepLinksDebug.dependsOn project.tasks.copyRes
     mergeReleaseResources.dependsOn project.tasks.copyRes
     extractDeepLinksRelease.dependsOn project.tasks.copyRes
 
+    generateDebugResources.dependsOn project.tasks.copyTranslation
+    mapDebugSourceSetPaths.dependsOn project.tasks.copyTranslation
     mergeDebugAssets.dependsOn project.tasks.copyTranslation
     mergeReleaseAssets.dependsOn project.tasks.copyTranslation
     extractDeepLinksDebug.dependsOn project.tasks.copyTranslation

AndorsTrail/app/src/main/AndroidManifest.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest 
-	xmlns:android="http://schemas.android.com/apk/res/android" 
-	package="com.gpl.rpg.AndorsTrail"
+	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:versionCode="76"
-	android:versionName="0.8.10dev"
+	android:versionName="0.8.10"
 	android:installLocation="auto"
 	>
 

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

@@ -24,11 +24,11 @@ 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 = true;
+	public static final boolean DEVELOPMENT_DEBUGBUTTONS = false;
 	public static final boolean DEVELOPMENT_FASTSPEED = false;
-	public static final boolean DEVELOPMENT_VALIDATEDATA = true;
-	public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
-	public static final String CURRENT_VERSION_DISPLAY = "0.8.10dev";
+	public static final boolean DEVELOPMENT_VALIDATEDATA = false;
+	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
+	public static final String CURRENT_VERSION_DISPLAY = "0.8.10";
 	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;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java

@@ -182,7 +182,7 @@ public final class DebugInterface {
 				,new DebugButton("cr", new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "houseatcrossroads4", "down", 0, 0);
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "crossroads", "middle", 0, 0);
 			}
 		})
 				,new DebugButton("lf", new OnClickListener() {
@@ -370,7 +370,7 @@ public final class DebugInterface {
 				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "waterway5", "south", 0, 0);
 			}
 		})
-		
+
 				,new DebugButton("#5", new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
@@ -378,6 +378,34 @@ public final class DebugInterface {
 			}
 		})
 
+				,new DebugButton("#6", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "blackwater_mountain54", "east4", 0, 0);
+			}
+		})
+
+				,new DebugButton("#7", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "blackwater_mountain30", "east", 0, 0);
+			}
+		})
+
+				,new DebugButton("#8", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "bwmfill3", "north2", 0, 0);
+			}
+		})
+
+				,new DebugButton("#9", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "island1", "south2", 0, 0);
+			}
+		})
+
 		}));
 		buttonList.addAll(tpButtons3);
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java

@@ -341,9 +341,9 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.monsters_men2, "monsters_men2", new Size(10, 1), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_misc, "monsters_misc", new Size(13, 1), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_newb_1, "monsters_newb_1", new Size(40, 34), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_newb_2, "monsters_newb_2", new Size(16, 2), sz1x2, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_newb_3, "monsters_newb_3", new Size(20, 4), sz2x2, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_newb_4, "monsters_newb_4", new Size(4, 2), sz2x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_newb_2, "monsters_newb_2", new Size(8, 2), sz1x2, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_newb_3, "monsters_newb_3", new Size(10, 2), sz2x2, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_newb_4, "monsters_newb_4", new Size(4, 1), sz2x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_rats, "monsters_rats", new Size(5, 1), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_redshrike1, "monsters_redshrike1", sz7x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_rltiles1, "monsters_rltiles1", new Size(20, 8), sz1x1, mTileSize);

AndorsTrail/build.gradle

@@ -1,17 +1,17 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:8.4.1'
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
 }

AndorsTrail/gradle.properties

@@ -1 +1,4 @@
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true

AndorsTrail/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Jan 30 18:12:43 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

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

@@ -1,6 +1,49 @@
 I put both (release notes + forum announcement) into this source, so it will be easier to maintain them parallel:
 
 
+APK 76 (0.8.10)  BWM Fill
+
+Release notes
+=============
+* 9 new maps that helps to cover the hole in the worldmap at Blackwater Mountain
+* New quest "It makes no fence"
+* Again a skeleton for "Stoutford's old castle" could have been out of reach. We hope this is the last one
+* Some minor map fixes
+* Translations
+
+
+Forum announcement  //2024-04-28
+==================
+Hello fellow adventurers,
+
+
+a few weeks ago Raphi had surprised us with a bunch of maps that helps to cover the hole in the worldmap at Blackwater Mountain 8-)
+Thank you for the fiddly work in this area of the mountains, lovers of complete maps will appreciate it! 
+Mountains are among the most difficult maps, especially if there already exist maps around them, because the different heights have to match each other exactly.
+
+Raphi has also placed a new quest there for the early midgame level, involving some of Dhayavar's existing residents.
+
+We have fine-tuned the project and are publishing it here now: 
+
+[list]Find 9 new maps filling up the Blackwater Mountain area.[/list]
+
+[list]Help a shepherd in the Mountains above Prim in the new quest "It makes no fence".[/list]
+
+[list]Again a skeleton for "Stoutford's old castle" could have been out of reach. We hope this is the last one.[/list]
+
+[list]New translations[/list]
+
+[list]And as always we've fixed some minor bugs and typos, and have embellished a few little things here and there.[/list]
+
+
+Here is is the link on our server: [url]https://andorstrail.com/static/AndorsTrail_v0.8.10.apk[/url]
+Google Play, F-Droid and Itch will follow soon.
+
+Happy playing!
+
+
+
+
 APK 75 (0.8.9)  Bugfix + translations
 
 Release notes

AndorsTrail/res/raw/actorconditions_bwmfill.json

@@ -0,0 +1,15 @@
+[
+    {
+        "id":"thirst",
+        "iconID":"actorconditions_1:18",
+        "name":"Thirst",
+        "category":"physical",
+        "roundEffect":{
+            "visualEffectID":"redSplash",
+            "increaseCurrentHP":{
+                "min":-2,
+                "max":-2
+            }
+        }
+    }
+]

AndorsTrail/res/raw/conversationlist_achievements.json

@@ -50,6 +50,77 @@
         ]
     },
     {
-        "id":"passive_achievement_check_2"
+        "id":"passive_achievement_check_2",
+        "replies":[
+            {
+                "nextPhraseID":"passive_achievement_grant_2",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"achievements",
+                        "value":130,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"guynmart_mare",
+                        "value":2
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"passive_achievement_check_3"
+            }
+        ]
+    },
+    {
+        "id":"passive_achievement_grant_2",
+        "message":"Phew, I dreamed about nightmares in a castle dungeon - although maybe it wasn't a nightmare at all! I never want to go through something like that again - neither in my dream nor in reality!",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"achievements",
+                "value":130
+            }
+        ]
+    },
+    {
+        "id":"passive_achievement_check_3"
+    },
+    {
+        "id":"passive_achievement_grant_3"
+    },
+    {
+        "id":"passive_achievement_check_4"
+    },
+    {
+        "id":"passive_achievement_grant_4"
+    },
+    {
+        "id":"passive_achievement_check_5"
+    },
+    {
+        "id":"passive_achievement_grant_5"
+    },
+    {
+        "id":"passive_achievement_check_6"
+    },
+    {
+        "id":"passive_achievement_grant_6"
+    },
+    {
+        "id":"passive_achievement_check_7"
+    },
+    {
+        "id":"passive_achievement_grant_7"
+    },
+    {
+        "id":"passive_achievement_check_8"
+    },
+    {
+        "id":"passive_achievement_grant_8"
+    },
+    {
+        "id":"passive_achievement_check_9"
     }
 ]

AndorsTrail/res/raw/conversationlist_brimhaven.json

@@ -3416,6 +3416,62 @@
             {
                 "text":"I am looking for my brother, Andor. He looks a bit like me.",
                 "nextPhraseID":"brv_woodcraftsman_1"
+            },
+            {
+                "text":"Hello. The woodcutter in Loneford said that you can make me fences for a sheperd. Is that true?",
+                "nextPhraseID":"brv_woodcraftsman_fence1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":210
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":220,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Here is your wood.",
+                "nextPhraseID":"brv_woodcraftsman_fence2",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":230
+                    },
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"tunlon_wood",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":240,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Ah, you are back.",
+                "nextPhraseID":"brv_woodcraftsman_fence3",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":235
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":240,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -7390,6 +7446,47 @@
                     }
                 ]
             },
+            {
+                "nextPhraseID":"brv_patrol_stop_hero_bur",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"bwmfill_nondisplay",
+                        "value":41,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":80
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_patrol_stop_hero_box1",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"bonemeal_potion",
+                        "value":1
+                    },
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"guynmart_bonemealbox",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_patrol_stop_hero_box2",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"guynmart_bonemealbox",
+                        "value":1
+                    }
+                ]
+            },
             {
                 "nextPhraseID":"brv_patrol_remove_all_bonemeals"
             }
@@ -7399,6 +7496,21 @@
                 "rewardType":"removeQuestProgress",
                 "rewardID":"brv_nondisplay",
                 "value":142
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"bwmfill_nondisplay",
+                "value":40
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"bwmfill_nondisplay",
+                "value":42
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"bwmfill_nondisplay",
+                "value":43
             }
         ]
     },
@@ -7486,13 +7598,55 @@
                 ]
             },
             {
-                "nextPhraseID":"brv_patrol_stop_hero"
+                "nextPhraseID":"brv_patrol_remove_all_bonemeals_lodar_x"
             }
         ]
     },
     {
         "id":"brv_patrol_bonemeals_removed",
         "message":"What's this? Smells like Bonemeal!\n\nBonemeal is illegal and forbidden by the law of Feygard. I will have to confiscate it.\n[He gives you back all your belongings but keeps the Bonemeals]\n\nKeep away from illegal stuff. Now go on your way.",
+        "replies":[
+            {
+                "text":"Hey, what the ...?",
+                "nextPhraseID":"brv_patrol_bonemeals_removed_bur",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"bwmfill_nondisplay",
+                        "value":40
+                    }
+                ]
+            },
+            {
+                "text":"Phew, at least they didn't find my iron reserve in the bonemeal box.",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"bwmfill_nondisplay",
+                        "value":42
+                    }
+                ]
+            },
+            {
+                "text":"Phew, at least they had let me go.",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"bwmfill_nondisplay",
+                        "value":40,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"bwmfill_nondisplay",
+                        "value":42,
+                        "negate":true
+                    }
+                ]
+            }
+        ],
         "rewards":[
             {
                 "rewardType":"questProgress",
@@ -9835,5 +9989,148 @@
                 "nextPhraseID":"R"
             }
         ]
+    },
+    {
+        "id":"brv_patrol_remove_all_bonemeals_lodar_x",
+        "replies":[
+            {
+                "nextPhraseID":"brv_patrol_remove_all_bonemeals_lodar_x_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"bwmfill_nondisplay",
+                        "value":43
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_patrol_remove_all_bonemeals_lodar_x_2",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"bwmfill_nondisplay",
+                        "value":42
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_patrol_stop_hero"
+            }
+        ]
+    },
+    {
+        "id":"brv_patrol_remove_all_bonemeals_lodar_x_1",
+        "replies":[
+            {
+                "nextPhraseID":"brv_patrol_stop_hero"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"giveItem",
+                "rewardID":"bonemeal_potion",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"brv_patrol_remove_all_bonemeals_lodar_x_2",
+        "replies":[
+            {
+                "nextPhraseID":"brv_patrol_stop_hero"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"giveItem",
+                "rewardID":"pot_bm_lodar",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"brv_patrol_stop_hero_bur",
+        "replies":[
+            {
+                "nextPhraseID":"brv_patrol_stop_hero"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_nondisplay",
+                "value":142
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"bwmfill_nondisplay",
+                "value":40
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"bwmfill_nondisplay",
+                "value":41
+            }
+        ]
+    },
+    {
+        "id":"brv_patrol_stop_hero_box1",
+        "replies":[
+            {
+                "nextPhraseID":"brv_patrol_remove_all_bonemeals"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"bwmfill_nondisplay",
+                "value":42
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"bwmfill_nondisplay",
+                "value":43
+            }
+        ]
+    },
+    {
+        "id":"brv_patrol_stop_hero_box2",
+        "replies":[
+            {
+                "nextPhraseID":"brv_patrol_remove_all_bonemeals"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"bwmfill_nondisplay",
+                "value":42
+            }
+        ]
+    },
+    {
+        "id":"brv_patrol_bonemeals_removed_bur",
+        "message":"One of the guards winks at you while putting the confiscated bonemeal potions back in your pouch.",
+        "switchToNPC":"none",
+        "replies":[
+            {
+                "text":"???",
+                "nextPhraseID":"brv_patrol_bonemeals_removed_bur_10"
+            }
+        ]
+    },
+    {
+        "id":"brv_patrol_bonemeals_removed_bur_10",
+        "message":"You'll be speechless - the guard is Burhczyd in the uniform of the Feygard Guard!",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_patrol_bonemeals_removed_bur_20"
+            }
+        ]
+    },
+    {
+        "id":"brv_patrol_bonemeals_removed_bur_20",
+        "message":"Before you react, the guards have moved on."
     }
 ]

AndorsTrail/res/raw/conversationlist_fallhaven_south.json

@@ -54,6 +54,23 @@
             {
                 "text":"Are you a woodcutter?",
                 "nextPhraseID":"fallhaven_lumberjack_2"
+            },
+            {
+                "text":"Tunlon has sent me to ask for some wood for fences.",
+                "nextPhraseID":"fallhaven_lumberjack_17",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":20,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -359,6 +376,23 @@
             {
                 "text":"Never mind. I don't need your services for now.",
                 "nextPhraseID":"X"
+            },
+            {
+                "text":"Tunlon has sent me to ask for some wood for fences.",
+                "nextPhraseID":"fallhaven_lumberjack_17",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":20,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_hadracor.json

@@ -88,6 +88,40 @@
             {
                 "text":"Have you seen my brother Andor around here? Looks somewhat like me.",
                 "nextPhraseID":"hadracor_andor_1"
+            },
+            {
+                "text":"Do you by any chance have some spare wood to make fences out of?",
+                "nextPhraseID":"hadracor_fence_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":20
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":30,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I'm $playername, running up and down Blackwater mountain for errands.",
+                "nextPhraseID":"hadracor_fence_2",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":30
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":32,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -349,6 +383,40 @@
                         "value":5
                     }
                 ]
+            },
+            {
+                "text":"No, but I wanted to ask if you have some spare wood to make fences out of.",
+                "nextPhraseID":"hadracor_fence_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":20
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":30,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"No, I'm too busy running up and down Blackwater mountain.",
+                "nextPhraseID":"hadracor_fence_2",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":30
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":32,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -438,6 +506,40 @@
             {
                 "text":"OK, let me see what you have.",
                 "nextPhraseID":"S"
+            },
+            {
+                "text":"Do you by any chance have some spare wood to make fences out of?",
+                "nextPhraseID":"hadracor_fence_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":20
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":30,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"No, thanks. I'm too busy running up and down Blackwater mountain.",
+                "nextPhraseID":"hadracor_fence_2",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":30
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":32,
+                        "negate":true
+                    }
+                ]
             }
         ]
     }

AndorsTrail/res/raw/conversationlist_loneford_2.json

@@ -25,7 +25,77 @@
     },
     {
         "id":"loneford_villager2",
-        "message":"Don't disturb me, I need to finish chopping this wood. Go bother someone else."
+        "message":"Don't disturb me, I need to finish chopping this wood. Go bother someone else.",
+        "replies":[
+            {
+                "text":"Do you by any chance have some fences?",
+                "nextPhraseID":"loneford_villager2_fence",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":100
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":150,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Do you by any chance have some fences?",
+                "nextPhraseID":"loneford_villager2_fence",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":110
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":150,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Unfortunately the fences you gave me are not tall enough. Do you have others?",
+                "nextPhraseID":"loneford_villager2_fence2",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":200
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":210,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"The Craftsman told me that I should get some wood from you.",
+                "nextPhraseID":"loneford_villager2_fence4",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":220
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":230,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
     },
     {
         "id":"loneford_villager3",

AndorsTrail/res/raw/conversationlist_mt_galmore.json

@@ -1146,7 +1146,7 @@
     },
     {
         "id":"troublemaker_wm_report_40",
-        "message":"You can find the empty house just south east of here. Enter it and you will find your way.",
+        "message":"You can find the empty house just southwest of here. Enter it and you will find your way.",
         "replies":[
             {
                 "text":"I'll be there. Thank you.",
@@ -1525,11 +1525,6 @@
                 "rewardID":"wild6_house_thief_spawn",
                 "mapName":"wild6_house"
             },
-            {
-                "rewardType":"giveItem",
-                "rewardID":"thieves_vault_key_fake",
-                "value":1
-            },
             {
                 "rewardType":"removeSpawnArea",
                 "rewardID":"aidem_base_defy_spawn",
@@ -1795,6 +1790,12 @@
                         "requireID":"thieves_vault_key",
                         "value":1,
                         "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"wanted_men",
+                        "value":80,
+                        "negate":true
                     }
                 ]
             },
@@ -3643,5 +3644,25 @@
                 "mapName":"waytogalmore0"
             }
         ]
+    },
+    {
+        "id":"fix_stn_skeletons_50",
+        "rewards":[
+            {
+                "rewardType":"activateMapObjectGroup",
+                "rewardID":"Keys_fix_stn_skeletons",
+                "mapName":"waytogalmore0"
+            }
+        ]
+    },
+    {
+        "id":"fix_stn_skeletons_60",
+        "rewards":[
+            {
+                "rewardType":"deactivateMapObjectGroup",
+                "rewardID":"Keys_fix_stn_skeletons",
+                "mapName":"waytogalmore0"
+            }
+        ]
     }
 ]

AndorsTrail/res/raw/conversationlist_tinlyn.json

@@ -92,7 +92,32 @@
     },
     {
         "id":"tinlyn_killedsheep_1",
-        "message":"You attacked my sheep! Get away from me you filthy murderer!"
+        "message":"You attacked my sheep! Get away from me you filthy murderer!",
+        "replies":[
+            {
+                "text":"I am sorry. But your brother sent me to ask if you knew where I could get fences for his sheep.",
+                "nextPhraseID":"tinlyn_fence_2",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":40
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":100,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":110,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
     },
     {
         "id":"tinlyn_complete_1",
@@ -108,6 +133,29 @@
                         "value":10
                     }
                 ]
+            },
+            {
+                "text":"Your brother has sent me to ask where I could get fences from. Do you maybe know?",
+                "nextPhraseID":"tinlyn_fence_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":40
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":100,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":110,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -118,6 +166,29 @@
             {
                 "text":"What's the problem?",
                 "nextPhraseID":"tinlyn_story_2"
+            },
+            {
+                "text":"Your brother has sent me to ask where I could get fences from. Do you maybe know?",
+                "nextPhraseID":"tinlyn_fence_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":40
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":100,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"tunlon_fence",
+                        "value":110,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },

AndorsTrail/res/raw/droplists_bwmfill.json

@@ -0,0 +1,284 @@
+[
+    {
+        "id":"bwmfill2_container",
+        "items":[
+            {
+                "itemID":"green_pepper",
+                "chance":"100",
+                "quantity":{
+                    "min":0,
+                    "max":4
+                }
+            },
+            {
+                "itemID":"yellow_pepper",
+                "chance":"100",
+                "quantity":{
+                    "min":0,
+                    "max":2
+                }
+            },
+            {
+                "itemID":"red_pepper",
+                "chance":"100",
+                "quantity":{
+                    "min":0,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":5,
+                    "max":15
+                }
+            }
+        ]
+    },
+    {
+        "id":"bwmfill6_container",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":70,
+                    "max":180
+                }
+            },
+            {
+                "itemID":"bwm_longsword",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"bwm_claws",
+                "chance":"50",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            },
+            {
+                "itemID":"bone",
+                "chance":"15",
+                "quantity":{
+                    "min":0,
+                    "max":3
+                }
+            }
+        ]
+    },
+    {
+        "id":"tunlon",
+        "items":[
+            {
+                "itemID":"green_pepper",
+                "chance":"70",
+                "quantity":{
+                    "min":1,
+                    "max":5
+                }
+            },
+            {
+                "itemID":"yellow_pepper",
+                "chance":"60",
+                "quantity":{
+                    "min":1,
+                    "max":5
+                }
+            },
+            {
+                "itemID":"red_pepper",
+                "chance":"50",
+                "quantity":{
+                    "min":1,
+                    "max":5
+                }
+            },
+            {
+                "itemID":"lamb_meat_raw",
+                "chance":"100",
+                "quantity":{
+                    "min":5,
+                    "max":10
+                }
+            },
+            {
+                "itemID":"lamb_meat",
+                "chance":"100",
+                "quantity":{
+                    "min":2,
+                    "max":5
+                }
+            }
+        ]
+    },
+    {
+        "id":"tunlon2",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":1000,
+                    "max":2000
+                }
+            },
+            {
+                "itemID":"qtrstaff",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"green_pepper",
+                "chance":"70",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            },
+            {
+                "itemID":"yellow_pepper",
+                "chance":"60",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            },
+            {
+                "itemID":"red_pepper",
+                "chance":"50",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
+    },
+    {
+        "id":"tunlon_quest",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":150,
+                    "max":350
+                }
+            },
+            {
+                "itemID":"lamb_meat2",
+                "chance":"100",
+                "quantity":{
+                    "min":3,
+                    "max":5
+                }
+            },
+            {
+                "itemID":"red_pepper",
+                "chance":"50",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"tunlon_fence1",
+        "items":[
+            {
+                "itemID":"tunlon_fence1",
+                "chance":"100",
+                "quantity":{
+                    "min":10,
+                    "max":10
+                }
+            }
+        ]
+    },
+    {
+        "id":"tunlon_fence2",
+        "items":[
+            {
+                "itemID":"tunlon_wood",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"tunlon_fence3",
+        "items":[
+            {
+                "itemID":"tunlon_fence2",
+                "chance":"100",
+                "quantity":{
+                    "min":10,
+                    "max":10
+                }
+            }
+        ]
+    },
+    {
+        "id":"gornaud_boss",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":10,
+                    "max":30
+                }
+            },
+            {
+                "itemID":"nor_gold",
+                "chance":"100",
+                "quantity":{
+                    "min":50,
+                    "max":150
+                }
+            },
+            {
+                "itemID":"meat",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":3
+                }
+            },
+            {
+                "itemID":"stone_mace",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"bwm_sheep",
+        "items":[
+            {
+                "itemID":"lamb_meat_raw",
+                "chance":"20",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    }
+]

AndorsTrail/res/raw/itemlist_bwmfill.json

@@ -0,0 +1,272 @@
+[
+    {
+        "id":"green_pepper",
+        "iconID":"items_consumables:16",
+        "name":"Green Pepper",
+        "displaytype":"ordinary",
+        "hasManualPrice":1,
+        "baseMarketCost":16,
+        "category":"food",
+        "useEffect":{
+            "increaseCurrentHP":{
+                "min":1,
+                "max":2
+            },
+            "conditionsSource":[
+                {
+                    "condition":"food",
+                    "magnitude":3,
+                    "duration":4,
+                    "chance":"100"
+                },
+                {
+                    "condition":"thirst",
+                    "magnitude":1,
+                    "duration":5,
+                    "chance":"100"
+                }
+            ]
+        }
+    },
+    {
+        "id":"yellow_pepper",
+        "iconID":"items_consumables:17",
+        "name":"Yellow Pepper",
+        "displaytype":"ordinary",
+        "hasManualPrice":1,
+        "baseMarketCost":22,
+        "category":"food",
+        "useEffect":{
+            "increaseCurrentHP":{
+                "min":2,
+                "max":3
+            },
+            "conditionsSource":[
+                {
+                    "condition":"food",
+                    "magnitude":3,
+                    "duration":6,
+                    "chance":"100"
+                },
+                {
+                    "condition":"thirst",
+                    "magnitude":1,
+                    "duration":7,
+                    "chance":"100"
+                }
+            ]
+        }
+    },
+    {
+        "id":"red_pepper",
+        "iconID":"items_consumables:18",
+        "name":"Red Pepper",
+        "displaytype":"ordinary",
+        "hasManualPrice":1,
+        "baseMarketCost":34,
+        "category":"food",
+        "useEffect":{
+            "increaseCurrentHP":{
+                "min":3,
+                "max":5
+            },
+            "conditionsSource":[
+                {
+                    "condition":"food",
+                    "magnitude":4,
+                    "duration":6,
+                    "chance":"100"
+                },
+                {
+                    "condition":"thirst",
+                    "magnitude":1,
+                    "duration":8,
+                    "chance":"100"
+                }
+            ]
+        }
+    },
+    {
+        "id":"bwm_longsword",
+        "iconID":"items_weapons:7",
+        "name":"Blackwater iron longsword",
+        "displaytype":"rare",
+        "hasManualPrice":1,
+        "baseMarketCost":1699,
+        "category":"lsword",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":4,
+                "max":9
+            },
+            "increaseAttackCost":4,
+            "increaseAttackChance":55,
+            "increaseBlockChance":0,
+            "setNonWeaponDamageModifier":122,
+            "addedConditions":[
+                {
+                    "condition":"blackwater_misery",
+                    "magnitude":1
+                }
+            ]
+        }
+    },
+    {
+        "id":"lamb_meat_raw",
+        "iconID":"items_japozero:519",
+        "name":"Raw lamb meat",
+        "displaytype":"ordinary",
+        "hasManualPrice":1,
+        "baseMarketCost":32,
+        "category":"food",
+        "useEffect":{
+            "increaseCurrentHP":{
+                "min":5,
+                "max":5
+            },
+            "conditionsSource":[
+                {
+                    "condition":"food",
+                    "magnitude":2,
+                    "duration":10,
+                    "chance":"100"
+                },
+                {
+                    "condition":"foodp",
+                    "magnitude":2,
+                    "duration":12,
+                    "chance":"25"
+                }
+            ]
+        }
+    },
+    {
+        "id":"lamb_meat",
+        "iconID":"items_japozero:517",
+        "name":"Cooked lamb meat",
+        "displaytype":"ordinary",
+        "hasManualPrice":1,
+        "baseMarketCost":65,
+        "category":"food",
+        "useEffect":{
+            "increaseCurrentHP":{
+                "min":7,
+                "max":7
+            },
+            "conditionsSource":[
+                {
+                    "condition":"food",
+                    "magnitude":3,
+                    "duration":10,
+                    "chance":"100"
+                }
+            ]
+        }
+    },
+    {
+        "id":"lamb_meat2",
+        "iconID":"items_japozero:517",
+        "name":"Specially peppered lamb meat",
+        "displaytype":"extraordinary",
+        "hasManualPrice":1,
+        "baseMarketCost":310,
+        "category":"food",
+        "useEffect":{
+            "increaseCurrentHP":{
+                "min":10,
+                "max":10
+            },
+            "conditionsSource":[
+                {
+                    "condition":"food",
+                    "magnitude":6,
+                    "duration":10,
+                    "chance":"100"
+                },
+                {
+                    "condition":"thirst",
+                    "magnitude":1,
+                    "duration":12,
+                    "chance":"100"
+                },
+                {
+                    "condition":"rage_minor",
+                    "magnitude":2,
+                    "duration":11,
+                    "chance":"100"
+                }
+            ]
+        }
+    },
+    {
+        "id":"tunlon_wood",
+        "iconID":"items_japozero:577",
+        "name":"Pile of wood",
+        "displaytype":"quest",
+        "category":"other",
+        "description":"This pile of wood is quite heavy."
+    },
+    {
+        "id":"tunlon_fence1",
+        "iconID":"items_japozero:576",
+        "name":"Sturdy fence",
+        "displaytype":"quest",
+        "category":"other",
+        "description":"This fence looks like it stood around for years."
+    },
+    {
+        "id":"tunlon_fence2",
+        "iconID":"items_japozero:576",
+        "name":"New fence",
+        "displaytype":"quest",
+        "category":"other",
+        "description":"This looks like some fine woodcraft."
+    },
+    {
+        "id":"stone_mace",
+        "iconID":"items_newb:462",
+        "name":"Gornaud's stone mace",
+        "displaytype":"extraordinary",
+        "hasManualPrice":1,
+        "baseMarketCost":639,
+        "category":"mace",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":5,
+                "max":13
+            },
+            "increaseAttackCost":7,
+            "increaseAttackChance":10,
+            "increaseBlockChance":0,
+            "setNonWeaponDamageModifier":160
+        },
+        "hitEffect":{
+            "conditionsTarget":[
+                {
+                    "condition":"stunned",
+                    "magnitude":1,
+                    "duration":3,
+                    "chance":"5"
+                }
+            ]
+        }
+    },
+    {
+        "id":"feygard_gold",
+        "iconID":"items_misc:10",
+        "name":"Feygard gold coins",
+        "hasManualPrice":1,
+        "baseMarketCost":1,
+        "category":"money",
+        "description":"A gold goin with the face of Lord Geomyr on it."
+    },
+    {
+        "id":"nor_gold",
+        "iconID":"items_misc:10",
+        "name":"Nor gold coins",
+        "hasManualPrice":1,
+        "baseMarketCost":1,
+        "category":"money",
+        "description":"A gold goin from Nor City."
+    }
+]

AndorsTrail/res/raw/itemlist_mt_galmore.json

@@ -12,7 +12,8 @@
         "iconID":"items_japozero:396",
         "name":"Fake Thieve's Guild vault key",
         "displaytype":"quest",
-        "category":"other"
+        "category":"other",
+        "description":"The fake key made by the Thieves Guild to trick Aidem."
     },
     {
         "id":"aidem_fake_vault_key",

AndorsTrail/res/raw/itemlist_stoutford_combined.json

@@ -1015,6 +1015,6 @@
         "iconID":"items_necklaces_1:20",
         "name":"Lutarc's medallion",
         "displaytype":"quest",
-        "category":"other"
+        "category":"neck"
     }
 ]

AndorsTrail/res/raw/monsterlist_bwmfill.json

@@ -0,0 +1,131 @@
+[
+    {
+        "id":"bwm_sheep1",
+        "name":"Mountain Sheep",
+        "iconID":"monsters_rltiles2:55",
+        "maxHP":30,
+        "maxAP":10,
+        "moveCost":3,
+        "monsterClass":"animal",
+        "movementAggressionType":"none",
+        "attackDamage":{
+            "min":1,
+            "max":5
+        },
+        "spawnGroup":"bwm_sheep",
+        "phraseID":"bwm_sheep_dialogue",
+        "droplistID":"bwm_sheep",
+        "attackCost":5,
+        "attackChance":60,
+        "blockChance":20,
+        "damageResistance":0
+    },
+    {
+        "id":"tunlon",
+        "name":"Tunlon",
+        "iconID":"monsters_rltiles1:83",
+        "monsterClass":"humanoid",
+        "spawnGroup":"tunlon",
+        "phraseID":"tunlon_start",
+        "droplistID":"tunlon"
+    },
+    {
+        "id":"tunlon2",
+        "name":"Tunlon",
+        "iconID":"monsters_rltiles1:83",
+        "maxHP":73,
+        "maxAP":10,
+        "moveCost":4,
+        "unique":1,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"wholeMap",
+        "attackDamage":{
+            "min":9,
+            "max":17
+        },
+        "spawnGroup":"tunlon2",
+        "droplistID":"tunlon2",
+        "attackCost":5,
+        "attackChance":200,
+        "criticalSkill":10,
+        "criticalMultiplier":2.0,
+        "blockChance":90,
+        "damageResistance":10
+    },
+    {
+        "id":"mountain_wolf_3",
+        "name":"Strong mountain wolf",
+        "iconID":"monsters_rltiles2:107",
+        "maxHP":73,
+        "maxAP":10,
+        "moveCost":4,
+        "monsterClass":"animal",
+        "attackDamage":{
+            "min":9,
+            "max":17
+        },
+        "spawnGroup":"primwolf3",
+        "attackCost":4,
+        "attackChance":160,
+        "blockChance":80,
+        "damageResistance":4,
+        "hitEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"haste",
+                    "magnitude":1,
+                    "duration":2,
+                    "chance":"15"
+                }
+            ]
+        }
+    },
+    {
+        "id":"mountain_wolf_4",
+        "name":"Reckless mountain wolf",
+        "iconID":"monsters_rltiles2:107",
+        "maxHP":68,
+        "maxAP":10,
+        "moveCost":4,
+        "monsterClass":"animal",
+        "attackDamage":{
+            "min":6,
+            "max":14
+        },
+        "spawnGroup":"primwolf3",
+        "attackCost":3,
+        "attackChance":175,
+        "blockChance":60,
+        "damageResistance":2
+    },
+    {
+        "id":"gornaud_boss",
+        "name":"Gornaud leader",
+        "iconID":"monsters_rltiles2:30",
+        "maxHP":165,
+        "maxAP":12,
+        "moveCost":5,
+        "unique":1,
+        "monsterClass":"giant",
+        "attackDamage":{
+            "min":10,
+            "max":30
+        },
+        "spawnGroup":"gornaud_boss",
+        "droplistID":"gornaud_boss",
+        "attackCost":5,
+        "attackChance":100,
+        "blockChance":70,
+        "damageResistance":5,
+        "hitEffect":{
+            "conditionsTarget":[
+                {
+                    "condition":"dazed",
+                    "magnitude":3,
+                    "duration":3,
+                    "chance":"50"
+                }
+            ]
+        }
+    }
+]

AndorsTrail/res/raw/questlist_bwmfill.json

@@ -0,0 +1,104 @@
+[
+    {
+        "id":"tunlon_fence",
+        "name":"It makes no fence",
+        "showInLog":1,
+        "stages":[
+            {
+                "progress":10,
+                "logText":"I found Tunlon, a sheep farmer, on the hill next to Crossglen. He asked me to help him get some wood for new fences. Since Crossglen doesn't have a lumberjack, I should go to Fallhaven and ask there."
+            },
+            {
+                "progress":12,
+                "logText":"Tunlon got furious when he saw that you killed his sheep.",
+                "rewardExperience":5,
+                "finishesQuest":1
+            },
+            {
+                "progress":20,
+                "logText":"I talked to Fallhaven's woodcutter. He told me that he had done a lot of work lately and therefore can't get any more wood for me. However, I should ask the woodcutters near Crossroads Guardhouse if they can help me."
+            },
+            {
+                "progress":30,
+                "logText":"The woodcutters told me that they have a lot of wood after clearing out the field around them, however all they have is firewood. Apparently this is not suitable for making fences. I should explain this to Tunlon."
+            },
+            {
+                "progress":32,
+                "logText":"Hadracor opened up a passage to the south, so I wouldn't have to take the long way up to Tunlon any more."
+            },
+            {
+                "progress":40,
+                "logText":"I talked to Tunlon again and he told me to talk to his brother Tinlyn if he knew any person who could help me out."
+            },
+            {
+                "progress":100,
+                "logText":"Tinlyn was glad to meet me. He said that Loneford had a woodcutter who could maybe help me out."
+            },
+            {
+                "progress":110,
+                "logText":"Tinlyn wasn't really happy to see me. However, he told me to go to Loneford."
+            },
+            {
+                "progress":150,
+                "logText":"In Loneford, I met a villager who told me he had some spare fences made. I should bring them to Tunlon."
+            },
+            {
+                "progress":200,
+                "logText":"Tunlon took a close look at the fences I brought him, but he didn't like them a lot. The fence posts were too short he said. I should go back and ask for taller ones.",
+                "rewardExperience":2000
+            },
+            {
+                "progress":210,
+                "logText":"The woodcutter in Loneford however said he couldn't make any fences, as he just cuts the wood. He recommended giving Brimhaven's woodcutter a visit, as he thinks that he can do some basic woodwork."
+            },
+            {
+                "progress":220,
+                "logText":"I gave the woodcutter in Brimhaven a visit and he told me to bring some wood, so the craftsman can make fences out of it. Loneford's woodcutter should have plenty, so I should go back and ask him for wood."
+            },
+            {
+                "progress":230,
+                "logText":"I got a pile of wood for the fences."
+            },
+            {
+                "progress":235,
+                "logText":"I gave the wood to the woodcraftsman in Brimhaven."
+            },
+            {
+                "progress":240,
+                "logText":"Brimhaven's wood craftsman sold me some nice looking fences."
+            },
+            {
+                "progress":250,
+                "logText":"Tunlon was happy to see the fences I brought him. These should be just fine, he said.",
+                "rewardExperience":5000,
+                "finishesQuest":1
+            }
+        ]
+    },
+    {
+        "id":"bwmfill_nondisplay",
+        "name":"bwmfill_nondisplay",
+        "stages":[
+            {
+                "progress":40,
+                "logText":"Guard Burhczyd active"
+            },
+            {
+                "progress":41,
+                "logText":"Guard Burhczyd used"
+            },
+            {
+                "progress":42,
+                "logText":"BMP box"
+            },
+            {
+                "progress":43,
+                "logText":"BMP box with normal BMP"
+            },
+            {
+                "progress":44,
+                "logText":"Killed Tunlon's sheep detected"
+            }
+        ]
+    }
+]

AndorsTrail/res/raw/questlist_fungi_panic.json

@@ -260,6 +260,11 @@
                 "progress":125,
                 "logText":"Uniform blue lighting: I solved a difficult logic riddle.",
                 "rewardExperience":1000
+            },
+            {
+                "progress":130,
+                "logText":"Nightmare Survived: I survived the most intense nightmares ever",
+                "rewardExperience":1000
             }
         ]
     }

AndorsTrail/res/values-bg/strings.xml

@@ -15,7 +15,7 @@
     <string name="startscreen_mode_3_lives">Екстремно (3 живота, 1 запазване на играта)</string>
     <string name="app_description">Фентъзи ролева игра базирана на куестове</string>
     <string name="dialog_loading_message">Зареждане на ресурсите…</string>
-    <string name="iteminfo_action_unequip">Съблечи</string>
+    <string name="iteminfo_action_unequip">Снеми</string>
     <string name="heroinfo_inv">Предмети</string>
     <string name="heroinfo_actionpoints">Точки действие (ТД):</string>
     <string name="dialog_monsterloot_gainedexp">Вие получихте %1$d точки опит.</string>
@@ -26,12 +26,12 @@
     <string name="monster_difficulty_impossible">Невъзможно</string>
     <string name="heroinfo_inventory_sort">Подреди по</string>
     <string name="inventory_item_used">Вие използвахте %1$s.</string>
-    <string name="conversation_rewarditems">[Вие спечелихте %1$d предмети]</string>
-    <string name="conversation_rewardgold">[Вие спечелихте %1$d злато]</string>
+    <string name="conversation_rewarditems">[Вие взехте %1$d предмета]</string>
+    <string name="conversation_rewardgold">[Вие получихте %1$d злато]</string>
     <string name="combat_result_heromiss">Атаката ви пропусна.</string>
     <string name="startscreen_enterheroname">Въведете името на героя</string>
     <string name="shop_infoitem">Информация</string>
-    <string name="inventory_unequip">Съблечете</string>
+    <string name="inventory_unequip">Снемете</string>
     <string name="dialog_loot_foundgold">Вие намерихте %1$d злато.</string>
     <string name="menu_settings">Настройки</string>
     <string name="startscreen_newgame">Нова игра</string>
@@ -73,7 +73,7 @@
     <string name="startscreen_mode_1_life">Хардкор (1 живот, 1 запазване на играта)</string>
     <string name="dialog_monsterencounter_message">Искате ли да атакувате?
 \nТрудност: %1$s</string>
-    <string name="inventory_drop">Постави на земята</string>
+    <string name="inventory_drop">Пуснете</string>
     <string name="startscreen_mode_10_lives">Много трудно (10 живота, 1 запазване на играта)</string>
     <string name="dialog_newversion_title">Добре дошли</string>
     <string name="startscreen_mode_50_lives">Трудно (50 живота, 1 запазване на играта)</string>
@@ -84,7 +84,7 @@
     <string name="actorinfo_health">Здраве:</string>
     <string name="dialog_rest_message">Вие си починахте и се възстановихте напълно.</string>
     <string name="questlog_includecompleted_onlycompleted">Завършени задачи</string>
-    <string name="conversation_rewardexp">[Вие спечелихте %1$d точки опит]</string>
+    <string name="conversation_rewardexp">[Вие получихте %1$d точки опит]</string>
     <string name="heroinfo_wornequipment">Текуща екипировка</string>
     <string name="dialog_rest_title">Почини</string>
     <string name="combat_condition_player_immune">Имунизирани сте срещу %1$s.</string>
@@ -97,7 +97,7 @@
 \nМоля посетете официалният форум на играта за дискусия с други играчи или за да направите играта по добра (вижте Относно).
 \n
 \nБлагодарим на всички за обратната връзка!</string>
-    <string name="conversation_rewarditem">[Вие спечелихте предмет]</string>
+    <string name="conversation_rewarditem">[Вие взехте предмет]</string>
     <string name="shop_yourgold">Вашето злато: %1$d</string>
     <string name="questlog_includecompleted_prompt">Изберете кои задачи да се показват</string>
     <string name="questlog_includecompleted_hidecompleted">Активни задачи</string>
@@ -115,17 +115,17 @@
     <string name="monster_difficulty_veryhard">Много трудно</string>
     <string name="questlog_queststatus">Статус: %1$s</string>
     <string name="combat_endturn">Край на хода</string>
-    <string name="conversation_next">Следващ</string>
+    <string name="conversation_next">Продължи</string>
     <string name="preferences_display_fullscreen_title">Цял екран</string>
     <string name="combat_result_monstermiss">%1$s пропусна!</string>
     <string name="heroinfo_inventory_categories">Категория</string>
     <string name="levelup_description">Добре дошли в ниво %1$d!</string>
-    <string name="heroinfo_levelup">Следващо ниво</string>
+    <string name="heroinfo_levelup">Вдигни ниво</string>
     <string name="startscreen_mode_unlimited_lives">Средна трудност (Неограничени животи, 1 запазване на играта)</string>
     <string name="monster_difficulty_hard">Трудно</string>
     <string name="levelup_buttontext">Вдигни ниво</string>
     <string name="combat_condition_monster_immune">%1$s е имунизиран срещу %2$s.</string>
-    <string name="startscreen_newgame_start">Стартирай играта</string>
+    <string name="startscreen_newgame_start">Стартирай игра</string>
     <string name="inventory_info">Информация</string>
     <string name="about_button3">Лиценз</string>
     <string name="shop_item_bought">%1$s купено.</string>
@@ -147,7 +147,7 @@
     <string name="combat_monsteraction">%1$s атакува.</string>
     <string name="dialog_groundloot_title">Предмети</string>
     <string name="heroinfo_experiencepoints">Точки опит (ТО):</string>
-    <string name="inventory_equip">Облечете</string>
+    <string name="inventory_equip">Сложете</string>
     <string name="dialog_loot_pickedupitem">Вие взехте предмет.</string>
     <string name="startscreen_selectherosprite">Изберете вашият герой</string>
     <string name="startscreen_error_loading_empty_slot">Не може да заредите игра от празен слот.</string>
@@ -157,16 +157,16 @@
     <string name="actorinfo_attack">Атака:</string>
     <string name="menu_save">Запази</string>
     <string name="iteminfo_action_use">Използвай</string>
-    <string name="iteminfo_action_equip">Облечи</string>
+    <string name="iteminfo_action_equip">Сложи</string>
     <string name="actorinfo_class">Клас:</string>
     <string name="heroinfo_inventory">Инвентар</string>
-    <string name="conversation_leave">Остави</string>
+    <string name="conversation_leave">Напусни</string>
     <string name="heroinfo_unlimited_lives">Неограничени животи, 1 запазване</string>
     <string name="levelup_add_blockchance">Увеличава шансът за блок с (+%1$d)</string>
     <string name="conversation_lostgold">Вие загубихте %1$d злато]</string>
     <string name="preferences_display_fullscreen">Изобрази играта в цял екран. (Изисква рестарт)</string>
     <string name="shop_sell">Продай</string>
-    <string name="inventory_item_equipped">Вие облякохте %1$s.</string>
+    <string name="inventory_item_equipped">Вие сложихте %1$s.</string>
     <string name="levelup_add_blockchance_description">Добавя %1$d към базовият шанс за блок.</string>
     <string name="shop_item_sort">Сортирай</string>
     <string name="combat_result_herohit">Ударихте %1$s за %2$d тз!</string>
@@ -179,13 +179,13 @@
     <string name="dialog_loading_failed_cheat">Следата на Андор не можа да зареди файла със запазената игра. Този файл вече е продължен.</string>
     <string name="dialog_more">Повече</string>
     <string name="combat_not_enough_ap">Нямате достатъчно ТД за текущият рунд.</string>
-    <string name="combat_result_herohitcritical">Понесохте критичен удар от %1$s в размер на %2$d ТЗ!</string>
+    <string name="combat_result_herohitcritical">Нанесохте критичен удар на %1$s в размер на %2$d ТЗ!</string>
     <string name="combat_begin_flee">Може да избягате от битката като натиснете в посоката в която искате да се придвижите.</string>
     <string name="rip_startscreen">(ПВМ)</string>
-    <string name="combat_result_monsterhitcritical">%1$s понесе критичен удар в размер на %2$d тз!</string>
+    <string name="combat_result_monsterhitcritical">%1$s нанесе критичен удар в размер на %2$d тз!</string>
     <string name="dialog_monsterencounter_conditions">Състояния</string>
     <string name="status_exp">ТО:</string>
-    <string name="combat_miss_animation_message">Прпуск</string>
+    <string name="combat_miss_animation_message">Несполучлив удар</string>
     <string name="dialog_recenter">Центрирай</string>
     <string name="status_hp">ТЗ:</string>
     <string name="combat_result_herokillsmonster">%1$s загина!</string>
@@ -198,7 +198,7 @@
     <string name="skill_title_cleave">Разсичане</string>
     <string name="actorinfo_basetraits">Базови бойни характеристики (не включващи тези от екипировката и уменията)</string>
     <string name="preferences_attackspeed_normal">Нормално</string>
-    <string name="preferences_movementmethods_avoid">Избягване на препадствия</string>
+    <string name="preferences_movementmethods_avoid">Избягване на препядствия</string>
     <string name="traitsinfo_attack_chance">Шанс за атака:</string>
     <string name="preferences_attackspeed_fast">Бързо</string>
     <string name="preferences_movement_dpad_positions_lower_left">Долен ляв ъгъл</string>
@@ -210,11 +210,11 @@
     <string name="traitsinfo_criticalhit_multiplier">Множител на критичният удар:</string>
     <string name="skill_title_more_exp">Бързоучещ</string>
     <string name="preferences_display_loot_never">Не показвай</string>
-    <string name="preferences_display_scaling_factor_double">Двоен размер</string>
+    <string name="preferences_display_scaling_factor_double">200%</string>
     <string name="preferences_movement_dpad_positions_disabled">Изключено</string>
     <string name="skill_title_better_criticals">По-точни критични удари</string>
     <string name="iteminfo_effect_increase_current_hp">Възстановява %1$s ТЗ</string>
-    <string name="levelup_add_attackchance">Увеличава шанса за сполучлива атака с (+%1$d)</string>
+    <string name="levelup_add_attackchance">Увеличава шанса за атака с (+%1$d)</string>
     <string name="preferences_attackspeed_slow">Бавно</string>
     <string name="actorconditioninfo_effect_every_full_round">Всеки пълен рунд</string>
     <string name="preferences_movement_dpad_positions_center_bottom">Долу в средата</string>
@@ -227,28 +227,240 @@
     <string name="bulkselection_select_all">Всичко</string>
     <string name="traitsinfo_criticalhit_skill">Умение за нанасяне на критичен удар:</string>
     <string name="preferences_movementmethod_title">Метод на придвижване</string>
-    <string name="traitsinfo_defense_chance">Шанс за блокиране на атаката:</string>
-    <string name="skill_title_dodge">Отскачане</string>
+    <string name="traitsinfo_defense_chance">Шанс за блокиране на атака:</string>
+    <string name="skill_title_dodge">Отдръпване</string>
     <string name="preferences_movement_category">Придвижване</string>
     <string name="bulkselection_sell_confirmation_title">Сигурен ли си?</string>
     <string name="skill_title_eater">Трупояд</string>
     <string name="skill_title_barter">Търговец</string>
     <string name="skill_title_coinfinder">Ловец на съкровища</string>
-    <string name="iteminfo_action_equip_ap">Облечи (%1$d ТД)</string>
+    <string name="iteminfo_action_equip_ap">Сложи (%1$d ТД)</string>
     <string name="preferences_dialog_confirmrest_title">Потвърди другите</string>
     <string name="startscreen_migration_failure">Неуспех при прехвърлянето на файловете със запазени игри.</string>
     <string name="startscreen_migration_text">Прехвърляне на файловете със запазени игри.</string>
     <string name="actorinfo_movecost">Необходими за придвижване (ТД):</string>
     <string name="levelup_add_attackchance_description">Добавя %1$d към базовия шанс за атака.</string>
     <string name="traitsinfo_attack_cost">Необходими за атака (ТД):</string>
-    <string name="iteminfo_action_unequip_ap">Съблечи (%1$d ТД)</string>
+    <string name="iteminfo_action_unequip_ap">Снеми (%1$d ТД)</string>
     <string name="levelup_add_attackdamage_description">Добавя %1$d към базовите щети.</string>
     <string name="combat_condition_player_clear">Изчистихте се от %1$s.</string>
-    <string name="inventory_item_dropped">%1$s беше изпуснато на земята.</string>
+    <string name="inventory_item_dropped">%1$s беше изпуснато.</string>
     <string name="startscreen_migration_title">Прехвърляне на информацията</string>
     <string name="preferences_dialog_category">Потвърждение</string>
     <string name="iteminfo_action_use_ap">Използвай (%1$d ТД)</string>
     <string name="combat_condition_monster_clear">%1$s е изчистен от %2$s.</string>
     <string name="combat_condition_player_apply">Бяхте засегнати от %1$s.</string>
     <string name="traitsinfo_defense_damageresist">Резистентност към щети:</string>
+    <string name="preferences_dialog_confirmrest">Задава въпрос дали бихте искали да почивате, когато сте върху легло. В противен случай автоматично ще почивате.</string>
+    <string name="preferences_dialog_confirmattack">Показва диалогов прозорез с въпрос \'Искате ли да атакувате..?\', когато атакувате чудовище.</string>
+    <string name="preferences_dialog_monsterloot_title">Показва плячката от чудовището</string>
+    <string name="preferences_combat_speed_title">Скорост на битката</string>
+    <string name="preferences_combat_speed">Определя колко бързо атакуват чудовищата.</string>
+    <string name="preferences_display_loot_dialog">Винаги показвай диалогов прозорец с плячката</string>
+    <string name="preferences_display_loot_dialog_on_items">Показва диалогов прозорец с плячката, когато бъдат открити предмети</string>
+    <string name="preferences_display_loot_dialog_on_items_or_toast">Показва диалог за предмети, в противен случай уведомява</string>
+    <string name="preferences_display_loot_toast">Покажи кратко уведомление</string>
+    <string name="preferences_display_loot_toast_on_items">Показва уведомление само когато са намерени предмети</string>
+    <string name="preferences_attackspeed_instant">Мигновенно (без анимации)</string>
+    <string name="preferences_movementmethod">Тип на метод за придвижване и преодоляване на препятствия.</string>
+    <string name="preferences_movementmethods_straight">Директно (оригинално)</string>
+    <string name="actorinfo_currentconditions">Активни въздействия</string>
+    <string name="actorcondition_info_removes_all">Премахва всички %1$s</string>
+    <string name="actorcondition_info_immunity">Имунинутет към %1$s</string>
+    <string name="iteminfo_effect_chance_of">%1$s шанс за %2$s</string>
+    <string name="iteminfo_effect_duration">(%1$d рунда)</string>
+    <string name="iteminfo_effect_works_on_source">На източника</string>
+    <string name="iteminfo_effect_works_on_target">На целта</string>
+    <string name="iteminfo_effect_works_on_attacker">На нападателя</string>
+    <string name="iteminfo_effect_works_when_hitting_target">При удар по целта</string>
+    <string name="iteminfo_effect_works_when_killing_target">При всяко убийство</string>
+    <string name="iteminfo_effect_works_when_used">Когато се използва</string>
+    <string name="iteminfo_effect_works_when_equipped">Когато е сложено</string>
+    <string name="iteminfo_effect_works_when_hit_by_attacker">При удар на атакуващия</string>
+    <string name="iteminfo_effect_decrease_current_hp">Взима %1$s ТЗ</string>
+    <string name="iteminfo_effect_decrease_current_ap">Взима %1$s ТД</string>
+    <string name="iteminfo_effect_increase_current_ap">Възстановява %1$s ТД</string>
+    <string name="iteminfo_effect_decrease_max_hp">Намалява максималните ТЗ с %1$d</string>
+    <string name="iteminfo_effect_increase_max_hp">Увеличава максималните ТЗ +%1$d</string>
+    <string name="iteminfo_effect_increase_max_ap">Увеличава максималните ТД +%1$d</string>
+    <string name="iteminfo_effect_decrease_max_ap">Намалява максималните ТД с %1$d</string>
+    <string name="iteminfo_effect_increase_movecost">Увеличава цената на придвижване +%1$d ТД</string>
+    <string name="iteminfo_effect_decrease_movecost">Намалява цената на придвижване %1$d ТД</string>
+    <string name="preferences_display_scaling_factor_title">Мащаб</string>
+    <string name="preferences_display_scaling_factor">Положението на камерата в играта.</string>
+    <string name="preferences_display_scaling_factor_50_percent">50%</string>
+    <string name="preferences_display_scaling_factor_50_percent_larger">150%</string>
+    <string name="preferences_display_scaling_factor_75_percent">75%</string>
+    <string name="preferences_language_description">Изберете език. Ако системния език не се поддържа или съдържанието не е преведено, ще се използва английски език. (Изисква рестарт)</string>
+    <string name="inventory_selectitem">Изберете предмет за назначаване</string>
+    <string name="inventory_assign">Определете бърз слот</string>
+    <string name="inventory_assign_slot1">Слот 1</string>
+    <string name="inventory_assign_slot2">Слот 2</string>
+    <string name="inventory_assign_slot3">Слот 3</string>
+    <string name="inventory_unassign">Премахнете бързият слот</string>
+    <string name="preferences_movement_dpad_position_title">Виртуален джойстик</string>
+    <string name="preferences_movement_dpad_position">Включва на екрана виртуален джойстик за управление на движението.</string>
+    <string name="preferences_movement_dpad_minimizeable_title">Минимизиран джойстик</string>
+    <string name="preferences_dialog_confirmattack_title">Потвърдете атака</string>
+    <string name="preferences_dialog_monsterloot">Изберете как да се показват резултатите от битката (злато, опит, предмети).</string>
+    <string name="preferences_movement_dpad_positions_center_left">В ляво от центъра</string>
+    <string name="preferences_movement_dpad_positions_center_top">Горе централно</string>
+    <string name="bulkselection_totalcost_buy">Обща сума на купените предмети: %1$d злато</string>
+    <string name="bulkselection_totalcost_sell">Обща сума на купените предмети: %1$d злато</string>
+    <string name="skill_title_weapon_chance">Точност на оръжието</string>
+    <string name="skill_title_barkskin">Дебела кожа</string>
+    <string name="skill_title_speed">Скорост на битката</string>
+    <string name="skill_title_fortitude">Издръжливост</string>
+    <string name="skill_title_magicfinder">Търсач на предмети</string>
+    <string name="skill_title_resistance_mental">Силен Ум</string>
+    <string name="skill_title_resistance_physical_capacity">Издръжливо тяло</string>
+    <string name="skill_title_resistance_blood_disorder">Чиста Кръв</string>
+    <string name="skill_shortdescription_weapon_dmg">Увеличаване щетите от атака</string>
+    <string name="skill_shortdescription_barter">По добри цени в магазина</string>
+    <string name="skill_shortdescription_dodge">Увеличаване шанса за блок</string>
+    <string name="skill_shortdescription_barkskin">Резистентност към щети</string>
+    <string name="skill_shortdescription_more_criticals">Увеличено умение за критичен удар</string>
+    <string name="skill_shortdescription_better_criticals">Увеличени щети от критичен удар</string>
+    <string name="skill_shortdescription_speed">Увеличени максимални точки за действие</string>
+    <string name="skill_shortdescription_coinfinder">По висок шанс за намиране на злато</string>
+    <string name="skill_shortdescription_more_exp">Повече опит от битките</string>
+    <string name="skill_shortdescription_cleave">Възстановява точки за действие след всяко убийство</string>
+    <string name="skill_shortdescription_fortitude">Увеличава точки здраве след всяко вдигане на ниво</string>
+    <string name="skill_shortdescription_regeneration">Възстановява точки здраве след всеки рунд</string>
+    <string name="skill_shortdescription_lower_exploss">Намалява точките опит, които губите след като бъдете убити</string>
+    <string name="skill_shortdescription_resistance_mental">Резистентност към умствени въздействия</string>
+    <string name="skill_shortdescription_resistance_physical_capacity">Резистентност към физически въздействия</string>
+    <string name="skill_shortdescription_resistance_blood_disorder">Резистентност към кръвни разстройства</string>
+    <string name="skill_longdescription_weapon_dmg">Увеличава максималните щети с %1$d за всяко ниво на умението.</string>
+    <string name="preferences_movement_dpad_positions_center_right">В дясно от центъра</string>
+    <string name="bulkselection_sell_confirmation">Сигурни ли сте, че искате да продадете %1$s? Този предмет е %2$s и няма как да го възстановите след това.</string>
+    <string name="skill_shortdescription_weapon_chance">Увеличаване шанса за атака</string>
+    <string name="skill_shortdescription_eater">Възстановява точки здраве след всяко убийство</string>
+    <string name="skill_shortdescription_evasion">Увеличен шанс за бягство</string>
+    <string name="skill_shortdescription_magicfinder">Увеличен шанс за намиране на хубави предмети</string>
+    <string name="skill_longdescription_weapon_chance">Увеличава шансът за атака с %1$d процента за всяко ниво на умението.</string>
+    <string name="inventory_category_potion">Отвара</string>
+    <string name="iteminfo_displaytypes_extraordinary">Необикновен</string>
+    <string name="iteminfo_displaytypes_rare">Рядък</string>
+    <string name="actorconditioninfo_category">Тип на въздействието: %1$s</string>
+    <string name="actorcondition_categories_spiritual">Духовен</string>
+    <string name="actorcondition_categories_mental">Психически</string>
+    <string name="skill_title_shadow_bless">Тъмна благословия на Сянката</string>
+    <string name="skill_shortdescription_shadow_bless">Устойчивост срещу всички видове въздействия</string>
+    <string name="skill_title_crit2">Счупване</string>
+    <string name="about_button4">Относно</string>
+    <string name="preferences_ui_enable_animations_title">Включи анимациите</string>
+    <string name="inventory_category_all">Всички</string>
+    <string name="inventory_category_favorites">Любими</string>
+    <string name="inventory_category_jewelry">Бижута</string>
+    <string name="inventory_category_quest">Предмет свързан със задача</string>
+    <string name="inventory_sort_type">Тип</string>
+    <string name="shoplist_sort_custom">Разбъркан</string>
+    <string name="skill_sort_unsorted">Разбъркан</string>
+    <string name="preferences_display_theme_title">Тема</string>
+    <string name="skill_sort_unlocked">Отключен</string>
+    <string name="skill_title_spore_immunity">Устойчивост към отровни спори</string>
+    <string name="skill_shortdescription_spore_immunity">Пълен имунитет към отровни спори</string>
+    <string name="preferences_movement_dpad_transparency_60_pct">60%</string>
+    <string name="preferences_movement_dpad_transparency_70_pct">70%</string>
+    <string name="iteminfo_displaytypes_legendary">Легендарен</string>
+    <string name="actorcondition_categories_physical">Физически</string>
+    <string name="actorcondition_categories_blood">Нарушения на кръвта</string>
+    <string name="traitsinfo_base_max_hp">Максимални ТЗ:</string>
+    <string name="traitsinfo_base_max_ap">Максимални ТД:</string>
+    <string name="menu_save_saving_not_allowed_in_combat">Не можете да запазвате играта, докато сте в битка.</string>
+    <string name="menu_save_switch_character_title">Изберете персонажа</string>
+    <string name="preferences_high_quality_filters_title">Висококачествени филтри</string>
+    <string name="inventory_movetop">Премести на горе</string>
+    <string name="inventory_movebottom">Премести на долу</string>
+    <string name="actorinfo_immune_criticals">Имунитет към критични удари</string>
+    <string name="traitsinfo_criticalhit_effectivechance">Ефективен шанс за нанасяне на критичен удар:</string>
+    <string name="skill_title_crit1">Вътрешен кръвоизлив</string>
+    <string name="skill_shortdescription_crit1">Шанс за вътрешен кръвоизлив</string>
+    <string name="skill_shortdescription_crit2">Шанс за счупване на кост</string>
+    <string name="menu_button_worldmap">Карта</string>
+    <string name="menu_button_worldmap_failed">Картата не може да бъде показана.</string>
+    <string name="preferences_ui_category">Интерфейс</string>
+    <string name="skill_title_fightstyle_weapon_shield">Боен стил: Оръжия и щит</string>
+    <string name="skill_title_fightstyle_unarmed_unarmored">Боен стил: Пътят на монаха</string>
+    <string name="skill_title_specialization_dualwield">Специализация: Две оръжия</string>
+    <string name="skill_title_specialization_2hand">Специализация: Оръжие за две ръце</string>
+    <string name="skill_title_specialization_weapon_shield">Специализация: Оръжие и щит</string>
+    <string name="heroinfo_gamestats_quests">Завършени задачи</string>
+    <string name="heroinfo_gamestats_deaths">Брой пъти изпадане в безсъзнание</string>
+    <string name="heroinfo_gamestats_spent_gold">Похарчено злато в магазините</string>
+    <string name="heroinfo_gamestats_bonemeals">Използвани костни отвари</string>
+    <string name="heroinfo_gamestats_num_used_items">Използвани предмети</string>
+    <string name="heroinfo_gamestats_top_boss">Най-силният противник убит от вас</string>
+    <string name="preferences_ui_use_localized_resources_title">Използвай преведени ресурси</string>
+    <string name="inventory_category_weapons">Оръжие</string>
+    <string name="inventory_category_armor">Броня</string>
+    <string name="inventory_category_food">Храна</string>
+    <string name="inventory_category_usable">Използваем</string>
+    <string name="inventory_sort_custom">Разбъркан</string>
+    <string name="inventory_sort_name">Име</string>
+    <string name="skill_sort_points">Точки</string>
+    <string name="preferences_display_theme">Изберете тема за интерфейса. (изисква рестарт)</string>
+    <string name="preferences_display_theme_blue">Кобалт</string>
+    <string name="skill_sort_name">Име</string>
+    <string name="skill_category_offense">Нападение</string>
+    <string name="skill_longdescription_dodge">Увеличава шанса за блок с %1$d процента за всяко ниво на умението.</string>
+    <string name="skill_longdescription_barkskin">Увеличава устойчивостта към физическа атака с %1$d за всяко ниво на умението.</string>
+    <string name="skillinfo_action_levelup">Вдигна ниво</string>
+    <string name="skill_current_level">Текущо ниво: %1$d</string>
+    <string name="skill_current_level_with_maximum">Текущо ниво: %1$d / %2$d</string>
+    <string name="levelup_adds_new_skillpoint">Това ниво ви дава точка за усъвършенстване на уменията!</string>
+    <string name="iteminfo_displaytypes_quest">Предмет свързан със задача</string>
+    <string name="skill_title_rejuvenation">Възстановяване</string>
+    <string name="display_worldmap_title">Карта</string>
+    <string name="combat_log_title">Боен дневник</string>
+    <string name="conversation_reward_quest_finished">[Задачата е завършена: \"%1$s\"]</string>
+    <string name="conversation_reward_quest_updated">[Задачата е обновена: \"%1$s\"]</string>
+    <string name="skill_title_fightstyle_dualwield">Боен стил: Две оръжия</string>
+    <string name="skill_title_fightstyle_2hand">Боен стил: Оръжие за две ръце</string>
+    <string name="heroinfo_gamestats">Статистика за играта</string>
+    <string name="heroinfo_gamestats_visited_maps">Посетени места</string>
+    <string name="heroinfo_gamestats_fav_monsters">Най-често убиваният от вас противник</string>
+    <string name="heroinfo_gamestats_name_and_qty">%1$s (%2$d)</string>
+    <string name="inventory_category_other">Друг</string>
+    <string name="inventory_sort_price">Цена</string>
+    <string name="inventory_sort_quantity">Количество</string>
+    <string name="inventory_sort_rarity">Рядкост</string>
+    <string name="shoplist_sort_name">Име</string>
+    <string name="shoplist_sort_quantity">Количество</string>
+    <string name="shoplist_sort_rarity">Рядкост</string>
+    <string name="shoplist_sort_type">Тип</string>
+    <string name="skill_category_all">Всичко</string>
+    <string name="skill_category_defense">Защита</string>
+    <string name="skill_category_criticals">Критични удари</string>
+    <string name="skill_category_immunity">Имунитет</string>
+    <string name="skill_category_utility">Помощно средство</string>
+    <string name="skill_category_speciality">Специалност</string>
+    <string name="skill_category_proficiency">Опитност</string>
+    <string name="preferences_display_theme_green">Малахит</string>
+    <string name="preferences_display_theme_charcoal">Обсидиан</string>
+    <string name="preferences_movement_dpad_transparency_30_pct">30%</string>
+    <string name="preferences_movement_dpad_transparency_40_pct">40%</string>
+    <string name="preferences_movement_dpad_transparency_50_pct">50%</string>
+    <string name="monsterinfo_killcount">Предишни убийства</string>
+    <string name="combat_log_noentries">Все още няма запис.</string>
+    <string name="heroinfo_gamestats_fav_item">Най-често използван предмет</string>
+    <string name="heroinfo_gamestats_num_killed_monsters">Убити чудовища</string>
+    <string name="shoplist_sort_price">Цена</string>
+    <string name="preferences_quickslots_placement_summary">Разположение на бързите слотове</string>
+    <string name="preferences_quickslots_placements_horizontal_center_bottom">Централно долу</string>
+    <string name="preferences_quickslots_placements_vertical_center_left">В средата от ляво</string>
+    <string name="preferences_quickslots_placements_vertical_center_right">В средата от дясно</string>
+    <string name="preferences_quickslots_placements_vertical_bottom_left">Долу в ляво, на лявата страна на екрана</string>
+    <string name="preferences_quickslots_placements_horizontal_bottom_left">Долу в ляво, на долната страна на екрана</string>
+    <string name="preferences_quickslots_placements_horizontal_bottom_right">Долу в дясно, на долната страна на екрана</string>
+    <string name="iteminfo_effect_works_when_killed_by_attacker">При убийство от атакуващия</string>
+    <string name="skill_longdescription_better_criticals">Увеличава текущия множител на критиен удар от екипировката с %1$d %% за всяко ниво на умението.</string>
+    <string name="skill_longdescription_more_exp">Увеличава точките опит от победите над враговете с %1$d %% за всяко ниво на умението.</string>
+    <string name="skill_longdescription_cleave">Всяко ниво на умението дава +%1$d точки действие (ТД) след всяка победа.</string>
+    <string name="skill_longdescription_eater">Всяко ниво на умението дава +%1$d точки здраве (ТЗ) след всяка победа.</string>
+    <string name="preferences_quickslots_placements_vertical_bottom_right">Долу в дясно, на дясната страна на екрана</string>
+    <string name="skill_longdescription_speed">Увеличава максималните точки действие (ТД) с %1$d за всяко ниво на умението.</string>
+    <string name="change_theme_requires_restart">Смяна на темата на потребителкия интерфейс изисква рестарт. Следата на Андор бе затворена.</string>
+    <string name="skill_longdescription_evasion">Всяко ниво на умението намалява шанса за неуспешно бягство с %1$d %% и шансът за възможна атака на намиращите се до вас противници с %2$d %%.</string>
 </resources>

AndorsTrail/res/values-gl/strings.xml

@@ -63,4 +63,59 @@
     <string name="loadsave_title_load">Cargar xogo gardado</string>
     <string name="menu_save_gamesaved">O xogo gardouse na ranura %1$d</string>
     <string name="app_description">RPG fantástico guiado por misións</string>
+    <string name="combat_result_herohit">O teu ataque %1$s por %2$d hp!</string>
+    <string name="dialog_monsterloot_gainedexp">Gañaches %1$d puntos de experiencia.</string>
+    <string name="status_ap">AP:</string>
+    <string name="monster_difficulty_impossible">Imposible</string>
+    <string name="combat_taunt_monster">Mofaches %1$s!</string>
+    <string name="inventory_item_used">Usaches %1$s.</string>
+    <string name="combat_result_heromiss">O teu ataque falla.</string>
+    <string name="inventory_unequip">Soltar</string>
+    <string name="dialog_loot_foundgold">Atopaches %1$d ouro.</string>
+    <string name="actorinfo_difficulty">Dificultade:</string>
+    <string name="combat_log_item_plural">Atopaches %1$d items:</string>
+    <string name="actorinfo_movecost">Costo do movemento (AP):</string>
+    <string name="combat_not_enough_ap">Non hai AP suficiente nesta ronda.</string>
+    <string name="combat_log_item_single">Atopaches un item:</string>
+    <string name="dialog_loading_failed_title">Fallou a carga</string>
+    <string name="combat_result_herohitcritical">Obtés un ataque crítico sn%1$s para %2$d hp!</string>
+    <string name="actorinfo_defense">Defensa:</string>
+    <string name="inventory_drop">Deixar</string>
+    <string name="actorinfo_health">Saúde:</string>
+    <string name="combat_result_monsterhitcritical">%1$s obtén un dano crítico por %2$d hp!</string>
+    <string name="combat_condition_player_immune">Agora estas inmunizado contra %1$s.</string>
+    <string name="combat_result_monsterhit">%1$s bate contra ti por %2$d hp!</string>
+    <string name="dialog_loot_pickall">Coller todos</string>
+    <string name="monster_difficulty_veryeasy">Moi sinxelo</string>
+    <string name="heroinfo_skill_sort">Ordear</string>
+    <string name="dialog_groundloot_message">Atopaches uns obxetos.</string>
+    <string name="monster_difficulty_veryhard">Moi difícil</string>
+    <string name="combat_miss_animation_message">Perdiche</string>
+    <string name="combat_result_monstermiss">%1$s perde!</string>
+    <string name="combat_condition_player_clear">Estás despexado de %1$s.</string>
+    <string name="heroinfo_levelup">Subir de nivel</string>
+    <string name="monster_difficulty_hard">Difícil</string>
+    <string name="inventory_item_dropped">%1$s foi soltado.</string>
+    <string name="combat_condition_monster_immune">%1$s está agora inmunizado contra %2$s.</string>
+    <string name="inventory_info">Información</string>
+    <string name="combat_result_herokillsmonster">%1$s morreu!</string>
+    <string name="monster_difficulty_normal">Normal</string>
+    <string name="monster_difficulty_easy">Sinxelo</string>
+    <string name="dialog_monsterloot_title">Victoria</string>
+    <string name="combat_condition_monster_apply">%1$s está afectado por %2$s.</string>
+    <string name="dialog_loot_pickedupitems">Colliches %1$d items.</string>
+    <string name="combat_hero_dies">Caes inconsciente, pero por sorte ergueste vivo, cansado e faritigado. Perdes %1$d experiencia.</string>
+    <string name="dialog_monsterloot_message">Sobreviviche ao encounter.</string>
+    <string name="inventory_use">Usar</string>
+    <string name="combat_condition_monster_clear">%1$s está despexado por %2$s.</string>
+    <string name="dialog_groundloot_title">Obxetos</string>
+    <string name="inventory_equip">Equipo</string>
+    <string name="dialog_loot_pickedupitem">Colliche un item.</string>
+    <string name="actorinfo_attack">Ataque:</string>
+    <string name="combat_condition_player_apply">Estás afectado por %1$s.</string>
+    <string name="app_name">O camiño de Andor</string>
+    <string name="actorinfo_class">Clase:</string>
+    <string name="inventory_item_equipped">Equipaches %1$s.</string>
+    <string name="actorinfo_basetraits">Estatísticas de combate básico (sen equipamento nin habilidades)</string>
+    <string name="actorinfo_currenttraits">Estatísticas de combate (actual)</string>
 </resources>

AndorsTrail/res/values-lzh/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

AndorsTrail/res/values-th/strings.xml

@@ -84,4 +84,15 @@
     <string name="combat_result_monstermiss">%1$s โจมตีพลาด!</string>
     <string name="combat_result_monsterhitcritical">%1$s ทำการโจมตีติดคริติคอล สร้างความดาเมจจำนวน %2$d HP!</string>
     <string name="combat_result_monsterhit">%1$s ทำการโจมตีคุณ สร้างดาเมจำนวน %2$d HP!</string>
+    <string name="combat_condition_monster_clear">%1$s ถูกเคลียร์จาก %2$s แล้ว</string>
+    <string name="combat_condition_player_clear">คุณเคลียร์ %1$s แล้ว</string>
+    <string name="combat_condition_player_immune">ขณะนี้คุณได้รับภูมิคุ้มกันแล้ว %1$s.</string>
+    <string name="combat_condition_player_apply">คุณได้รับผลกระทบจาก %1$s</string>
+    <string name="combat_taunt_monster">คุณล้อเลียน %1$s!</string>
+    <string name="combat_result_herokillsmonster">%1$s ตาย!</string>
+    <string name="combat_result_herohitcritical">คุณได้รับการโจมตีคริติคอลด้วย %1$ สำหรับ%2$d hp!</string>
+    <string name="combat_not_enough_ap">เอพีไม่เพียงพอทิ้งสำหรับรอบนี้</string>
+    <string name="combat_hero_dies">คุณหมดสติไป แต่โชคดีที่ตื่นขึ้นมาอย่างมีชีวิตชีวา มึนงง และเหนื่อยล้า คุณสูญเสีย %1$d ประสบการณ์</string>
+    <string name="combat_miss_animation_message">ผิดพลาด, คิดถึง</string>
+    <string name="combat_condition_monster_apply">%1$s ได้รับผลกระทบจาก %2$s</string>
 </resources>

AndorsTrail/res/values-tr/strings.xml

@@ -621,7 +621,7 @@
     <string name="loadsave_import_save_successfull">İçeri aktarma başarılı</string>
     <string name="loadsave_import_save_unsuccessfull">İçeri aktarma başarısız</string>
     <string name="loadsave_import_save_error_unknown">İçe aktarılırken bilinmeyen bir hata meydana geldi.</string>
-    <string name="loadsave_import_file_exists_question">Mevcut Yuvanın Üzerine Yazılsın mı\? Hedef yuvada zaten kayıtlı bir oyun var. Mevcut kaydı tutmak mı, içe aktarılan kayıtla üzerine yazmak mı yoksa kaydı bir yuvaya içe aktarmak mı istiyorsunuz\?
+    <string name="loadsave_import_file_exists_question">Mevcut Yuvanın Üzerine Yazılsın mı? Hedef yuvada zaten kayıtlı bir oyun var. Mevcut kaydı tutmak mı, içe aktarılan kayıtla üzerine yazmak mı yoksa kaydı bir yuvaya içe aktarmak mı istiyorsunuz?
 \n
 \n%1$s
 \n

AndorsTrail/res/values-zh-rCN/strings.xml

@@ -589,7 +589,7 @@
 \n
 \nAndor\'s Trail不使用访问您的设备用于任何其他目的，也不访问互联网。Andor’s Trail是开源的；源代码可以在github上找到。</string>
     <string name="about_contents3">本程序为自由软件，在自由软件基金会发布的GNU通用公共许可协议的约束下，你可以对其进行再发布及修改。协议版本为第二版或（任意）更新的版本。&lt;br /&gt; &lt;br /&gt; 我们希望发布的这款程序有用，但&lt;b&gt;不保证&lt;/b&gt;，甚至不保证它有&lt;b&gt;经济价值&lt;/b&gt;和&lt;b&gt;适合特定用途&lt;/b&gt;。详情参见GNU通用公共许可协议。&lt;br /&gt; &lt;br /&gt; 你理当已收到一份GNU通用公共许可协议的副本，如果没有，请见 &lt;a href=http://www.gnu.org/licenses&gt;http://www.gnu.org/licenses&lt;/a&gt;&lt;br /&gt; &lt;br /&gt; 有关源代码和功能请求，请访问项目页面 &lt;a href=https://github.com/AndorsTrailRelease/andors-trail/&gt;https://github.com/AndorsTrailRelease/andors-trail/&lt;/a&gt;&lt;br /&gt;</string>
-    <string name="preferences_display_theme">主题（需要重启游戏）</string>
+    <string name="preferences_display_theme">选择界面主题。（需要重启游戏）</string>
     <string name="preferences_movement_dpad_transparency_70_pct">70%</string>
     <string name="preferences_movement_dpad_transparency_60_pct">60%</string>
     <string name="preferences_movement_dpad_transparency_50_pct">50%</string>
@@ -616,7 +616,7 @@
     <string name="loadsave_import_save">导入存档游戏</string>
     <string name="loadsave_import_save_successfull">导入成功</string>
     <string name="loadsave_import_save_unsuccessfull">导入失败</string>
-    <string name="loadsave_import_save_error_unknown">导入时发生未知错误。</string>
+    <string name="loadsave_import_save_error_unknown">- 已废弃 -</string>
     <string name="loadsave_import_option_keep_existing">保留现有存档</string>
     <string name="loadsave_import_option_keep_imported">保留导入的保存</string>
     <string name="loadsave_import_option_add_as_new">添加为新的保存</string>
@@ -627,7 +627,7 @@
     <string name="loadsave_import_worldmap">导入世界地图</string>
     <string name="loadsave_import_worldmap_successfull">世界地图导入成功</string>
     <string name="loadsave_import_worldmap_unsuccessfull">世界地图导入成功</string>
-    <string name="loadsave_import_worldmap_wrong_directory">你确定这个文件夹里有一个世界地图吗？请在你的导出位置里面选择名为\'worldmap\'的文件夹。</string>
+    <string name="loadsave_import_worldmap_wrong_directory">- 已废弃 -</string>
     <string name="monsterinfo_killcount">历史杀戮</string>
     <string name="loadsave_import_file_exists_question">在目标槽中已经有一个保存游戏。你想保留现有的保存，用导入的保存覆盖它，还是把保存导入到一个插槽中？
 \n