Minor fixes for v070 content.

This commit is contained in:
Oskar Wiksten
2013-06-12 00:50:28 +02:00
parent 91c22586a1
commit f4d2438a2e
13 changed files with 72 additions and 84 deletions

View File

@@ -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
}
]

View File

@@ -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": [

View File

@@ -4,7 +4,7 @@
"rewards": [
{
"rewardID": "charwood1",
"value": 20
"value": 19
}
],
"replies": [

View File

@@ -4,7 +4,7 @@
"rewards": [
{
"rewardID": "charwood1",
"value": 20
"value": 19
}
],
"replies": [

View File

@@ -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
}
]

View File

@@ -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",

View File

@@ -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

View File

@@ -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
}
]

View File

@@ -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.",

View File

@@ -175,8 +175,8 @@
<property name="quantity" value="2"/>
</properties>
</object>
<object name="caveslir1" type="spawn" x="480" y="480" width="32" height="32"/>
<object name="cavenarg1" type="spawn" x="352" y="480" width="32" height="32"/>
<object name="caveburr2" type="spawn" x="480" y="480" width="32" height="32"/>
<object name="caveburr1" type="spawn" x="352" y="480" width="32" height="32"/>
<object name="caveburr1" type="spawn" x="224" y="512" width="128" height="128"/>
<object name="caveburr1" type="spawn" x="128" y="576" width="32" height="64">
<properties>

View File

@@ -149,7 +149,7 @@
</object>
</objectgroup>
<objectgroup name="Spawn" width="20" height="20">
<object name="caveat2" type="spawn" x="480" y="160" width="128" height="128">
<object name="cavebat2" type="spawn" x="480" y="160" width="128" height="128">
<properties>
<property name="quantity" value="2"/>
</properties>

View File

@@ -184,7 +184,7 @@
<property name="quantity" value="2"/>
</properties>
</object>
<object name="cavegir1" type="spawn" x="96" y="448" width="64" height="32">
<object name="hirathil0" type="spawn" x="96" y="448" width="64" height="32">
<properties>
<property name="quantity" value="2"/>
</properties>

View File

@@ -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<Integer> preloadedTileIDs = new HashSet<Integer>();