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

Merge pull request #557 from dydzio0614/CrystalDragonAbility

Browse Source 
Fix crystal dragon ability to match H3
This commit is contained in:
Alexander Shishkin 2019-03-21 17:02:20 +03:00 committed by GitHub
commit 549d8c97df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/creatures/neutral.json
View File

@ -122,10 +122,7 @@
}, },
"crystals" : "crystals" :
{ {
"type" : "GENERATE_RESOURCE", "type" : "SPECIAL_CRYSTAL_GENERATION"
"subtype" : "resource.crystal",
"val" : 1,
"propagator" : "HERO"
}, },
"FLYING_ARMY" : null "FLYING_ARMY" : null
}, },

1
lib/HeroBonus.h
View File

@ -269,6 +269,7 @@ public:
BONUS_NAME(SHOOTS_ALL_ADJACENT) /* H4 Cyclops-like shoot (attacks all hexes neighboring with target) without spell-like mechanics */\ BONUS_NAME(SHOOTS_ALL_ADJACENT) /* H4 Cyclops-like shoot (attacks all hexes neighboring with target) without spell-like mechanics */\
BONUS_NAME(BLOCK_MAGIC_BELOW) /*blocks casting spells of the level < value */ \ BONUS_NAME(BLOCK_MAGIC_BELOW) /*blocks casting spells of the level < value */ \
BONUS_NAME(DESTRUCTION) /*kills extra units after hit, subtype = 0 - kill percentage of units, 1 - kill amount, val = chance in percent to trigger, additional info - amount/percentage to kill*/ \ BONUS_NAME(DESTRUCTION) /*kills extra units after hit, subtype = 0 - kill percentage of units, 1 - kill amount, val = chance in percent to trigger, additional info - amount/percentage to kill*/ \
BONUS_NAME(SPECIAL_CRYSTAL_GENERATION) /*crystal dragon crystal generation*/ \
/* end of list */ /* end of list */

32
server/CGameHandler.cpp
View File

@ -1739,6 +1739,38 @@ void CGameHandler::newTurn()
n.res[elem.first] = elem.second.resources; n.res[elem.first] = elem.second.resources;
if(!firstTurn && newWeek) //weekly crystal generation if 1 or more crystal dragons in any hero army or town garrison
{
bool hasCrystalGenCreature = false;
for(CGHeroInstance * hero : elem.second.heroes)
{
for(auto stack : hero->stacks)
{
if(stack.second->hasBonusOfType(Bonus::SPECIAL_CRYSTAL_GENERATION))
{
hasCrystalGenCreature = true;
break;
}
}
}
if(!hasCrystalGenCreature) //not found in armies, check towns
{
for(CGTownInstance * town : elem.second.towns)
{
for(auto stack : town->stacks)
{
if(stack.second->hasBonusOfType(Bonus::SPECIAL_CRYSTAL_GENERATION))
{
hasCrystalGenCreature = true;
break;
}
}
}
}
if(hasCrystalGenCreature)
n.res[elem.first][Res::CRYSTAL] += 3;
}
for (CGHeroInstance *h : (elem).second.heroes) for (CGHeroInstance *h : (elem).second.heroes)
{ {
if (h->visitedTown) if (h->visitedTown)