1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00

Merge pull request #642 from vcmi/issue3112

Fixed Gargoyles immunity, issue 3112.
This commit is contained in:
Alexander Shishkin
2020-05-09 07:04:46 +03:00
committed by GitHub
3 changed files with 40 additions and 22 deletions

View File

@@ -1924,23 +1924,35 @@
"type" : "STACK_HEALTH",
"val" : 25,
"valueType" : "PERCENT_TO_BASE",
},
{
"type" : "STACK_HEALTH",
"val" : -25,
"valueType" : "PERCENT_TO_BASE",
"limiters" : ["IS_UNDEAD"]
"limiters" : [
"noneOf",
"IS_UNDEAD",
{
"type" : "HAS_ANOTHER_BONUS_LIMITER",
"parameters" : [ "NON_LIVING" ]
},
{
"type" : "HAS_ANOTHER_BONUS_LIMITER",
"parameters" : [ "GARGOYLE" ]
}
]
},
{
"type" : "HP_REGENERATION",
"val" : 50,
"valueType" : "BASE_NUMBER"
},
{
"type" : "HP_REGENERATION",
"val" : -50,
"valueType" : "BASE_NUMBER",
"limiters" : ["IS_UNDEAD"]
"valueType" : "PERCENT_TO_BASE",
"limiters" : [
"noneOf",
"IS_UNDEAD",
{
"type" : "HAS_ANOTHER_BONUS_LIMITER",
"parameters" : [ "NON_LIVING" ]
},
{
"type" : "HAS_ANOTHER_BONUS_LIMITER",
"parameters" : [ "GARGOYLE" ]
}
]
}
],
"index" : 131,

View File

@@ -87,9 +87,10 @@
},
"targetCondition" : {
"noneOf" : {
"bonus.NON_LIVING" : "normal",
"bonus.NON_LIVING" : "absolute",
"bonus.SIEGE_WEAPON" : "absolute",
"bonus.UNDEAD" : "normal"
"bonus.UNDEAD" : "absolute",
"bonus.GARGOYLE" : "absolute"
}
}
},
@@ -235,9 +236,10 @@
},
"targetCondition" : {
"noneOf" : {
"bonus.NON_LIVING" : "normal",
"bonus.NON_LIVING" : "absolute",
"bonus.SIEGE_WEAPON" : "absolute",
"bonus.UNDEAD" : "normal"
"bonus.UNDEAD" : "absolute",
"bonus.GARGOYLE" : "absolute"
}
}
},
@@ -266,9 +268,10 @@
},
"targetCondition" : {
"noneOf" : {
"bonus.NON_LIVING" : "normal",
"bonus.NON_LIVING" : "absolute",
"bonus.SIEGE_WEAPON" : "absolute",
"bonus.UNDEAD" : "normal"
"bonus.UNDEAD" : "absolute",
"bonus.GARGOYLE" : "absolute"
}
}
},
@@ -354,7 +357,8 @@
"noneOf" : {
"bonus.NON_LIVING" : "absolute",
"bonus.SIEGE_WEAPON" : "absolute",
"bonus.UNDEAD" : "absolute"
"bonus.UNDEAD" : "absolute",
"bonus.GARGOYLE" : "absolute"
}
}
},

View File

@@ -442,7 +442,8 @@
"noneOf" : {
"bonus.NON_LIVING" : "absolute",
"bonus.SIEGE_WEAPON" : "absolute",
"bonus.UNDEAD" : "absolute"
"bonus.UNDEAD" : "absolute",
"bonus.GARGOYLE" : "absolute"
}
}
},
@@ -512,7 +513,8 @@
"noneOf" : {
"bonus.NON_LIVING" : "absolute",
"bonus.SIEGE_WEAPON" : "absolute",
"bonus.UNDEAD" : "absolute"
"bonus.UNDEAD" : "absolute",
"bonus.GARGOYLE" : "absolute"
}
}
},