Merge pull request Zukero#10 from NutAndor/test_brimhaven

Test brimhaven
Chriz76 · May 1, 2020 · 45859bc · 45859bc
2 parents 03cb7a0 + a4f6ace
commit 45859bc
Show file tree

Hide file tree

Showing 77 changed files with 698 additions and 259 deletions.
diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml
@@ -3,8 +3,8 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="51"
-	android:versionName="0.7.9"
+	android:versionCode="52"
+	android:versionName="0.7.10"
 	android:installLocation="auto"
 	>
 	<uses-sdk 
@@ -22,9 +22,8 @@
 
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-
-
-
+
+
 	<application 
 		android:name=".AndorsTrailApplication" 
 		android:label="@string/app_name" 

diff --git a/AndorsTrail/res/drawable/items_misc_2.png b/AndorsTrail/res/drawable/items_misc_2.png
diff --git a/AndorsTrail/res/drawable/items_rijackson_1.png b/AndorsTrail/res/drawable/items_rijackson_1.png
diff --git a/AndorsTrail/res/drawable/map_cavewall_1.png b/AndorsTrail/res/drawable/map_cavewall_1.png
diff --git a/AndorsTrail/res/drawable/map_entrance_2.png b/AndorsTrail/res/drawable/map_entrance_2.png
diff --git a/AndorsTrail/res/drawable/map_indoor_2.png b/AndorsTrail/res/drawable/map_indoor_2.png
diff --git a/AndorsTrail/res/drawable/map_pillar_2.png b/AndorsTrail/res/drawable/map_pillar_2.png
diff --git a/AndorsTrail/res/drawable/map_roof_1.png b/AndorsTrail/res/drawable/map_roof_1.png
diff --git a/AndorsTrail/res/drawable/map_table_2.png b/AndorsTrail/res/drawable/map_table_2.png
diff --git a/AndorsTrail/res/drawable/monsters_giantbasilisk.png b/AndorsTrail/res/drawable/monsters_giantbasilisk.png
diff --git a/AndorsTrail/res/drawable/monsters_misc.png b/AndorsTrail/res/drawable/monsters_misc.png
diff --git a/AndorsTrail/res/layout/abilitymodifierview.xml b/AndorsTrail/res/layout/abilitymodifierview.xml
@@ -23,6 +23,12 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
+	<TextView
+		android:text="@string/iteminfo_effect_set_damage_modifier"
+		android:id="@+id/abilitymodifierinfo_set_damage_modifier"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		/>
 	<TextView
 		android:text="@string/iteminfo_effect_increase_critical_skill"
 		android:id="@+id/abilitymodifierinfo_change_critical_skill"

diff --git a/AndorsTrail/res/raw/conversationlist_burhczyd.json b/AndorsTrail/res/raw/conversationlist_burhczyd.json
@@ -2544,7 +2544,7 @@
             {
                 "rewardType":"removeQuestProgress",
                 "rewardID":"quest_burhczyd_nd",
-                "value":84
+                "value":83
             }
         ]
     },

diff --git a/AndorsTrail/res/raw/conversationlist_crossglen_odair.json b/AndorsTrail/res/raw/conversationlist_crossglen_odair.json
@@ -152,7 +152,7 @@
             },
             {
                 "rewardType":"dropList",
-                "rewardID":"gold20"
+                "rewardID":"gold100"
             }
         ]
     },

diff --git a/AndorsTrail/res/raw/conversationlist_graveyard1.json b/AndorsTrail/res/raw/conversationlist_graveyard1.json
@@ -249,7 +249,8 @@
                 "requires":[
                     {
                         "requireType":"wear",
-                        "requireID":"lifetaker"
+                        "requireID":"lifetaker",
+                        "value":1
                     }
                 ]
             },
@@ -266,6 +267,7 @@
                     {
                         "requireType":"wear",
                         "requireID":"lifetaker",
+                        "value":1,
                         "negate":true
                     }
                 ]

diff --git a/AndorsTrail/res/raw/conversationlist_mikhail.json b/AndorsTrail/res/raw/conversationlist_mikhail.json
@@ -347,7 +347,7 @@
             },
             {
                 "rewardType":"dropList",
-                "rewardID":"gold20"
+                "rewardID":"gold50"
             }
         ]
     },

diff --git a/AndorsTrail/res/raw/droplists_crossglen.json b/AndorsTrail/res/raw/droplists_crossglen.json
@@ -113,18 +113,31 @@
         ]
     },
     {
-        "id":"gold20",
+        "id":"gold100",
         "items":[
             {
                 "itemID":"gold",
                 "chance":"100",
                 "quantity":{
-                    "min":20,
-                    "max":20
+                    "min":100,
+                    "max":100
                 }
             }
         ]
     },
+    {
+      "id":"gold20",
+      "items":[
+        {
+          "itemID":"gold",
+          "chance":"100",
+          "quantity":{
+            "min":20,
+            "max":20
+          }
+        }
+      ]
+    },
     {
         "id":"canine",
         "items":[
@@ -216,8 +229,8 @@
                 "itemID":"gold",
                 "chance":"100",
                 "quantity":{
-                    "min":10,
-                    "max":10
+                    "min":100,
+                    "max":100
                 }
             },
             {
@@ -228,6 +241,14 @@
                     "max":1
                 }
             },
+            {
+                "itemID":"ironsword2",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
             {
                 "itemID":"gem1",
                 "chance":"5",

diff --git a/AndorsTrail/res/raw/droplists_v0610_shops.json b/AndorsTrail/res/raw/droplists_v0610_shops.json
@@ -1291,6 +1291,14 @@
                     "min":5,
                     "max":5
                 }
+            },
+            {
+                "itemID":"gloves_critical",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     },
@@ -1756,6 +1764,14 @@
                     "min":1,
                     "max":1
                 }
+            },
+            {
+                "itemID":"robe_protector",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     },

diff --git a/AndorsTrail/res/raw/itemlist_arulir_mountain.json b/AndorsTrail/res/raw/itemlist_arulir_mountain.json
@@ -32,13 +32,11 @@
             "increaseAttackCost":4,
             "increaseAttackChance":25
         },
-        "hitEffect":{
+        "killEffect":{
             "increaseCurrentAP":{
                 "min":1,
-                "max":1
-            }
-        },
-        "killEffect":{
+                "max":3
+            },
             "conditionsSource":[
                 {
                     "condition":"rage_minor",
@@ -102,6 +100,7 @@
                 "max":40
             },
             "increaseAttackCost":14,
+            "setNonWeaponDamageModifier":320,
             "increaseAttackChance":20,
             "increaseCriticalSkill":5,
             "setCriticalMultiplier":3.0

diff --git a/AndorsTrail/res/raw/itemlist_graveyard1.json b/AndorsTrail/res/raw/itemlist_graveyard1.json
@@ -24,6 +24,7 @@
                 "max":7
             },
             "increaseAttackCost":4,
+			"setNonWeaponDamageModifier":104,
             "increaseAttackChance":30,
             "increaseCriticalSkill":0,
             "increaseBlockChance":0,
@@ -120,6 +121,7 @@
                 "max":8
             },
             "increaseAttackCost":7,
+            "setNonWeaponDamageModifier":195,
             "increaseAttackChance":12
         },
         "hitEffect":{

diff --git a/AndorsTrail/res/raw/itemlist_omicronrg9.json b/AndorsTrail/res/raw/itemlist_omicronrg9.json
@@ -35,6 +35,7 @@
             },
             "increaseReequipCost":0,
             "increaseAttackCost":4,
+			"setNonWeaponDamageModifier":96,
             "increaseAttackChance":15,
             "increaseCriticalSkill":10,
             "increaseBlockChance":2,
@@ -117,6 +118,7 @@
             },
             "increaseMaxHP":0,
             "increaseAttackCost":5,
+            "setNonWeaponDamageModifier":113,
             "increaseAttackChance":19,
             "increaseCriticalSkill":10,
             "increaseBlockChance":0,
@@ -167,6 +169,7 @@
                 "max":4
             },
             "increaseAttackCost":4,
+			"setNonWeaponDamageModifier":101,
             "increaseAttackChance":9,
             "increaseBlockChance":11
         }

diff --git a/AndorsTrail/res/raw/itemlist_stoutford_combined.json b/AndorsTrail/res/raw/itemlist_stoutford_combined.json
@@ -82,6 +82,7 @@
                 "max":6
             },
             "increaseAttackCost":4,
+			"setNonWeaponDamageModifier":102,
             "increaseAttackChance":20,
             "increaseBlockChance":0
         },
@@ -108,6 +109,7 @@
                 "max":11
             },
             "increaseAttackCost":6,
+            "setNonWeaponDamageModifier":130,
             "increaseAttackChance":15
         }
     },
@@ -123,6 +125,7 @@
                 "max":13
             },
             "increaseAttackCost":6,
+            "setNonWeaponDamageModifier":130,
             "increaseAttackChance":15,
             "increaseCriticalSkill":4,
             "setCriticalMultiplier":1.5
@@ -150,6 +153,7 @@
                 "max":3
             },
             "increaseAttackCost":5,
+            "setNonWeaponDamageModifier":115,
             "increaseAttackChance":10,
             "increaseCriticalSkill":1,
             "increaseBlockChance":7,
@@ -168,6 +172,7 @@
                 "max":4
             },
             "increaseAttackCost":4,
+			"setNonWeaponDamageModifier":105,
             "increaseAttackChance":17,
             "increaseCriticalSkill":9,
             "setCriticalMultiplier":2.5
@@ -196,6 +201,7 @@
                 "max":9
             },
             "increaseAttackCost":6,
+            "setNonWeaponDamageModifier":130,
             "increaseAttackChance":15,
             "increaseBlockChance":4
         }
@@ -215,6 +221,7 @@
                 "max":3
             },
             "increaseAttackCost":6,
+            "setNonWeaponDamageModifier":135,
             "increaseAttackChance":8,
             "increaseBlockChance":1
         },
@@ -261,6 +268,7 @@
                 "max":14
             },
             "increaseAttackCost":6,
+            "setNonWeaponDamageModifier":135,
             "increaseAttackChance":8,
             "increaseCriticalSkill":10,
             "setCriticalMultiplier":2.0
@@ -880,6 +888,7 @@
                 "max":5
             },
             "increaseAttackCost":5,
+            "setNonWeaponDamageModifier":115,
             "increaseAttackChance":15,
             "increaseCriticalSkill":8,
             "increaseBlockChance":5,
@@ -898,6 +907,7 @@
                 "max":28
             },
             "increaseAttackCost":13,
+            "setNonWeaponDamageModifier":320,
             "increaseAttackChance":22,
             "increaseCriticalSkill":1,
             "increaseBlockChance":-5,