games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Rename ADVANCED_CATAPULT bonus to reflect the purpose better

Browse Source
This commit is contained in:
dydzio 2017-02-01 13:38:28 +01:00
parent a8f04aede7
commit 4c4539b00e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/bonuses_texts.json
View File

@ -18,9 +18,9 @@
"description": "May Retaliate ${val} extra times" "description": "May Retaliate ${val} extra times"
}, },
"ADVANCED_CATAPULT": "CATAPULT_EXTRA_SHOTS":
{ {
"name": "Advanced wall breaker", "name": "Additional siege attacks",
"description": "Can hit siege walls ${val} extra times per attack" "description": "Can hit siege walls ${val} extra times per attack"
}, },

2
config/creatures/stronghold.json
View File

@ -273,7 +273,7 @@
{ {
"siegeDoubleAttack" : "siegeDoubleAttack" :
{ {
"type" : "ADVANCED_CATAPULT", "type" : "CATAPULT_EXTRA_SHOTS",
"val" : 1 "val" : 1
} }
}, },

2
lib/HeroBonus.h
View File

@ -216,7 +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(ADVANCED_CATAPULT) /*val - number of additional shots, requires CATAPULT bonus to work*/\ BONUS_NAME(CATAPULT_EXTRA_SHOTS) /*val - number of additional shots, requires CATAPULT bonus to work*/\
/* end of list */ /* end of list */

2
server/CGameHandler.cpp
View File

@ -3961,7 +3961,7 @@ bool CGameHandler::makeBattleAction(BattleAction &ba)
else //may need to use higher ballistics level for creatures in future for some cases to match original H3 (upgraded cyclops etc) 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 = VLC->heroh->ballistics.at(1);
sbi.shots += std::max(stack->valOfBonuses(Bonus::ADVANCED_CATAPULT), 0); 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);