From c0c11050d96d0eaf9e69dec8ba3d2e71cda56f64 Mon Sep 17 00:00:00 2001
From: Martin Ambrus <martin@martinambrus.com>
Date: Fri, 1 Dec 2017 10:50:35 +0100
Subject: [PATCH] fix: WW villages created via Admin do not have any units

#392
---
 GameEngine/Admin/Mods/natarbuildingplan.php | 5 +----
 GameEngine/Admin/Mods/natarend.php          | 6 ++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/GameEngine/Admin/Mods/natarbuildingplan.php b/GameEngine/Admin/Mods/natarbuildingplan.php
index 1928f904..f37b0726 100755
--- a/GameEngine/Admin/Mods/natarbuildingplan.php
+++ b/GameEngine/Admin/Mods/natarbuildingplan.php
@@ -27,7 +27,6 @@ include_once($autoprefix."GameEngine/Database.php");
 
 $id = (int) $_POST['id'];
 $amt = (int) $_POST['vill_amount'];
-$addUnitsWrefs = [];
 
     for($i=1;$i<=$amt;$i++) {
 
@@ -41,7 +40,7 @@ $addUnitsWrefs = [];
         mysqli_query($GLOBALS["link"], $q);
         $pop = $automation->recountPop($wid);
         $cp = $automation->recountPop($wid);
-        $addUnitsWrefs[] = $wid;
+        $database->addUnits($wid);
         $database->addTech($wid);
         $database->addABTech($wid);
         $speed = NATARS_UNITS;
@@ -51,8 +50,6 @@ $addUnitsWrefs = [];
         $database->addArtefact($wid, 3, 11, 1, PLAN, $desc, '', 'type1.gif');
     }
 
-    $database->addUnits($addUnitsWrefs);
-
     $myFile = "../../../Templates/text.tpl";
     $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: templates/text.tpl");
     $text = file_get_contents("../../../Templates/text_format.tpl");
diff --git a/GameEngine/Admin/Mods/natarend.php b/GameEngine/Admin/Mods/natarend.php
index bbb3be0a..a3fd058f 100755
--- a/GameEngine/Admin/Mods/natarend.php
+++ b/GameEngine/Admin/Mods/natarend.php
@@ -27,7 +27,6 @@ include_once($autoprefix."GameEngine/Database.php");
 
 $id = (int) $_POST['id'];
 $amt = (int) $_POST['vill_amount'];
-$addUnitsWrefs = [];
 $addTechWrefs = [];
 $addABTechWrefs = [];
 
@@ -44,17 +43,16 @@ for($i=1;$i<=$amt;$i++) {
 		mysqli_query($GLOBALS["link"], $q);
 		$pop = $automation->recountPop($wid);
 		$cp = $automation->recountPop($wid);
-		$addUnitsWrefs[] = $wid;
 		$addTechWrefs[] = $wid;
 		$addABTechWrefs[] = $wid;
 		$speed = NATARS_UNITS;
 
 		//new with random amount of troops
-	    $q = "INSERT IGNORE INTO " . TB_PREFIX . "units SET u41 = " . (rand(50, 1200) * $speed) . ", u42 = " . (rand(100, 1400) * $speed) . ", u43 = " . (rand(200, 1600) * $speed) . ", u44 = " . (rand(10, 50) * $speed) . ", u45 = " . (rand(48, 1700) * $speed) . ", u46 = " . (rand(60, 1800) * $speed) . ", u47 = " . (rand(200, 1600) * $speed) . ", u48 = " . (rand(40, 200) * $speed) . " , u49 = " . (rand(4, 20) * $speed) . ", u50 = " . (rand(5, 25) * $speed) . " WHERE vref = ".$wid;
+        $database->addUnits($wid);
+        $q = "UPDATE " . TB_PREFIX . "units SET u41 = " . (rand(50, 1200) * $speed) . ", u42 = " . (rand(100, 1400) * $speed) . ", u43 = " . (rand(200, 1600) * $speed) . ", u44 = " . (rand(10, 50) * $speed) . ", u45 = " . (rand(48, 1700) * $speed) . ", u46 = " . (rand(60, 1800) * $speed) . ", u47 = " . (rand(200, 1600) * $speed) . ", u48 = " . (rand(40, 200) * $speed) . " , u49 = " . (rand(4, 20) * $speed) . ", u50 = " . (rand(5, 25) * $speed) . " WHERE vref = '".$wid."'";
 		mysqli_query($GLOBALS["link"], $q);
 }
 
-$database->addUnits($addUnitsWrefs);
 $database->addTech($addTechWrefs);
 $database->addABTech($addABTechWrefs);