From 9c51bf88227a0a6520db37158d7334d451df3729 Mon Sep 17 00:00:00 2001
From: evanpelle <evanpelle@gmail.com>
Date: Thu, 19 Sep 2024 16:52:03 -0700
Subject: [PATCH] rebalance

---
 TODO.txt                                |  3 ++-
 src/core/configuration/DefaultConfig.ts | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index 87a6c5e6b..cfdd6eeb2 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -121,7 +121,8 @@
 * add traitor icon DONE 9/18/2024
 * make alliance icon DONE 9/19/2024
 * bots attack traitors DONE 9/19/2024
-* BUG: alliance should stop attack
+* BUG: alliance should stop attack DONE 9/19/2024
+* BUG: bot attacks don't stop
 * create event box
 * make fake humans easier
 * click alliance sends alliance request
diff --git a/src/core/configuration/DefaultConfig.ts b/src/core/configuration/DefaultConfig.ts
index 8e8e58834..23d9faa11 100644
--- a/src/core/configuration/DefaultConfig.ts
+++ b/src/core/configuration/DefaultConfig.ts
@@ -41,19 +41,19 @@ export class DefaultConfig implements Config {
         let speed = 0
         switch (tileToConquer.terrain()) {
             case TerrainType.Plains:
-                mag = 10
-                speed = 10
+                mag = 20
+                speed = 5
                 break
             case TerrainType.Highland:
-                mag = 20
-                speed = 20
+                mag = 40
+                speed = 10
                 break
             case TerrainType.Mountain:
-                mag = 40
-                speed = 40
+                mag = 60
+                speed = 20
                 break
         }
-        speed = mag
+        // speed = mag  
 
         if (attacker.isPlayer() && defender.isPlayer()) {
             if (attacker.type() == PlayerType.Bot && (defender.type() == PlayerType.FakeHuman || defender.type() == PlayerType.Human)) {
@@ -66,9 +66,9 @@ export class DefaultConfig implements Config {
 
         if (defender.isPlayer()) {
             return {
-                attackerTroopLoss: within(defender.troops() / attacker.troops() * mag, 1, 1000),
+                attackerTroopLoss: within(defender.troops() / attacker.troops(), .2, 5) * mag,
                 defenderTroopLoss: defender.troops() / defender.numTilesOwned(),
-                tilesPerTickUsed: within(defender.troops() / (attackTroops * 5), .2, 3) * speed
+                tilesPerTickUsed: within(defender.troops() / (attackTroops * 5), .2, 1.5) * speed
             }
         } else {
             return {