summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/game.hpp3
-rw-r--r--src/game/unit_replicator.cpp8
-rw-r--r--src/game/unit_scientist.cpp2
-rw-r--r--src/game/unit_soldier.cpp3
-rw-r--r--src/game/worldgen.cpp8
5 files changed, 12 insertions, 12 deletions
diff --git a/src/game/game.hpp b/src/game/game.hpp
index 387df1a..4066b02 100644
--- a/src/game/game.hpp
+++ b/src/game/game.hpp
@@ -147,8 +147,7 @@ namespace game {
bool populate_pie_menu(std::vector<interface::pie_item_t> &items);
void command(v2f_t x, int number);
- size_t crystals = 9999;
- //size_t crystals = 150;
+ size_t crystals = 150;
};
enum {
diff --git a/src/game/unit_replicator.cpp b/src/game/unit_replicator.cpp
index 5d2eef5..28442f5 100644
--- a/src/game/unit_replicator.cpp
+++ b/src/game/unit_replicator.cpp
@@ -21,10 +21,10 @@ namespace game {
unit_replicator_t::unit_replicator_t(game::state_t *game_) : unit_t(game_, UNIT_REPLICATOR)
{
- size[0] = {-0.4f, -0.2f};
- size[1] = {+0.4f, +0.4f};
- render_size[0] = {-0.4f, -0.666667f};
- render_size[1] = {+0.4f, +0.4f};
+ size[0] = v2f_t(-0.4f, -0.2f) * 1.3f;
+ size[1] = v2f_t(+0.4f, +0.4f) * 1.3f;
+ render_size[0] = v2f_t(-0.4f, -0.666667f) * 1.3f;
+ render_size[1] = v2f_t(+0.4f, +0.4f) * 1.3f;
cmodel.cflags = CF_SOLID;
name = "Replicator";
diff --git a/src/game/unit_scientist.cpp b/src/game/unit_scientist.cpp
index 129d7fa..8319aaa 100644
--- a/src/game/unit_scientist.cpp
+++ b/src/game/unit_scientist.cpp
@@ -77,7 +77,7 @@ void unit_scientist_t::gather_crystals(void)
goto out;
}
- crystals = game->prng.next() % 100 + 1;
+ crystals = 75;
game->crystals += crystals;
game->interface.print(name + " collected " + std::to_string(crystals) + " " +
(crystals == 1 ? "crystal" : "crystals"));
diff --git a/src/game/unit_soldier.cpp b/src/game/unit_soldier.cpp
index 1750e2e..969075a 100644
--- a/src/game/unit_soldier.cpp
+++ b/src/game/unit_soldier.cpp
@@ -58,7 +58,8 @@ unit_soldier_t::unit_soldier_t(game::state_t *game) : unit_t(game, UNIT_SOLDIER)
health = max_health = 28;
storage.max_shells = storage.shells = 20;
- storage.max_grenades = storage.grenades = 3;
+ storage.grenades = 0;
+ storage.max_grenades = 3;
}
static v2f_t spread_aim(v2f_t x, v2f_t aim, float cof, procgen::prng_t *prng)
diff --git a/src/game/worldgen.cpp b/src/game/worldgen.cpp
index de47988..12bd3b1 100644
--- a/src/game/worldgen.cpp
+++ b/src/game/worldgen.cpp
@@ -78,11 +78,11 @@ just_decos:
break;
case TILE_DIRT:
- if (noise > 0.35)
+ if (noise > 0.34)
type = DECO_CRYSTAL;
- else if (noise > 0.34)
- type = DECO_CRYSTAL_BROKEN;
else if (noise > 0.33)
+ type = DECO_CRYSTAL_BROKEN;
+ else if (noise > 0.32)
type = DECO_STONE;
else if (noise > 0.26)
type = DECO_SPIKE;
@@ -95,7 +95,7 @@ just_decos:
break;
case TILE_GRAVEL:
- if (noise > 0.30)
+ if (noise > 0.26)
type = DECO_CRYSTAL;
else if (noise > 0.25)
type = DECO_STONE;