1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-21 17:17:06 +02:00

Merge pull request #4940 from krs0/Fix_missing_shots_ability_for_shooters

Fix missing shots ability for shooters
This commit is contained in:
Ivan Savenko 2024-11-19 13:03:51 +02:00 committed by GitHub
commit 80632cdf8b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 38 additions and 5 deletions

View File

@ -57,6 +57,7 @@
"extraNames": [ "lightCrossbowman" ], "extraNames": [ "lightCrossbowman" ],
"faction": "castle", "faction": "castle",
"upgrades": ["marksman"], "upgrades": ["marksman"],
"shots" : 12,
"abilities" : "abilities" :
{ {
"shooter" : { "shooter" : {
@ -86,6 +87,7 @@
"index": 3, "index": 3,
"level": 2, "level": 2,
"faction": "castle", "faction": "castle",
"shots" : 24,
"abilities": "abilities":
{ {
"shooter" : { "shooter" : {
@ -228,6 +230,7 @@
"level": 5, "level": 5,
"faction": "castle", "faction": "castle",
"upgrades": ["zealot"], "upgrades": ["zealot"],
"shots" : 12,
"abilities" : "abilities" :
{ {
"shooter" : { "shooter" : {
@ -257,6 +260,7 @@
"index": 9, "index": 9,
"level": 5, "level": 5,
"faction": "castle", "faction": "castle",
"shots" : 24,
"abilities" : "abilities" :
{ {
"shooter" : { "shooter" : {

View File

@ -127,6 +127,7 @@
"index": 127, "index": 127,
"level": 2, "level": 2,
"faction": "conflux", "faction": "conflux",
"shots" : 24,
"abilities": "abilities":
{ {
"nonLiving" : "nonLiving" :
@ -301,6 +302,7 @@
"level": 3, "level": 3,
"faction": "conflux", "faction": "conflux",
"doubleWide" : true, "doubleWide" : true,
"shots" : 24,
"abilities": "abilities":
{ {
"nonLiving" : "nonLiving" :
@ -472,11 +474,11 @@
{ {
"type" : "NON_LIVING" "type" : "NON_LIVING"
}, },
"canFly" : "energizes" :
{ {
"type" : "FLYING" "type" : "FLYING"
}, },
"spellcaster": "spellcaster" :
{ {
"type" : "SPELLCASTER", "type" : "SPELLCASTER",
"subtype" : "spell.protectFire", "subtype" : "spell.protectFire",

View File

@ -138,6 +138,7 @@
"level": 3, "level": 3,
"faction": "dungeon", "faction": "dungeon",
"upgrades": ["evilEye"], "upgrades": ["evilEye"],
"shots" : 12,
"abilities" : "abilities" :
{ {
"shooter" : "shooter" :
@ -179,6 +180,7 @@
"index": 75, "index": 75,
"level": 3, "level": 3,
"faction": "dungeon", "faction": "dungeon",
"shots" : 24,
"abilities" : "abilities" :
{ {
"shooter" : "shooter" :
@ -221,6 +223,7 @@
"level": 4, "level": 4,
"faction": "dungeon", "faction": "dungeon",
"doubleWide" : true, "doubleWide" : true,
"shots" : 4,
"abilities": "abilities":
{ {
"shooter" : "shooter" :
@ -264,6 +267,7 @@
"level": 4, "level": 4,
"faction": "dungeon", "faction": "dungeon",
"doubleWide" : true, "doubleWide" : true,
"shots" : 8,
"abilities": "abilities":
{ {
"shooter" : "shooter" :

View File

@ -44,6 +44,7 @@
"faction": "fortress", "faction": "fortress",
"upgrades": ["lizardWarrior"], "upgrades": ["lizardWarrior"],
"hasDoubleWeek": true, "hasDoubleWeek": true,
"shots" : 12,
"abilities" : "abilities" :
{ {
"shooter" : "shooter" :
@ -74,6 +75,7 @@
"index": 101, "index": 101,
"level": 2, "level": 2,
"faction": "fortress", "faction": "fortress",
"shots" : 24,
"abilities" : "abilities" :
{ {
"shooter" : "shooter" :

View File

@ -51,6 +51,7 @@
"faction": "inferno", "faction": "inferno",
"upgrades": ["magog"], "upgrades": ["magog"],
"hasDoubleWeek": true, "hasDoubleWeek": true,
"shots" : 12,
"abilities" : "abilities" :
{ {
"shooter" : "shooter" :
@ -81,6 +82,7 @@
"index": 45, "index": 45,
"level": 2, "level": 2,
"faction": "inferno", "faction": "inferno",
"shots" : 24,
"abilities": "abilities":
{ {
"shooter" : "shooter" :
@ -353,7 +355,7 @@
"faction": "inferno", "faction": "inferno",
"abilities": "abilities":
{ {
"canFly" : "teleports" :
{ {
"type" : "FLYING", "type" : "FLYING",
"subtype" : "movementTeleporting" "subtype" : "movementTeleporting"
@ -413,7 +415,7 @@
"faction": "inferno", "faction": "inferno",
"abilities" : "abilities" :
{ {
"canFly" : "teleports" :
{ {
"type" : "FLYING", "type" : "FLYING",
"subtype" : "movementTeleporting" "subtype" : "movementTeleporting"

View File

@ -265,6 +265,7 @@
"index": 64, "index": 64,
"level": 5, "level": 5,
"faction": "necropolis", "faction": "necropolis",
"shots" : 12,
"abilities": "abilities":
{ {
"undead" : "undead" :
@ -305,6 +306,7 @@
"index": 65, "index": 65,
"level": 5, "level": 5,
"faction": "necropolis", "faction": "necropolis",
"shots" : 24,
"abilities": "abilities":
{ {
"undead" : "undead" :

View File

@ -323,6 +323,7 @@
"extraNames": [ "enchanters" ], "extraNames": [ "enchanters" ],
"faction": "neutral", "faction": "neutral",
"excludeFromRandomization" : true, "excludeFromRandomization" : true,
"shots" : 32,
"abilities": "abilities":
{ {
"shooter" : "shooter" :
@ -410,6 +411,7 @@
"extraNames": [ "sharpshooters" ], "extraNames": [ "sharpshooters" ],
"faction": "neutral", "faction": "neutral",
"excludeFromRandomization" : true, "excludeFromRandomization" : true,
"shots" : 32,
"abilities": "abilities":
{ {
"shooter" : "shooter" :
@ -448,6 +450,7 @@
"index": 138, "index": 138,
"level": 1, "level": 1,
"faction": "neutral", "faction": "neutral",
"shots" : 24,
"abilities": "abilities":
{ {
"shooter" : "shooter" :

View File

@ -101,6 +101,7 @@
"level": 3, "level": 3,
"faction": "rampart", "faction": "rampart",
"upgrades": ["grandElf"], "upgrades": ["grandElf"],
"shots" : 24,
"abilities" : "abilities" :
{ {
"shooter" : "shooter" :
@ -131,7 +132,8 @@
"index": 19, "index": 19,
"level": 3, "level": 3,
"faction": "rampart", "faction": "rampart",
"abilities": "shots" : 24,
"abilities" :
{ {
"shooter" : "shooter" :
{ {

View File

@ -37,6 +37,7 @@
"level": 0, "level": 0,
"faction": "neutral", "faction": "neutral",
"doubleWide" : true, "doubleWide" : true,
"shots" : 24,
"abilities" : "abilities" :
{ {
"siegeWeapon" : "siegeWeapon" :
@ -75,6 +76,7 @@
"level": 0, "level": 0,
"faction": "neutral", "faction": "neutral",
"doubleWide" : true, "doubleWide" : true,
"shots" : 24,
"abilities" : "abilities" :
{ {
"siegeWeapon" : "siegeWeapon" :
@ -163,8 +165,10 @@
"index": 149, "index": 149,
"level": 0, "level": 0,
"faction": "neutral", "faction": "neutral",
"shots" : 99,
"abilities": "abilities":
{ {
"siegeWeapon" : { "type" : "SIEGE_WEAPON" },
"shooter" : { "type" : "SHOOTER" }, "shooter" : { "type" : "SHOOTER" },
"ignoreDefence" : { "type" : "ENEMY_DEFENCE_REDUCTION", "val" : 100 }, "ignoreDefence" : { "type" : "ENEMY_DEFENCE_REDUCTION", "val" : 100 },
"noWallPenalty" : { "type" : "NO_WALL_PENALTY" }, "noWallPenalty" : { "type" : "NO_WALL_PENALTY" },

View File

@ -92,6 +92,7 @@
"level": 3, "level": 3,
"faction": "stronghold", "faction": "stronghold",
"upgrades": ["orcChieftain"], "upgrades": ["orcChieftain"],
"shots" : 12,
"abilities" : "abilities" :
{ {
"shooter" : "shooter" :
@ -122,6 +123,7 @@
"index": 89, "index": 89,
"level": 3, "level": 3,
"faction": "stronghold", "faction": "stronghold",
"shots" : 24,
"abilities" : "abilities" :
{ {
"shooter" : "shooter" :
@ -274,6 +276,7 @@
"index": 94, "index": 94,
"level": 6, "level": 6,
"faction": "stronghold", "faction": "stronghold",
"shots" : 16,
"abilities" : "abilities" :
{ {
"shooter" : "shooter" :
@ -310,6 +313,7 @@
"index": 95, "index": 95,
"level": 6, "level": 6,
"faction": "stronghold", "faction": "stronghold",
"shots" : 24,
"abilities": "abilities":
{ {
"shooter" : "shooter" :

View File

@ -26,6 +26,7 @@
"index": 29, "index": 29,
"level": 1, "level": 1,
"faction": "tower", "faction": "tower",
"shots" : 8,
"abilities" : "abilities" :
{ {
"shooter" : "shooter" :
@ -178,6 +179,7 @@
"index": 34, "index": 34,
"level": 4, "level": 4,
"faction": "tower", "faction": "tower",
"shots" : 24,
"abilities": "abilities":
{ {
"shooter" : "shooter" :
@ -218,6 +220,7 @@
"index": 35, "index": 35,
"level": 4, "level": 4,
"faction": "tower", "faction": "tower",
"shots" : 24,
"abilities": "abilities":
{ {
"shooter" : "shooter" :
@ -444,6 +447,7 @@
"index": 41, "index": 41,
"level": 7, "level": 7,
"faction": "tower", "faction": "tower",
"shots" : 24,
"abilities" : "abilities" :
{ {
"shooter" : "shooter" :