Skip to content

Commit

Permalink
Fixed war machines spell immunity.
Browse files Browse the repository at this point in the history 
* Should fix http://bugs.vcmi.eu/view.php?id=2407
  • Loading branch information
@alexvins
alexvins committed Sep 5, 2016
1 parent 8e94b1c commit 13aedac
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 39 deletions.
19 changes: 19 additions & 0 deletions config/spells/ability.json
View file
Expand Up @@ -40,6 +40,9 @@
} }
} }
}, },
"absoluteImmunity":{
"SIEGE_WEAPON": true
},
"flags" : { "flags" : {
"indifferent": true "indifferent": true
} }
Expand Down Expand Up @@ -74,6 +77,9 @@
} }
} }
}, },
"absoluteImmunity":{
"SIEGE_WEAPON": true
},
"immunity" : { "immunity" : {
"UNDEAD": true, "UNDEAD": true,
"NON_LIVING": true "NON_LIVING": true
Expand Down Expand Up @@ -139,6 +145,9 @@
} }
} }
}, },
"absoluteImmunity":{
"SIEGE_WEAPON": true
},
"immunity" : { "immunity" : {
"UNDEAD": true, "UNDEAD": true,
"NON_LIVING": true "NON_LIVING": true
Expand Down Expand Up @@ -179,6 +188,9 @@
} }
} }
}, },
"absoluteImmunity":{
"SIEGE_WEAPON": true
},
"flags" : { "flags" : {
"negative": true "negative": true
} }
Expand Down Expand Up @@ -207,6 +219,9 @@
} }
} }
}, },
"absoluteImmunity":{
"SIEGE_WEAPON": true
},
"immunity" : { "immunity" : {
"UNDEAD": true, "UNDEAD": true,
"NON_LIVING": true "NON_LIVING": true
Expand All @@ -230,6 +245,9 @@
"range" : "0-1" "range" : "0-1"
} }
}, },
"absoluteImmunity":{
"SIEGE_WEAPON": true
},
"immunity" : { "immunity" : {
"UNDEAD": true, "UNDEAD": true,
"NON_LIVING": true "NON_LIVING": true
Expand Down Expand Up @@ -296,6 +314,7 @@
}, },
"absoluteImmunity" : { "absoluteImmunity" : {
"UNDEAD": true, "UNDEAD": true,
"SIEGE_WEAPON": true,
"NON_LIVING": true "NON_LIVING": true
}, },
"flags" : { "flags" : {
Expand Down
80 changes: 41 additions & 39 deletions config/spells/other.json
View file
Expand Up @@ -2,7 +2,7 @@
"quicksand" : { "quicksand" : {
"index" : 10, "index" : 10,
"targetType" : "NO_TARGET", "targetType" : "NO_TARGET",

"sounds": { "sounds": {
"cast": "QUIKSAND" "cast": "QUIKSAND"
}, },
Expand All @@ -18,7 +18,7 @@
"landMine" : { "landMine" : {
"index" : 11, "index" : 11,
"targetType" : "NO_TARGET", "targetType" : "NO_TARGET",

"sounds": { "sounds": {
"cast": "" "cast": ""
}, },
Expand All @@ -38,7 +38,7 @@
"forceField" : { "forceField" : {
"index" : 12, "index" : 12,
"targetType" : "LOCATION", "targetType" : "LOCATION",

"sounds": { "sounds": {
"cast": "FORCEFLD" "cast": "FORCEFLD"
}, },
Expand All @@ -56,8 +56,8 @@
}, },
"fireWall" : { "fireWall" : {
"index" : 13, "index" : 13,
"targetType" : "LOCATION", "targetType" : "LOCATION",

"sounds": { "sounds": {
"cast": "FIREWALL" "cast": "FIREWALL"
}, },
Expand All @@ -66,7 +66,7 @@
"range" : "0", "range" : "0",
"targetModifier":{ "targetModifier":{
"clearAffected": true "clearAffected": true
} }
} }
}, },
"flags" : { "flags" : {
Expand All @@ -79,8 +79,8 @@
}, },
"earthquake" : { "earthquake" : {
"index" : 14, "index" : 14,
"targetType" : "NO_TARGET", "targetType" : "NO_TARGET",

"sounds": { "sounds": {
"cast": "ERTHQUAK" "cast": "ERTHQUAK"
}, },
Expand All @@ -94,27 +94,27 @@
"indifferent": true "indifferent": true
} }
}, },

"dispel" : { "dispel" : {
"index" : 35, "index" : 35,
"targetType" : "CREATURE", "targetType" : "CREATURE",

"animation":{ "animation":{
"affect":["C05SPW"] //C05SPW0 "affect":["C05SPW"] //C05SPW0
}, },
"sounds": { "sounds": {
"cast": "DISPELL" "cast": "DISPELL"
}, },
"levels" : { "levels" : {
"base":{ "base":{
"targetModifier":{"smart":true}, "targetModifier":{"smart":true},
"range" : "0" "range" : "0"
}, },
"advanced":{ "advanced":{
"targetModifier":{"smart":false} "targetModifier":{"smart":false}
}, },
"expert":{ "expert":{
"targetModifier":{"smart":false}, "targetModifier":{"smart":false},
"range" : "X" "range" : "X"
} }
}, },
Expand All @@ -124,11 +124,11 @@
}, },
"cure" : { "cure" : {
"index" : 37, "index" : 37,
"targetType" : "CREATURE", "targetType" : "CREATURE",
"animation":{ "animation":{
"affect":["C03SPW"]//C03SPW0 "affect":["C03SPW"]//C03SPW0
}, },

"sounds": { "sounds": {
"cast": "CURE" "cast": "CURE"
}, },
Expand All @@ -147,8 +147,8 @@
}, },
"resurrection" : { "resurrection" : {
"index" : 38, "index" : 38,
"targetType" : "CREATURE", "targetType" : "CREATURE",

"animation":{ "animation":{
"affect":["C01SPE0"] "affect":["C01SPE0"]
}, },
Expand All @@ -167,16 +167,17 @@
}, },
"absoluteImmunity" : { "absoluteImmunity" : {
"UNDEAD": true, "UNDEAD": true,
"SIEGE_WEAPON": true,
"NON_LIVING": true "NON_LIVING": true
} }
}, },
"animateDead" : { "animateDead" : {
"index" : 39, "index" : 39,
"targetType" : "CREATURE", "targetType" : "CREATURE",

"animation":{ "animation":{
"affect":["C01SPE0"] "affect":["C01SPE0"]
}, },
"sounds": { "sounds": {
"cast": "ANIMDEAD" "cast": "ANIMDEAD"
}, },
Expand All @@ -196,11 +197,11 @@
}, },
"sacrifice" : { "sacrifice" : {
"index" : 40, "index" : 40,
"targetType" : "CREATURE", "targetType" : "CREATURE",

"animation":{ "animation":{
"affect":["C01SPE0"] "affect":["C01SPE0"]
}, },
"sounds": { "sounds": {
"cast": "SACRIF1" "cast": "SACRIF1"
}, },
Expand All @@ -215,14 +216,15 @@
"positive": true "positive": true
}, },
"absoluteImmunity" : { "absoluteImmunity" : {
"SIEGE_WEAPON": true,
"UNDEAD": true, "UNDEAD": true,
"NON_LIVING": true "NON_LIVING": true
} }
}, },
"teleport" : { "teleport" : {
"index" : 63, "index" : 63,
"targetType" : "CREATURE", "targetType" : "CREATURE",

"sounds": { "sounds": {
"cast": "TELPTOUT" "cast": "TELPTOUT"
}, },
Expand All @@ -241,10 +243,10 @@
}, },
"removeObstacle" : { "removeObstacle" : {
"index" : 64, "index" : 64,
"targetType" : "OBSTACLE", "targetType" : "OBSTACLE",
"animation":{ "animation":{
"cast":[2] "cast":[2]
}, },
"sounds": { "sounds": {
"cast": "REMOVEOB" "cast": "REMOVEOB"
}, },
Expand All @@ -259,10 +261,10 @@
}, },
"clone" : { "clone" : {
"index" : 65, "index" : 65,
"targetType" : "CREATURE", "targetType" : "CREATURE",
"animation":{ "animation":{
"cast":[2] "cast":[2]
}, },
"sounds": { "sounds": {
"cast": "CLONE" "cast": "CLONE"
}, },
Expand All @@ -281,10 +283,10 @@
}, },
"fireElemental" : { "fireElemental" : {
"index" : 66, "index" : 66,
"targetType" : "NO_TARGET", "targetType" : "NO_TARGET",
"animation":{ "animation":{
"cast":[2] "cast":[2]
}, },
"sounds": { "sounds": {
"cast": "SUMNELM" "cast": "SUMNELM"
}, },
Expand All @@ -299,10 +301,10 @@
}, },
"earthElemental" : { "earthElemental" : {
"index" : 67, "index" : 67,
"targetType" : "NO_TARGET", "targetType" : "NO_TARGET",
"animation":{ "animation":{
"cast":[2] "cast":[2]
}, },
"sounds": { "sounds": {
"cast": "SUMNELM" "cast": "SUMNELM"
}, },
Expand All @@ -317,10 +319,10 @@
}, },
"waterElemental" : { "waterElemental" : {
"index" : 68, "index" : 68,
"targetType" : "NO_TARGET", "targetType" : "NO_TARGET",
"animation":{ "animation":{
"cast":[2] "cast":[2]
}, },
"sounds": { "sounds": {
"cast": "SUMNELM" "cast": "SUMNELM"
}, },
Expand All @@ -335,10 +337,10 @@
}, },
"airElemental" : { "airElemental" : {
"index" : 69, "index" : 69,
"targetType" : "NO_TARGET", "targetType" : "NO_TARGET",
"animation":{ "animation":{
"cast":[2] "cast":[2]
}, },
"sounds": { "sounds": {
"cast": "SUMNELM" "cast": "SUMNELM"
}, },
Expand Down
1 change: 1 addition & 0 deletions config/spells/timed.json
View file
Expand Up @@ -310,6 +310,7 @@
"spell.curse": true "spell.curse": true
}, },
"absoluteImmunity" : { "absoluteImmunity" : {
"SIEGE_WEAPON": true,
"UNDEAD": true "UNDEAD": true
}, },
"flags" : { "flags" : {
Expand Down

0 comments on commit 13aedac

Please sign in to comment.