intermediate commit

7 files changed, 46 insertions, 2 deletions

diff --git a/src/Model/Building/ClayPit.php b/src/Model/Building/ClayPit.php
index 8127818..b4905eb 100644
--- a/src/Model/Building/ClayPit.php
+++ b/src/Model/Building/ClayPit.php
@@ -10,6 +10,8 @@ class ClayPit extends ResourceGenerator
 
   public array $resourceRequirements = [
     'wood' => 1.0,
+    'clay' => 2.0,
+    'iron' => 1.0,
   ];
 
   public string $resourceType = 'clay';
diff --git a/src/Model/Building/Embassy.php b/src/Model/Building/Embassy.php
new file mode 100644
index 0000000..3be1f7f
--- /dev/null
+++ b/src/Model/Building/Embassy.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Model\Building;
+
+use App\Model\Building;
+
+class Embassy extends Building
+{
+  public int $buildTimeFactor = 1;
+  public int $maxLevel = 25;
+
+  public array $resourceRequirements = [
+    'wood' => 25.0,
+    'clay' => 25.0,
+    'iron' => 30.0,
+  ];
+}
diff --git a/src/Model/Building/Farm.php b/src/Model/Building/Farm.php
index aaa58b5..222d8cd 100644
--- a/src/Model/Building/Farm.php
+++ b/src/Model/Building/Farm.php
@@ -13,6 +13,8 @@ class Farm extends ResourceGenerator
 
   public array $resourceRequirements = [
     'wood' => 1.0,
+    'clay' => 1.0,
+    'iron' => 1.0,
   ];
 
   public string $resourceType = 'food';
diff --git a/src/Model/Building/IronMine.php b/src/Model/Building/IronMine.php
index 4bf5cc6..d240e3a 100644
--- a/src/Model/Building/IronMine.php
+++ b/src/Model/Building/IronMine.php
@@ -10,6 +10,8 @@ class IronMine extends ResourceGenerator
 
   public array $resourceRequirements = [
     'wood' => 1.0,
+    'clay' => 1.0,
+    'iron' => 2.0,
   ];
 
   public string $resourceType = 'iron';
diff --git a/src/Model/Building/Marketplace.php b/src/Model/Building/Marketplace.php
new file mode 100644
index 0000000..714de0d
--- /dev/null
+++ b/src/Model/Building/Marketplace.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Model\Building;
+
+use App\Model\Building;
+
+class Marketplace extends Building
+{
+  public int $buildTimeFactor = 1;
+  public int $maxLevel = 25;
+
+  public array $resourceRequirements = [
+    'wood' => 10.0,
+    'clay' => 10.0,
+    'iron' => 8.0,
+  ];
+}
diff --git a/src/Model/Building/Storage.php b/src/Model/Building/Storage.php
index fde4c4e..de2df92 100644
--- a/src/Model/Building/Storage.php
+++ b/src/Model/Building/Storage.php
@@ -12,11 +12,13 @@ class Storage extends Building
 
   public array $resourceRequirements = [
     'wood' => 1.0,
+    'clay' => 1.0,
+    'iron' => 1.0,
   ];
 
   public function getCapacity(): int
   {
-    return $this->level * 2560;
+    return $this->level * $_ENV['BASE_STORAGE_CAPACITY_FACTOR'];
   }
 
   public function getResourceCapacity(string $resourceType): int
diff --git a/src/Model/Building/WoodCutter.php b/src/Model/Building/WoodCutter.php
index 86bde9b..726cdbc 100644
--- a/src/Model/Building/WoodCutter.php
+++ b/src/Model/Building/WoodCutter.php
@@ -9,7 +9,9 @@ class WoodCutter extends ResourceGenerator
   public int $maxLevel = 25;
 
   public array $resourceRequirements = [
-    'wood' => 1.0,
+    'wood' => 2.0,
+    'clay' => 1.0,
+    'iron' => 1.0,
   ];
 
   public string $resourceType = 'wood';