games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-12 02:28:11 +02:00
Code Issues Releases Activity

immunities: polishing

Browse Source
This commit is contained in:
Konstantin 2023-08-21 21:42:16 +03:00 committed by Konstantin P
parent 344593e891
commit d20711bcd6
4 changed files with 31 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
config/bonuses.json
View File

@ -19,14 +19,6 @@
} }
}, },
"AIR_IMMUNITY":
{
"graphics":
{
"icon": "zvs/Lib1.res/E_SPAIR1"
}
},
"ATTACKS_ALL_ADJACENT": "ATTACKS_ALL_ADJACENT":
{ {
"graphics": "graphics":
@ -137,14 +129,6 @@
"hidden": true "hidden": true
}, },
"EARTH_IMMUNITY":
{
"graphics":
{
"icon": "zvs/Lib1.res/E_SPEATH1"
}
},
"ENCHANTER": "ENCHANTER":
{ {
"graphics": "graphics":
@ -169,14 +153,6 @@
} }
}, },
"FIRE_IMMUNITY":
{
"graphics":
{
"icon": "zvs/Lib1.res/E_SPFIRE1"
}
},
"FIRE_SHIELD": "FIRE_SHIELD":
{ {
"graphics": "graphics":
@ -585,14 +561,6 @@
"hidden": true "hidden": true
}, },
"WATER_IMMUNITY":
{
"graphics":
{
"icon": "zvs/Lib1.res/E_SPWATER1"
}
},
"WIDE_BREATH": "WIDE_BREATH":
{ {
"graphics": "graphics":

38
config/creatures/conflux.json
View File

@ -154,8 +154,8 @@
}, },
"immuneToFire" : "immuneToFire" :
{ {
"type" : "FIRE_IMMUNITY", "type" : "SPELL_SCHOOL_IMMUNITY",
"subtype" : 0 "subtype" : "spellSchool.fire"
}, },
"frostRingVulnerablity" : "frostRingVulnerablity" :
{ {
@ -246,10 +246,15 @@
"subtype" : "spell.armageddon", "subtype" : "spell.armageddon",
"val" : 100 "val" : 100
}, },
"immuneToWater" : "immuneToIceBolt" :
{ {
"type" : "WATER_IMMUNITY", "type" : "SPELL_IMMUNITY",
"subtype" : 2 //immune to damage spells only "subtype" : "spell.iceBolt"
},
"immuneToFrostRing" :
{
"type" : "SPELL_IMMUNITY",
"subtype" : "spell.frostRing"
}, },
"oppositeFire" : "oppositeFire" :
{ {
@ -440,10 +445,15 @@
"subtype" : "spell.armageddon", "subtype" : "spell.armageddon",
"val" : 100 "val" : 100
}, },
"immuneToWater" : "immuneToIceBolt" :
{ {
"type" : "WATER_IMMUNITY", "type" : "SPELL_IMMUNITY",
"subtype" : 2 //immune to damage spells only "subtype" : "spell.iceBolt"
},
"immuneToFrostRing" :
{
"type" : "SPELL_IMMUNITY",
"subtype" : "spell.frostRing"
}, },
"oppositeFire" : "oppositeFire" :
{ {
@ -661,8 +671,8 @@
}, },
"immuneToFire" : "immuneToFire" :
{ {
"type" : "FIRE_IMMUNITY", "type" : "SPELL_SCHOOL_IMMUNITY",
"subtype" : 0 "subtype" : "spellSchool.fire"
}, },
"frostRingVulnerablity" : "frostRingVulnerablity" :
{ {
@ -732,8 +742,8 @@
{ {
"immuneToFire" : "immuneToFire" :
{ {
"type" : "FIRE_IMMUNITY", "type" : "SPELL_SCHOOL_IMMUNITY",
"subtype" : 0 //this IS important "subtype" : "spellSchool.fire"
} }
}, },
"graphics" : "graphics" :
@ -763,8 +773,8 @@
}, },
"immuneToFire" : "immuneToFire" :
{ {
"type" : "FIRE_IMMUNITY", "type" : "SPELL_SCHOOL_IMMUNITY",
"subtype" : 0 //this IS important "subtype" : "spellSchool.fire"
}, },
"rebirth" : "rebirth" :
{ {

8
config/creatures/inferno.json
View File

@ -272,8 +272,8 @@
}, },
"immuneToFire" : "immuneToFire" :
{ {
"type" : "FIRE_IMMUNITY", "type" : "SPELL_SCHOOL_IMMUNITY",
"subtype" : 0 "subtype" : "spellSchool.fire"
} }
}, },
"upgrades": ["efreetSultan"], "upgrades": ["efreetSultan"],
@ -315,8 +315,8 @@
}, },
"immuneToFire" : "immuneToFire" :
{ {
"type" : "FIRE_IMMUNITY", "type" : "SPELL_SCHOOL_IMMUNITY",
"subtype" : 0 "subtype" : "spellSchool.fire"
}, },
"fireShield" : "fireShield" :
{ {

6
lib/CBonusTypeHandler.cpp
View File

@ -118,9 +118,9 @@ std::string CBonusTypeHandler::bonusToGraphics(const std::shared_ptr<Bonus> & bo
} }
break; break;
} }
// fileName = "E_FIRE.bmp"; //fire damage // fileName = "E_FIRE.bmp"; //fire damage
// fileName = "E_COLD.bmp"; //cold damage // fileName = "E_COLD.bmp"; //cold damage
// fileName = "E_LIGHT.bmp"; //lightning damage // fileName = "E_LIGHT.bmp"; //lightning damage
case BonusType::NEGATIVE_EFFECTS_IMMUNITY: case BonusType::NEGATIVE_EFFECTS_IMMUNITY:
{ {
switch(bonus->subtype) switch(bonus->subtype)