diff --git a/Assets/code/Logic/FactoryType.cs b/Assets/code/Logic/FactoryType.cs index 1ce735cc..ab01d1b5 100644 --- a/Assets/code/Logic/FactoryType.cs +++ b/Assets/code/Logic/FactoryType.cs @@ -30,7 +30,7 @@ static FactoryType() { new FactoryType("Forestry", new Storage(Product.Wood, 2f), false); new FactoryType("Gold pit", new Storage(Product.Gold, 2f), true); - new FactoryType("Metal pit", new Storage(Product.MetallOre, 2f), true); + new FactoryType("Metal pit", new Storage(Product.MetalOre, 2f), true); new FactoryType("Coal pit", new Storage(Product.Coal, 3f), true); new FactoryType("Cotton farm", new Storage(Product.Cotton, 2f), false); new FactoryType("Quarry", new Storage(Product.Stone, 2f), true); @@ -55,7 +55,7 @@ static FactoryType() resourceInput = new StorageSet(); resourceInput.set(new Storage(Product.Fuel, 0.5f)); - resourceInput.set(new Storage(Product.MetallOre, 2f)); + resourceInput.set(new Storage(Product.MetalOre, 2f)); new FactoryType("Metal smelter", new Storage(Product.Metal, 4f), resourceInput); resourceInput = new StorageSet(); diff --git a/Assets/code/Logic/Game.cs b/Assets/code/Logic/Game.cs index 176b7afc..b7fe66fc 100644 --- a/Assets/code/Logic/Game.cs +++ b/Assets/code/Logic/Game.cs @@ -207,7 +207,7 @@ static private void setStartResources() Country.allCountries[3].getCapital().setResource(Product.Gold); Country.allCountries[4].getCapital().setResource(Product.Cotton); Country.allCountries[5].getCapital().setResource(Product.Stone); - Country.allCountries[6].getCapital().setResource(Product.MetallOre); + Country.allCountries[6].getCapital().setResource(Product.MetalOre); Country.allCountries[7].getCapital().setResource(Product.Wood); } diff --git a/Assets/code/Logic/Product.cs b/Assets/code/Logic/Product.cs index 4f8a299d..3ec3e1a3 100644 --- a/Assets/code/Logic/Product.cs +++ b/Assets/code/Logic/Product.cs @@ -16,7 +16,7 @@ public class Product : Name private readonly List substitutes; private readonly Color color; - internal static readonly Product Fish, Grain, Cattle, Wood, Lumber, Furniture, Gold, Metal, MetallOre, + internal static readonly Product Fish, Grain, Cattle, Wood, Lumber, Furniture, Gold, Metal, MetalOre, Cotton, Clothes, Stone, Cement, Fruit, Liquor, ColdArms, Ammunition, Firearms, Artillery, Oil, MotorFuel, Cars, Tanks, Airplanes, Rubber, Machinery, Coal = new Product("Coal", 1f, Color.black), @@ -45,7 +45,7 @@ static Product() Stone = new Product("Stone", 1f, new Color(0.82f, 0.62f, 0.82f));//light grey Cement = new Product("Cement", 2f); - MetallOre = new Product("Metal ore", 3f, Color.blue); + MetalOre = new Product("Metal ore", 3f, Color.blue); Metal = new Product("Metal", 6f); ColdArms = new Product("Cold arms", 13f); @@ -215,7 +215,7 @@ public bool isInvented(Country country) { if ( ( - (this == Metal || this == MetallOre || this == ColdArms) && !country.isInvented(Invention.Metal)) + (this == Metal || this == MetalOre || this == ColdArms) && !country.isInvented(Invention.Metal)) || (!country.isInvented(Invention.SteamPower) && (this == Machinery || this == Cement)) || ((this == Artillery || this == Ammunition) && !country.isInvented(Invention.Gunpowder)) || (this == Firearms && !country.isInvented(Invention.Firearms)) diff --git a/Assets/code/Logic/Province.cs b/Assets/code/Logic/Province.cs index 30d45c9b..5e639b95 100644 --- a/Assets/code/Logic/Province.cs +++ b/Assets/code/Logic/Province.cs @@ -660,7 +660,7 @@ public void BalanceEmployableWorkForce() internal void setResource(Product inres) { resource = inres; - if (resource == Product.Stone || resource == Product.Gold || resource == Product.MetallOre || resource == Product.Coal) + if (resource == Product.Stone || resource == Product.Gold || resource == Product.MetalOre || resource == Product.Coal) terrain = TerrainTypes.Mountains; else terrain = TerrainTypes.Plains; diff --git a/WEBGL/Build/WEBGL.asm.code.unityweb b/WEBGL/Build/WEBGL.asm.code.unityweb index 194a0a4a..225b2158 100644 Binary files a/WEBGL/Build/WEBGL.asm.code.unityweb and b/WEBGL/Build/WEBGL.asm.code.unityweb differ diff --git a/WEBGL/Build/WEBGL.asm.framework.unityweb b/WEBGL/Build/WEBGL.asm.framework.unityweb index 751faff2..aa09cb6c 100644 Binary files a/WEBGL/Build/WEBGL.asm.framework.unityweb and b/WEBGL/Build/WEBGL.asm.framework.unityweb differ diff --git a/WEBGL/Build/WEBGL.asm.memory.unityweb b/WEBGL/Build/WEBGL.asm.memory.unityweb index 3689b7e2..5a2edaf3 100644 Binary files a/WEBGL/Build/WEBGL.asm.memory.unityweb and b/WEBGL/Build/WEBGL.asm.memory.unityweb differ diff --git a/WEBGL/Build/WEBGL.data.unityweb b/WEBGL/Build/WEBGL.data.unityweb index a5a9090d..2373d80d 100644 Binary files a/WEBGL/Build/WEBGL.data.unityweb and b/WEBGL/Build/WEBGL.data.unityweb differ