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

Miscellaneous fixes to banks:

Browse Source 
- fixed evaluation of bank thread by AI (1850)
- fixed crash on evaluating bank threat after loading from save (1830)
- fixed typo in bank config. TODO: schema?
This commit is contained in:
Ivan Savenko 2014-08-09 12:31:43 +03:00
parent f55d335e1c
commit 05d8fad314
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
config/objects/creatureBanks.json
View File

@ -110,7 +110,7 @@
},
"dwarvenTreasury" : {
"index" : 1,
"resetDuraition" : 28,
"resetDuration" : 28,
"name" : "Dwarven Treasury",
"rmg" : {
"value" : 2000,
@ -197,7 +197,7 @@
},
"griffinConservatory" : {
"index" : 2,
"resetDuraition" : 28,
"resetDuration" : 28,
"name" : "Griffin Conservatory",
"rmg" : {
"value" : 2000,
@ -268,7 +268,7 @@
},
"inpCache" : {
"index" : 3,
"resetDuraition" : 28,
"resetDuration" : 28,
"name" : "Imp Cache",
"rmg" : {
"value" : 5000,
@ -354,7 +354,7 @@
},
"medusaStore" : {
"index" : 4,
"resetDuraition" : 28,
"resetDuration" : 28,
"name" : "Medusa Stores",
"rmg" : {
"value" : 1500,
@ -441,7 +441,7 @@
},
"nagaBank" : {
"index" : 5,
"resetDuraition" : 28,
"resetDuration" : 28,
"name" : "Naga Bank",
"rmg" : {
"value" : 3000,
@ -528,7 +528,7 @@
},
"dragonflyHive" : {
"index" : 6,
"resetDuraition" : 28,
"resetDuration" : 28,
"name" : "Dragon Fly Hive",
"rmg" : {
"value" : 9000,
@ -605,7 +605,7 @@
"types" : {
"shipwreck" : {
"index" : 0,
"resetDuraition" : 28,
"resetDuration" : 28,
"name" : "Shipwreck",
"rmg" : {
"value" : 2000,
@ -696,7 +696,7 @@
"types" : {
"derelictShip" : {
"index" : 0,
"resetDuraition" : 28,
"resetDuration" : 28,
"name" : "Derelict Ship",
"rmg" : {
"value" : 4000,
@ -788,7 +788,7 @@
"types" : {
"crypt" : {
"index" : 0,
"resetDuraition" : 28,
"resetDuration" : 28,
"name" : "Crypt",
"rmg" : {
"value" : 1000,
@ -877,7 +877,7 @@
"types" : {
"dragonUtopia" : {
"index" : 0,
"resetDuraition" : 28,
"resetDuration" : 28,
"name" : "Dragon Utopia",
"rmg" : {
"value" : 10000,
@ -986,7 +986,7 @@
"types" : {
"pyramid" : {
"index" : 0,
"resetDuraition" : 28,
"resetDuration" : 28,
"name" : "Pyramid",
"rmg" : {
"value" : 5000,
@ -1011,4 +1011,4 @@
}
}
}
}
}

1
lib/mapObjects/CommonConstructors.cpp
View File

@ -303,6 +303,7 @@ void CBankInstanceConstructor::configureObject(CGObjectInstance * object, CRando
CBankInfo::CBankInfo(JsonVector config):
config(config)
{
assert(!config.empty());
}
static void addStackToArmy(IObjectInfo::CArmyStructure & army, const CCreature * crea, si32 amount)

6
lib/mapObjects/CommonConstructors.h
View File

@ -184,4 +184,10 @@ public:
void configureObject(CGObjectInstance * object, CRandomGenerator & rng) const;
std::unique_ptr<IObjectInfo> getObjectInfo(ObjectTemplate tmpl) const;
template <typename Handler> void serialize(Handler &h, const int version)
{
h & levels & bankResetDuration;
h & static_cast<CDefaultObjectTypeHandler<CBank>&>(*this);
}
};

1
lib/mapObjects/JsonRandom.cpp
View File

@ -202,6 +202,7 @@ namespace JsonRandom
for (auto creaID : crea->upgrades)
info.allowedCreatures.push_back(VLC->creh->creatures[creaID]);
}
ret.push_back(info);
}
return ret;
}