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

Stack experience more or less handled. Neutrals get 10K xp every day.

Browse Source
This commit is contained in:
DjWarmonger
2011-02-13 13:11:09 +00:00
parent 252cee96f5
commit a5a493bfc1
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CCreatureSet.cpp
View File

@@ -441,7 +441,7 @@ int CStackInstance::getQuantityID() const
int CStackInstance::getExpRank() const int CStackInstance::getExpRank() const
{ {
int tier = type->level; int tier = type->level;
if (isbetw(tier, 1, 7)) if (iswith(tier, 1, 7))
{ {
for (int i = VLC->creh->expRanks[tier].size()-2; i >-1; --i)//sic! for (int i = VLC->creh->expRanks[tier].size()-2; i >-1; --i)//sic!
{ //exp values vary from 1st level to max exp at 11th level { //exp values vary from 1st level to max exp at 11th level

5
lib/CObjectHandler.cpp
View File

@@ -2962,6 +2962,8 @@ void CGCreature::newTurn() const
cb->setObjProperty(id, 10, std::min (power/1000 , (ui32)CREEP_SIZE)); //set new amount cb->setObjProperty(id, 10, std::min (power/1000 , (ui32)CREEP_SIZE)); //set new amount
cb->setObjProperty(id, 11, power); //increase temppower cb->setObjProperty(id, 11, power); //increase temppower
} }
if (STACK_EXP)
cb->setObjProperty(id, 12, 10000); //for testing purpose
} }
void CGCreature::setPropertyDer(ui8 what, ui32 val) void CGCreature::setPropertyDer(ui8 what, ui32 val)
{ {
@@ -2973,6 +2975,9 @@ void CGCreature::setPropertyDer(ui8 what, ui32 val)
case 11: case 11:
temppower = val; temppower = val;
break; break;
case 12:
giveStackExp(val);
break;
} }
} }

2
lib/NetPacks.h
View File

@@ -1184,8 +1184,6 @@ struct BattleResult : public CPackForClient//3003
expType exp[2]; //exp for attacker and defender expType exp[2]; //exp for attacker and defender
std::set<ui32> artifacts; //artifacts taken from loser to winner std::set<ui32> artifacts; //artifacts taken from loser to winner
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
{ {
h & result & winner & casualties[0] & casualties[1] & exp & artifacts; h & result & winner & casualties[0] & casualties[1] & exp & artifacts;

8
lib/NetPacksLib.cpp
View File

@@ -910,6 +910,14 @@ void BattleResult::applyGs( CGameState *gs )
if(h) if(h)
h->bonuses.remove_if(Bonus::OneBattle); h->bonuses.remove_if(Bonus::OneBattle);
if (STACK_EXP)
{
if (exp[0]) //checking local array is easier than dereferencing this crap twice
gs->curB->belligerents[0]->giveStackExp(exp[0]);
if (exp[1])
gs->curB->belligerents[1]->giveStackExp(exp[1]);
}
gs->curB->belligerents[0]->battle = gs->curB->belligerents[1]->battle = NULL; gs->curB->belligerents[0]->battle = gs->curB->belligerents[1]->battle = NULL;
gs->curB.dellNull(); gs->curB.dellNull();
} }