From 4560e16973255c40efd00419aecb7fb28b289072 Mon Sep 17 00:00:00 2001
From: tomjobes <41448091+tomjobes@users.noreply.github.com>
Date: Wed, 22 Apr 2020 14:33:22 -0400
Subject: [PATCH 1/3] Fix tree problem in road1 near roadblock

---
 AndorsTrail/res/xml/road1.tmx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/AndorsTrail/res/xml/road1.tmx b/AndorsTrail/res/xml/road1.tmx
index 213ecdfbc..a678d66ab 100644
--- a/AndorsTrail/res/xml/road1.tmx
+++ b/AndorsTrail/res/xml/road1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="25" height="25" tilewidth="32" tileheight="32" infinite="0" nextobjectid="16">
+<map version="1.0" tiledversion="1.1.6" orientation="orthogonal" renderorder="right-down" width="25" height="25" tilewidth="32" tileheight="32" infinite="0" nextobjectid="16">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
@@ -188,22 +188,22 @@
    eJy7J8nA8A6IN3Ki4s1QjCwGUncPSe09SYQYMo0sj6yPWHvAWJhEjMV9hOw4KEwaRg4HDPfisMdEmoHBFIjNpAn7AaQWPWyJscMZqM8FiF2lCfvBWRoz7oj1C7qfsGEzJD/gi3dCdsD8xMwOoZExyJ9BrLjTJSn2UAsPFzvIsQdfHFPDHkJplVh7iLGPHH/gsode6WEo24WvjKOWXfQoGyhJN6N4FFOCAVqdySY=
   </data>
  </layer>
- <layer name="Objects" width="25" height="25">
+ <layer name="Objects" width="25" height="25" visible="0">
   <data encoding="base64" compression="zlib">
    eJyNVb1Ow0AMtioVdUIk0EiV4BEYgQkeBmZ2FjaQeAB4FdIdFCidClX6k4mlIqVdQEJMiHMb93yur40li7vj/H3+bF8K4FovAHiK7H5s1rnxScOeTRtQ2nx3fwxmxnieizXy8Ji/7XI8Mr8kmK81Le+hG7u5U44jDVyeYcHh00I5POwCPO6ux8d7EOr/SyJdy011vn8zsd0SHHhP9oT2rcjVgvpIy5XhuTZ+a/y8AvBSB/jesNq4xtOqWyeuAS33zBjZnYm/rNg98qE2TaPse8xwfH3pmtw77Bzz2t9b1kk2Cty5jCO779RdLciRGr8X3o7sPJCdbQFcVJfvojfZeuDpPb7V4xrASQmf6QxszbR3KetFPG2RN8UPxfmXZ3Z5DPZe4/koHPlGgR8nNxifDXc/ZvuUxUoeyUczR7lNBC7nGXtyShQ9q7iIj3LOBI+miev5LXydLswLnbAkZo/p4fXGt4AzzflWcSEmxb+GtiarLGZ1l9p8daQ6ZUptSBuf05bAma7hyj34vl7QnCXit7EvvhWcC2vO+03Y/QLLN2NxEctx+TdmEFku3m85V9y4Luwf9QTfZ8owZxrFrCzqHOp6eh4dTZGvZlQD3g/eF222+FmsYGcCi3Nlnnpp80a5LWol7mg5c9y+8h7p74H5Rh8WflSbc9CZnEEZ+w939yQl
   </data>
  </layer>
- <layer name="Above" width="25" height="25">
+ <layer name="Above" width="25" height="25" visible="0">
   <data encoding="base64" compression="zlib">
    eJzFVVsKwkAMXIXS/guC4D28mJ7QG+jXSlvQk9ilBsJ2s500Aeenj3RnMpNAQ5gxnIIK/fT9eCjXElcv8CE671bXyxbsOtt5bV6Ip0+7zA7RuTYh3BrM076TZ+OF+3H5TpsXx/M8X8lnwqOgQUj+LHr/hLX3/DzCZ9HkuxSn+1fl2crPYeWtgXPnOh6eOJek4wELp2YnKJNSNkheazpRqCPc+f6gvrbMWeOjxu25Y8Tjvbc071zHwoVyIGdKPfJe40rNG5bsL7//uuT7C6IoWX0=
   </data>
  </layer>
- <layer name="Above_replace" width="25" height="25">
+ <layer name="Above_replace" width="25" height="25" visible="0">
   <data encoding="base64" compression="zlib">
    eJxjYBgFo2AUDAbQIjD07bglSR9/jIJRMApGwShgYAAAUygCsA==
   </data>
  </layer>
- <layer name="Walkable" width="25" height="25">
+ <layer name="Walkable" width="25" height="25" visible="0">
   <data encoding="base64" compression="zlib">
    eJzdlNENACEIQ53C/VdgQx1AoJRqLteED3OhT6qnzTFsVyabmvoKp8tC9Ze8XpzHiRWxT99YZX7ZmmWqPCr5M3c46kfy78wazXM7wxtSnw/LUUjxn1cZXl6eF8Lp3C+0x3u7UHXmYLxQBjtPlaHab8TIepA9KqrivwCLg9Kq
   </data>
@@ -213,9 +213,9 @@
    eJxjYBgFo2AUDAawUWzo2wEynx7+GAWjYBSMglHAwAAA3vsDHQ==
   </data>
  </layer>
- <layer name="Above_replace2" width="25" height="25" visible="0">
+ <layer name="Above_replace2" width="25" height="25">
   <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20ON6AAAHgzCcQAAQ==
+   eJxjYBgFo2AUjALqgFuSA+2CUTAKRsEoGDkAADcSAPQ=
   </data>
  </layer>
  <layer name="Walkable_replace2" width="25" height="25" visible="0">

From 72bc552df2471dc6c3423b3d4b4d2a802df64264 Mon Sep 17 00:00:00 2001
From: Nut <nut.andor@posteo.de>
Date: Fri, 24 Apr 2020 09:27:50 +0200
Subject: [PATCH 2/3] added map_table_2.png

---
 AndorsTrail/res/drawable/map_table_2.png        | Bin 0 -> 17075 bytes
 .../AndorsTrail/resource/ResourceLoader.java    |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 AndorsTrail/res/drawable/map_table_2.png

diff --git a/AndorsTrail/res/drawable/map_table_2.png b/AndorsTrail/res/drawable/map_table_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..951d34c5d0e3adc406bac3d0c485a1c58e0d48cc
GIT binary patch
literal 17075
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

literal 0
HcmV?d00001

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
index 92be7017f..e65583bd1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
@@ -405,6 +405,7 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.map_shop_1, "map_shop_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_sign_ladder_1, "map_sign_ladder_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_table_1, "map_table_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_table_2, "map_table_2", new Size(14, 8), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_trail_1, "map_trail_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_transition_1, "map_transition_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_transition_2, "map_transition_2", mapTileSize, sz1x1, mTileSize);

From 3f3ba031c3ac3fc40fafd55fe453dfc76b5e0212 Mon Sep 17 00:00:00 2001
From: Rijackson <richard.jackson@vspec-solutions.com>
Date: Sun, 26 Apr 2020 13:55:20 -0400
Subject: [PATCH 3/3] Changed skill descriptions to include parrying weapons
 with shields.

---
 AndorsTrail/res/values/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml
index 222b89c7b..f2dc185f6 100644
--- a/AndorsTrail/res/values/strings.xml
+++ b/AndorsTrail/res/values/strings.xml
@@ -624,7 +624,7 @@
 	<string name="skill_shortdescription_weapon_prof_axe">Better at fighting with axes</string>
 	<string name="skill_shortdescription_weapon_prof_blunt">Better at fighting with bludgeoning weapons</string>
 	<string name="skill_shortdescription_weapon_prof_unarmed">Better at fighting without weapons</string>
-	<string name="skill_shortdescription_armor_prof_shield">Make better use of shields</string>
+	<string name="skill_shortdescription_armor_prof_shield">Make better use of shields and parrying weapons</string>
 	<string name="skill_shortdescription_armor_prof_unarmored">Better at fighting without armor</string>
 	<string name="skill_shortdescription_armor_prof_light">Make better use of light armor</string>
 	<string name="skill_shortdescription_armor_prof_heavy">Make better use of heavy armor</string>
@@ -643,7 +643,7 @@
 	<string name="skill_longdescription_weapon_prof_axe">For each skill level, increases attack chance of axes and greataxes by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
 	<string name="skill_longdescription_weapon_prof_blunt">For each skill level, increases attack chance of bludgeoning weapons by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill. This includes clubs, quarterstaves, maces, scepters, war hammers and giant hammers.</string>
 	<string name="skill_longdescription_weapon_prof_unarmed">When fighting without a weapon and shield, gain %1$d attack chance, %2$d damage potential and %3$d block chance per skill level.</string>
-	<string name="skill_longdescription_armor_prof_shield">Increase damage resistance by %1$d per skill level while having a shield equipped.</string>
+	<string name="skill_longdescription_armor_prof_shield">Increase damage resistance by %1$d per skill level while having a shield or parrying weapon equipped.</string>
 	<string name="skill_longdescription_armor_prof_unarmored">While fighting without having any piece of armor equipped, gain %1$d block chance per skill level. Items made of cloth are not considered as being armor.</string>
 	<string name="skill_longdescription_armor_prof_light">For every skill level, increases the block chance of every piece of light armor being worn by %1$d %% of their original block chances. Light armors include leather, light metal and hide armors.</string>
 	<string name="skill_longdescription_armor_prof_heavy">For every skill level, increases the block chance of every piece of heavy armor being worn by %1$d %% of their original block chances. Pieces of heavy armor have their movement penalties reduced by %2$d %% per skill level, and their attack speed penalties reduced by %3$d %% per skill level. Heavy armors include metal armors, chain mail and plate mail.</string>
@@ -657,15 +657,15 @@ With two levels of this skill, %4$d %% of the off-hand\'s weapon\'s qualities ma
 	<string name="skill_longdescription_fightstyle_2hand">"Gives benefits when using weapons that require both hands to wield, such as two-handed swords, greataxes or giant hammers.
 
 Every skill level increases damage potential of two-handed weapons with %1$d %% of the original damage potential."</string>
-	<string name="skill_longdescription_fightstyle_weapon_shield">"Gives benefits when fighting with a weapon in the main hand and having a shield equipped in the off-hand.
+	<string name="skill_longdescription_fightstyle_weapon_shield">"Gives benefits when fighting with a weapon in the main hand and having a shield or parrying weapon equipped in the off-hand.
 
-Every skill level increases the attack chance of weapons with %1$d %% of their original attack chances, and the block chance of shields by %2$d %% of their original block chances."</string>
+Every skill level increases the attack chance of weapons in the main hand with %1$d %% of their original attack chances, and the block chance of shields or parrying weapons by %2$d %% of their original block chances."</string>
 	<string name="skill_longdescription_fightstyle_unarmed_unarmored">"While fighting without having any piece of armor equipped and without using a weapon or shield, gain %1$d attack chance, %2$d block chance, %3$d damage resistance and increase the maximum damage by %4$d per skill level. The skill also gives a critical multiplier of 1 plus 0.%5$d per level.
 
 Items made of cloth are not considered as being armor." </string>
 	<string name="skill_longdescription_specialization_dualwield">Increases the attack chance of both wielded weapons by an additional %1$d %% of their original attack chances, in addition to the benefits given by the weapon style skill. The block chances of both wielded weapons are also increased by %2$d %% of their original block chances.</string>
 	<string name="skill_longdescription_specialization_2hand">Increases damage potential of two-handed weapons by an additional %1$d %% of the original damage potential, in addition to the benefits given by the weapon style skill. The attack chances of two-handed weapons are also increased by %2$d %% of their original attack chances.</string>
-	<string name="skill_longdescription_specialization_weapon_shield">Increases both attack chances and damage potential of weapons. The attack chance is increased by %1$d %% of the original attack chance, and the damage potential is increased by %2$d %% of the original damage potential.</string>
+	<string name="skill_longdescription_specialization_weapon_shield">Increases both attack chances and damage potential of weapons in the main hand. The attack chance is increased by %1$d %% of the original attack chance, and the damage potential is increased by %2$d %% of the original damage potential.</string>
 	<string name="skill_longdescription_weapon_prof_pole">For each skill level, increases attack chance when using pole weapons by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
 
 	<string name="preferences_quickslots_placement">Quickslot position</string>