diff --git a/AndorsTrail/res/raw/actorconditions_v070.json b/AndorsTrail/res/raw/actorconditions_v070.json index 36cac588f..8d66b73a9 100644 --- a/AndorsTrail/res/raw/actorconditions_v070.json +++ b/AndorsTrail/res/raw/actorconditions_v070.json @@ -180,5 +180,18 @@ }, "iconID": "actorconditions_1:1", "category": 2 + }, + { + "id": "sting_minor", + "name": "Minor sting", + "isStacking": 1, + "roundEffect": { + "increaseCurrentHP": { + "min": -1, + "max": -1 + } + }, + "iconID": "actorconditions_1:63", + "category": 2 } ] diff --git a/AndorsTrail/res/raw/conversationlist_charwood1.json b/AndorsTrail/res/raw/conversationlist_charwood1.json index 38a8b386d..d7a2dd716 100644 --- a/AndorsTrail/res/raw/conversationlist_charwood1.json +++ b/AndorsTrail/res/raw/conversationlist_charwood1.json @@ -4,7 +4,7 @@ "rewards": [ { "rewardID": "charwood1", - "value": 20 + "value": 19 } ], "replies": [ @@ -96,7 +96,7 @@ "rewards": [ { "rewardID": "charwood1", - "value": 20 + "value": 19 } ], "replies": [ @@ -124,7 +124,7 @@ "rewards": [ { "rewardID": "charwood1", - "value": 20 + "value": 19 } ], "replies": [ diff --git a/AndorsTrail/res/raw/conversationlist_kantya.json b/AndorsTrail/res/raw/conversationlist_kantya.json index f565f9099..49c2e0f16 100644 --- a/AndorsTrail/res/raw/conversationlist_kantya.json +++ b/AndorsTrail/res/raw/conversationlist_kantya.json @@ -4,7 +4,7 @@ "rewards": [ { "rewardID": "charwood1", - "value": 20 + "value": 19 } ], "replies": [ diff --git a/AndorsTrail/res/raw/conversationlist_maevalia.json b/AndorsTrail/res/raw/conversationlist_maevalia.json index 6d250f1e3..7bccf06a2 100644 --- a/AndorsTrail/res/raw/conversationlist_maevalia.json +++ b/AndorsTrail/res/raw/conversationlist_maevalia.json @@ -4,7 +4,7 @@ "rewards": [ { "rewardID": "charwood1", - "value": 20 + "value": 19 } ], "replies": [ diff --git a/AndorsTrail/res/raw/monsterlist_v070_lodar5cave.json b/AndorsTrail/res/raw/monsterlist_v070_lodar5cave.json index e8550321b..5d57c7d99 100644 --- a/AndorsTrail/res/raw/monsterlist_v070_lodar5cave.json +++ b/AndorsTrail/res/raw/monsterlist_v070_lodar5cave.json @@ -13,16 +13,6 @@ "blockChance": 126, "attackDamage": { "max": 5 - }, - "hitEffect": { - "conditionsTarget": [ - { - "condition": "slow", - "magnitude": 1, - "duration": 3, - "chance": 10 - } - ] } }, { @@ -39,16 +29,6 @@ "blockChance": 129, "attackDamage": { "max": 6 - }, - "hitEffect": { - "conditionsTarget": [ - { - "condition": "slow", - "magnitude": 1, - "duration": 3, - "chance": 20 - } - ] } }, { @@ -68,12 +48,6 @@ }, "hitEffect": { "conditionsTarget": [ - { - "condition": "slow", - "magnitude": 1, - "duration": 3, - "chance": 10 - }, { "condition": "poison_weak", "magnitude": 1, @@ -100,12 +74,6 @@ }, "hitEffect": { "conditionsTarget": [ - { - "condition": "slow", - "magnitude": 1, - "duration": 3, - "chance": 20 - }, { "condition": "poison_weak", "magnitude": 1, @@ -132,12 +100,6 @@ }, "hitEffect": { "conditionsTarget": [ - { - "condition": "slow", - "magnitude": 1, - "duration": 5, - "chance": 10 - }, { "condition": "poison_weak", "magnitude": 2, @@ -164,7 +126,8 @@ "attackDamage": { "min": 3, "max": 5 - } + }, + "movementAggressionType": 2 }, { "id": "cavebat2", @@ -183,7 +146,8 @@ "attackDamage": { "min": 2, "max": 6 - } + }, + "movementAggressionType": 2 }, { "id": "cavebat3", @@ -202,7 +166,8 @@ "attackDamage": { "min": 1, "max": 7 - } + }, + "movementAggressionType": 2 }, { "id": "cavebat4", @@ -221,7 +186,8 @@ "attackDamage": { "min": 1, "max": 7 - } + }, + "movementAggressionType": 2 }, { "id": "cavebat5", @@ -240,6 +206,7 @@ "attackDamage": { "min": 1, "max": 7 - } + }, + "movementAggressionType": 2 } ] \ No newline at end of file diff --git a/AndorsTrail/res/raw/monsterlist_v070_lodarcave.json b/AndorsTrail/res/raw/monsterlist_v070_lodarcave.json index 232fc1cd7..e38cc419d 100644 --- a/AndorsTrail/res/raw/monsterlist_v070_lodarcave.json +++ b/AndorsTrail/res/raw/monsterlist_v070_lodarcave.json @@ -17,7 +17,8 @@ "attackDamage": { "min": 6, "max": 7 - } + }, + "movementAggressionType": 1 }, { "id": "hirathil1", @@ -37,7 +38,8 @@ "attackDamage": { "min": 6, "max": 7 - } + }, + "movementAggressionType": 1 }, { "id": "hirathil2", @@ -57,7 +59,8 @@ "attackDamage": { "min": 6, "max": 7 - } + }, + "movementAggressionType": 1 }, { "id": "hirathil3", @@ -77,7 +80,8 @@ "attackDamage": { "min": 6, "max": 7 - } + }, + "movementAggressionType": 1 }, { "id": "hirathil4", @@ -97,7 +101,8 @@ "attackDamage": { "min": 7, "max": 16 - } + }, + "movementAggressionType": 1 }, { "id": "hirathil5", @@ -117,7 +122,8 @@ "attackDamage": { "min": 7, "max": 16 - } + }, + "movementAggressionType": 1 }, { "id": "hirathil6", @@ -137,7 +143,8 @@ "attackDamage": { "min": 7, "max": 16 - } + }, + "movementAggressionType": 1 }, { "id": "hirathil7", @@ -157,7 +164,8 @@ "attackDamage": { "min": 7, "max": 16 - } + }, + "movementAggressionType": 1 }, { "id": "hirazinn", diff --git a/AndorsTrail/res/raw/monsterlist_v070_lodarmaze.json b/AndorsTrail/res/raw/monsterlist_v070_lodarmaze.json index 98209d8e3..9a57eb714 100644 --- a/AndorsTrail/res/raw/monsterlist_v070_lodarmaze.json +++ b/AndorsTrail/res/raw/monsterlist_v070_lodarmaze.json @@ -17,7 +17,8 @@ "min": 4, "max": 5 }, - "droplistID": "wasp" + "droplistID": "wasp", + "movementAggressionType": 2 }, { "id": "dungfly2", @@ -37,7 +38,8 @@ "min": 5, "max": 7 }, - "droplistID": "wasp" + "droplistID": "wasp", + "movementAggressionType": 2 }, { "id": "dungfly3", @@ -57,17 +59,8 @@ "min": 7, "max": 8 }, - "hitEffect": { - "conditionsTarget": [ - { - "condition": "sleeping_sickness", - "magnitude": 2, - "duration": 3, - "chance": 50 - } - ] - }, - "droplistID": "wasp" + "droplistID": "wasp", + "movementAggressionType": 2 }, { "id": "brtender1", @@ -334,7 +327,8 @@ "min": 4, "max": 12 }, - "droplistID": "zortak" + "droplistID": "zortak", + "movementAggressionType": 1 }, { "id": "zortak2", @@ -354,7 +348,8 @@ "min": 4, "max": 9 }, - "droplistID": "zortak" + "droplistID": "zortak", + "movementAggressionType": 1 }, { "id": "zortak3", @@ -374,7 +369,8 @@ "min": 2, "max": 10 }, - "droplistID": "zortak" + "droplistID": "zortak", + "movementAggressionType": 1 }, { "id": "zortak4", @@ -394,7 +390,8 @@ "min": 3, "max": 11 }, - "droplistID": "zortak" + "droplistID": "zortak", + "movementAggressionType": 1 }, { "id": "zortakb", @@ -935,7 +932,7 @@ "hitEffect": { "conditionsTarget": [ { - "condition": "poisoning_blood", + "condition": "poison_weak", "magnitude": 2, "duration": 5, "chance": 30 @@ -961,7 +958,7 @@ "hitEffect": { "conditionsTarget": [ { - "condition": "poisoning_blood", + "condition": "poison_weak", "magnitude": 2, "duration": 5, "chance": 30 diff --git a/AndorsTrail/res/raw/monsterlist_v070_oldcave.json b/AndorsTrail/res/raw/monsterlist_v070_oldcave.json index 4fbb9de5b..460d33f13 100644 --- a/AndorsTrail/res/raw/monsterlist_v070_oldcave.json +++ b/AndorsTrail/res/raw/monsterlist_v070_oldcave.json @@ -108,7 +108,8 @@ "min": 2, "max": 9 }, - "droplistID": "undead1" + "droplistID": "undead1", + "movementAggressionType": 1 }, { "id": "zombie6", @@ -126,7 +127,8 @@ "min": 2, "max": 9 }, - "droplistID": "undead1" + "droplistID": "undead1", + "movementAggressionType": 1 }, { "id": "zombie7", @@ -144,6 +146,7 @@ "min": 3, "max": 9 }, - "droplistID": "undead1" + "droplistID": "undead1", + "movementAggressionType": 1 } ] \ No newline at end of file diff --git a/AndorsTrail/res/raw/questlist_v070_charwood.json b/AndorsTrail/res/raw/questlist_v070_charwood.json index eeab8b597..3e5f32fff 100644 --- a/AndorsTrail/res/raw/questlist_v070_charwood.json +++ b/AndorsTrail/res/raw/questlist_v070_charwood.json @@ -14,7 +14,7 @@ }, { "logText": "I have found the Charwood cabin in the forest northwest of the Foaming Flask tavern.", - "progress": 20 + "progress": 19 }, { "logText": "Maevalia in the Charwood cabin told me a story about how their mining settlement was attacked by some monsters, forcing them to flee down the mountain. They are still missing several of their friends and relatives from the Charwood heights, either killed or captured by the monsters.", diff --git a/AndorsTrail/res/xml/lodar5cave0.tmx b/AndorsTrail/res/xml/lodar5cave0.tmx index 24634f7d2..467c1566c 100644 --- a/AndorsTrail/res/xml/lodar5cave0.tmx +++ b/AndorsTrail/res/xml/lodar5cave0.tmx @@ -175,8 +175,8 @@ - - + + diff --git a/AndorsTrail/res/xml/lodar5cave2.tmx b/AndorsTrail/res/xml/lodar5cave2.tmx index ac88e2727..5147e042f 100644 --- a/AndorsTrail/res/xml/lodar5cave2.tmx +++ b/AndorsTrail/res/xml/lodar5cave2.tmx @@ -149,7 +149,7 @@ - + diff --git a/AndorsTrail/res/xml/lodarcave4.tmx b/AndorsTrail/res/xml/lodarcave4.tmx index 4ed6afd0e..8687a99b5 100644 --- a/AndorsTrail/res/xml/lodarcave4.tmx +++ b/AndorsTrail/res/xml/lodarcave4.tmx @@ -184,7 +184,7 @@ - + diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java index 89fd71613..f2e1bdaa6 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java @@ -62,7 +62,7 @@ public final class TileManager { public final TileCache tileCache = new TileCache(); - public final TileCollection preloadedTiles = new TileCollection(96); + public final TileCollection preloadedTiles = new TileCollection(97); public TileCollection currentMapTiles; public TileCollection adjacentMapTiles; private final HashSet preloadedTileIDs = new HashSet();