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

Fixed duplicated Redwood Observatory on snow and possibly other objects.

Browse Source
This commit is contained in:
DjWarmonger 2014-07-27 07:37:56 +02:00
parent c6d8a0a01e
commit 713912574a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/objects/generic.json
View File

@ -106,11 +106,16 @@
}, },
"redwoodObservatory" : { "redwoodObservatory" : {
"index" :58, "index" :58,
"handler" : "observatory", "handler" : "observatory",
"types" : { "types" : {
"object" : { "object" : {
"index" : 0, "index" : 0,
"templates" :
{
"base" : { "animation" : "avxredw.def", "visitableFrom" : [ "---", "+++", "+++" ], "mask" : [ "VV", "VV", "VA"], "allowedTerrains":["grass", "swamp", "dirt", "sand", "lava", "rough"] },
"snow" : { "animation" : "avxreds0.def", "visitableFrom" : [ "---", "+++", "+++" ], "mask" : [ "VV", "VV", "VA"], "allowedTerrains":["snow"] }
},
"rmg" : { "rmg" : {
"zoneLimit" : 1, "zoneLimit" : 1,
"value" : 750, "value" : 750,

2
lib/rmg/CRmgTemplateZone.cpp
View File

@ -712,6 +712,8 @@ bool CRmgTemplateZone::createTreasurePile (CMapGenerator* gen, int3 &pos)
auto oiptr = std::find(possibleObjects.begin(), possibleObjects.end(), oi); auto oiptr = std::find(possibleObjects.begin(), possibleObjects.end(), oi);
assert (oiptr != possibleObjects.end()); assert (oiptr != possibleObjects.end());
oiptr->maxPerZone--; oiptr->maxPerZone--;
if (!oiptr->maxPerZone)
possibleObjects.erase(oiptr);
//TODO //TODO
//update treasure pile area //update treasure pile area