diff --git a/AndorsTrail/res/raw/actorconditions_v070.json b/AndorsTrail/res/raw/actorconditions_v070.json
index 8262cc825..36cac588f 100644
--- a/AndorsTrail/res/raw/actorconditions_v070.json
+++ b/AndorsTrail/res/raw/actorconditions_v070.json
@@ -165,5 +165,20 @@
},
"iconID": "actorconditions_1:87",
"category": 2
+ },
+ {
+ "id": "fire",
+ "name": "Ablaze",
+ "roundEffect": {
+ "increaseCurrentHP": {
+ "min": -1,
+ "max": -1
+ }
+ },
+ "abilityEffect": {
+ "increaseAttackChance": -15
+ },
+ "iconID": "actorconditions_1:1",
+ "category": 2
}
]
diff --git a/AndorsTrail/res/raw/conversationlist_thukuzun.json b/AndorsTrail/res/raw/conversationlist_thukuzun.json
index ddb0bc600..0792d1fbe 100644
--- a/AndorsTrail/res/raw/conversationlist_thukuzun.json
+++ b/AndorsTrail/res/raw/conversationlist_thukuzun.json
@@ -8,7 +8,7 @@
"message": "The air around here is much hotter around the hole in the ground here than in the rest of this room. This must be where the miners found the strange markings on the ground.",
"rewards": [
{
- "rewardID": "charwood1",
+ "rewardID": "charwood2",
"value": 20
}
]
diff --git a/AndorsTrail/res/raw/droplists_v070_mobs.json b/AndorsTrail/res/raw/droplists_v070_mobs.json
index 69aeca044..bc09509c8 100644
--- a/AndorsTrail/res/raw/droplists_v070_mobs.json
+++ b/AndorsTrail/res/raw/droplists_v070_mobs.json
@@ -573,5 +573,80 @@
"chance": 1
}
]
+ },
+ {
+ "id": "mazarth",
+ "items": [
+ {
+ "itemID": "gold",
+ "quantity": { "min": 0, "max": 30 },
+ "chance": 30
+ },
+ {
+ "itemID": "bone",
+ "quantity": { "min": 0, "max": 5 },
+ "chance": 50
+ },
+ {
+ "itemID": "meat",
+ "quantity": { "min": 0, "max": 5 },
+ "chance": 30
+ },
+ {
+ "itemID": "mace_iron",
+ "quantity": { "min": 1, "max": 1 },
+ "chance": 5
+ }
+ ]
+ },
+ {
+ "id": "ash",
+ "items": [
+ {
+ "itemID": "ash",
+ "quantity": { "min": 0, "max": 3 },
+ "chance": 10
+ },
+ {
+ "itemID": "axe_black2",
+ "quantity": { "min": 1, "max": 1 },
+ "chance": 5
+ }
+ ]
+ },
+ {
+ "id": "ashsp",
+ "items": [
+ {
+ "itemID": "ash",
+ "quantity": { "min": 0, "max": 2 },
+ "chance": 10
+ },
+ {
+ "itemID": "axe_black2",
+ "quantity": { "min": 1, "max": 1 },
+ "chance": 5
+ },
+ {
+ "itemID": "gem_fire",
+ "quantity": { "min": 1, "max": 1 },
+ "chance": "1/1000"
+ }
+ ]
+ },
+ {
+ "id": "fire",
+ "items": [
+ {
+ "itemID": "ash",
+ "quantity": { "min": 0, "max": 1 },
+ "chance": 10
+ },
+ {
+ "quantity": { "min": 1, "max": 3 },
+ "itemID": "gem1",
+ "chance": 100
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/itemlist_v070.json b/AndorsTrail/res/raw/itemlist_v070.json
index af244bdfb..8434469b1 100644
--- a/AndorsTrail/res/raw/itemlist_v070.json
+++ b/AndorsTrail/res/raw/itemlist_v070.json
@@ -1677,5 +1677,21 @@
"category": "animal",
"iconID": "items_misc:45",
"baseMarketCost": 2
+ },
+ {
+ "id": "ash",
+ "name": "Burnt ash",
+ "hasManualPrice": 1,
+ "category": "other",
+ "iconID": "items_misc_2:124",
+ "baseMarketCost": 1
+ },
+ {
+ "id": "gem_fire",
+ "name": "Gem of warmth",
+ "hasManualPrice": 1,
+ "category": "gem",
+ "iconID": "items_misc_5:26",
+ "baseMarketCost": 25
}
]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/monsterlist_v070_charwood2.json b/AndorsTrail/res/raw/monsterlist_v070_charwood2.json
new file mode 100644
index 000000000..737c56a98
--- /dev/null
+++ b/AndorsTrail/res/raw/monsterlist_v070_charwood2.json
@@ -0,0 +1,507 @@
+[
+ {
+ "id": "mazarth1",
+ "iconID": "monsters_ld2:36",
+ "name": "Mazarth beast",
+ "spawnGroup": "mazarth1",
+ "monsterClass": 5,
+ "maxHP": 129,
+ "moveCost": 5,
+ "attackCost": 5,
+ "attackChance": 75,
+ "criticalSkill": 20,
+ "criticalMultiplier": 3,
+ "blockChance": 60,
+ "damageResistance": 12,
+ "attackDamage": {
+ "max": 17
+ },
+ "droplistID": "mazarth"
+ },
+ {
+ "id": "mazarth2",
+ "iconID": "monsters_ld2:37",
+ "name": "Tough Mazarth beast",
+ "spawnGroup": "mazarth2",
+ "monsterClass": 5,
+ "maxHP": 148,
+ "moveCost": 5,
+ "attackCost": 5,
+ "attackChance": 79,
+ "criticalSkill": 20,
+ "criticalMultiplier": 3,
+ "blockChance": 67,
+ "damageResistance": 12,
+ "attackDamage": {
+ "max": 20
+ },
+ "droplistID": "mazarth"
+ },
+ {
+ "id": "ashs1",
+ "iconID": "monsters_ld2:224",
+ "name": "Weeping ash spectre",
+ "spawnGroup": "ashs1",
+ "monsterClass": 8,
+ "maxHP": 75,
+ "moveCost": 5,
+ "attackCost": 5,
+ "attackChance": 175,
+ "blockChance": 138,
+ "attackDamage": {
+ "min": 5,
+ "max": 15
+ },
+ "droplistID": "ash"
+ },
+ {
+ "id": "ashs2",
+ "iconID": "monsters_ld2:224",
+ "name": "Wailing Ash spectre",
+ "spawnGroup": "ashs1",
+ "monsterClass": 8,
+ "maxHP": 87,
+ "moveCost": 5,
+ "attackCost": 5,
+ "attackChance": 181,
+ "blockChance": 146,
+ "attackDamage": {
+ "min": 5,
+ "max": 15
+ },
+ "droplistID": "ash"
+ },
+ {
+ "id": "ashs3",
+ "iconID": "monsters_ld2:220",
+ "name": "Ash spectre",
+ "spawnGroup": "ashs2",
+ "monsterClass": 8,
+ "maxHP": 97,
+ "moveCost": 5,
+ "attackCost": 5,
+ "attackChance": 187,
+ "blockChance": 151,
+ "attackDamage": {
+ "min": 5,
+ "max": 15
+ },
+ "droplistID": "ash"
+ },
+ {
+ "id": "ash1",
+ "iconID": "monsters_misc:1",
+ "name": "Young ash gargoyle",
+ "spawnGroup": "ash1",
+ "monsterClass": 3,
+ "maxHP": 109,
+ "moveCost": 5,
+ "attackCost": 5,
+ "attackChance": 90,
+ "blockChance": 99,
+ "damageResistance": 5,
+ "attackDamage": {
+ "min": 3,
+ "max": 10
+ },
+ "droplistID": "ash"
+ },
+ {
+ "id": "ash2",
+ "iconID": "monsters_misc:1",
+ "name": "Ash gargoyle",
+ "spawnGroup": "ash1",
+ "monsterClass": 3,
+ "maxHP": 116,
+ "moveCost": 5,
+ "attackCost": 5,
+ "attackChance": 94,
+ "blockChance": 103,
+ "damageResistance": 5,
+ "attackDamage": {
+ "min": 3,
+ "max": 10
+ },
+ "droplistID": "ash"
+ },
+ {
+ "id": "ash3",
+ "iconID": "monsters_misc:2",
+ "name": "Strong ash gargoyle",
+ "spawnGroup": "ash2",
+ "monsterClass": 3,
+ "maxHP": 131,
+ "moveCost": 5,
+ "attackCost": 3,
+ "attackChance": 134,
+ "blockChance": 109,
+ "damageResistance": 6,
+ "attackDamage": {
+ "min": 3,
+ "max": 13
+ },
+ "droplistID": "ash"
+ },
+ {
+ "id": "ash4",
+ "iconID": "monsters_misc:2",
+ "name": "Handened ash gargoyle",
+ "spawnGroup": "ash2",
+ "monsterClass": 3,
+ "maxHP": 131,
+ "moveCost": 5,
+ "attackCost": 3,
+ "attackChance": 134,
+ "blockChance": 115,
+ "damageResistance": 9,
+ "attackDamage": {
+ "min": 3,
+ "max": 13
+ },
+ "droplistID": "ash"
+ },
+ {
+ "id": "ash5",
+ "iconID": "monsters_tometik2:10",
+ "name": "Young ash spawn",
+ "spawnGroup": "ash3",
+ "monsterClass": 2,
+ "maxHP": 80,
+ "moveCost": 5,
+ "attackCost": 3,
+ "attackChance": 138,
+ "criticalSkill": 15,
+ "criticalMultiplier": 4,
+ "blockChance": 81,
+ "attackDamage": {
+ "max": 5
+ },
+ "droplistID": "ashsp"
+ },
+ {
+ "id": "ash6",
+ "iconID": "monsters_tometik2:10",
+ "name": "Ash spawn",
+ "spawnGroup": "ash3",
+ "monsterClass": 2,
+ "maxHP": 83,
+ "moveCost": 5,
+ "attackCost": 3,
+ "attackChance": 141,
+ "criticalSkill": 15,
+ "criticalMultiplier": 4,
+ "blockChance": 86,
+ "attackDamage": {
+ "max": 5
+ },
+ "droplistID": "ashsp"
+ },
+ {
+ "id": "ash7",
+ "iconID": "monsters_tometik2:11",
+ "name": "Tough ash spawn",
+ "spawnGroup": "ash4",
+ "monsterClass": 2,
+ "maxHP": 87,
+ "moveCost": 5,
+ "attackCost": 3,
+ "attackChance": 146,
+ "criticalSkill": 15,
+ "criticalMultiplier": 4,
+ "blockChance": 89,
+ "attackDamage": {
+ "max": 5
+ },
+ "droplistID": "ashsp"
+ },
+ {
+ "id": "fire1",
+ "iconID": "monsters_rltiles2:154",
+ "name": "Glowing abcess",
+ "spawnGroup": "fire1",
+ "monsterClass": 3,
+ "maxHP": 91,
+ "moveCost": 5,
+ "attackCost": 3,
+ "attackChance": 149,
+ "criticalSkill": 15,
+ "criticalMultiplier": 4,
+ "blockChance": 92,
+ "damageResistance": 4,
+ "attackDamage": {
+ "max": 8
+ },
+ "hitEffect": {
+ "conditionsTarget": [
+ {
+ "condition": "fire",
+ "magnitude": 5,
+ "duration": 3,
+ "chance": 20
+ }
+ ]
+ },
+ "droplistID": "fire"
+ },
+ {
+ "id": "fire2",
+ "iconID": "monsters_rltiles2:154",
+ "name": "Blazing abcess",
+ "spawnGroup": "fire1",
+ "monsterClass": 3,
+ "maxHP": 95,
+ "moveCost": 5,
+ "attackCost": 3,
+ "attackChance": 152,
+ "criticalSkill": 15,
+ "criticalMultiplier": 2,
+ "blockChance": 96,
+ "damageResistance": 4,
+ "attackDamage": {
+ "max": 8
+ },
+ "hitEffect": {
+ "conditionsTarget": [
+ {
+ "condition": "fire",
+ "magnitude": 5,
+ "duration": 4,
+ "chance": 20
+ }
+ ]
+ },
+ "droplistID": "fire"
+ },
+ {
+ "id": "fire3",
+ "iconID": "monsters_rltiles2:24",
+ "name": "Lava Spawn",
+ "spawnGroup": "fire2",
+ "monsterClass": 3,
+ "maxHP": 102,
+ "moveCost": 5,
+ "attackCost": 3,
+ "attackChance": 145,
+ "criticalSkill": 20,
+ "criticalMultiplier": 2,
+ "blockChance": 86,
+ "damageResistance": 6,
+ "attackDamage": {
+ "max": 9
+ },
+ "hitEffect": {
+ "conditionsTarget": [
+ {
+ "condition": "fire",
+ "magnitude": 1,
+ "duration": 4,
+ "chance": 10
+ }
+ ]
+ },
+ "droplistID": "fire"
+ },
+ {
+ "id": "fire4",
+ "iconID": "monsters_rltiles2:24",
+ "name": "Tough lava Spawn",
+ "spawnGroup": "fire2",
+ "monsterClass": 3,
+ "maxHP": 107,
+ "moveCost": 5,
+ "attackCost": 3,
+ "attackChance": 149,
+ "criticalSkill": 25,
+ "criticalMultiplier": 2,
+ "blockChance": 89,
+ "damageResistance": 6,
+ "attackDamage": {
+ "max": 9
+ },
+ "hitEffect": {
+ "conditionsTarget": [
+ {
+ "condition": "fire",
+ "magnitude": 1,
+ "duration": 5,
+ "chance": 10
+ }
+ ]
+ },
+ "droplistID": "fire"
+ },
+ {
+ "id": "fire5",
+ "iconID": "monsters_rltiles1:2",
+ "name": "Glowing flame",
+ "spawnGroup": "fire3",
+ "monsterClass": 3,
+ "maxHP": 112,
+ "moveCost": 5,
+ "attackCost": 3,
+ "attackChance": 153,
+ "criticalSkill": 15,
+ "criticalMultiplier": "2.5",
+ "blockChance": 94,
+ "damageResistance": 6,
+ "attackDamage": {
+ "max": 9
+ },
+ "hitEffect": {
+ "conditionsTarget": [
+ {
+ "condition": "fire",
+ "magnitude": 1,
+ "duration": 5,
+ "chance": 20
+ }
+ ]
+ },
+ "droplistID": "fire"
+ },
+ {
+ "id": "fire6",
+ "iconID": "monsters_rltiles1:2",
+ "name": "Flame spawn",
+ "spawnGroup": "fire3",
+ "monsterClass": 3,
+ "maxHP": 127,
+ "moveCost": 5,
+ "attackCost": 3,
+ "attackChance": 152,
+ "criticalSkill": 20,
+ "criticalMultiplier": "2.5",
+ "blockChance": 72,
+ "damageResistance": 7,
+ "attackDamage": {
+ "max": 10
+ },
+ "hitEffect": {
+ "conditionsTarget": [
+ {
+ "condition": "fire",
+ "magnitude": 2,
+ "duration": 5,
+ "chance": 10
+ }
+ ]
+ },
+ "droplistID": "fire"
+ },
+ {
+ "id": "fire7",
+ "iconID": "monsters_rltiles1:2",
+ "name": "Walking flame",
+ "spawnGroup": "fire4",
+ "monsterClass": 3,
+ "maxHP": 131,
+ "moveCost": 5,
+ "attackCost": 3,
+ "attackChance": 157,
+ "criticalSkill": 20,
+ "criticalMultiplier": "2.5",
+ "blockChance": 75,
+ "damageResistance": 7,
+ "attackDamage": {
+ "max": 10
+ },
+ "hitEffect": {
+ "conditionsTarget": [
+ {
+ "condition": "fire",
+ "magnitude": 2,
+ "duration": 5,
+ "chance": 20
+ }
+ ]
+ },
+ "droplistID": "fire"
+ },
+ {
+ "id": "fire8",
+ "iconID": "monsters_tometik1:36",
+ "name": "Walking inferno",
+ "spawnGroup": "fire4",
+ "monsterClass": 3,
+ "maxHP": 135,
+ "moveCost": 5,
+ "attackCost": 3,
+ "attackChance": 161,
+ "criticalSkill": 20,
+ "criticalMultiplier": "2.5",
+ "blockChance": 78,
+ "damageResistance": 7,
+ "attackDamage": {
+ "max": 10
+ },
+ "hitEffect": {
+ "conditionsTarget": [
+ {
+ "condition": "fire",
+ "magnitude": 3,
+ "duration": 5,
+ "chance": 20
+ }
+ ]
+ },
+ "droplistID": "fire"
+ },
+ {
+ "id": "fire9",
+ "iconID": "monsters_tometik1:36",
+ "name": "Ancient walking inferno",
+ "spawnGroup": "fire5",
+ "monsterClass": 3,
+ "maxHP": 135,
+ "moveCost": 5,
+ "attackCost": 3,
+ "attackChance": 160,
+ "criticalSkill": 20,
+ "criticalMultiplier": "2.5",
+ "blockChance": 77,
+ "damageResistance": 7,
+ "attackDamage": {
+ "max": 10
+ },
+ "hitEffect": {
+ "conditionsTarget": [
+ {
+ "condition": "fire",
+ "magnitude": 3,
+ "duration": 5,
+ "chance": 20
+ }
+ ]
+ },
+ "droplistID": "fire"
+ },
+ {
+ "id": "thukuzun",
+ "iconID": "monsters_rltiles1:123",
+ "name": "Thukuzun",
+ "monsterClass": 6,
+ "unique": 1,
+ "maxHP": 193,
+ "moveCost": 5,
+ "attackCost": 3,
+ "attackChance": 136,
+ "blockChance": 140,
+ "damageResistance": 9,
+ "attackDamage": {
+ "min": 6,
+ "max": 25
+ },
+ "hitEffect": {
+ "conditionsTarget": [
+ {
+ "condition": "fire",
+ "magnitude": 3,
+ "duration": 7,
+ "chance": 20
+ }
+ ]
+ },
+ "phraseID": "thukuzun",
+ "droplistID": "thukuzun"
+ }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/monsterlist_v070_npcs.json b/AndorsTrail/res/raw/monsterlist_v070_npcs.json
index db4f072d7..9d259b2e8 100644
--- a/AndorsTrail/res/raw/monsterlist_v070_npcs.json
+++ b/AndorsTrail/res/raw/monsterlist_v070_npcs.json
@@ -25,7 +25,15 @@
"iconID": "monsters_rltiles1:86",
"phraseID": "aulowenn0",
"unique": 1,
- "droplistID": "aulowenn"
+ "droplistID": "aulowenn",
+ "maxHP": 194,
+ "maxAP": 10,
+ "moveCost": 5,
+ "attackCost": 3,
+ "attackChance": 120,
+ "blockChance": 90,
+ "damageResistance": 5,
+ "attackDamage": { "min": 0, "max": 9 }
},
{
"id": "charwd_guard",
@@ -166,7 +174,15 @@
"unique": 1,
"phraseID": "tiqui",
"droplistID": "tiqui",
- "iconID": "monsters_tometik5:87"
+ "iconID": "monsters_tometik5:87",
+ "maxHP": 145,
+ "maxAP": 10,
+ "moveCost": 5,
+ "attackCost": 3,
+ "attackChance": 90,
+ "blockChance": 120,
+ "damageResistance": 9,
+ "attackDamage": { "min": 0, "max": 9 }
},
{
"id": "twoteeth",
diff --git a/AndorsTrail/res/raw/questlist_v070_charwood.json b/AndorsTrail/res/raw/questlist_v070_charwood.json
index b90f2872e..f4f740215 100644
--- a/AndorsTrail/res/raw/questlist_v070_charwood.json
+++ b/AndorsTrail/res/raw/questlist_v070_charwood.json
@@ -146,7 +146,7 @@
"progress": 20
},
{
- "logText": "Among the undead in the lower parts of the mine, I've encountered some type of dragon-like creature. I guess this is the source of all the chaos in the mine. I should attempt to kill it and then venture back to Maevalia to tell her about it.",
+ "logText": "Among the fires in the lower parts of the mine, I've encountered some type of dragon-like creature. I guess this is the source of all the chaos in the mine. I should attempt to kill it and then venture back to Maevalia to tell her about it.",
"progress": 30
},
{
diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml
index bc71ca9ac..1468b9125 100644
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -239,6 +239,7 @@
- @raw/monsterlist_v0611_npcs1
- @raw/monsterlist_v0611_npcs2
- @raw/monsterlist_v070_charwood
+ - @raw/monsterlist_v070_charwood2
- @raw/monsterlist_v070_lodar1cave
- @raw/monsterlist_v070_lodar5cave
- @raw/monsterlist_v070_lodarcave
diff --git a/AndorsTrail/res/xml/lodar0.tmx b/AndorsTrail/res/xml/lodar0.tmx
index 2956abf33..58babc7a7 100644
--- a/AndorsTrail/res/xml/lodar0.tmx
+++ b/AndorsTrail/res/xml/lodar0.tmx
@@ -207,7 +207,7 @@
-