From ef416cd5489c473c118575145bec8f21cdba3f5d Mon Sep 17 00:00:00 2001
From: Martin Ambrus <martin@martinambrus.com>
Date: Sun, 26 Nov 2017 16:00:55 +0100
Subject: [PATCH] fix: horse drinking trough forgives upkeep for all horse
 units

#105
---
 GameEngine/Technology.php | 40 ++++++---------------------------------
 1 file changed, 6 insertions(+), 34 deletions(-)

diff --git a/GameEngine/Technology.php b/GameEngine/Technology.php
index 0820131e..223cc101 100755
--- a/GameEngine/Technology.php
+++ b/GameEngine/Technology.php
@@ -499,26 +499,12 @@ class Technology {
                          || ( $i == 5 && $buildarray[ 'f' . $horsedrinking ] >= 15 )
                          || ( $i == 6 && $buildarray[ 'f' . $horsedrinking ] == 20 )
                     ) {
-                        $upkeepDecrement = 0;
-                        switch ( $i ) {
-                            case 4:
-                                $upkeepDecrement = 2;
-                                break;
-
-                            case 5:
-                                $upkeepDecrement = 3;
-                                break;
-
-                            case 6:
-                                $upkeepDecrement = 4;
-                                break;
-                        }
-                        $upkeep += ( $dataarray['pop'] - $upkeepDecrement ) * $array[ $unit ];
+                        $upkeep += (( $dataarray['pop'] - 1 ) * $array[ $unit ]);
                     } else {
-                        $upkeep += $dataarray['pop'] * $array[ $unit ];
+                        $upkeep += ($dataarray['pop'] * $array[ $unit ]);
                     }
                 } else {
-                    $upkeep += $dataarray['pop'] * $array[ $unit ];
+                    $upkeep += ($dataarray['pop'] * $array[ $unit ]);
                 }
             } else {
                 if ( isset( $horsedrinking ) ) {
@@ -526,26 +512,12 @@ class Technology {
                          || ( $i == 5 && $buildarray[ 'f' . $horsedrinking ] >= 15 )
                          || ( $i == 6 && $buildarray[ 'f' . $horsedrinking ] == 20 )
                     ) {
-                        $upkeepDecrement = 0;
-                        switch ( $i ) {
-                            case 4:
-                                $upkeepDecrement = 2;
-                                break;
-
-                            case 5:
-                                $upkeepDecrement = 3;
-                                break;
-
-                            case 6:
-                                $upkeepDecrement = 4;
-                                break;
-                        }
-                        $upkeep += ( $dataarray['pop'] - $upkeepDecrement ) * $array[ $unit2 ];
+                        $upkeep += (( $dataarray['pop'] - 1 ) * $array[ $unit2 ]);
                     } else {
-                        $upkeep += $dataarray['pop'] * $array[ $unit2 ];
+                        $upkeep += ($dataarray['pop'] * $array[ $unit2 ]);
                     }
                 } else {
-                    $upkeep += $dataarray['pop'] * $array[ $unit2 ];
+                    $upkeep += ($dataarray['pop'] * $array[ $unit2 ]);
                 }
             }
         }