diff --git a/Assets/Scripts/Resources/BerryBush.cs b/Assets/Scripts/Resources/BerryBush.cs
index a59fb0c266193d36c1604fd310c3d9ded8408302..86357309adab71a515a2b03d44b8647d2146d084 100644
--- a/Assets/Scripts/Resources/BerryBush.cs
+++ b/Assets/Scripts/Resources/BerryBush.cs
@@ -18,7 +18,7 @@ public class BerryBush : Resource
private IEnumerator timer()
{
yield return new WaitForSeconds(600);
- setAmount(500);
+ setAmount(50);
coroutineRunning = false;
@@ -37,19 +37,19 @@ public class BerryBush : Resource
{
gameObject.GetComponent<SpriteRenderer>().sprite = sprites[5];
}
- else if (getAmount() < 100)
+ else if (getAmount() <= 10)
{
gameObject.GetComponent<SpriteRenderer>().sprite = sprites[4];
}
- else if (getAmount() < 200)
+ else if (getAmount() <= 20)
{
gameObject.GetComponent<SpriteRenderer>().sprite = sprites[3];
}
- else if (getAmount() < 300)
+ else if (getAmount() <= 30)
{
gameObject.GetComponent<SpriteRenderer>().sprite = sprites[2];
}
- else if (getAmount() < 400)
+ else if (getAmount() <= 40)
{
gameObject.GetComponent<SpriteRenderer>().sprite = sprites[1];
}
@@ -63,7 +63,7 @@ public class BerryBush : Resource
void Start()
{
setEventType(EventType.Berrypicked);
- setAmount(500);
+ setAmount(50);
}
// Update is called once per frame
diff --git a/Assets/Scripts/Resources/Forest.cs b/Assets/Scripts/Resources/Forest.cs
index 479bc3769ced9b80243de47d65fd66937b397fce..4e2556dc527e968762cc531628da538f179939dd 100644
--- a/Assets/Scripts/Resources/Forest.cs
+++ b/Assets/Scripts/Resources/Forest.cs
@@ -12,42 +12,42 @@ public class Forest : Resource
isForester = i;
if (isForester == true)
{
- growthspeed = 5f;
+ growthspeed = 3f;
}
else
{
- growthspeed = 10f;
+ growthspeed = 5f;
}
}
public override void refreshSprite()
{
if (sprites == null) return;
- if (getAmount() < 125)
+ if (getAmount() < 25)
{
gameObject.GetComponent<SpriteRenderer>().sprite = sprites[7];
}
- else if (getAmount() < 250)
+ else if (getAmount() < 50)
{
gameObject.GetComponent<SpriteRenderer>().sprite = sprites[6];
}
- else if (getAmount() < 375)
+ else if (getAmount() < 75)
{
gameObject.GetComponent<SpriteRenderer>().sprite = sprites[5];
}
- else if (getAmount() < 500)
+ else if (getAmount() < 100)
{
gameObject.GetComponent<SpriteRenderer>().sprite = sprites[4];
}
- else if (getAmount() < 625)
+ else if (getAmount() < 125)
{
gameObject.GetComponent<SpriteRenderer>().sprite = sprites[3];
}
- else if (getAmount() < 750)
+ else if (getAmount() < 150)
{
gameObject.GetComponent<SpriteRenderer>().sprite = sprites[2];
}
- else if (getAmount() < 875)
+ else if (getAmount() < 175)
{
gameObject.GetComponent<SpriteRenderer>().sprite = sprites[1];
}
@@ -69,7 +69,7 @@ public class Forest : Resource
void Start()
{
setEventType(EventType.WoodChopped);
- setAmount(Random.Range(50, 300));
+ setAmount(Random.Range(50, 150));
isForester = false;
growthspeed = 1;
StartCoroutine("Grow");
@@ -77,7 +77,7 @@ public class Forest : Resource
IEnumerator Grow()
{
- while (getAmount() < 1000)
+ while (getAmount() < 200)
{
setAmount(getAmount() + 1);
yield return new WaitForSeconds(growthspeed);
diff --git a/Assets/Scripts/Resources/Quarry.cs b/Assets/Scripts/Resources/Quarry.cs
index d9369494e23d9d56d6e60a2af09f78edce1a7454..848ff43f60b642c1c1d11aca4bb491ba84adc36a 100644
--- a/Assets/Scripts/Resources/Quarry.cs
+++ b/Assets/Scripts/Resources/Quarry.cs
@@ -16,23 +16,23 @@ public class Quarry : Resource
public override void refreshSprite()
{
if (sprites == null) return;
- if (getAmount() < 100)
+ if (getAmount() < 50)
{
gameObject.GetComponent<SpriteRenderer>().sprite = sprites[5];
}
- else if (getAmount() < 200)
+ else if (getAmount() < 166)
{
gameObject.GetComponent<SpriteRenderer>().sprite = sprites[4];
}
- else if (getAmount() < 300)
+ else if (getAmount() < 333)
{
gameObject.GetComponent<SpriteRenderer>().sprite = sprites[3];
}
- else if (getAmount() < 400)
+ else if (getAmount() < 500)
{
gameObject.GetComponent<SpriteRenderer>().sprite = sprites[2];
}
- else if (getAmount() < 500)
+ else if (getAmount() < 633)
{
gameObject.GetComponent<SpriteRenderer>().sprite = sprites[1];
}
@@ -46,7 +46,7 @@ public class Quarry : Resource
void Start()
{
setEventType(EventType.StoneCut);
- setAmount(Random.Range(2000, 4000));
+ setAmount(Random.Range(500, 800));
}
// Update is called once per frame
diff --git a/Assets/Sprites/BestCity.png b/Assets/Sprites/BestCity.png
deleted file mode 100644
index 8d3313888b129620c2a72a9174b8e3236ab679d7..0000000000000000000000000000000000000000
Binary files a/Assets/Sprites/BestCity.png and /dev/null differ
diff --git a/Assets/Sprites/BestCity.png.meta b/Assets/Sprites/BestCity.png.meta
deleted file mode 100644
index 4b06d4c152dc13393c7b346d3636c580e62bbea6..0000000000000000000000000000000000000000
--- a/Assets/Sprites/BestCity.png.meta
+++ /dev/null
@@ -1,88 +0,0 @@
-fileFormatVersion: 2
-guid: 97ef8f8e39d4729499350db932ec9671
-TextureImporter:
- fileIDToRecycleName: {}
- externalObjects: {}
- serializedVersion: 9
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- sRGBTexture: 1
- linearTexture: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapsPreserveCoverage: 0
- alphaTestReferenceValue: 0.5
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- streamingMipmaps: 0
- streamingMipmapsPriority: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -100
- wrapU: 1
- wrapV: 1
- wrapW: 1
- nPOTScale: 0
- lightmap: 0
- compressionQuality: 50
- spriteMode: 1
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 1
- spriteTessellationDetail: -1
- textureType: 8
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- platformSettings:
- - serializedVersion: 2
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID: c59ed5ba7acbe0e4cb698556957189fe
- vertices: []
- indices:
- edges: []
- weights: []
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Sprites/FirstCity.png b/Assets/Sprites/FirstCity.png
deleted file mode 100644
index a94e4fb70f3559fbacd21e7489689d2192337910..0000000000000000000000000000000000000000
Binary files a/Assets/Sprites/FirstCity.png and /dev/null differ
diff --git a/Assets/Sprites/FirstCity.png.meta b/Assets/Sprites/FirstCity.png.meta
deleted file mode 100644
index b472f23debb8527b06f284d94d10e22b96db4e95..0000000000000000000000000000000000000000
--- a/Assets/Sprites/FirstCity.png.meta
+++ /dev/null
@@ -1,88 +0,0 @@
-fileFormatVersion: 2
-guid: 23dbd6b7f8b166f408cdb676d37102ad
-TextureImporter:
- fileIDToRecycleName: {}
- externalObjects: {}
- serializedVersion: 9
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- sRGBTexture: 1
- linearTexture: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapsPreserveCoverage: 0
- alphaTestReferenceValue: 0.5
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- streamingMipmaps: 0
- streamingMipmapsPriority: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -100
- wrapU: 1
- wrapV: 1
- wrapW: 1
- nPOTScale: 0
- lightmap: 0
- compressionQuality: 50
- spriteMode: 1
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 1
- spriteTessellationDetail: -1
- textureType: 8
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- platformSettings:
- - serializedVersion: 2
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID: e6e209070f1e3b140b0aabd1e522e3fe
- vertices: []
- indices:
- edges: []
- weights: []
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName:
- assetBundleVariant: