Merge pull request #96 from EuleMitKeule/develop

fix: various fixes
EuleMitKeule · Dec 1, 2022 · 2c5d75a · 2c5d75a
2 parents d8b662d + ca37722
commit 2c5d75a
Show file tree

Hide file tree

Showing 41 changed files with 1,505 additions and 2,952 deletions.
diff --git a/TanksOnAPlain/Assets/GameAssets/AttackAssets/attack_enemy_attack_cooldown.asset b/TanksOnAPlain/Assets/GameAssets/AttackAssets/attack_enemy_attack_cooldown.asset
@@ -33,10 +33,10 @@ MonoBehaviour:
       Data: 5
     - Name: EndValue
       Entry: 4
-      Data: 5
+      Data: 15
     - Name: Time
       Entry: 3
-      Data: 1
+      Data: 900
     - Name: 
       Entry: 8
       Data: 
@@ -60,13 +60,13 @@ MonoBehaviour:
       Data: TanksOnAPlain.Unity.Components.Difficulty.ScaledFloat, TanksOnAPlain.Unity
     - Name: StartValue
       Entry: 4
-      Data: 5
+      Data: 10
     - Name: EndValue
       Entry: 4
-      Data: 5
+      Data: 40
     - Name: Time
       Entry: 3
-      Data: 1
+      Data: 900
     - Name: 
       Entry: 8
       Data: 

diff --git a/TanksOnAPlain/Assets/GameAssets/AttackAssets/attack_enemy_base.asset b/TanksOnAPlain/Assets/GameAssets/AttackAssets/attack_enemy_base.asset
@@ -33,10 +33,10 @@ MonoBehaviour:
       Data: 5
     - Name: EndValue
       Entry: 4
-      Data: 5
+      Data: 15
     - Name: Time
       Entry: 3
-      Data: 1
+      Data: 900
     - Name: 
       Entry: 8
       Data: 
@@ -48,10 +48,10 @@ MonoBehaviour:
       Data: 3
     - Name: EndValue
       Entry: 4
-      Data: 3
+      Data: 1.5
     - Name: Time
       Entry: 3
-      Data: 1
+      Data: 900
     - Name: 
       Entry: 8
       Data: 
@@ -60,13 +60,13 @@ MonoBehaviour:
       Data: TanksOnAPlain.Unity.Components.Difficulty.ScaledFloat, TanksOnAPlain.Unity
     - Name: StartValue
       Entry: 4
-      Data: 5
+      Data: 10
     - Name: EndValue
       Entry: 4
-      Data: 5
+      Data: 40
     - Name: Time
       Entry: 3
-      Data: 1
+      Data: 900
     - Name: 
       Entry: 8
       Data: 

diff --git a/TanksOnAPlain/Assets/GameAssets/AttackAssets/attack_enemy_damage.asset b/TanksOnAPlain/Assets/GameAssets/AttackAssets/attack_enemy_damage.asset
@@ -33,10 +33,10 @@ MonoBehaviour:
       Data: 5
     - Name: EndValue
       Entry: 4
-      Data: 5
+      Data: 15
     - Name: Time
       Entry: 3
-      Data: 1
+      Data: 900
     - Name: 
       Entry: 8
       Data: 
@@ -48,10 +48,10 @@ MonoBehaviour:
       Data: 3
     - Name: EndValue
       Entry: 4
-      Data: 3
+      Data: 1.5
     - Name: Time
       Entry: 3
-      Data: 1
+      Data: 900
     - Name: 
       Entry: 8
       Data: 
@@ -60,10 +60,10 @@ MonoBehaviour:
       Data: TanksOnAPlain.Unity.Components.Difficulty.ScaledFloat, TanksOnAPlain.Unity
     - Name: StartValue
       Entry: 4
-      Data: 10
+      Data: 15
     - Name: EndValue
       Entry: 4
-      Data: 50
+      Data: 60
     - Name: Time
       Entry: 3
       Data: 900

diff --git a/TanksOnAPlain/Assets/GameAssets/AttackAssets/attack_enemy_life_steal.asset b/TanksOnAPlain/Assets/GameAssets/AttackAssets/attack_enemy_life_steal.asset
@@ -33,10 +33,10 @@ MonoBehaviour:
       Data: 5
     - Name: EndValue
       Entry: 4
-      Data: 5
+      Data: 15
     - Name: Time
       Entry: 3
-      Data: 1
+      Data: 900
     - Name: 
       Entry: 8
       Data: 
@@ -48,10 +48,10 @@ MonoBehaviour:
       Data: 3
     - Name: EndValue
       Entry: 4
-      Data: 3
+      Data: 1.5
     - Name: Time
       Entry: 3
-      Data: 1
+      Data: 900
     - Name: 
       Entry: 8
       Data: 
@@ -60,13 +60,13 @@ MonoBehaviour:
       Data: TanksOnAPlain.Unity.Components.Difficulty.ScaledFloat, TanksOnAPlain.Unity
     - Name: StartValue
       Entry: 4
-      Data: 5
+      Data: 10
     - Name: EndValue
       Entry: 4
-      Data: 5
+      Data: 40
     - Name: Time
       Entry: 3
-      Data: 1
+      Data: 900
     - Name: 
       Entry: 8
       Data: 
@@ -87,12 +87,12 @@ MonoBehaviour:
       Data: 
     - Name: LifeSteal
       Entry: 7
-      Data: TanksOnAPlain.Unity.Components.Difficulty.ScaledFloat, TanksOnAPlain.Unity
+      Data: TanksOnAPlain.Unity.Components.Difficulty.ScaledInt, TanksOnAPlain.Unity
     - Name: StartValue
-      Entry: 4
-      Data: 100
+      Entry: 3
+      Data: 35
     - Name: EndValue
-      Entry: 4
+      Entry: 3
       Data: 500
     - Name: Time
       Entry: 3

diff --git a/TanksOnAPlain/Assets/GameAssets/AttackAssets/attack_enemy_projectile_speed.asset b/TanksOnAPlain/Assets/GameAssets/AttackAssets/attack_enemy_projectile_speed.asset
@@ -48,10 +48,10 @@ MonoBehaviour:
       Data: 3
     - Name: EndValue
       Entry: 4
-      Data: 3
+      Data: 1.5
     - Name: Time
       Entry: 3
-      Data: 1
+      Data: 900
     - Name: 
       Entry: 8
       Data: 
@@ -60,13 +60,13 @@ MonoBehaviour:
       Data: TanksOnAPlain.Unity.Components.Difficulty.ScaledFloat, TanksOnAPlain.Unity
     - Name: StartValue
       Entry: 4
-      Data: 5
+      Data: 10
     - Name: EndValue
       Entry: 4
-      Data: 5
+      Data: 40
     - Name: Time
       Entry: 3
-      Data: 1
+      Data: 900
     - Name: 
       Entry: 8
       Data: 

diff --git a/TanksOnAPlain/Assets/GameAssets/AttackAssets/attack_enemy_ricochet.asset b/TanksOnAPlain/Assets/GameAssets/AttackAssets/attack_enemy_ricochet.asset
@@ -33,10 +33,10 @@ MonoBehaviour:
       Data: 5
     - Name: EndValue
       Entry: 4
-      Data: 5
+      Data: 15
     - Name: Time
       Entry: 3
-      Data: 1
+      Data: 900
     - Name: 
       Entry: 8
       Data: 
@@ -48,10 +48,10 @@ MonoBehaviour:
       Data: 3
     - Name: EndValue
       Entry: 4
-      Data: 3
+      Data: 1.5
     - Name: Time
       Entry: 3
-      Data: 1
+      Data: 900
     - Name: 
       Entry: 8
       Data: 
@@ -60,13 +60,13 @@ MonoBehaviour:
       Data: TanksOnAPlain.Unity.Components.Difficulty.ScaledFloat, TanksOnAPlain.Unity
     - Name: StartValue
       Entry: 4
-      Data: 5
+      Data: 10
     - Name: EndValue
       Entry: 4
-      Data: 5
+      Data: 40
     - Name: Time
       Entry: 3
-      Data: 1
+      Data: 900
     - Name: 
       Entry: 8
       Data: 

diff --git a/TanksOnAPlain/Assets/GameAssets/PowerUpAssets/powerup_life_steal.asset b/TanksOnAPlain/Assets/GameAssets/PowerUpAssets/powerup_life_steal.asset
@@ -25,9 +25,6 @@ MonoBehaviour:
     - Name: Prefab
       Entry: 10
       Data: 0
-    - Name: LifeStealPercentage
-      Entry: 4
-      Data: 10
     - Name: LifeSteal
-      Entry: 4
-      Data: 10
+      Entry: 3
+      Data: 1
diff --git a/TanksOnAPlain/Assets/GameAssets/SpawnAssets/spawner_base.asset b/TanksOnAPlain/Assets/GameAssets/SpawnAssets/spawner_base.asset
@@ -29,10 +29,10 @@ MonoBehaviour:
       Data: TanksOnAPlain.Unity.Components.Difficulty.ScaledFloat, TanksOnAPlain.Unity
     - Name: StartValue
       Entry: 4
-      Data: 7
+      Data: 5
     - Name: EndValue
       Entry: 4
-      Data: 1
+      Data: 0.75
     - Name: Time
       Entry: 3
       Data: 900

diff --git a/TanksOnAPlain/Assets/GameAssets/TankCannonAssets/tank_cannon_enemy_base.asset b/TanksOnAPlain/Assets/GameAssets/TankCannonAssets/tank_cannon_enemy_base.asset
@@ -23,4 +23,4 @@ MonoBehaviour:
     SerializationNodes:
     - Name: RotationSpeed
       Entry: 4
-      Data: 50
+      Data: 75
diff --git a/TanksOnAPlain/Assets/GameAssets/TankMovementAssets/tank_movement_enemy_base.asset b/TanksOnAPlain/Assets/GameAssets/TankMovementAssets/tank_movement_enemy_base.asset
@@ -26,13 +26,13 @@ MonoBehaviour:
       Data: TanksOnAPlain.Unity.Components.Difficulty.ScaledFloat, TanksOnAPlain.Unity
     - Name: StartValue
       Entry: 4
-      Data: 125
+      Data: 150
     - Name: EndValue
       Entry: 4
-      Data: 125
+      Data: 275
     - Name: Time
       Entry: 3
-      Data: 1
+      Data: 900
     - Name: 
       Entry: 8
       Data: 
@@ -44,10 +44,10 @@ MonoBehaviour:
       Data: 100
     - Name: EndValue
       Entry: 4
-      Data: 100
+      Data: 200
     - Name: Time
       Entry: 3
-      Data: 1
+      Data: 900
     - Name: 
       Entry: 8
       Data: 
diff --git a/TanksOnAPlain/Assets/GameAssets/TankMovementAssets/tank_movement_enemy_movement_speed.asset b/TanksOnAPlain/Assets/GameAssets/TankMovementAssets/tank_movement_enemy_movement_speed.asset
@@ -26,10 +26,10 @@ MonoBehaviour:
       Data: TanksOnAPlain.Unity.Components.Difficulty.ScaledFloat, TanksOnAPlain.Unity
     - Name: StartValue
       Entry: 4
-      Data: 175
+      Data: 200
     - Name: EndValue
       Entry: 4
-      Data: 350
+      Data: 400
     - Name: Time
       Entry: 3
       Data: 900
@@ -41,10 +41,10 @@ MonoBehaviour:
       Data: TanksOnAPlain.Unity.Components.Difficulty.ScaledFloat, TanksOnAPlain.Unity
     - Name: StartValue
       Entry: 4
-      Data: 125
+      Data: 150
     - Name: EndValue
       Entry: 4
-      Data: 250
+      Data: 275
     - Name: Time
       Entry: 3
       Data: 900