games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

* next part of stack bonus system

Browse Source 
* support for a few new creatures
This commit is contained in:
mateuszb
2009-05-24 17:35:11 +00:00
parent bd608a3d88
commit 4f12f73cb9
3 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
lib/CGameState.cpp
View File

@@ -446,13 +446,13 @@ std::pair< std::vector<int>, int > BattleInfo::getPath(int start, int dest, bool
int CStack::valOfFeatures(StackFeature::ECombatFeatures type, int subtype) const int CStack::valOfFeatures(StackFeature::ECombatFeatures type, int subtype) const
{ {
int ret = 0; int ret = 0;
if(subtype == -1) if(subtype == -1024) //any subtype
{ {
for(std::vector<StackFeature>::const_iterator i=features.begin(); i != features.end(); i++) for(std::vector<StackFeature>::const_iterator i=features.begin(); i != features.end(); i++)
if(i->type == type) if(i->type == type)
ret += i->value; ret += i->value;
} }
else else //given subtype
{ {
for(std::vector<StackFeature>::const_iterator i=features.begin(); i != features.end(); i++) for(std::vector<StackFeature>::const_iterator i=features.begin(); i != features.end(); i++)
if(i->type == type && i->subtype == subtype) if(i->type == type && i->subtype == subtype)
@@ -463,7 +463,7 @@ int CStack::valOfFeatures(StackFeature::ECombatFeatures type, int subtype) const
bool CStack::hasFeatureOfType(StackFeature::ECombatFeatures type, int subtype) const bool CStack::hasFeatureOfType(StackFeature::ECombatFeatures type, int subtype) const
{ {
if(subtype == -1) //any subtype if(subtype == -1024) //any subtype
{ {
for(std::vector<StackFeature>::const_iterator i=features.begin(); i != features.end(); i++) for(std::vector<StackFeature>::const_iterator i=features.begin(); i != features.end(); i++)
if(i->type == type) if(i->type == type)
@@ -540,14 +540,14 @@ ui8 CStack::howManyEffectsSet(ui16 id) const
si8 CStack::Morale() const si8 CStack::Morale() const
{ {
si8 ret = morale; si8 ret = morale;
if(getEffect(49)) //mirth
ret += valOfFeatures(StackFeature::MORALE_BONUS); //mirth & sorrow & other
if(hasFeatureOfType(StackFeature::SELF_MORALE)) //eg. minotaur
{ {
ret += VLC->spellh->spells[49].powers[getEffect(49)->level]; ret = std::max<si8>(ret, +1);
}
if(getEffect(50)) //sorrow
{
ret -= VLC->spellh->spells[50].powers[getEffect(50)->level];
} }
if(ret > 3) ret = 3; if(ret > 3) ret = 3;
if(ret < -3) ret = -3; if(ret < -3) ret = -3;
return ret; return ret;
@@ -556,14 +556,14 @@ si8 CStack::Morale() const
si8 CStack::Luck() const si8 CStack::Luck() const
{ {
si8 ret = luck; si8 ret = luck;
if(getEffect(51)) //fortune
ret += valOfFeatures(StackFeature::LUCK_BONUS); //fortune & misfortune & other
if(hasFeatureOfType(StackFeature::SELF_LUCK)) //eg. halfling
{ {
ret += VLC->spellh->spells[51].powers[getEffect(51)->level]; ret = std::max<si8>(ret, +1);
}
if(getEffect(52)) //misfortune
{
ret -= VLC->spellh->spells[52].powers[getEffect(52)->level];
} }
if(ret > 3) ret = 3; if(ret > 3) ret = 3;
if(ret < -3) ret = -3; if(ret < -3) ret = -3;
return ret; return ret;
@@ -578,7 +578,7 @@ si32 CStack::Attack() const
ret += (VLC->spellh->spells[56].powers[getEffect(56)->level]/100.0) * Defense(false); ret += (VLC->spellh->spells[56].powers[getEffect(56)->level]/100.0) * Defense(false);
} }
ret += valOfFeatures(StackFeature::ATTACK_BONUS); ret += valOfFeatures(StackFeature::ATTACK_BONUS, -1);
return ret; return ret;
} }
@@ -592,7 +592,7 @@ si32 CStack::Defense(bool withFrenzy /*= true*/) const
return 0; return 0;
} }
ret += valOfFeatures(StackFeature::DEFENCE_BONUS); ret += valOfFeatures(StackFeature::DEFENCE_BONUS, -1);
return ret; return ret;
} }
@@ -1778,14 +1778,14 @@ int BattleInfo::calculateDmg(const CStack* attacker, const CStack* defender, con
//calculating total attack/defense skills modifier //calculating total attack/defense skills modifier
if(!shooting && attacker->getEffect(43)) //bloodlust handling if(!shooting && attacker->hasFeatureOfType(StackFeature::ATTACK_BONUS, 0)) //bloodlust handling (etc.)
{ {
attackDefenseBonus += VLC->spellh->spells[43].powers[attacker->getEffect(43)->level]; attackDefenseBonus += attacker->valOfFeatures(StackFeature::ATTACK_BONUS, 0);
} }
if(shooting && attacker->getEffect(44)) //precision handling if(shooting && attacker->hasFeatureOfType(StackFeature::ATTACK_BONUS, 1)) //precision handling (etc.)
{ {
attackDefenseBonus += VLC->spellh->spells[44].powers[attacker->getEffect(44)->level]; attackDefenseBonus += attacker->valOfFeatures(StackFeature::ATTACK_BONUS, 1);
} }
if(attacker->getEffect(55)) //slayer handling if(attacker->getEffect(55)) //slayer handling
@@ -1922,13 +1922,13 @@ int BattleInfo::calculateDmg(const CStack* attacker, const CStack* defender, con
} }
} }
//handling spell effects //handling spell effects
if(!shooting && defender->getEffect(27)) //shield if(!shooting && defender->hasFeatureOfType(StackFeature::GENERAL_DAMAGE_REDUCTION, 0)) //eg. shield
{ {
dmgBonusMultiplier *= float(VLC->spellh->spells[27].powers[attacker->getEffect(27)->level]) / 100.0f; dmgBonusMultiplier *= float(defender->valOfFeatures(StackFeature::GENERAL_DAMAGE_REDUCTION, 0)) / 100.0f;
} }
else if(shooting && defender->getEffect(28)) //air shield else if(shooting && defender->hasFeatureOfType(StackFeature::GENERAL_DAMAGE_REDUCTION, 1)) //eg. air shield
{ {
dmgBonusMultiplier *= float(VLC->spellh->spells[28].powers[attacker->getEffect(28)->level]) / 100.0f; dmgBonusMultiplier *= float(defender->valOfFeatures(StackFeature::GENERAL_DAMAGE_REDUCTION, 1)) / 100.0f;
} }
if(attacker->getEffect(42)) //curse handling (partial, the rest is below) if(attacker->getEffect(42)) //curse handling (partial, the rest is below)
{ {

4
lib/CGameState.h
View File

@@ -173,8 +173,8 @@ public:
}; };
std::vector<StackEffect> effects; std::vector<StackEffect> effects;
int valOfFeatures(StackFeature::ECombatFeatures type, int subtype = -1) const;//subtype -> subtype of bonus, if -1 then any int valOfFeatures(StackFeature::ECombatFeatures type, int subtype = -1024) const;//subtype -> subtype of bonus, if -1024 then any
bool hasFeatureOfType(StackFeature::ECombatFeatures type, int subtype = -1) const; //determines if stack has a bonus of given type (and optionally subtype) bool hasFeatureOfType(StackFeature::ECombatFeatures type, int subtype = -1024) const; //determines if stack has a bonus of given type (and optionally subtype)
CStack(CCreature * C, int A, int O, int I, bool AO, int S); //c-tor CStack(CCreature * C, int A, int O, int I, bool AO, int S); //c-tor
CStack() : ID(-1), creature(NULL), amount(-1), baseAmount(-1), firstHPleft(-1), owner(255), slot(255), attackerOwned(true), position(-1), counterAttacks(1) {} //c-tor CStack() : ID(-1), creature(NULL), amount(-1), baseAmount(-1), firstHPleft(-1), owner(255), slot(255), attackerOwned(true), position(-1), counterAttacks(1) {} //c-tor

23
server/CGameHandler.cpp
View File

@@ -2342,24 +2342,31 @@ static ui32 calculateSpellDmg(const CSpell * sp, const CGHeroInstance * caster,
} }
//applying protections - when spell has more then one elements, only one protection should be applied (I think) //applying protections - when spell has more then one elements, only one protection should be applied (I think)
if(sp->air && affectedCreature->getEffect(30)) //air spell & protection from air if(sp->air && affectedCreature->hasFeatureOfType(StackFeature::SPELL_DAMAGE_REDUCTION, 0)) //air spell & protection from air
{ {
ret *= VLC->spellh->spells[30].powers[affectedCreature->getEffect(30)->level]; ret *= affectedCreature->valOfFeatures(StackFeature::SPELL_DAMAGE_REDUCTION, 0);
ret /= 100; ret /= 100;
} }
else if(sp->fire && affectedCreature->getEffect(31)) //fire spell & protection from fire else if(sp->fire && affectedCreature->hasFeatureOfType(StackFeature::SPELL_DAMAGE_REDUCTION, 1)) //fire spell & protection from fire
{ {
ret *= VLC->spellh->spells[31].powers[affectedCreature->getEffect(31)->level]; ret *= affectedCreature->valOfFeatures(StackFeature::SPELL_DAMAGE_REDUCTION, 1);
ret /= 100; ret /= 100;
} }
else if(sp->water && affectedCreature->getEffect(32)) //water spell & protection from water else if(sp->water && affectedCreature->hasFeatureOfType(StackFeature::SPELL_DAMAGE_REDUCTION, 2)) //water spell & protection from water
{ {
ret *= VLC->spellh->spells[32].powers[affectedCreature->getEffect(32)->level]; ret *= affectedCreature->valOfFeatures(StackFeature::SPELL_DAMAGE_REDUCTION, 2);
ret /= 100; ret /= 100;
} }
else if (sp->earth && affectedCreature->getEffect(33)) //earth spell & protection from earth else if (sp->earth && affectedCreature->hasFeatureOfType(StackFeature::SPELL_DAMAGE_REDUCTION, 3)) //earth spell & protection from earth
{ {
ret *= VLC->spellh->spells[33].powers[affectedCreature->getEffect(33)->level]; ret *= affectedCreature->valOfFeatures(StackFeature::SPELL_DAMAGE_REDUCTION, 3);
ret /= 100;
}
//general spell dmg reduction
if(sp->air && affectedCreature->hasFeatureOfType(StackFeature::SPELL_DAMAGE_REDUCTION, -1)) //air spell & protection from air
{
ret *= affectedCreature->valOfFeatures(StackFeature::SPELL_DAMAGE_REDUCTION, -1);
ret /= 100; ret /= 100;
} }