diff --git a/config/creatures/castle.json b/config/creatures/castle.json index 97dce1531..34f13b06b 100644 --- a/config/creatures/castle.json +++ b/config/creatures/castle.json @@ -346,11 +346,6 @@ "faction": "castle", "abilities": { - "KING_2" : // Will be affected by Advanced Slayer or better - { - "type" : "KING", - "val" : 2 - }, "canFly" : { "type" : "FLYING" @@ -362,6 +357,11 @@ "propagator" : "HERO", "stacking" : "Angels" }, + "KING_2" : // Will be affected by Advanced Slayer or better + { + "type" : "KING", + "val" : 2 + }, "hateDevils" : { "type" : "HATE", @@ -397,11 +397,6 @@ "doubleWide" : true, "abilities": { - "KING_2" : // Will be affected by Advanced Slayer or better - { - "type" : "KING", - "val" : 2 - }, "canFly" : { "type" : "FLYING" @@ -429,6 +424,11 @@ "propagator" : "HERO", "stacking" : "Angels" }, + "KING_2" : // Will be affected by Advanced Slayer or better + { + "type" : "KING", + "val" : 2 + }, "hateDevils" : { "type" : "HATE", diff --git a/config/creatures/conflux.json b/config/creatures/conflux.json index c16d6024e..dd0d9fc8a 100755 --- a/config/creatures/conflux.json +++ b/config/creatures/conflux.json @@ -767,11 +767,6 @@ "doubleWide" : true, "abilities": { - "KING_1" : // Will be affected by Slayer with no expertise - { - "type" : "KING", - "val" : 0 - }, "canFly" : { "type" : "FLYING" @@ -784,6 +779,11 @@ { "type" : "SPELL_SCHOOL_IMMUNITY", "subtype" : "spellSchool.fire" + }, + "KING_1" : // Will be affected by Slayer with no expertise + { + "type" : "KING", + "val" : 0 } }, "graphics" : @@ -807,11 +807,6 @@ "doubleWide" : true, "abilities": { - "KING_1" : // Will be affected by Slayer with no expertise - { - "type" : "KING", - "val" : 0 - }, "canFly" : { "type" : "FLYING" @@ -820,11 +815,6 @@ { "type" : "TWO_HEX_ATTACK_BREATH" }, - "immuneToFire" : - { - "type" : "SPELL_SCHOOL_IMMUNITY", - "subtype" : "spellSchool.fire" - }, "rebirthOnce" : { "type" : "CASTS", @@ -834,6 +824,16 @@ { "type" : "REBIRTH", "val" : 20 + }, + "immuneToFire" : + { + "type" : "SPELL_SCHOOL_IMMUNITY", + "subtype" : "spellSchool.fire" + }, + "KING_1" : // Will be affected by Slayer with no expertise + { + "type" : "KING", + "val" : 0 } }, "graphics" : diff --git a/config/creatures/dungeon.json b/config/creatures/dungeon.json index 41791fb96..39e6f8b67 100644 --- a/config/creatures/dungeon.json +++ b/config/creatures/dungeon.json @@ -425,19 +425,14 @@ "doubleWide" : true, "abilities": { - "KING_1" : // Will be affected by Slayer with no expertise + "dragon" : { - "type" : "KING", - "val" : 0 + "type" : "DRAGON_NATURE" }, "canFly" : { "type" : "FLYING" }, - "dragon" : - { - "type" : "DRAGON_NATURE" - }, "twoHexAttackBreath" : { "type" : "TWO_HEX_ATTACK_BREATH" @@ -446,6 +441,11 @@ { "type" : "LEVEL_SPELL_IMMUNITY", "val" : 3 + }, + "KING_1" : // Will be affected by Slayer with no expertise + { + "type" : "KING", + "val" : 0 } }, "upgrades": ["blackDragon"], @@ -470,19 +470,14 @@ "doubleWide" : true, "abilities": { - "KING_1" : // Will be affected by Slayer with no expertise + "dragon" : { - "type" : "KING", - "val" : 0 + "type" : "DRAGON_NATURE" }, "canFly" : { "type" : "FLYING" }, - "dragon" : - { - "type" : "DRAGON_NATURE" - }, "twoHexAttackBreath" : { "type" : "TWO_HEX_ATTACK_BREATH" @@ -492,6 +487,11 @@ "type" : "LEVEL_SPELL_IMMUNITY", "val" : 5 }, + "KING_1" : // Will be affected by Slayer with no expertise + { + "type" : "KING", + "val" : 0 + }, "hateTitans" : { "type" : "HATE", diff --git a/config/creatures/fortress.json b/config/creatures/fortress.json index de7fa6ca7..ddcafe3a6 100644 --- a/config/creatures/fortress.json +++ b/config/creatures/fortress.json @@ -99,54 +99,6 @@ "wince": "ALIZWNCE.wav" } }, - "gorgon" : - { - "index": 102, - "level": 5, - "faction": "fortress", - "upgrades": ["mightyGorgon"], - "doubleWide" : true, - "graphics" : - { - "animation": "CCGORG.DEF" - }, - "sound" : - { - "attack": "CGORATTK.wav", - "defend": "CGORDFND.wav", - "killed": "CGORKILL.wav", - "move": "CGORMOVE.wav", - "wince": "CGORWNCE.wav" - } - }, - "mightyGorgon" : - { - "index": 103, - "level": 5, - "faction": "fortress", - "doubleWide" : true, - "abilities": - { - "deathStare" : - { - "type" : "DEATH_STARE", - "subtype" : "deathStareGorgon", - "val" : 10 - } - }, - "graphics" : - { - "animation": "CBGOG.DEF" - }, - "sound" : - { - "attack": "BGORATTK.wav", - "defend": "BGORDFND.wav", - "killed": "BGORKILL.wav", - "move": "BGORMOVE.wav", - "wince": "BGORWNCE.wav" - } - }, "serpentFly" : { "index": 104, @@ -276,6 +228,54 @@ "wince": "GBASWNCE.wav" } }, + "gorgon" : + { + "index": 102, + "level": 5, + "faction": "fortress", + "upgrades": ["mightyGorgon"], + "doubleWide" : true, + "graphics" : + { + "animation": "CCGORG.DEF" + }, + "sound" : + { + "attack": "CGORATTK.wav", + "defend": "CGORDFND.wav", + "killed": "CGORKILL.wav", + "move": "CGORMOVE.wav", + "wince": "CGORWNCE.wav" + } + }, + "mightyGorgon" : + { + "index": 103, + "level": 5, + "faction": "fortress", + "doubleWide" : true, + "abilities": + { + "deathStare" : + { + "type" : "DEATH_STARE", + "subtype" : "deathStareGorgon", + "val" : 10 + } + }, + "graphics" : + { + "animation": "CBGOG.DEF" + }, + "sound" : + { + "attack": "BGORATTK.wav", + "defend": "BGORDFND.wav", + "killed": "BGORKILL.wav", + "move": "BGORMOVE.wav", + "wince": "BGORWNCE.wav" + } + }, "wyvern" : { "index": 108, @@ -343,11 +343,6 @@ "doubleWide" : true, "abilities": { - "KING_1" : // Will be affected by Slayer with no expertise - { - "type" : "KING", - "val" : 0 - }, "attackAllAdjacent" : { "type" : "ATTACKS_ALL_ADJACENT" @@ -355,6 +350,11 @@ "noRetaliation" : { "type" : "BLOCKS_RETALIATION" + }, + "KING_1" : // Will be affected by Slayer with no expertise + { + "type" : "KING", + "val" : 0 } }, "upgrades": ["chaosHydra"], @@ -379,11 +379,6 @@ "doubleWide" : true, "abilities": { - "KING_1" : // Will be affected by Slayer with no expertise - { - "type" : "KING", - "val" : 0 - }, "attackAllAdjacent" : { "type" : "ATTACKS_ALL_ADJACENT" @@ -391,6 +386,11 @@ "noRetaliation" : { "type" : "BLOCKS_RETALIATION" + }, + "KING_1" : // Will be affected by Slayer with no expertise + { + "type" : "KING", + "val" : 0 } }, "graphics" : diff --git a/config/creatures/inferno.json b/config/creatures/inferno.json index 4faeca5ae..491968747 100755 --- a/config/creatures/inferno.json +++ b/config/creatures/inferno.json @@ -353,11 +353,6 @@ "faction": "inferno", "abilities": { - "KING_2" : // Will be affected by Advanced Slayer or better - { - "type" : "KING", - "val" : 2 - }, "canFly" : { "type" : "FLYING", @@ -376,6 +371,11 @@ "propagationUpdater" : "BONUS_OWNER_UPDATER", "limiters" : [ "OPPOSITE_SIDE" ] }, + "KING_2" : // Will be affected by Advanced Slayer or better + { + "type" : "KING", + "val" : 2 + }, "hateAngels" : { "type" : "HATE", @@ -413,11 +413,6 @@ "faction": "inferno", "abilities" : { - "KING_2" : // Will be affected by Advanced Slayer or better - { - "type" : "KING", - "val" : 2 - }, "canFly" : { "type" : "FLYING", @@ -436,6 +431,11 @@ "propagationUpdater" : "BONUS_OWNER_UPDATER", "limiters" : [ "OPPOSITE_SIDE" ] }, + "KING_2" : // Will be affected by Advanced Slayer or better + { + "type" : "KING", + "val" : 2 + }, "hateAngels" : { "type" : "HATE", diff --git a/config/creatures/necropolis.json b/config/creatures/necropolis.json index 1844f0c24..ebbb5dc0b 100644 --- a/config/creatures/necropolis.json +++ b/config/creatures/necropolis.json @@ -421,19 +421,14 @@ { "type" : "UNDEAD" }, - "KING_1" : // Will be affected by Slayer with no expertise + "dragon" : { - "type" : "KING", - "val" : 0 + "type" : "DRAGON_NATURE" }, "canFly" : { "type" : "FLYING" }, - "dragon" : - { - "type" : "DRAGON_NATURE" - }, "decreaseMorale" : { "type" : "MORALE", @@ -442,6 +437,11 @@ "propagator": "BATTLE_WIDE", "propagationUpdater" : "BONUS_OWNER_UPDATER", "limiters" : [ "OPPOSITE_SIDE" ] + }, + "KING_1" : // Will be affected by Slayer with no expertise + { + "type" : "KING", + "val" : 0 } }, "upgrades": ["ghostDragon"], @@ -470,19 +470,14 @@ { "type" : "UNDEAD" }, - "KING_1" : // Will be affected by Slayer with no expertise + "dragon" : { - "type" : "KING", - "val" : 0 + "type" : "DRAGON_NATURE" }, "canFly" : { "type" : "FLYING" }, - "dragon" : - { - "type" : "DRAGON_NATURE" - }, "age" : { "type" : "SPELL_AFTER_ATTACK", @@ -497,6 +492,11 @@ "propagator": "BATTLE_WIDE", "propagationUpdater" : "BONUS_OWNER_UPDATER", "limiters" : [ "OPPOSITE_SIDE" ] + }, + "KING_1" : // Will be affected by Slayer with no expertise + { + "type" : "KING", + "val" : 0 } }, "graphics" : diff --git a/config/creatures/neutral.json b/config/creatures/neutral.json index 731e65f58..a8e7db89d 100644 --- a/config/creatures/neutral.json +++ b/config/creatures/neutral.json @@ -71,19 +71,14 @@ "doubleWide" : true, "abilities": { - "KING_1" : // Will be affected by Slayer with no expertise + "dragon" : { - "type" : "KING", - "val" : 0 + "type" : "DRAGON_NATURE" }, "canFly" : { "type" : "FLYING" }, - "dragon" : - { - "type" : "DRAGON_NATURE" - }, "twoHexAttackBreath" : { "type" : "TWO_HEX_ATTACK_BREATH" @@ -100,6 +95,11 @@ { "type" : "LEVEL_SPELL_IMMUNITY", "val" : 3 + }, + "KING_1" : // Will be affected by Slayer with no expertise + { + "type" : "KING", + "val" : 0 } }, "graphics" : @@ -124,23 +124,23 @@ "doubleWide" : true, "abilities": { - "KING_1" : // Will be affected by Slayer with no expertise - { - "type" : "KING", - "val" : 0 - }, "dragon" : { "type" : "DRAGON_NATURE" }, + "crystals" : + { + "type" : "SPECIAL_CRYSTAL_GENERATION" + }, "magicResistance" : { "type" : "MAGIC_RESISTANCE", "val" : 20 }, - "crystals" : + "KING_1" : // Will be affected by Slayer with no expertise { - "type" : "SPECIAL_CRYSTAL_GENERATION" + "type" : "KING", + "val" : 0 } }, "graphics" : @@ -165,15 +165,14 @@ "doubleWide" : true, "abilities": { - "KING_1" : // Will be affected by Slayer with no expertise - { - "type" : "KING", - "val" : 0 - }, "dragon" : { "type" : "DRAGON_NATURE" }, + "canFly" : + { + "type" : "FLYING" + }, "mirror" : { "type" : "MAGIC_MIRROR", @@ -244,6 +243,11 @@ "subtype" : "spell.meteorShower", "addInfo" : 5, "val" : 2 + }, + "KING_1" : // Will be affected by Slayer with no expertise + { + "type" : "KING", + "val" : 0 } }, "graphics" : @@ -269,19 +273,14 @@ "doubleWide" : true, "abilities": { - "KING_1" : // Will be affected by Slayer with no expertise + "dragon" : { - "type" : "KING", - "val" : 0 + "type" : "DRAGON_NATURE" }, "canFly" : { "type" : "FLYING" }, - "dragon" : - { - "type" : "DRAGON_NATURE" - }, "twoHexAttackBreath" : { "type" : "TWO_HEX_ATTACK_BREATH" @@ -297,6 +296,11 @@ "type" : "SPELL_AFTER_ATTACK", "subtype" : "spell.acidBreath", "val" : 100 + }, + "KING_1" : // Will be affected by Slayer with no expertise + { + "type" : "KING", + "val" : 0 } }, "graphics" : diff --git a/config/creatures/rampart.json b/config/creatures/rampart.json index 42259b2df..7a64a1460 100644 --- a/config/creatures/rampart.json +++ b/config/creatures/rampart.json @@ -359,19 +359,14 @@ "doubleWide" : true, "abilities": { - "KING_1" : // Will be affected by Slayer with no expertise + "dragon" : { - "type" : "KING", - "val" : 0 + "type" : "DRAGON_NATURE" }, "canFly" : { "type" : "FLYING" }, - "dragon" : - { - "type" : "DRAGON_NATURE" - }, "twoHexAttackBreath" : { "type" : "TWO_HEX_ATTACK_BREATH" @@ -380,6 +375,11 @@ { "type" : "LEVEL_SPELL_IMMUNITY", "val" : 3 + }, + "KING_1" : // Will be affected by Slayer with no expertise + { + "type" : "KING", + "val" : 0 } }, "upgrades": ["goldDragon"], @@ -404,19 +404,14 @@ "doubleWide" : true, "abilities": { - "KING_1" : // Will be affected by Slayer with no expertise + "dragon" : { - "type" : "KING", - "val" : 0 + "type" : "DRAGON_NATURE" }, "canFly" : { "type" : "FLYING" }, - "dragon" : - { - "type" : "DRAGON_NATURE" - }, "twoHexAttackBreath" : { "type" : "TWO_HEX_ATTACK_BREATH" @@ -425,6 +420,11 @@ { "type" : "LEVEL_SPELL_IMMUNITY", "val" : 4 + }, + "KING_1" : // Will be affected by Slayer with no expertise + { + "type" : "KING", + "val" : 0 } }, "graphics" : diff --git a/config/creatures/special.json b/config/creatures/special.json index 5ebdcf246..f2457fcb4 100644 --- a/config/creatures/special.json +++ b/config/creatures/special.json @@ -39,6 +39,14 @@ "doubleWide" : true, "abilities" : { + "siegeWeapon" : + { + "type" : "SIEGE_WEAPON" + }, + "shooter" : + { + "type" : "SHOOTER" + }, "siegeMachine" : { "type" : "CATAPULT", @@ -67,6 +75,17 @@ "level": 0, "faction": "neutral", "doubleWide" : true, + "abilities" : + { + "siegeWeapon" : + { + "type" : "SIEGE_WEAPON" + }, + "shooter" : + { + "type" : "SHOOTER" + } + }, "graphics" : { "animation": "SMBAL.DEF", @@ -91,7 +110,12 @@ "doubleWide" : true, "abilities": { - "heals" : { + "siegeWeapon" : + { + "type" : "SIEGE_WEAPON" + }, + "heals" : + { "type" : "HEALER" , "subtype" : "spell.firstAid" } @@ -112,7 +136,17 @@ "index": 148, "level": 0, "faction": "neutral", - "abilities": { "inactive" : { "type" : "NOT_ACTIVE" } }, + "abilities": + { + "siegeWeapon" : + { + "type" : "SIEGE_WEAPON" + }, + "inactive" : + { + "type" : "NOT_ACTIVE" + } + }, "graphics" : { "animation": "SMCART.DEF" diff --git a/config/creatures/stronghold.json b/config/creatures/stronghold.json index 3c690bb2d..b52a3cc82 100644 --- a/config/creatures/stronghold.json +++ b/config/creatures/stronghold.json @@ -355,15 +355,15 @@ "doubleWide" : true, "abilities": { - "KING_1" : // Will be affected by Slayer with no expertise - { - "type" : "KING", - "val" : 0 - }, "reduceDefence" : { "type" : "ENEMY_DEFENCE_REDUCTION", "val" : 40 + }, + "KING_1" : // Will be affected by Slayer with no expertise + { + "type" : "KING", + "val" : 0 } }, "upgrades": ["ancientBehemoth"], @@ -388,15 +388,15 @@ "doubleWide" : true, "abilities": { - "KING_1" : // Will be affected by Slayer with no expertise - { - "type" : "KING", - "val" : 0 - }, "reduceDefence" : { "type" : "ENEMY_DEFENCE_REDUCTION", "val" : 80 + }, + "KING_1" : // Will be affected by Slayer with no expertise + { + "type" : "KING", + "val" : 0 } }, "graphics" : diff --git a/config/creatures/tower.json b/config/creatures/tower.json index 2fd19fdac..259b6e056 100644 --- a/config/creatures/tower.json +++ b/config/creatures/tower.json @@ -415,14 +415,14 @@ "faction": "tower", "abilities" : { + "immuneToMind" : + { + "type" : "MIND_IMMUNITY" + }, "KING_3" : // Will be affected by Expert Slayer only { "type" : "KING", "val" : 3 - }, - "immuneToMind" : - { - "type" : "MIND_IMMUNITY" } }, "upgrades": ["titan"], @@ -446,11 +446,6 @@ "faction": "tower", "abilities" : { - "KING_3" : // Will be affected by Expert Slayer only - { - "type" : "KING", - "val" : 3 - }, "shooter" : { "type" : "SHOOTER" @@ -463,6 +458,11 @@ { "type" : "MIND_IMMUNITY" }, + "KING_3" : // Will be affected by Expert Slayer only + { + "type" : "KING", + "val" : 3 + }, "hateBlackDragons" : { "type" : "HATE",