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

Merge pull request #272 from dydzio0614/bug2600

Browse Source 
Nice, thanks :)
This commit is contained in:
DjWarmonger
2017-02-01 17:57:58 +01:00
committed by GitHub
parent f4c55ae3c9 4c4539b00e
commit 6d37c8bceb
4 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/bonuses_texts.json
View File

@@ -17,6 +17,12 @@
"name": "Additional retaliations", "name": "Additional retaliations",
"description": "May Retaliate ${val} extra times" "description": "May Retaliate ${val} extra times"
}, },
"CATAPULT_EXTRA_SHOTS":
{
"name": "Additional siege attacks",
"description": "Can hit siege walls ${val} extra times per attack"
},
"AIR_IMMUNITY": "AIR_IMMUNITY":
{ {

8
config/creatures/stronghold.json
View File

@@ -269,6 +269,14 @@
"index": 95, "index": 95,
"level": 6, "level": 6,
"faction": "stronghold", "faction": "stronghold",
"abilities":
{
"siegeDoubleAttack" :
{
"type" : "CATAPULT_EXTRA_SHOTS",
"val" : 1
}
},
"graphics" : "graphics" :
{ {
"animation": "CCYCLLOR.DEF", "animation": "CCYCLLOR.DEF",

1
lib/HeroBonus.h
View File

@@ -216,6 +216,7 @@ public:
BONUS_NAME(DISGUISED) /* subtype - spell level */\ BONUS_NAME(DISGUISED) /* subtype - spell level */\
BONUS_NAME(VISIONS) /* subtype - spell level */\ BONUS_NAME(VISIONS) /* subtype - spell level */\
BONUS_NAME(NO_TERRAIN_PENALTY) /* subtype - terrain type */\ BONUS_NAME(NO_TERRAIN_PENALTY) /* subtype - terrain type */\
BONUS_NAME(CATAPULT_EXTRA_SHOTS) /*val - number of additional shots, requires CATAPULT bonus to work*/\
/* end of list */ /* end of list */

10
server/CGameHandler.cpp
View File

@@ -3954,7 +3954,15 @@ bool CGameHandler::makeBattleAction(BattleAction &ba)
auto wrapper = wrapAction(ba); auto wrapper = wrapAction(ba);
const CGHeroInstance * attackingHero = gs->curB->battleGetFightingHero(ba.side); const CGHeroInstance * attackingHero = gs->curB->battleGetFightingHero(ba.side);
CHeroHandler::SBallisticsLevelInfo sbi = VLC->heroh->ballistics.at(attackingHero->getSecSkillLevel(SecondarySkill::BALLISTICS));
CHeroHandler::SBallisticsLevelInfo sbi;
if(stack->getCreature()->idNumber == CreatureID::CATAPULT)
sbi = VLC->heroh->ballistics.at(attackingHero->getSecSkillLevel(SecondarySkill::BALLISTICS));
else //may need to use higher ballistics level for creatures in future for some cases to match original H3 (upgraded cyclops etc)
{
sbi = VLC->heroh->ballistics.at(1);
sbi.shots += std::max(stack->valOfBonuses(Bonus::CATAPULT_EXTRA_SHOTS), 0);
}
auto wallPart = gs->curB->battleHexToWallPart(ba.destinationTile); auto wallPart = gs->curB->battleHexToWallPart(ba.destinationTile);
if (!gs->curB->isWallPartPotentiallyAttackable(wallPart)) if (!gs->curB->isWallPartPotentiallyAttackable(wallPart))