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

* Fixed Ring of the Magi (56 durations instead of 50)

Browse Source 
* Implemented Elixir of Life (although the 25% HP bonus only shows up in battle)
* Minor, reverted the inclusion of a header.
This commit is contained in:
OnionKnight
2009-08-21 20:20:46 +00:00
parent 9bc40f1a8d
commit ae918b3930
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hch/CArtHandler.cpp
View File

@ -342,6 +342,9 @@ void CArtHandler::addBonuses()
//Cloak of the Undead King //Cloak of the Undead King
giveArtBonus(130, HeroBonus::SECONDARY_SKILL_PREMY, +30, 12); giveArtBonus(130, HeroBonus::SECONDARY_SKILL_PREMY, +30, 12);
//Elixir of Life
giveArtBonus(131, HeroBonus::STACK_HEALTH, +4);
//Armor of the Damned //Armor of the Damned
ART_ATTACK_AND_DEFENSE(132, +3); ART_ATTACK_AND_DEFENSE(132, +3);
ART_POWER_AND_KNOWLEDGE(132, +2); ART_POWER_AND_KNOWLEDGE(132, +2);
@ -367,7 +370,7 @@ void CArtHandler::addBonuses()
giveArtBonus(137, HeroBonus::NO_SHOTING_PENALTY, 0); giveArtBonus(137, HeroBonus::NO_SHOTING_PENALTY, 0);
//Ring of the Magi //Ring of the Magi
giveArtBonus(139, HeroBonus::SPELL_DURATION, +50); giveArtBonus(139, HeroBonus::SPELL_DURATION, +56);
//Cornucopia //Cornucopia
giveArtBonus(140, HeroBonus::GENERATE_RESOURCE, +5, 1); giveArtBonus(140, HeroBonus::GENERATE_RESOURCE, +5, 1);

1
hch/CArtHandler.h
View File

@ -5,7 +5,6 @@
#include <list> #include <list>
#include <string> #include <string>
#include <vector> #include <vector>
#include <climits>
/* /*
* CArtHandler.h, part of VCMI engine * CArtHandler.h, part of VCMI engine

2
lib/CGameState.cpp
View File

@ -2238,6 +2238,8 @@ CStack * BattleInfo::generateNewStack(const CGHeroInstance * owner, int creature
//other bonuses //other bonuses
ret->features.push_back(makeFeature(StackFeature::ATTACK_BONUS, StackFeature::WHOLE_BATTLE, 0, owner->getPrimSkillLevel(0), StackFeature::BONUS_FROM_HERO)); ret->features.push_back(makeFeature(StackFeature::ATTACK_BONUS, StackFeature::WHOLE_BATTLE, 0, owner->getPrimSkillLevel(0), StackFeature::BONUS_FROM_HERO));
ret->features.push_back(makeFeature(StackFeature::DEFENCE_BONUS, StackFeature::WHOLE_BATTLE, 0, owner->getPrimSkillLevel(1), StackFeature::BONUS_FROM_HERO)); ret->features.push_back(makeFeature(StackFeature::DEFENCE_BONUS, StackFeature::WHOLE_BATTLE, 0, owner->getPrimSkillLevel(1), StackFeature::BONUS_FROM_HERO));
if (owner->getArtPos(131) != -1) // Elixir of Life, add 25% HP
ret->features.push_back(makeFeature(StackFeature::HP_BONUS, StackFeature::WHOLE_BATTLE, 0, ret->creature->hitPoints*0.25, StackFeature::BONUS_FROM_HERO));
ret->features.push_back(makeFeature(StackFeature::HP_BONUS, StackFeature::WHOLE_BATTLE, 0, owner->valOfBonuses(HeroBonus::STACK_HEALTH), StackFeature::BONUS_FROM_HERO)); ret->features.push_back(makeFeature(StackFeature::HP_BONUS, StackFeature::WHOLE_BATTLE, 0, owner->valOfBonuses(HeroBonus::STACK_HEALTH), StackFeature::BONUS_FROM_HERO));
ret->firstHPleft = ret->MaxHealth(); ret->firstHPleft = ret->MaxHealth();
} }