games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-05-31 22:59:54 +02:00
Code Issues Releases Activity

First version that works:

Browse Source 
- Covered RMG with exceptions
- Fixes for object randomization & placement
This commit is contained in:
DjWarmonger 2014-05-23 17:12:31 +02:00
parent 342aec0700
commit 4ea9810831
8 changed files with 104 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/CRandomGenerator.h
View File

@ -98,6 +98,24 @@ public:
namespace RandomGeneratorUtil
{
/// Gets an iterator to an element of a nonempty container randomly. Undefined behaviour if container is empty.
//template<typename T>
//auto nextItem(const std::set<T> & container, CRandomGenerator & rand) -> decltype(std::begin(container))
//{
// assert(!container.empty());
// auto ret = container.begin();
// std::advance(ret, rand.nextInt(container.size() - 1));
// return ret;
//}
//template<typename T>
//auto nextItem(std::set<T> & container, CRandomGenerator & rand) -> decltype(std::begin(container))
//{
// assert(!container.empty());
// auto ret = container.begin();
// std::advance(ret, rand.nextInt(container.size() - 1));
// return ret;
//}
template<typename Container>
auto nextItem(const Container & container, CRandomGenerator & rand) -> decltype(std::begin(container))
{

10
lib/CTownHandler.cpp
View File

@ -815,3 +815,13 @@ std::vector<bool> CTownHandler::getDefaultAllowed() const
}
return allowedFactions;
}
std::set<TFaction> CTownHandler::getAllowedFactions() const
{
std::set<TFaction> allowedFactions;
auto allowed = getDefaultAllowed();
for (size_t i=0; i<allowed.size(); i++)
if (allowed[i])
allowedFactions.insert(i);
return allowedFactions;
}

1
lib/CTownHandler.h
View File

@ -270,6 +270,7 @@ public:
void afterLoadFinalization() override;
std::vector<bool> getDefaultAllowed() const override;
std::set<TFaction> getAllowedFactions() const;
template <typename Handler> void serialize(Handler &h, const int version)
{

5
lib/mapping/CMap.cpp
View File

@ -20,10 +20,7 @@ PlayerInfo::PlayerInfo(): canHumanPlay(false), canComputerPlay(false),
aiTactic(EAiTactic::RANDOM), isFactionRandom(false), mainCustomHeroPortrait(-1), mainCustomHeroId(-1), hasMainTown(false),
generateHeroAtMainTown(false), team(255), hasRandomHero(false), /* following are unused */ generateHero(false), p7(0), powerPlaceholders(-1)
{
auto allowed = VLC->townh->getDefaultAllowed();
for (size_t i=0; i<allowed.size(); i++)
if (allowed[i])
allowedFactions.insert(i);
allowedFactions = VLC->townh->getAllowedFactions();
}
si8 PlayerInfo::defaultCastle() const

22
lib/rmg/CMapGenerator.cpp
View File

@ -26,16 +26,22 @@ CMapGenerator::~CMapGenerator()
std::unique_ptr<CMap> CMapGenerator::generate()
{
mapGenOptions->finalize(rand);
mapGenOptions->finalize(rand);
map = make_unique<CMap>();
editManager = map->getEditManager();
editManager->getUndoManager().setUndoRedoLimit(0);
addHeaderInfo();
genZones();
fillZones();
map = make_unique<CMap>();
editManager = map->getEditManager();
try
{
editManager->getUndoManager().setUndoRedoLimit(0);
addHeaderInfo();
genZones();
fillZones();
}
catch (rmgException &e)
{
logGlobal->infoStream() << "Random map generation received exception: " << e.what();
}
return std::move(map);
}

18
lib/rmg/CMapGenerator.h
View File

@ -29,6 +29,24 @@ typedef std::vector<JsonNode> JsonVector;
class CMapGenerator;
class rmgException : std::exception
{
std::string msg;
public:
explicit rmgException(const std::string& _Message) : msg(_Message)
{
}
virtual ~rmgException() throw ()
{
};
const char *what() const throw () override
{
return msg.c_str();
}
};
/// The map generator creates a map randomly.
class DLL_LINKAGE CMapGenerator
{

59
lib/rmg/CRmgTemplateZone.cpp
View File

@ -32,7 +32,8 @@ int CRmgTemplateZone::CTownInfo::getTownCount() const
void CRmgTemplateZone::CTownInfo::setTownCount(int value)
{
if(value < 0) throw std::runtime_error("Negative value for town count not allowed.");
if(value < 0)
throw rmgException("Negative value for town count not allowed.");
townCount = value;
}
@ -43,7 +44,8 @@ int CRmgTemplateZone::CTownInfo::getCastleCount() const
void CRmgTemplateZone::CTownInfo::setCastleCount(int value)
{
if(value < 0) throw std::runtime_error("Negative value for castle count not allowed.");
if(value < 0)
throw rmgException("Negative value for castle count not allowed.");
castleCount = value;
}
@ -54,7 +56,8 @@ int CRmgTemplateZone::CTownInfo::getTownDensity() const
void CRmgTemplateZone::CTownInfo::setTownDensity(int value)
{
if(value < 0) throw std::runtime_error("Negative value for town density not allowed.");
if(value < 0)
throw rmgException("Negative value for town density not allowed.");
townDensity = value;
}
@ -65,7 +68,8 @@ int CRmgTemplateZone::CTownInfo::getCastleDensity() const
void CRmgTemplateZone::CTownInfo::setCastleDensity(int value)
{
if(value < 0) throw std::runtime_error("Negative value for castle density not allowed.");
if(value < 0)
throw rmgException("Negative value for castle density not allowed.");
castleDensity = value;
}
@ -81,7 +85,8 @@ int CRmgTemplateZone::CTileInfo::getNearestObjectDistance() const
void CRmgTemplateZone::CTileInfo::setNearestObjectDistance(int value)
{
if(value < 0) throw std::runtime_error("Negative value for nearest object distance not allowed.");
if(value < 0)
throw rmgException(boost::to_string(boost::format("Negative value %d for nearest object distance not allowed.") %value));
nearestObjectDistance = value;
}
@ -129,7 +134,8 @@ TRmgTemplateZoneId CRmgTemplateZone::getId() const
void CRmgTemplateZone::setId(TRmgTemplateZoneId value)
{
if(value <= 0) throw std::runtime_error("Zone id should be greater than 0.");
if(value <= 0)
throw rmgException(boost::to_string(boost::format("Zone %d id should be greater than 0.") %id));
id = value;
}
@ -149,7 +155,8 @@ int CRmgTemplateZone::getSize() const
void CRmgTemplateZone::setSize(int value)
{
if(value <= 0) throw std::runtime_error("Zone size needs to be greater than 0.");
if(value <= 0)
throw rmgException(boost::to_string(boost::format("Zone %d size needs to be greater than 0.") % id));
size = value;
}
@ -160,7 +167,8 @@ boost::optional<int> CRmgTemplateZone::getOwner() const
void CRmgTemplateZone::setOwner(boost::optional<int> value)
{
if(!(*value >= 0 && *value <= PlayerColor::PLAYER_LIMIT_I)) throw std::runtime_error("Owner has to be in range 0 to max player count.");
if(!(*value >= 0 && *value <= PlayerColor::PLAYER_LIMIT_I))
throw rmgException(boost::to_string(boost::format ("Owner of zone %d has to be in range 0 to max player count.") %id));
owner = value;
}
@ -291,7 +299,7 @@ void CRmgTemplateZone::setShape(std::vector<int3> shape)
if (z == -1)
z = point.z;
if (point.z != z)
throw std::runtime_error("Zone shape points should lie on same z.");
throw rmgException("Zone shape points should lie on same z.");
minx = std::min(minx, point.x);
maxx = std::max(maxx, point.x);
miny = std::min(miny, point.y);
@ -343,7 +351,7 @@ bool CRmgTemplateZone::fill(CMapGenerator* gen)
int townId = gen->mapGenOptions->getPlayersSettings().find(player)->second.getStartingTown();
if(townId == CMapGenOptions::CPlayerSettings::RANDOM_TOWN)
townId = gen->rand.nextInt (VLC->townh->factions.size()); // all possible towns
townId = *RandomGeneratorUtil::nextItem(VLC->townh->getAllowedFactions(), gen->rand); // all possible towns, skip neutral
town->subID = townId;
town->tempOwner = player;
@ -391,7 +399,7 @@ bool CRmgTemplateZone::fill(CMapGenerator* gen)
logGlobal->infoStream() << "Looking for place";
if ( ! findPlaceForObject(gen, obj, 3, pos))
{
logGlobal->errorStream() << "Failed to fill zone due to lack of space";
logGlobal->errorStream() << boost::format("Failed to fill zone %d due to lack of space") %id;
//TODO CLEANUP!
return false;
}
@ -445,7 +453,7 @@ bool CRmgTemplateZone::fill(CMapGenerator* gen)
}
logGlobal->infoStream() << boost::format("Filling %d with ROCK") % sel.getSelectedItems().size();
//gen->editManager->drawTerrain(ETerrainType::ROCK, &gen->gen);
logGlobal->infoStream() << "Zone filled successfully";
logGlobal->infoStream() << boost::format ("Zone %d filled successfully") %id;
return true;
}
@ -477,12 +485,28 @@ bool CRmgTemplateZone::findPlaceForObject(CMapGenerator* gen, CGObjectInstance*
return result;
}
void CRmgTemplateZone::checkAndPlaceObject(CMapGenerator* gen, CGObjectInstance* object, const int3 &pos)
{
object->pos = pos;
if (!gen->map->isInTheMap(object->visitablePos()))
throw rmgException(boost::to_string(boost::format("Visitable tile %s of object %d at %s is outside the map") % object->visitablePos() % object->id % object->pos()));
for (auto tile : object->getBlockedPos())
{
if (!gen->map->isInTheMap(tile))
throw rmgException(boost::to_string(boost::format("Tile %s of object %d at %s is outside the map") % tile() % object->id % object->pos()));
}
gen->editManager->insertObject(object, pos);
logGlobal->infoStream() << boost::format ("Successfully inserted object (%d,%d) at pos %s") %object->ID %object->id %pos();
}
void CRmgTemplateZone::placeObject(CMapGenerator* gen, CGObjectInstance* object, const int3 &pos)
{
logGlobal->infoStream() << boost::format("Insert object at %d %d") % pos.x % pos.y;
object->pos = pos;
gen->editManager->insertObject(object, pos);
logGlobal->infoStream() << "Inserted object";
logGlobal->infoStream() << boost::format("Inserting object at %d %d") % pos.x % pos.y;
checkAndPlaceObject (gen, object, pos);
auto points = object->getBlockedPos();
if (object->isVisitable())
points.emplace(pos + object->getVisitableOffset());
@ -538,7 +562,6 @@ bool CRmgTemplateZone::guardObject(CMapGenerator* gen, CGObjectInstance* object,
//type will be set during initialization
guard->putStack(SlotID(0), hlp);
guard->pos = guard_tile;
gen->editManager->insertObject(guard, guard->pos);
checkAndPlaceObject(gen, guard, guard_tile);
return true;
}

1
lib/rmg/CRmgTemplateZone.h
View File

@ -120,6 +120,7 @@ private:
int3 getCenter();
bool pointIsIn(int x, int y);
bool findPlaceForObject(CMapGenerator* gen, CGObjectInstance* obj, si32 min_dist, int3 &pos);
void checkAndPlaceObject(CMapGenerator* gen, CGObjectInstance* object, const int3 &pos);
void placeObject(CMapGenerator* gen, CGObjectInstance* object, const int3 &pos);
bool guardObject(CMapGenerator* gen, CGObjectInstance* object, si32 str);
};