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

Build #1

Browse Source
This commit is contained in:
dydzio 2017-01-28 12:28:30 +01:00
parent f447e44427
commit f5b5fa149f
3 changed files with 156 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/bonuses_texts.json
View File

@ -418,4 +418,10 @@
"name": "Water immunity",
"description": "Immune to all Water school spells"
}
"WIDE_BREATH":
{
"name": "Szerokie Zionięcie",
"description": "Stożek ognia obejmuje znacznie większy obszar"
}
}

157
lib/CBattleCallback.cpp
View File

@ -1506,7 +1506,148 @@ AttackableTiles CBattleInfoCallback::getPotentiallyAttackableHexes (const CStack
}
}
}
if (attacker->hasBonusOfType(Bonus::TWO_HEX_ATTACK_BREATH) && BattleHex::mutualPosition (destinationTile.hex, hex) > -1) //only adjacent hexes are subject of dragon breath calculation
if (attacker->hasBonusOfType(Bonus::WIDE_BREATH))
{
std::vector<BattleHex> hexes;
const int WN = GameConstants::BFIELD_WIDTH;
logGlobal->infoStream() << hex;
logGlobal->infoStream() << destinationTile;
// atack stand
if (hex == destinationTile.movedInDir(BattleHex::EDir::LEFT, false)) {
if (destinationTile.getY() % 2 == 0)
{
BattleHex::checkAndPush(destinationTile, hexes);
BattleHex::checkAndPush(destinationTile + 1, hexes);
BattleHex::checkAndPush(destinationTile + WN, hexes);
BattleHex::checkAndPush(destinationTile + WN + 1, hexes);
BattleHex::checkAndPush(destinationTile + (2 * WN) - 1, hexes);
BattleHex::checkAndPush(destinationTile + (2 * WN), hexes);
}
else {
BattleHex::checkAndPush(destinationTile, hexes);
BattleHex::checkAndPush(destinationTile + 1, hexes);
BattleHex::checkAndPush(destinationTile + WN, hexes);
BattleHex::checkAndPush(destinationTile + WN - 1, hexes);
BattleHex::checkAndPush(destinationTile + (2 * WN) - 1, hexes);
BattleHex::checkAndPush(destinationTile + (2 * WN), hexes);
}
}
if (hex == destinationTile.movedInDir(BattleHex::EDir::RIGHT, false)) {
if (destinationTile.getY() % 2 == 0)
{
BattleHex::checkAndPush(destinationTile, hexes);
BattleHex::checkAndPush(destinationTile - 1, hexes);
BattleHex::checkAndPush(destinationTile + WN, hexes);
BattleHex::checkAndPush(destinationTile + WN + 1, hexes);
BattleHex::checkAndPush(destinationTile + (2 * WN), hexes);
BattleHex::checkAndPush(destinationTile + (2 * WN) + 1, hexes);
}
else
{
BattleHex::checkAndPush(destinationTile, hexes);
BattleHex::checkAndPush(destinationTile - 1, hexes);
BattleHex::checkAndPush(destinationTile + WN, hexes);
BattleHex::checkAndPush(destinationTile + WN - 1, hexes);
BattleHex::checkAndPush(destinationTile + (2 * WN), hexes);
BattleHex::checkAndPush(destinationTile + (2 * WN) + 1, hexes);
}
}
// atack down
if (hex == destinationTile.movedInDir(BattleHex::EDir::TOP_LEFT, false)) {
if (destinationTile.getY() % 2 == 1)
{
BattleHex::checkAndPush(destinationTile, hexes);
BattleHex::checkAndPush(destinationTile - 1, hexes);
BattleHex::checkAndPush(destinationTile - 2, hexes);
BattleHex::checkAndPush(destinationTile + WN, hexes);
BattleHex::checkAndPush(destinationTile + WN - 1, hexes);
BattleHex::checkAndPush(destinationTile + WN - 2, hexes);
}
else {
BattleHex::checkAndPush(destinationTile, hexes);
BattleHex::checkAndPush(destinationTile - 1, hexes);
BattleHex::checkAndPush(destinationTile - 2, hexes);
BattleHex::checkAndPush(destinationTile + WN, hexes);
BattleHex::checkAndPush(destinationTile + WN + 1, hexes);
BattleHex::checkAndPush(destinationTile + WN - 1, hexes);
}
}
if (hex == destinationTile.movedInDir(BattleHex::EDir::TOP_RIGHT, false)) {
if (destinationTile.getY() % 2 == 1)
{
BattleHex::checkAndPush(destinationTile, hexes);
BattleHex::checkAndPush(destinationTile + 1, hexes);
BattleHex::checkAndPush(destinationTile + 2, hexes);
BattleHex::checkAndPush(destinationTile + WN - 1, hexes);
BattleHex::checkAndPush(destinationTile + WN, hexes);
BattleHex::checkAndPush(destinationTile + WN + 1, hexes);
}
else
{
BattleHex::checkAndPush(destinationTile, hexes);
BattleHex::checkAndPush(destinationTile + 1, hexes);
BattleHex::checkAndPush(destinationTile + 2, hexes);
BattleHex::checkAndPush(destinationTile + WN, hexes);
BattleHex::checkAndPush(destinationTile + WN + 1, hexes);
BattleHex::checkAndPush(destinationTile + WN + 2, hexes);
}
}
// attack up
if (hex == destinationTile.movedInDir(BattleHex::EDir::BOTTOM_LEFT, false)) {
if (destinationTile.getY() % 2 == 1)
{
BattleHex::checkAndPush(destinationTile, hexes);
BattleHex::checkAndPush(destinationTile + 1, hexes);
BattleHex::checkAndPush(destinationTile + WN, hexes);
BattleHex::checkAndPush(destinationTile + WN + 1, hexes);
BattleHex::checkAndPush(destinationTile - WN, hexes);
BattleHex::checkAndPush(destinationTile - WN - 1, hexes);
}
else {
BattleHex::checkAndPush(destinationTile, hexes);
BattleHex::checkAndPush(destinationTile + 1, hexes);
BattleHex::checkAndPush(destinationTile + WN + 1, hexes);
BattleHex::checkAndPush(destinationTile + WN + 2, hexes);
BattleHex::checkAndPush(destinationTile - WN, hexes);
BattleHex::checkAndPush(destinationTile - WN + 1, hexes);
}
}
if (hex == destinationTile.movedInDir(BattleHex::EDir::BOTTOM_RIGHT, false)) {
if (destinationTile.getY() % 2 == 1)
{
BattleHex::checkAndPush(destinationTile, hexes);
BattleHex::checkAndPush(destinationTile - 1, hexes);
BattleHex::checkAndPush(destinationTile + WN - 1, hexes);
BattleHex::checkAndPush(destinationTile + WN - 2, hexes);
BattleHex::checkAndPush(destinationTile - WN, hexes);
BattleHex::checkAndPush(destinationTile - WN - 1, hexes);
}
else
{
BattleHex::checkAndPush(destinationTile, hexes);
BattleHex::checkAndPush(destinationTile - 1, hexes);
BattleHex::checkAndPush(destinationTile + WN, hexes);
BattleHex::checkAndPush(destinationTile + WN - 1, hexes);
BattleHex::checkAndPush(destinationTile - WN, hexes);
BattleHex::checkAndPush(destinationTile - WN + 1, hexes);
}
}
for (BattleHex tile : hexes)
{
//friendly stacks can also be damaged by Dragon Breath
if (battleGetStackByPos(tile, true))
at.friendlyCreaturePositions.insert(tile);
}
}
else if (attacker->hasBonusOfType(Bonus::TWO_HEX_ATTACK_BREATH) && BattleHex::mutualPosition(destinationTile.hex, hex) > -1) //only adjacent hexes are subject of dragon breath calculation
{
std::vector<BattleHex> hexes; //only one, in fact
int pseudoVector = destinationTile.hex - hex;
@ -1514,24 +1655,24 @@ AttackableTiles CBattleInfoCallback::getPotentiallyAttackableHexes (const CStack
{
case 1:
case -1:
BattleHex::checkAndPush (destinationTile.hex + pseudoVector, hexes);
BattleHex::checkAndPush(destinationTile.hex + pseudoVector, hexes);
break;
case WN: //17 //left-down or right-down
case -WN: //-17 //left-up or right-up
case WN + 1: //18 //right-down
case -WN + 1: //-16 //right-up
BattleHex::checkAndPush (destinationTile.hex + pseudoVector + (((hex/WN)%2) ? 1 : -1 ), hexes);
BattleHex::checkAndPush(destinationTile.hex + pseudoVector + (((hex / WN) % 2) ? 1 : -1), hexes);
break;
case WN-1: //16 //left-down
case -WN-1: //-18 //left-up
BattleHex::checkAndPush (destinationTile.hex + pseudoVector + (((hex/WN)%2) ? 1 : 0), hexes);
case WN - 1: //16 //left-down
case -WN - 1: //-18 //left-up
BattleHex::checkAndPush(destinationTile.hex + pseudoVector + (((hex / WN) % 2) ? 1 : 0), hexes);
break;
}
for (BattleHex tile : hexes)
{
//friendly stacks can also be damaged by Dragon Breath
if (battleGetStackByPos (tile, true))
at.friendlyCreaturePositions.insert (tile);
if (battleGetStackByPos(tile, true))
at.friendlyCreaturePositions.insert(tile);
}
}

1
lib/HeroBonus.h
View File

@ -219,6 +219,7 @@ public:
BONUS_NAME(DISGUISED) /* subtype - spell level */\
BONUS_NAME(VISIONS) /* subtype - spell level */\
BONUS_NAME(NO_TERRAIN_PENALTY) /* subtype - terrain type */\
BONUS_NAME(WIDE_BREATH) /* Kuririn skill */\
/* end of list */