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

Little more work on #760:

Browse Source 
* no tactics in creature banks
* no spellcasting during tactics phase
This commit is contained in:
Michał W. Urbańczyk 2012-03-28 21:54:43 +00:00
parent c698181c4c
commit 3cf4ebc163
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/BattleState.cpp
View File

@ -1472,6 +1472,7 @@ BattleInfo * BattleInfo::setupBattle( int3 tile, int terrain, int terType, const
{ {
CMP_stack cmpst; CMP_stack cmpst;
BattleInfo *curB = new BattleInfo; BattleInfo *curB = new BattleInfo;
curB->castSpells[0] = curB->castSpells[1] = 0;
curB->sides[0] = armies[0]->tempOwner; curB->sides[0] = armies[0]->tempOwner;
curB->sides[1] = armies[1]->tempOwner; curB->sides[1] = armies[1]->tempOwner;
if(curB->sides[1] == 254) if(curB->sides[1] == 254)
@ -1765,17 +1766,20 @@ BattleInfo * BattleInfo::setupBattle( int3 tile, int terrain, int terType, const
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
//tactics //tactics
bool isTacticsAllowed = !creatureBank; //no tactics in crebanks
int tacticLvls[2] = {0}; int tacticLvls[2] = {0};
for(int i = 0; i < ARRAY_COUNT(tacticLvls); i++) for(int i = 0; i < ARRAY_COUNT(tacticLvls); i++)
{ {
if(heroes[i]) if(heroes[i])
tacticLvls[i] += heroes[i]->getSecSkillLevel(CGHeroInstance::TACTICS); tacticLvls[i] += heroes[i]->getSecSkillLevel(CGHeroInstance::TACTICS);
} }
int tacticsSkillDiff = tacticLvls[0] - tacticLvls[1];
if(int diff = tacticLvls[0] - tacticLvls[1]) if(tacticsSkillDiff && isTacticsAllowed)
{ {
curB->tacticsSide = diff < 0; curB->tacticsSide = tacticsSkillDiff < 0;
curB->tacticDistance = std::abs(diff)*2 + 1; curB->tacticDistance = std::abs(tacticsSkillDiff)*2 + 1;
} }
else else
curB->tacticDistance = 0; curB->tacticDistance = 0;
@ -1820,6 +1824,8 @@ ESpellCastProblem::ESpellCastProblem BattleInfo::battleCanCastSpell(int player,
{ {
case ECastingMode::HERO_CASTING: case ECastingMode::HERO_CASTING:
{ {
if(tacticDistance)
return ESpellCastProblem::ONGOING_TACTIC_PHASE;
if(castSpells[side] > 0) if(castSpells[side] > 0)
return ESpellCastProblem::ALREADY_CASTED_THIS_TURN; return ESpellCastProblem::ALREADY_CASTED_THIS_TURN;
if(!heroes[side]) if(!heroes[side])

2
lib/CGameState.cpp
View File

@ -2081,7 +2081,7 @@ int CGameState::victoryCheck( ui8 player ) const
BOOST_FOREACH(const CGTownInstance *t, map->towns) BOOST_FOREACH(const CGTownInstance *t, map->towns)
if((t == map->victoryCondition.obj || !map->victoryCondition.obj) if((t == map->victoryCondition.obj || !map->victoryCondition.obj)
&& t->tempOwner == player && t->tempOwner == player
&& vstd::contains(t->builtBuildings, 26)) && vstd::contains(t->builtBuildings, EBuilding::GRAIL))
return 1; return 1;
break; break;

2
lib/GameConstants.h
View File

@ -145,7 +145,7 @@ namespace ESpellCastProblem
OK, NO_HERO_TO_CAST_SPELL, ALREADY_CASTED_THIS_TURN, NO_SPELLBOOK, ANOTHER_ELEMENTAL_SUMMONED, OK, NO_HERO_TO_CAST_SPELL, ALREADY_CASTED_THIS_TURN, NO_SPELLBOOK, ANOTHER_ELEMENTAL_SUMMONED,
HERO_DOESNT_KNOW_SPELL, NOT_ENOUGH_MANA, ADVMAP_SPELL_INSTEAD_OF_BATTLE_SPELL, HERO_DOESNT_KNOW_SPELL, NOT_ENOUGH_MANA, ADVMAP_SPELL_INSTEAD_OF_BATTLE_SPELL,
SECOND_HEROS_SPELL_IMMUNITY, SPELL_LEVEL_LIMIT_EXCEEDED, NO_SPELLS_TO_DISPEL, SECOND_HEROS_SPELL_IMMUNITY, SPELL_LEVEL_LIMIT_EXCEEDED, NO_SPELLS_TO_DISPEL,
NO_APPROPRIATE_TARGET, STACK_IMMUNE_TO_SPELL, WRONG_SPELL_TARGET NO_APPROPRIATE_TARGET, STACK_IMMUNE_TO_SPELL, WRONG_SPELL_TARGET, ONGOING_TACTIC_PHASE
}; };
} }

8
server/NetPacksServer.cpp
View File

@ -265,8 +265,12 @@ bool MakeAction::applyGh( CGameHandler *gh )
bool MakeCustomAction::applyGh( CGameHandler *gh ) bool MakeCustomAction::applyGh( CGameHandler *gh )
{ {
if(!GS(gh)->curB) ERROR_AND_RETURN; const BattleInfo *b = GS(gh)->curB;
if(gh->connections[GS(gh)->curB->getStack(GS(gh)->curB->activeStack)->owner] != c) ERROR_AND_RETURN; if(!b) ERROR_AND_RETURN;
if(b->tacticDistance) ERROR_AND_RETURN;
const CStack *active = GS(gh)->curB->getStack(GS(gh)->curB->activeStack);
if(!active) ERROR_AND_RETURN;
if(gh->connections[active->owner] != c) ERROR_AND_RETURN;
return gh->makeCustomAction(ba); return gh->makeCustomAction(ba);
} }