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

Removed odd "no shoting penalty" bonus. It seems to be confused with No Distance Penalty.

Browse Source
This commit is contained in:
DjWarmonger
2011-06-20 06:42:53 +00:00
parent b071888800
commit e7bbfb615c
5 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/bonusnames.txt
View File

@ -1,5 +1,4 @@
Bonus Name (30 characters?) Description (30) Bonus Name (30 characters?) Description (30)
NO_SHOTING_PENALTY No Shooting penalty? ???
ADDITIONAL_RETALIATION Additional retaliations May Retaliate %d extra times ADDITIONAL_RETALIATION Additional retaliations May Retaliate %d extra times
ATTACKS_ALL_ADJACENT Attack all around Attacks all adjacent enemies ATTACKS_ALL_ADJACENT Attack all around Attacks all adjacent enemies
RETURN_AFTER_STRIKE Attack and Return Returns after melee attack RETURN_AFTER_STRIKE Attack and Return Returns after melee attack

2
lib/BattleState.cpp
View File

@ -607,7 +607,7 @@ TDmgRange BattleInfo::calculateDmgRange( const CStack* attacker, const CStack* d
}; };
//wall / distance penalty + advanced air shield //wall / distance penalty + advanced air shield
if (shooting && !NBonus::hasOfType(attackerHero, Bonus::NO_SHOTING_PENALTY) && ( if (shooting && !NBonus::hasOfType(attackerHero, Bonus::NO_DISTANCE_PENALTY) && (
hasDistancePenalty(attacker, defender->position) || hasWallPenalty(attacker, defender->position) || hasDistancePenalty(attacker, defender->position) || hasWallPenalty(attacker, defender->position) ||
HLP::hasAdvancedAirShield(defender) ) HLP::hasAdvancedAirShield(defender) )
) )

4
lib/CArtHandler.cpp
View File

@ -644,7 +644,7 @@ void CArtHandler::addBonuses()
giveArtBonus(89,Bonus::EARTH_SPELLS,0);//Tome of Earth Magic giveArtBonus(89,Bonus::EARTH_SPELLS,0);//Tome of Earth Magic
giveArtBonus(90,Bonus::WATER_WALKING, 0, 1);//Boots of Levitation giveArtBonus(90,Bonus::WATER_WALKING, 0, 1);//Boots of Levitation
giveArtBonus(91,Bonus::NO_SHOTING_PENALTY,0, 0, 0, new HasAnotherBonusLimiter(Bonus::SHOOTER));//Golden Bow giveArtBonus(91,Bonus::NO_DISTANCE_PENALTY,0, 0, 0, new HasAnotherBonusLimiter(Bonus::SHOOTER));//Golden Bow
giveArtBonus(92,Bonus::SPELL_IMMUNITY,0,35);//Sphere of Permanence giveArtBonus(92,Bonus::SPELL_IMMUNITY,0,35);//Sphere of Permanence
giveArtBonus(93,Bonus::NEGATE_ALL_NATURAL_IMMUNITIES,0);//Orb of Vulnerability giveArtBonus(93,Bonus::NEGATE_ALL_NATURAL_IMMUNITIES,0);//Orb of Vulnerability
@ -735,7 +735,7 @@ void CArtHandler::addBonuses()
giveArtBonus(136, Bonus::FREE_SHIP_BOARDING, 0); giveArtBonus(136, Bonus::FREE_SHIP_BOARDING, 0);
//Bow of the Sharpshooter //Bow of the Sharpshooter
giveArtBonus(137, Bonus::NO_SHOTING_PENALTY, 0); giveArtBonus(137, Bonus::NO_DISTANCE_PENALTY, 0);
giveArtBonus(137, Bonus::FREE_SHOOTING, 0); giveArtBonus(137, Bonus::FREE_SHOOTING, 0);
//Wizard's Well //Wizard's Well

1
lib/CCreatureSet.cpp
View File

@ -556,7 +556,6 @@ std::string CStackInstance::bonusToString(Bonus *bonus, bool description) const
case Bonus::UNLIMITED_RETALIATIONS: case Bonus::UNLIMITED_RETALIATIONS:
case Bonus::SHOOTER: case Bonus::SHOOTER:
case Bonus::FREE_SHOOTING: case Bonus::FREE_SHOOTING:
case Bonus::NO_SHOTING_PENALTY:
case Bonus::NO_MELEE_PENALTY: case Bonus::NO_MELEE_PENALTY:
case Bonus::NO_DISTANCE_PENALTY: case Bonus::NO_DISTANCE_PENALTY:
case Bonus::NO_OBSTACLES_PENALTY: case Bonus::NO_OBSTACLES_PENALTY:

1
lib/HeroBonus.h
View File

@ -56,7 +56,6 @@ namespace PrimarySkill
BONUS_NAME(FIRE_SPELL_DMG_PREMY) \ BONUS_NAME(FIRE_SPELL_DMG_PREMY) \
BONUS_NAME(WATER_SPELL_DMG_PREMY) \ BONUS_NAME(WATER_SPELL_DMG_PREMY) \
BONUS_NAME(WATER_WALKING) /*subtype 1 - without penalty, 2 - with penalty*/ \ BONUS_NAME(WATER_WALKING) /*subtype 1 - without penalty, 2 - with penalty*/ \
BONUS_NAME(NO_SHOTING_PENALTY) /* duplicates NO_DISTANCE_PENALTY or FREE_SHOOTHING?*/\
BONUS_NAME(NEGATE_ALL_NATURAL_IMMUNITIES) \ BONUS_NAME(NEGATE_ALL_NATURAL_IMMUNITIES) \
BONUS_NAME(STACK_HEALTH) \ BONUS_NAME(STACK_HEALTH) \
BONUS_NAME(BLOCK_MORALE) \ BONUS_NAME(BLOCK_MORALE) \