From 6221f4ac2ce1eb0d1272f891ac5412246bf08368 Mon Sep 17 00:00:00 2001 From: DjWarmonger Date: Tue, 3 Jun 2014 08:57:20 +0200 Subject: [PATCH] - Corrected guard types - Corrected town positions --- lib/rmg/CMapGenOptions.cpp | 4 ++++ lib/rmg/CRmgTemplateZone.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/rmg/CMapGenOptions.cpp b/lib/rmg/CMapGenOptions.cpp index 88a9c1a1c..cf3db66e1 100644 --- a/lib/rmg/CMapGenOptions.cpp +++ b/lib/rmg/CMapGenOptions.cpp @@ -222,6 +222,10 @@ void CMapGenOptions::finalize(CRandomGenerator & rand) { monsterStrength = static_cast(rand.nextInt(EMonsterStrength::LAST_ITEM)); } + + //rectangular maps are the future of gaming + //setHeight(20); + //setWidth(50); } void CMapGenOptions::updatePlayers() diff --git a/lib/rmg/CRmgTemplateZone.cpp b/lib/rmg/CRmgTemplateZone.cpp index 137224ba2..8cd64482c 100644 --- a/lib/rmg/CRmgTemplateZone.cpp +++ b/lib/rmg/CRmgTemplateZone.cpp @@ -410,7 +410,7 @@ void CRmgTemplateZone::addMonster(CMapGenerator* gen, int3 &pos, si32 strength) creId = VLC->creh->pickRandomMonster(gen->rand); auto cre = VLC->creh->creatures[creId]; amount = std::ceil((float)strength / cre->fightValue); - if (amount >= cre->ammMin && amount <= 100) + if (strength >= cre->fightValue && amount >= cre->ammMin && amount <= 100) //at leats one full monster. size between minimum size of given stack and 100 break; } @@ -448,7 +448,7 @@ bool CRmgTemplateZone::fill(CMapGenerator* gen) town->builtBuildings.insert(BuildingID::FORT); town->builtBuildings.insert(BuildingID::DEFAULT); - placeObject(gen, town, getPos()); + placeObject(gen, town, getPos() + town->getVisitableOffset()); //towns are big objects and should be centered around visitable position logGlobal->traceStream() << "Placed object"; logGlobal->traceStream() << "Fill player info " << player_id;