games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity

Merge branch 'develop' of https://github.com/vcmi/vcmi into develop

Browse Source
This commit is contained in:
DjWarmonger 2016-01-29 18:21:56 +01:00
commit ca4e13b2dc
16 changed files with 114 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/windows/CAdvmapInterface.cpp
View File

@ -1069,7 +1069,7 @@ void CAdvMapInt::keyPressed(const SDL_KeyboardEvent & key)
LOCPLINT->proposeLoadingGame();
return;
case SDLK_s:
if(isActive())
if(isActive() && key.type == SDL_KEYUP)
GH.pushInt(new CSavingScreen(CPlayerInterface::howManyPeople > 1));
return;
case SDLK_d:

2
config/factions/castle.json
View File

@ -146,6 +146,8 @@
"mageGuild" : 4,
"warMachine" : "ballista",
"moatDamage" : 70,
"moatHexes" : [ 11, 28, 44, 61, 77, 111, 129, 146, 164, 181 ],
"primaryResource": "ore",
"buildings" :
{

1
config/factions/conflux.json
View File

@ -151,6 +151,7 @@
"primaryResource" : "mercury",
"warMachine" : "ballista",
"moatDamage" : 70,
"moatHexes" : [ 11, 28, 44, 61, 77, 111, 129, 146, 164, 181 ],
"buildings" :
{

1
config/factions/dungeon.json
View File

@ -146,6 +146,7 @@
"primaryResource" : "sulfur",
"warMachine" : "ballista",
"moatDamage" : 90,
"moatHexes" : [ 11, 28, 44, 61, 77, 111, 129, 146, 164, 181 ],
"buildings" :
{

4
config/factions/fortress.json
View File

@ -144,9 +144,11 @@
],
"horde" : [ 0, -1 ],
"mageGuild" : 3,
"primaryResource":"ore",
"warMachine" : "firstAidTent",
"moatDamage" : 90,
"primaryResource":"ore",
"moatHexes" : [ 10, 11, 27, 28, 43, 44, 60, 61, 76, 77, 94, 110, 111, 128, 129, 145, 146, 163, 164, 180, 181 ],
"buildings" :
{
"mageGuild1": { "id" : 0 },

1
config/factions/inferno.json
View File

@ -147,6 +147,7 @@
"primaryResource" : "mercury",
"warMachine" : "ammoCart",
"moatDamage" : 90,
"moatHexes" : [ 11, 28, 44, 61, 77, 111, 129, 146, 164, 181 ],
"buildings" :
{

3
config/factions/necropolis.json
View File

@ -148,9 +148,10 @@
],
"horde" : [ 0, -1 ],
"mageGuild" : 5,
"primaryResource": "ore",
"warMachine" : "firstAidTent",
"moatDamage" : 70,
"primaryResource": "ore",
"moatHexes" : [ 11, 28, 44, 61, 77, 111, 129, 146, 164, 181 ],
"buildings" :
{

1
config/factions/rampart.json
View File

@ -151,6 +151,7 @@
"primaryResource" : "crystal",
"warMachine" : "firstAidTent",
"moatDamage" : 70,
"moatHexes" : [ 11, 28, 44, 61, 77, 111, 129, 146, 164, 181 ],
"buildings" :
{

1
config/factions/stronghold.json
View File

@ -145,6 +145,7 @@
"mageGuild" : 3,
"warMachine" : "ammoCart",
"moatDamage" : 70,
"moatHexes" : [ 11, 28, 44, 61, 77, 111, 129, 146, 164, 181 ],
"buildings" :
{

1
config/factions/tower.json
View File

@ -146,6 +146,7 @@
"mageGuild" : 5,
"warMachine" : "ammoCart",
"moatDamage" : 0, //TODO: minefield
"moatHexes" : [ 11, 28, 44, 61, 77, 111, 129, 146, 164, 181 ],
"buildings" :
{

5
config/schemas/faction.json
View File

@ -230,6 +230,11 @@
"type":"number",
"description": "Damage dealt to creature that entered town moat during siege"
},
"moatHexes": {
"type" : "array",
"description" : "Numbers of battlefield hexes affected by moat during siege",
"items" : { "type" : "number" }
},
"musicTheme": {
"type":"string",
"description": "Path to town music theme",

5
lib/CObstacleInstance.cpp
View File

@ -1,6 +1,7 @@
#include "StdInc.h"
#include "CObstacleInstance.h"
#include "CHeroHandler.h"
#include "CTownHandler.h"
#include "VCMI_Lib.h"
#include "spells/CSpellHandler.h"
@ -145,7 +146,5 @@ void SpellCreatedObstacle::battleTurnPassed()
std::vector<BattleHex> MoatObstacle::getAffectedTiles() const
{
//rrr... need initializer lists
static const BattleHex moatHexes[] = {11, 28, 44, 61, 77, 111, 129, 146, 164, 181};
return std::vector<BattleHex>(moatHexes, moatHexes + ARRAY_COUNT(moatHexes));
return VLC->townh->factions[ID]->town->moatHexes;
}

15
lib/CTownHandler.cpp
View File

@ -13,6 +13,7 @@
#include "filesystem/Filesystem.h"
#include "mapObjects/CObjectClassesHandler.h"
#include "mapObjects/CObjectHandler.h"
#include "BattleHex.h"
/*
* CTownHandler.cpp, part of VCMI engine
@ -85,6 +86,12 @@ CTown::~CTown()
str.dellNull();
}
std::vector<BattleHex> CTown::defaultMoatHexes()
{
static const std::vector<BattleHex> moatHexes = {11, 28, 44, 61, 77, 111, 129, 146, 164, 181};
return moatHexes;
}
CTownHandler::CTownHandler()
{
VLC->townh = this;
@ -542,7 +549,13 @@ void CTownHandler::loadTown(CTown &town, const JsonNode & source)
town.moatDamage = source["moatDamage"].Float();
// Compatability for <= 0.98f mods
if(source["moatHexes"].isNull())
{
town.moatHexes = CTown::defaultMoatHexes();
}
else
town.moatHexes = source["moatHexes"].convertTo<std::vector<BattleHex> >();
town.mageLevel = source["mageGuild"].Float();
town.names = source["names"].convertTo<std::vector<std::string> >();

15
lib/CTownHandler.h
View File

@ -21,6 +21,7 @@ class CLegacyConfigParser;
class JsonNode;
class CTown;
class CFaction;
struct BattleHex;
/// a typical building encountered in every castle ;]
/// this is structure available to both client and server
@ -136,6 +137,8 @@ class DLL_LINKAGE CTown
public:
CTown();
~CTown();
// TODO: remove once save and mod compatability not needed
static std::vector<BattleHex> defaultMoatHexes();
CFaction * faction;
@ -156,6 +159,7 @@ public:
ui16 primaryRes;
ArtifactID warMachine;
si32 moatDamage;
std::vector<BattleHex> moatHexes;
// default chance for hero of specific class to appear in tavern, if field "tavern" was not set
// resulting chance = sqrt(town.chance * heroClass.chance)
ui32 defaultTavernChance;
@ -205,7 +209,16 @@ public:
template <typename Handler> void serialize(Handler &h, const int version)
{
h & names & faction & creatures & dwellings & dwellingNames & buildings & hordeLvl & mageLevel
& primaryRes & warMachine & clientInfo & moatDamage & defaultTavernChance;
& primaryRes & warMachine & clientInfo & moatDamage;
if(version >= 758)
{
h & moatHexes;
}
else if(!h.saving)
{
moatHexes = defaultMoatHexes();
}
h & defaultTavernChance;
auto findNull = [](const std::pair<BuildingID, ConstTransitivePtr<CBuilding>> &building)
{ return building.second == nullptr; };

2
lib/Connection.h
View File

@ -27,7 +27,7 @@
#include "mapping/CCampaignHandler.h" //for CCampaignState
#include "rmg/CMapGenerator.h" // for CMapGenOptions
const ui32 version = 757;
const ui32 version = 758;
const ui32 minSupportedVersion = 753;
class CISer;

127
lib/mapObjects/CQuest.cpp
View File

@ -45,20 +45,20 @@ static std::string & visitedTxt(const bool visited)
return VLC->generaltexth->allTexts[id];
}
bool CQuest::checkQuest (const CGHeroInstance * h) const
bool CQuest::checkQuest(const CGHeroInstance * h) const
{
switch (missionType)
{
case MISSION_NONE:
return true;
case MISSION_LEVEL:
if (m13489val <= h->level)
if(m13489val <= h->level)
return true;
return false;
case MISSION_PRIMARY_STAT:
for (int i = 0; i < GameConstants::PRIMARY_SKILLS; ++i)
for(int i = 0; i < GameConstants::PRIMARY_SKILLS; ++i)
{
if (h->getPrimSkillLevel(static_cast<PrimarySkill::PrimarySkill>(i)) < m2stats[i])
if(h->getPrimSkillLevel(static_cast<PrimarySkill::PrimarySkill>(i)) < m2stats[i])
return false;
}
return true;
@ -68,9 +68,9 @@ bool CQuest::checkQuest (const CGHeroInstance * h) const
return true;
return false;
case MISSION_ART:
for (auto & elem : m5arts)
for(auto & elem : m5arts)
{
if (h->hasArt(elem, false, true))
if(h->hasArt(elem, false, true))
continue;
return false; //if the artifact was not found
}
@ -80,31 +80,31 @@ bool CQuest::checkQuest (const CGHeroInstance * h) const
std::vector<CStackBasicDescriptor>::const_iterator cre;
TSlots::const_iterator it;
ui32 count;
for (cre = m6creatures.begin(); cre != m6creatures.end(); ++cre)
for(cre = m6creatures.begin(); cre != m6creatures.end(); ++cre)
{
for (count = 0, it = h->Slots().begin(); it != h->Slots().end(); ++it)
for(count = 0, it = h->Slots().begin(); it != h->Slots().end(); ++it)
{
if (it->second->type == cre->type)
if(it->second->type == cre->type)
count += it->second->count;
}
if (count < cre->count) //not enough creatures of this kind
if(count < cre->count) //not enough creatures of this kind
return false;
}
}
return true;
case MISSION_RESOURCES:
for (Res::ERes i = Res::WOOD; i <= Res::GOLD; vstd::advance(i, +1)) //including Mithril ?
for(Res::ERes i = Res::WOOD; i <= Res::GOLD; vstd::advance(i, +1)) //including Mithril ?
{ //Quest has no direct access to callback
if (h->cb->getResource (h->tempOwner, i) < m7resources[i])
if(h->cb->getResource (h->tempOwner, i) < m7resources[i])
return false;
}
return true;
case MISSION_HERO:
if (m13489val == h->type->ID.getNum())
if(m13489val == h->type->ID.getNum())
return true;
return false;
case MISSION_PLAYER:
if (m13489val == h->getOwner().getNum())
if(m13489val == h->getOwner().getNum())
return true;
return false;
default:
@ -112,17 +112,17 @@ bool CQuest::checkQuest (const CGHeroInstance * h) const
}
}
void CQuest::getVisitText (MetaString &iwText, std::vector<Component> &components, bool isCustom, bool firstVisit, const CGHeroInstance * h) const
void CQuest::getVisitText(MetaString &iwText, std::vector<Component> &components, bool isCustom, bool firstVisit, const CGHeroInstance * h) const
{
std::string text;
bool failRequirements = (h ? !checkQuest(h) : true);
if (firstVisit)
if(firstVisit)
{
isCustom = isCustomFirst;
iwText << (text = firstVisitText);
}
else if (failRequirements)
else if(failRequirements)
{
isCustom = isCustomNext;
iwText << (text = nextVisitText);
@ -131,15 +131,15 @@ void CQuest::getVisitText (MetaString &iwText, std::vector<Component> &component
{
case MISSION_LEVEL:
components.push_back(Component (Component::EXPERIENCE, 0, m13489val, 0));
if (!isCustom)
if(!isCustom)
iwText.addReplacement(m13489val);
break;
case MISSION_PRIMARY_STAT:
{
MetaString loot;
for (int i = 0; i < 4; ++i)
for(int i = 0; i < 4; ++i)
{
if (m2stats[i])
if(m2stats[i])
{
components.push_back(Component (Component::PRIM_SKILL, i, m2stats[i], 0));
loot << "%d %s";
@ -153,19 +153,19 @@ void CQuest::getVisitText (MetaString &iwText, std::vector<Component> &component
break;
case MISSION_KILL_HERO:
components.push_back(Component(Component::HERO_PORTRAIT, heroPortrait, 0, 0));
if (!isCustom)
if(!isCustom)
addReplacements(iwText, text);
break;
case MISSION_HERO:
//FIXME: portrait may not match hero, if custom portrait was set in map editor
components.push_back(Component (Component::HERO_PORTRAIT, VLC->heroh->heroes[m13489val]->imageIndex, 0, 0));
if (!isCustom)
if(!isCustom)
iwText.addReplacement(VLC->heroh->heroes[m13489val]->name);
break;
case MISSION_KILL_CREATURE:
{
components.push_back(Component(stackToKill));
if (!isCustom)
if(!isCustom)
{
addReplacements(iwText, text);
}
@ -174,35 +174,35 @@ void CQuest::getVisitText (MetaString &iwText, std::vector<Component> &component
case MISSION_ART:
{
MetaString loot;
for (auto & elem : m5arts)
for(auto & elem : m5arts)
{
components.push_back(Component (Component::ARTIFACT, elem, 0, 0));
loot << "%s";
loot.addReplacement(MetaString::ART_NAMES, elem);
}
if (!isCustom)
if(!isCustom)
iwText.addReplacement(loot.buildList());
}
break;
case MISSION_ARMY:
{
MetaString loot;
for (auto & elem : m6creatures)
for(auto & elem : m6creatures)
{
components.push_back(Component(elem));
loot << "%s";
loot.addReplacement(elem);
}
if (!isCustom)
if(!isCustom)
iwText.addReplacement(loot.buildList());
}
break;
case MISSION_RESOURCES:
{
MetaString loot;
for (int i = 0; i < 7; ++i)
for(int i = 0; i < 7; ++i)
{
if (m7resources[i])
if(m7resources[i])
{
components.push_back(Component (Component::RESOURCE, i, m7resources[i], 0));
loot << "%d %s";
@ -210,29 +210,29 @@ void CQuest::getVisitText (MetaString &iwText, std::vector<Component> &component
loot.addReplacement(MetaString::RES_NAMES, i);
}
}
if (!isCustom)
if(!isCustom)
iwText.addReplacement(loot.buildList());
}
break;
case MISSION_PLAYER:
components.push_back(Component (Component::FLAG, m13489val, 0, 0));
if (!isCustom)
if(!isCustom)
iwText.addReplacement(VLC->generaltexth->colors[m13489val]);
break;
}
}
void CQuest::getRolloverText (MetaString &ms, bool onHover) const
void CQuest::getRolloverText(MetaString &ms, bool onHover) const
{
// Quests with MISSION_NONE type don't have a text for them
assert(missionType != MISSION_NONE);
if (onHover)
if(onHover)
ms << "\n\n";
ms << VLC->generaltexth->quests[missionType-1][onHover ? 3 : 4][textOption];
switch (missionType)
switch(missionType)
{
case MISSION_LEVEL:
ms.addReplacement(boost::lexical_cast<std::string>(m13489val));
@ -306,10 +306,10 @@ void CQuest::getRolloverText (MetaString &ms, bool onHover) const
}
}
void CQuest::getCompletionText (MetaString &iwText, std::vector<Component> &components, bool isCustom, const CGHeroInstance * h) const
void CQuest::getCompletionText(MetaString &iwText, std::vector<Component> &components, bool isCustom, const CGHeroInstance * h) const
{
iwText << completedText;
switch (missionType)
switch(missionType)
{
case CQuest::MISSION_LEVEL:
if (!isCustomComplete)
@ -398,14 +398,14 @@ CGSeerHut::CGSeerHut() : IQuestObject()
void CGSeerHut::setObjToKill()
{
if (quest->missionType == CQuest::MISSION_KILL_CREATURE)
if(quest->missionType == CQuest::MISSION_KILL_CREATURE)
{
quest->stackToKill = getCreatureToKill(false)->getStack(SlotID(0)); //FIXME: stacks tend to disappear (desync?) on server :?
assert(quest->stackToKill.type);
quest->stackToKill.count = 0; //no count in info window
quest->stackDirection = checkDirection();
}
else if (quest->missionType == CQuest::MISSION_KILL_HERO)
else if(quest->missionType == CQuest::MISSION_KILL_HERO)
{
quest->heroName = getHeroToKill(false)->name;
quest->heroPortrait = getHeroToKill(false)->portrait;
@ -416,7 +416,7 @@ void CGSeerHut::init()
{
seerName = *RandomGeneratorUtil::nextItem(VLC->generaltexth->seerNames, cb->gameState()->getRandomGenerator());
quest->textOption = cb->gameState()->getRandomGenerator().nextInt(2);
quest->completedOption = cb->gameState()->getRandomGenerator().nextInt(1, 5);
quest->completedOption = cb->gameState()->getRandomGenerator().nextInt(1, 3);
}
void CGSeerHut::initObj()
@ -424,13 +424,13 @@ void CGSeerHut::initObj()
init();
quest->progress = CQuest::NOT_ACTIVE;
if (quest->missionType)
if(quest->missionType)
{
if (!quest->isCustomFirst)
if(!quest->isCustomFirst)
quest->firstVisitText = VLC->generaltexth->quests[quest->missionType-1][0][quest->textOption];
if (!quest->isCustomNext)
if(!quest->isCustomNext)
quest->nextVisitText = VLC->generaltexth->quests[quest->missionType-1][1][quest->textOption];
if (!quest->isCustomComplete)
if(!quest->isCustomComplete)
quest->completedText = VLC->generaltexth->quests[quest->missionType-1][2][quest->textOption];
}
else
@ -440,23 +440,23 @@ void CGSeerHut::initObj()
}
}
void CGSeerHut::getRolloverText (MetaString &text, bool onHover) const
void CGSeerHut::getRolloverText(MetaString &text, bool onHover) const
{
quest->getRolloverText (text, onHover);//TODO: simplify?
if (!onHover)
if(!onHover)
text.addReplacement(seerName);
}
std::string CGSeerHut::getHoverText(PlayerColor player) const
{
std::string hoverName = getObjectName();
if (ID == Obj::SEER_HUT && quest->progress != CQuest::NOT_ACTIVE)
if(ID == Obj::SEER_HUT && quest->progress != CQuest::NOT_ACTIVE)
{
hoverName = VLC->generaltexth->allTexts[347];
boost::algorithm::replace_first(hoverName,"%s", seerName);
boost::algorithm::replace_first(hoverName, "%s", seerName);
}
if (quest->progress & quest->missionType) //rollover when the quest is active
if(quest->progress & quest->missionType) //rollover when the quest is active
{
MetaString ms;
getRolloverText (ms, true);
@ -495,7 +495,7 @@ void IQuestObject::getVisitText (MetaString &text, std::vector<Component> &compo
void CGSeerHut::getCompletionText(MetaString &text, std::vector<Component> &components, bool isCustom, const CGHeroInstance * h) const
{
quest->getCompletionText (text, components, isCustom, h);
switch (rewardType)
switch(rewardType)
{
case EXPERIENCE: components.push_back(Component (Component::EXPERIENCE, 0, h->calculateXp(rVal), 0));
break;
@ -522,7 +522,7 @@ void CGSeerHut::getCompletionText(MetaString &text, std::vector<Component> &comp
void CGSeerHut::setPropertyDer (ui8 what, ui32 val)
{
switch (what)
switch(what)
{
case 10:
quest->progress = static_cast<CQuest::Eprogress>(val);
@ -532,44 +532,44 @@ void CGSeerHut::setPropertyDer (ui8 what, ui32 val)
void CGSeerHut::newTurn() const
{
if (quest->lastDay >= 0 && quest->lastDay < cb->getDate()-1) //time is up
if(quest->lastDay >= 0 && quest->lastDay <= cb->getDate() - 1) //time is up
{
cb->setObjProperty (id, CGSeerHut::OBJPROP_VISITED, CQuest::COMPLETE);
}
}
void CGSeerHut::onHeroVisit( const CGHeroInstance * h ) const
void CGSeerHut::onHeroVisit(const CGHeroInstance * h) const
{
InfoWindow iw;
iw.player = h->getOwner();
if (quest->progress < CQuest::COMPLETE)
if(quest->progress < CQuest::COMPLETE)
{
bool firstVisit = !quest->progress;
bool failRequirements = !checkQuest(h);
bool isCustom=false;
bool isCustom = false;
if (firstVisit)
if(firstVisit)
{
isCustom = quest->isCustomFirst;
cb->setObjProperty (id, CGSeerHut::OBJPROP_VISITED, CQuest::IN_PROGRESS);
cb->setObjProperty(id, CGSeerHut::OBJPROP_VISITED, CQuest::IN_PROGRESS);
AddQuest aq;
aq.quest = QuestInfo (quest, this, visitablePos());
aq.player = h->tempOwner;
cb->sendAndApply (&aq); //TODO: merge with setObjProperty?
cb->sendAndApply(&aq); //TODO: merge with setObjProperty?
}
else if (failRequirements)
else if(failRequirements)
{
isCustom = quest->isCustomNext;
}
if (firstVisit || failRequirements)
if(firstVisit || failRequirements)
{
getVisitText (iw.text, iw.components, isCustom, firstVisit, h);
cb->showInfoDialog(&iw);
}
if (!failRequirements) // propose completion, also on first visit
if(!failRequirements) // propose completion, also on first visit
{
BlockingDialog bd (true, false);
bd.player = h->getOwner();
@ -746,6 +746,7 @@ void CGQuestGuard::init()
{
blockVisit = true;
quest->textOption = cb->gameState()->getRandomGenerator().nextInt(3, 5);
quest->completedOption = cb->gameState()->getRandomGenerator().nextInt(4, 5);
}
void CGQuestGuard::completeQuest(const CGHeroInstance *h) const
@ -817,12 +818,12 @@ void CGBorderGuard::getRolloverText (MetaString &text, bool onHover) const
text << VLC->generaltexth->tentColors[subID] << " " << VLC->objtypeh->getObjectName(Obj::KEYMASTER);
}
bool CGBorderGuard::checkQuest (const CGHeroInstance * h) const
bool CGBorderGuard::checkQuest(const CGHeroInstance * h) const
{
return wasMyColorVisited (h->tempOwner);
}
void CGBorderGuard::onHeroVisit( const CGHeroInstance * h ) const
void CGBorderGuard::onHeroVisit(const CGHeroInstance * h) const
{
if (wasMyColorVisited (h->getOwner()) )
{
@ -850,7 +851,7 @@ void CGBorderGuard::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answ
cb->removeObject(this);
}
void CGBorderGate::onHeroVisit( const CGHeroInstance * h ) const //TODO: passability
void CGBorderGate::onHeroVisit(const CGHeroInstance * h) const //TODO: passability
{
if (!wasMyColorVisited (h->getOwner()) )
{