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

New battlegrounds (#758)

Browse Source
This commit is contained in:
Nordsoft91
2022-06-22 11:41:02 +03:00
committed by Andrii Danylchenko
parent aaa07e4d2e
commit c4035134e5
34 changed files with 412 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lib/CGameState.cpp
View File

@ -1894,17 +1894,17 @@ void CGameState::initVisitingAndGarrisonedHeroes()
}
}
BFieldType CGameState::battleGetBattlefieldType(int3 tile, CRandomGenerator & rand)
BattleField CGameState::battleGetBattlefieldType(int3 tile, CRandomGenerator & rand)
{
if(!tile.valid() && curB)
tile = curB->tile;
else if(!tile.valid() && !curB)
return BFieldType::NONE;
return BattleField::NONE;
const TerrainTile &t = map->getTile(tile);
//fight in mine -> subterranean
if(dynamic_cast<const CGMine *>(t.visitableObjects.front()))
return BFieldType::SUBTERRANEAN;
return BattleField("subterranean");
for(auto &obj : map->objects)
{
@ -1915,56 +1915,32 @@ BFieldType CGameState::battleGetBattlefieldType(int3 tile, CRandomGenerator & ra
switch(obj->ID)
{
case Obj::CLOVER_FIELD:
return BFieldType::CLOVER_FIELD;
return BattleField("clover_field");
case Obj::CURSED_GROUND1: case Obj::CURSED_GROUND2:
return BFieldType::CURSED_GROUND;
return BattleField("cursed_ground");
case Obj::EVIL_FOG:
return BFieldType::EVIL_FOG;
return BattleField("evil_fog");
case Obj::FAVORABLE_WINDS:
return BFieldType::FAVORABLE_WINDS;
return BattleField("favorable_winds");
case Obj::FIERY_FIELDS:
return BFieldType::FIERY_FIELDS;
return BattleField("fiery_fields");
case Obj::HOLY_GROUNDS:
return BFieldType::HOLY_GROUND;
return BattleField("holy_ground");
case Obj::LUCID_POOLS:
return BFieldType::LUCID_POOLS;
return BattleField("lucid_pools");
case Obj::MAGIC_CLOUDS:
return BFieldType::MAGIC_CLOUDS;
return BattleField("magic_clouds");
case Obj::MAGIC_PLAINS1: case Obj::MAGIC_PLAINS2:
return BFieldType::MAGIC_PLAINS;
return BattleField("magic_plains");
case Obj::ROCKLANDS:
return BFieldType::ROCKLANDS;
return BattleField("rocklands");
}
}
if(map->isCoastalTile(tile)) //coastal tile is always ground
return BFieldType::SAND_SHORE;
if(t.terType == Terrain("dirt"))
return BFieldType(rand.nextInt(3, 5));
if(t.terType == Terrain("sand"))
return BFieldType::SAND_MESAS; //TODO: coast support
if(t.terType == Terrain("grass"))
return BFieldType(rand.nextInt(6, 7));
if(t.terType == Terrain("snow"))
return BFieldType(rand.nextInt(10, 11));
if(t.terType == Terrain("swamp"))
return BFieldType::SWAMP_TREES;
if(t.terType == Terrain("rough"))
return BFieldType::ROUGH;
if(t.terType.isUnderground())
return BFieldType::SUBTERRANEAN;
if(t.terType == Terrain("lava"))
return BFieldType::LAVA;
if(t.terType.isWater())
return BFieldType::SHIP;
if(!t.terType.isPassable())
return BFieldType::ROCKLANDS;
return BattleField("sand_shore");
//TODO: STUB, support new battlegrounds
return BFieldType::DIRT_HILLS;
return BFieldType::NONE;
return *RandomGeneratorUtil::nextItem(Terrain::Manager::getInfo(t.terType).battleFields, rand);
}
UpgradeInfo CGameState::getUpgradeInfo(const CStackInstance &stack)