commit aa9637b6

Poul Sander · 2020-07-13 17:47
aa9637b6062346f0427147d69d11d95358d2795e patch · browse files
parent 6d8379fdd526ff0736d1d6c6983588e51a38ad7a

Start to create a forrest region

Changed files

M	src/saland/GameRegion.cpp before

diff --git a/src/saland/GameRegion.cpp b/src/saland/GameRegion.cpp index 4b8ebed..17d14f1 100644 --- a/src/saland/GameRegion.cpp +++ b/src/saland/GameRegion.cpp

@@ -78,12 +78,16 @@ void GameRegion::SpawnItem(const ItemDef& def, float destX, float destY) {

barrel.get()->destructible = def.isDestructible;

barrel.get()->health = def.health;

barrel.get()->name = def.itemid;

+ if (world.tile_protected(destX/32, destY/32)) {

+ std::cout << "Do not spawn " << def.itemid << "(" << destX << "," << "destY" << "), Protected tile\n";

+ return;

+ }

for (std::shared_ptr<Placeable>& target : placeables) {

if (target->removeMe) {

continue;

}

if (Intersect(*barrel.get(), *target.get())) {

- std::cout << "Do not spawn " << def.itemid << "\n";

+ std::cout << "Do not spawn " << def.itemid << "(" << destX << "," << "destY" << "), already an item placed\n";

return;

}

@@ -148,7 +152,7 @@ void GameRegion::Init(int x, int y, const std::string& worldName, bool forceRese

SpawnItem(barrelDef, 100.0f, 100.0f+64.0f);

- const ItemDef& pineDef = getItem("tree_pine");

+ ItemDef pineDef = getItem("tree_pine");

SpawnItem(pineDef, 200.0f, 400.0f);

@@ -156,6 +160,18 @@ void GameRegion::Init(int x, int y, const std::string& worldName, bool forceRese

SpawnItem(potatoDef, 600.0f, 20.0f);

+ //Forrest region

+ if (region_x == -1 && region_y == 0) {

+ std::cout << "Forrest region\n";

+ for (int i=0; i<10; ++i) {

+ int x = (rand()%97+1)*32+rand()%32;

+ int y = (rand()%97+1)*32+rand()%32;

+ SpawnItem(pineDef, x, y);

+ std::cout << "Spawning at " << x << ", " << y << "\n";

+ }

MonsterDef batDef;

batDef.radius = 16.0f;

batDef.race = "bat";