From 86395421df03c3e962ca72fd21613131d00cc8f4 Mon Sep 17 00:00:00 2001
From: coco <cornelius@hexgolems.com>
Date: Sat, 10 Aug 2019 22:33:04 +0200
Subject: [PATCH] some balancing

---
 resources/rons/buffs.ron | 34 +++++++++++++++++-----------------
 resources/rons/tower.ron |  2 +-
 resources/rons/waves.ron | 31 ++++++++++++++++++++++++++++++-
 src/card.rs              | 18 +++++++++---------
 src/card_deck.rs         | 13 ++++---------
 5 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/resources/rons/buffs.ron b/resources/rons/buffs.ron
index 6fd4bde..6557d3d 100644
--- a/resources/rons/buffs.ron
+++ b/resources/rons/buffs.ron
@@ -2,19 +2,19 @@
     (
         kind: Freeze,
         level_to_effectiveness: {
-          1: 10,
-          2: 20,
-          3: 25,
-          4: 30,
-          5: 35,
-        },
-        level_to_cooldown: {
           1: 20,
-          2: 40,
-          3: 50,
-          4: 60,
+          2: 30,
+          3: 40,
+          4: 50,
           5: 65,
         },
+        level_to_cooldown: {
+          1: 40,
+          2: 60,
+          3: 70,
+          4: 75,
+          5: 80,
+        },
         level_to_price: {
           1: 20,
           2: 40,
@@ -45,8 +45,8 @@
     (
         kind: RPM,
         level_to_effectiveness: {
-          1: 30,
-          2: 60,
+          1: 50,
+          2: 70,
           3: 90,
           4: 120,
           5: 150,
@@ -63,11 +63,11 @@
     (
         kind: Damage,
         level_to_effectiveness: {
-          1: 25,
-          2: 50,
-          3: 75,
-          4: 100,
-          5: 125,
+          1: 50,
+          2: 70,
+          3: 100,
+          4: 150,
+          5: 200,
         },
         level_to_cooldown: {},
         level_to_price: {
diff --git a/resources/rons/tower.ron b/resources/rons/tower.ron
index e23e651..55ad8d0 100644
--- a/resources/rons/tower.ron
+++ b/resources/rons/tower.ron
@@ -4,7 +4,7 @@
     range: 150.0,
     rpm: 140,
     projectile_speed: 12.0,
-    price: 50,
+    price: 100,
     mana_cost: 2,
   ),
 ]
diff --git a/resources/rons/waves.ron b/resources/rons/waves.ron
index 056c46a..d97c208 100644
--- a/resources/rons/waves.ron
+++ b/resources/rons/waves.ron
@@ -26,7 +26,6 @@
         spawn_delay: 100,
         speed: 0.5,
     ),
-
     (
         color: (0.7,0.7,1),
         enemy_count: 90,
@@ -54,4 +53,34 @@
         spawn_delay: 140,
         speed: 0.5,
     ),
+
+    (
+        color: (0.2,0.1,1),
+        enemy_count: 10,
+        health: 300,
+        img: Zombie,
+        size: 0.8,
+        spawn_delay: 80,
+        speed: 5,
+    ),
+
+    (
+        color: (0.7,0.7,1),
+        enemy_count: 20,
+        health: 800,
+        img: Zombie,
+        size: 2.3,
+        spawn_delay: 100,
+        speed: 0.5,
+    ),
+
+    (
+        color: (0.7,0.7,1),
+        enemy_count: 30,
+        health: 800,
+        img: Zombie,
+        size: 2.7,
+        spawn_delay: 70,
+        speed: 0.5,
+    ),
 ]
diff --git a/src/card.rs b/src/card.rs
index 55b87f6..9385e3e 100644
--- a/src/card.rs
+++ b/src/card.rs
@@ -76,7 +76,7 @@ impl CardType {
             CardType::Empty => 0,
             CardType::Tower => state.towers.stats.price,
             CardType::SellTower => 0,
-            CardType::DamageEnemy => 150,
+            CardType::DamageEnemy => 0,
             CardType::Shop => 0,
             CardType::Coin(1) => 0,
             CardType::Coin(2) => 0,
@@ -99,18 +99,18 @@ impl CardType {
             CardType::Empty => 0,
             CardType::Tower => state.towers.stats.mana_cost,
             CardType::SellTower => 1,
-            CardType::DamageEnemy => 150,
+            CardType::DamageEnemy => 1,
             CardType::Shop => 0,
             CardType::Coin(1) => 1,
             CardType::Coin(2) => 1,
             CardType::Coin(3) => 1,
             CardType::Coin(_) => unreachable!(),
             CardType::Take2 => 2,
-            CardType::Buff(BuffType::Freeze) => 4,
-            CardType::Buff(BuffType::Damage) => 4,
-            CardType::Buff(BuffType::RPM) => 4,
-            CardType::Buff(BuffType::Range) => 4,
-            CardType::Buff(BuffType::Aura) => 4,
+            CardType::Buff(BuffType::Freeze) => 3,
+            CardType::Buff(BuffType::Damage) => 3,
+            CardType::Buff(BuffType::RPM) => 3,
+            CardType::Buff(BuffType::Range) => 3,
+            CardType::Buff(BuffType::Aura) => 3,
             CardType::NextWave => 0,
             CardType::DrawPile => 0,
             CardType::DiscardPile => 0,
@@ -122,7 +122,7 @@ impl CardType {
             CardType::Empty => 0,
             CardType::Tower => 60,
             CardType::SellTower => 50,
-            CardType::DamageEnemy => 100,
+            CardType::DamageEnemy => 50,
             CardType::Shop => 100,
             CardType::Coin(1) => 50,
             CardType::Coin(2) => 500,
@@ -247,7 +247,7 @@ impl CardType {
             }
             CardType::DamageEnemy => {
                 for e in state.enemies.in_range(GameMap::tile_center(x, y), 80.0) {
-                    state.enemies.damage(e, 150);
+                    state.enemies.damage(e, 100);
                 }
                 state.gui.set_cursor(CursorMode::Actions(0));
             }
diff --git a/src/card_deck.rs b/src/card_deck.rs
index aaa61fc..0275475 100644
--- a/src/card_deck.rs
+++ b/src/card_deck.rs
@@ -27,11 +27,11 @@ impl CardDeck {
             CardType::Buff(BuffType::Aura),
         ];
         let actions = vec![
-            CardType::NextWave,
-            CardType::Tower,
+            //CardType::NextWave,
+            //CardType::Tower,
             CardType::Shop,
             CardType::DrawPile,
-            CardType::DiscardPile,
+            //CardType::DiscardPile,
         ];
         let discard = vec![];
         Self {
@@ -46,12 +46,7 @@ impl CardDeck {
         let hand = vec![CardType::Tower, CardType::Coin(1)];
         let deck = vec![];
         let discard = vec![];
-        let actions = vec![
-            CardType::NextWave,
-            CardType::Shop,
-            CardType::DrawPile,
-            CardType::DiscardPile,
-        ];
+        let actions = vec![CardType::Shop, CardType::DrawPile];
         Self {
             hand,
             deck,