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

- it is possible to read json file with vector

Browse Source 
- town configuration:
- - all town-related texts are now in TownHandler
- - alignments are now part of faction
- - removed CTown::bonus field
This commit is contained in:
Ivan Savenko
2012-10-05 13:11:26 +00:00
parent f113f9573d
commit 306d64b0c4
15 changed files with 227 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/CCreatureHandler.cpp
View File

@@ -24,12 +24,7 @@ CCreatureHandler::CCreatureHandler()
{
VLC->creh = this;
// Set the faction alignments to the defaults:
// Good: Castle, Rampart, Tower
// Evil: Inferno, Necropolis, Dungeon
// Neutral: Stronghold, Fortess, Conflux, neutrals
factionAlignments += 1, 1, 1, -1, -1, -1, 0, 0, 0, 0;
doubledCreatures += 4, 14, 20, 28, 44, 60, 70, 72, 85, 86, 100, 104; //according to Strategija
doubledCreatures += 4, 14, 20, 28, 44, 60, 70, 72, 85, 86, 100, 104; //FIXME: move to creature config //according to Strategija
allCreatures.setDescription("All creatures");
creaturesOfLevel[0].setDescription("Creatures of unnormalized tier");
@@ -94,7 +89,7 @@ bool CCreature::isUndead() const
*/
bool CCreature::isGood () const
{
return VLC->creh->isGood(faction);
return VLC->townh->factions[faction].alignment == EAlignment::GOOD;
}
/**
@@ -103,7 +98,7 @@ bool CCreature::isGood () const
*/
bool CCreature::isEvil () const
{
return VLC->creh->isEvil(faction);
return VLC->townh->factions[faction].alignment == EAlignment::EVIL;
}
si32 CCreature::maxAmount(const std::vector<si32> &res) const //how many creatures can be bought
@@ -151,26 +146,6 @@ bool CCreature::isItNativeTerrain(int terrain) const
return VLC->townh->factions[faction].nativeTerrain == terrain;
}
/**
* Determines if a faction is good.
* @param ID of the faction.
* @return true if the faction is good, false otherwise.
*/
bool CCreatureHandler::isGood (si8 faction) const
{
return factionAlignments[faction] == 1;
}
/**
* Determines if a faction is evil.
* @param ID of the faction.
* @return true if the faction is evil, false otherwise.
*/
bool CCreatureHandler::isEvil (si8 faction) const
{
return factionAlignments[faction] == -1;
}
static void AddAbility(CCreature *cre, const JsonVector &ability_vec)
{
Bonus *nsf = new Bonus();