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

- Place all standard visitable objects

Browse Source 
- Fixed some constructors
This commit is contained in:
DjWarmonger 2014-07-05 19:35:46 +02:00
parent 22f811ea52
commit 0782557814
4 changed files with 51 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/objects/generic.json
View File

@ -311,8 +311,6 @@
"object" : { "object" : {
"index" : 0, "index" : 0,
"rmg" : { "rmg" : {
"value" : 2000,
"rarity" : 100
} }
} }
} }

11
lib/mapObjects/MiscObjects.cpp
View File

@ -871,6 +871,12 @@ void CGArtifact::initObj()
blockVisit = true; blockVisit = true;
if(ID == Obj::ARTIFACT) if(ID == Obj::ARTIFACT)
{ {
if (!storedArtifact)
{
auto a = new CArtifactInstance();
cb->gameState()->map->addNewArtifactInstance(a);
storedArtifact = a;
}
if(!storedArtifact->artType) if(!storedArtifact->artType)
storedArtifact->setType(VLC->arth->artifacts[subID]); storedArtifact->setType(VLC->arth->artifacts[subID]);
} }
@ -963,6 +969,11 @@ void CGArtifact::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer)
void CGWitchHut::initObj() void CGWitchHut::initObj()
{ {
if (allowedAbilities.empty()) //this can happen for RMG. regular maps load abilities from map file
{
for (int i = 0; i < GameConstants::SKILL_QUANTITY; i++)
allowedAbilities.push_back(i);
}
ability = *RandomGeneratorUtil::nextItem(allowedAbilities, cb->gameState()->getRandomGenerator()); ability = *RandomGeneratorUtil::nextItem(allowedAbilities, cb->gameState()->getRandomGenerator());
} }

2
lib/mapObjects/MiscObjects.h
View File

@ -158,6 +158,8 @@ public:
CArtifactInstance *storedArtifact; CArtifactInstance *storedArtifact;
std::string message; std::string message;
CGArtifact() : CArmedInstance() {storedArtifact = nullptr;};
void onHeroVisit(const CGHeroInstance * h) const override; void onHeroVisit(const CGHeroInstance * h) const override;
void battleFinished(const CGHeroInstance *hero, const BattleResult &result) const override; void battleFinished(const CGHeroInstance *hero, const BattleResult &result) const override;
void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const override; void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const override;

184
lib/rmg/CRmgTemplateZone.cpp
View File

@ -719,7 +719,21 @@ bool CRmgTemplateZone::createTreasurePile (CMapGenerator* gen, int3 &pos)
{ {
for (auto treasure : treasures) for (auto treasure : treasures)
{ {
placeObject(gen, treasure.second, treasure.first - treasure.second->getVisitableOffset()); bool objectFitsHere = true; //temporary workaround
int3 visitableOffset = treasure.second->getVisitableOffset();
std::set<int3> blockedOffsets = treasure.second->getBlockedOffsets();
blockedOffsets.insert (visitableOffset);
for (auto blockingTile : blockedOffsets)
{
int3 t = treasure.first + visitableOffset + blockingTile;
if (!gen->map->isInTheMap(t))
{
objectFitsHere = false; //if at least one tile is not possible, object can't be placed here
break;
}
}
if (objectFitsHere)
placeObject(gen, treasure.second, treasure.first + visitableOffset);
} }
if (addMonster(gen, guardPos, currentValue)) if (addMonster(gen, guardPos, currentValue))
{//block only if the object is guarded {//block only if the object is guarded
@ -1368,116 +1382,29 @@ void CRmgTemplateZone::addAllPossibleObjects (CMapGenerator* gen)
ObjectInfo oi; ObjectInfo oi;
static const Res::ERes preciousRes[] = {Res::ERes::CRYSTAL, Res::ERes::GEMS, Res::ERes::MERCURY, Res::ERes::SULFUR}; for (auto primaryID : VLC->objtypeh->knownObjects())
for (int i = 0; i < 4; i++) {
{ for (auto secondaryID : VLC->objtypeh->knownSubObjects(primaryID))
oi.generateObject = [i, gen]() -> CGObjectInstance * {
{ auto handler = VLC->objtypeh->getHandlerFor(primaryID, secondaryID);
auto obj = new CGResource(); if (!handler->isStaticObject() && handler->getRMGInfo().value)
obj->ID = Obj::RESOURCE; {
obj->subID = static_cast<si32>(preciousRes[i]); for (auto temp : handler->getTemplates())
obj->amount = 0; {
return obj; if (temp.canBePlacedAt(terrainType))
}; {
oi.value = 1400; oi.generateObject = [gen, temp]() -> CGObjectInstance *
oi.probability = 300; {
possibleObjects.push_back (oi); return VLC->objtypeh->getHandlerFor(temp.id, temp.subid)->create(temp);
} };
oi.value = handler->getRMGInfo().value;
static const Res::ERes woodOre[] = {Res::ERes::WOOD, Res::ERes::ORE}; oi.probability = handler->getRMGInfo().rarity;
for (int i = 0; i < 2; i++) possibleObjects.push_back (oi);
{ }
oi.generateObject = [i, gen]() -> CGObjectInstance * }
{ }
auto obj = new CGResource(); }
obj->ID = Obj::RESOURCE; }
obj->subID = static_cast<si32>(woodOre[i]);
obj->amount = 0;
return obj;
};
oi.value = 1400;
oi.probability = 300;
possibleObjects.push_back (oi);
}
oi.generateObject = [gen]() -> CGObjectInstance *
{
auto obj = new CGResource();
obj->ID = Obj::RESOURCE;
obj->subID = static_cast<si32>(Res::ERes::GOLD);
obj->amount = 0;
return obj;
};
oi.value = 750;
oi.probability = 300;
possibleObjects.push_back (oi);
oi.generateObject = [gen]() -> CGObjectInstance *
{
auto obj = new CGPickable();
obj->ID = Obj::TREASURE_CHEST;
obj->subID = 0;
return obj;
};
oi.value = 1500;
oi.probability = 1000;
possibleObjects.push_back (oi);
oi.generateObject = [gen]() -> CGObjectInstance *
{
auto obj = new CGArtifact();
obj->ID = Obj::RANDOM_TREASURE_ART;
obj->subID = 0;
auto a = new CArtifactInstance();
gen->map->addNewArtifactInstance(a);
obj->storedArtifact = a;
return obj;
};
oi.value = 2000;
oi.probability = 150;
possibleObjects.push_back (oi);
oi.generateObject = [gen]() -> CGObjectInstance *
{
auto obj = new CGArtifact();
obj->ID = Obj::RANDOM_MINOR_ART;
obj->subID = 0;
auto a = new CArtifactInstance();
gen->map->addNewArtifactInstance(a);
obj->storedArtifact = a;
return obj;
};
oi.value = 5000;
oi.probability = 150;
possibleObjects.push_back (oi);
oi.generateObject = [gen]() -> CGObjectInstance *
{
auto obj = new CGArtifact();
obj->ID = Obj::RANDOM_MAJOR_ART;
obj->subID = 0;
auto a = new CArtifactInstance();
gen->map->addNewArtifactInstance(a);
obj->storedArtifact = a;
return obj;
};
oi.value = 10000;
oi.probability = 150;
possibleObjects.push_back (oi);
oi.generateObject = [gen]() -> CGObjectInstance *
{
auto obj = new CGArtifact();
obj->ID = Obj::RANDOM_RELIC_ART;
obj->subID = 0;
auto a = new CArtifactInstance();
gen->map->addNewArtifactInstance(a);
obj->storedArtifact = a;
return obj;
};
oi.value = 20000;
oi.probability = 150;
possibleObjects.push_back (oi);
static const int scrollValues[] = {500, 2000, 3000, 4000, 5000}; static const int scrollValues[] = {500, 2000, 3000, 4000, 5000};
@ -1508,39 +1435,4 @@ void CRmgTemplateZone::addAllPossibleObjects (CMapGenerator* gen)
oi.probability = 30; oi.probability = 30;
possibleObjects.push_back (oi); possibleObjects.push_back (oi);
} }
//non-removable object for test
//oi.generateObject = [gen]() -> CGObjectInstance *
//{
// auto obj = new CGMagicWell();
// obj->ID = Obj::MAGIC_WELL;
// obj->subID = 0;
// return obj;
//};
//oi.value = 250;
//oi.probability = 100;
//possibleObjects.push_back (oi);
//oi.generateObject = [gen]() -> CGObjectInstance *
//{
// auto obj = new CGObelisk();
// obj->ID = Obj::OBELISK;
// obj->subID = 0;
// return obj;
//};
//oi.value = 3500;
//oi.probability = 200;
//possibleObjects.push_back (oi);
//oi.generateObject = [gen]() -> CGObjectInstance *
//{
// auto obj = new CBank();
// obj->ID = Obj::CREATURE_BANK;
// obj->subID = 5; //naga bank
// return obj;
//};
//oi.value = 3000;
//oi.probability = 100;
//possibleObjects.push_back (oi);
} }