load resources from data file

[blobs.git] / src / app / app.cpp

diff --git a/src/app/app.cpp b/src/app/app.cpp
index a67d1a8286527d582de03627a7bbef6516c2f828..ccccd9a6c15c5b2590e8a27b0274c74541c1451e 100644 (file)
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -175,14 +175,11 @@ Assets::Assets()
 , data_path(path + "data/")
 , skin_path(path + "skins/")
 , tile_path(path + "tiles/") {
-       data.resources.Add({ "air", "Air", 0 });
-       data.resources.Add({ "biomass", "Biomass", 0 });
-       data.resources.Add({ "dirt", "Dirt", 0 });
-       data.resources.Add({ "ice", "Ice", 0 });
-       data.resources.Add({ "rock", "Rock", 0 });
-       data.resources.Add({ "sand", "Sand", 0 });
-       data.resources.Add({ "water", "Water", 0 });
-       data.resources.Add({ "wood", "Wood", 0 });
+       {
+               std::ifstream resource_file(data_path + "resources");
+               io::TokenStreamReader resource_reader(resource_file);
+               ReadResources(resource_reader);
+       }
 
        {
                std::ifstream tile_file(data_path + "tiles");
@@ -190,31 +187,6 @@ Assets::Assets()
                ReadTileTypes(tile_reader);
        }
 
-       data.tiles["algae"]   .resources.push_back({ data.resources["water"].id,   1.0  });
-       data.tiles["algae"]   .resources.push_back({ data.resources["biomass"].id, 0.5  });
-       data.tiles["desert"]  .resources.push_back({ data.resources["sand"].id,    1.0  });
-       data.tiles["forest"]  .resources.push_back({ data.resources["wood"].id,    1.0  });
-       data.tiles["forest"]  .resources.push_back({ data.resources["dirt"].id,    0.5  });
-       data.tiles["grass"]   .resources.push_back({ data.resources["dirt"].id,    0.5  });
-       data.tiles["grass"]   .resources.push_back({ data.resources["biomass"].id, 0.25 });
-       data.tiles["grass"]   .resources.push_back({ data.resources["water"].id,   0.25 });
-       data.tiles["ice"]     .resources.push_back({ data.resources["ice"].id,     1.0  });
-       data.tiles["ice"]     .resources.push_back({ data.resources["water"].id,   0.25 });
-       data.tiles["jungle"]  .resources.push_back({ data.resources["wood"].id,    0.5  });
-       data.tiles["jungle"]  .resources.push_back({ data.resources["biomass"].id, 0.5  });
-       data.tiles["mountain"].resources.push_back({ data.resources["rock"].id,    1.0  });
-       data.tiles["ocean"]   .resources.push_back({ data.resources["water"].id,   1.0  });
-       data.tiles["rock"]    .resources.push_back({ data.resources["rock"].id,    1.0  });
-       data.tiles["sand"]    .resources.push_back({ data.resources["sand"].id,    1.0  });
-       data.tiles["taiga"]   .resources.push_back({ data.resources["wood"].id,    1.0  });
-       data.tiles["taiga"]   .resources.push_back({ data.resources["water"].id,   0.5  });
-       data.tiles["tundra"]  .resources.push_back({ data.resources["rock"].id,    1.0  });
-       data.tiles["tundra"]  .resources.push_back({ data.resources["ice"].id,     0.5  });
-       data.tiles["water"]   .resources.push_back({ data.resources["water"].id,   1.0  });
-       data.tiles["water"]   .resources.push_back({ data.resources["biomass"].id, 0.25 });
-       data.tiles["wheat"]   .resources.push_back({ data.resources["biomass"].id, 1.0  });
-       data.tiles["wheat"]   .resources.push_back({ data.resources["water"].id,   0.25 });
-
        graphics::Format format;
        textures.tiles.Bind();
        textures.tiles.Reserve(256, 256, 14, format);
@@ -249,6 +221,37 @@ Assets::Assets()
 Assets::~Assets() {
 }
 
+void Assets::ReadResources(io::TokenStreamReader &in) {
+       while (in.HasMore()) {
+               string name;
+               in.ReadIdentifier(name);
+               in.Skip(io::Token::EQUALS);
+
+               int id = 0;
+               if (data.resources.Has(name)) {
+                       id = data.resources[name].id;
+               } else {
+                       world::Resource res;
+                       res.name = name;
+                       id = data.resources.Add(res);
+               }
+
+               in.Skip(io::Token::ANGLE_BRACKET_OPEN);
+               while (in.Peek().type != io::Token::ANGLE_BRACKET_CLOSE) {
+                       in.ReadIdentifier(name);
+                       in.Skip(io::Token::EQUALS);
+                       if (name == "label") {
+                               in.ReadString(data.resources[id].label);
+                       } else {
+                               throw std::runtime_error("unknown resource property '" + name + "'");
+                       }
+                       in.Skip(io::Token::SEMICOLON);
+               }
+               in.Skip(io::Token::ANGLE_BRACKET_CLOSE);
+               in.Skip(io::Token::SEMICOLON);
+       }
+}
+
 void Assets::ReadTileTypes(io::TokenStreamReader &in) {
        while (in.HasMore()) {
                string name;
@@ -272,6 +275,31 @@ void Assets::ReadTileTypes(io::TokenStreamReader &in) {
                                in.ReadString(data.tiles[id].label);
                        } else if (name == "texture") {
                                data.tiles[id].texture = in.GetInt();
+                       } else if (name == "yield") {
+                               in.Skip(io::Token::BRACKET_OPEN);
+                               while (in.Peek().type != io::Token::BRACKET_CLOSE) {
+                                       world::TileType::Yield yield;
+                                       in.Skip(io::Token::ANGLE_BRACKET_OPEN);
+                                       while (in.Peek().type != io::Token::ANGLE_BRACKET_CLOSE) {
+                                               in.ReadIdentifier(name);
+                                               in.Skip(io::Token::EQUALS);
+                                               if (name == "resource") {
+                                                       in.ReadIdentifier(name);
+                                                       yield.resource = data.resources[name].id;
+                                               } else if (name == "ubiquity") {
+                                                       yield.ubiquity = in.GetDouble();
+                                               } else {
+                                                       throw std::runtime_error("unknown tile type yield property '" + name + "'");
+                                               }
+                                               in.Skip(io::Token::SEMICOLON);
+                                       }
+                                       in.Skip(io::Token::ANGLE_BRACKET_CLOSE);
+                                       data.tiles[id].resources.push_back(yield);
+                                       if (in.Peek().type == io::Token::COMMA) {
+                                               in.Skip(io::Token::COMMA);
+                                       }
+                               }
+                               in.Skip(io::Token::BRACKET_CLOSE);
                        } else {
                                throw std::runtime_error("unknown tile type property '" + name + "'");
                        }