From cf7496960330253ca0f96b795dc08bd1497d0e08 Mon Sep 17 00:00:00 2001 From: DjWarmonger Date: Wed, 11 Mar 2015 22:17:35 +0100 Subject: [PATCH] Fixes, logging for Seer Huts --- config/objects/moddables.json | 3 --- lib/rmg/CRmgTemplateZone.cpp | 8 +++++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/config/objects/moddables.json b/config/objects/moddables.json index 9ecb0fd42..6de7c321b 100644 --- a/config/objects/moddables.json +++ b/config/objects/moddables.json @@ -241,9 +241,6 @@ } }, - // subtype: different appearance. That's all? - "seerHut" : { "index" :83, "handler": "seerHut" }, - // subtype: level "randomDwellingLvl" : { "index" :217, "handler": "randomDwelling", diff --git a/lib/rmg/CRmgTemplateZone.cpp b/lib/rmg/CRmgTemplateZone.cpp index bfef4dd6c..6d3f2599b 100644 --- a/lib/rmg/CRmgTemplateZone.cpp +++ b/lib/rmg/CRmgTemplateZone.cpp @@ -1691,6 +1691,12 @@ void CRmgTemplateZone::placeObject(CMapGenerator* gen, CGObjectInstance* object, gen->setNearestObjectDistance(tile, std::min(d, gen->getNearestObjectDistance(tile))); } } + if (object->ID == Obj::SEER_HUT) //debug + { + CGSeerHut * sh = dynamic_cast(object); + auto artid = sh->quest->m5arts.front(); + logGlobal->warnStream() << boost::format("Placed Seer Hut at %s, quest artifact %d is %s") % object->pos % artid % VLC->arth->artifacts[artid]->Name(); + } } void CRmgTemplateZone::placeAndGuardObject(CMapGenerator* gen, CGObjectInstance* object, const int3 &pos, si32 str, bool zoneGuard) @@ -2253,7 +2259,7 @@ void CRmgTemplateZone::addAllPossibleObjects(CMapGenerator* gen) return obj; }; oi.setTemplate(Obj::PANDORAS_BOX, 0, terrainType); - oi.value = 3000; + oi.value = 30000; oi.probability = 2; possibleObjects.push_back(oi);