Setup/img-maps

 * script cleanup
 * fixed subzone generation and made color less garish
 * fixed alphamap generation and alphamapcheck not pointing to the same path
 * fixed padding UtilityScript args with unexpected var types

Author: Sarjuuk

.gitignore

@@ -3,8 +3,8 @@
 
 # cache
 /cache/template/*
-/setup/generated/alphaMaps/*.png
-/cache/firstrun
+/cache/alphaMaps/*
+/cache/setup/*
 
 # extract from MPQ
 /setup/mpqdata/*

includes/game.php

@@ -244,7 +244,7 @@ public static function getPageText($ptId)
 
     private static function alphaMapCheck(int $areaId, array &$set) : bool
     {
-        $file = 'setup/generated/alphaMaps/'.$areaId.'.png';
+        $file = 'cache/alphaMaps/'.$areaId.'.png';
         if (!file_exists($file))                            // file does not exist (probably instanced area)
             return false;
 

localization/locale_dede.php

@@ -1151,6 +1151,7 @@
         'Miscellaneous' => "Diverse",
         'Azeroth'       => "Azeroth",
         'CosmicMap'     => "Kosmische Karte",
+        'floorN'        => "%d. Stockwerk"
     ),
     'privileges' => array(
         'main'          => "Auf unserer Seite könnt Ihr <a href=\"?reputation\">Ruf</a> erringen. Hauptsächlich erringt man Ruf dadurch, dass Eure Kommentare positiv bewertet werden.<br><br>Das heißt, Euer Ruf hängt in gewissem Maße davon ab, wie sehr Ihr der Community beiträgt.<br><br>Mit dem Sammeln von Ruf verdient Ihr Euch auch das Vertrauen der Gemeinschaft ein, und Ihr erhält Privilegien. Unten könnt Ihr eine vollständige Liste einsehen.",

localization/locale_enus.php

@@ -1152,6 +1152,7 @@
         'Miscellaneous' => "Miscellaneous",
         'Azeroth'       => "Azeroth",
         'CosmicMap'     => "Cosmic Map",
+        'floorN'        => "Level %d"
     ),
     'privileges' => array(
         'main'          => "Here on our Site you can generate <a href=\"?reputation\">reputation</a>. The main way to generate it is to get your comments upvotes.<br><br>So, reputation is a rough measure of how much you contributed to the community.<br><br>As you amass reputation you earn the community's trust and you will be granted with additional privileges. You can find a full list below.",

localization/locale_eses.php

@@ -1151,6 +1151,7 @@
         'Miscellaneous' => "Miscelánea",
         'Azeroth'       => "Azeroth",
         'CosmicMap'     => "Mapa cósmico",
+        'floorN'        => "Nivel %d"
     ),
     'privileges' => array(
         'main'          => "Aquí, en AoWoW, puedes conseguir <a href=\"?reputation\">reputación</a>. La forma principal de conseguirla es conseguir que tus comentarios sean votados de forma positiva.<br /><br />Así pues, la reputación es algo que mide, más o menos, cúanto has contribuido a la comunidad.<br /><br />Conforme consigues reputación, te ganas la confianza de la comunidad y tendrás privilegios adicionales. Puedes encontrar una lista completa debajo.",

localization/locale_frfr.php

@@ -1151,6 +1151,7 @@
         'Miscellaneous' => "Divers",
         'Azeroth'       => "Azeroth",
         'CosmicMap'     => "Carte cosmique",
+        'floorN'        => "Plancher %d"
     ),
     'privileges' => array(
         'main'          => "Sur AoWoW, vous pouvez accumuler de la <a href=\"?reputation\">réputation</a>. Le principal moyen d'en accumuler est d'avoir un score élevé pour vos commentaires.<br><br>Ainsi, la réputation est une vision sommaire de vos contributions à la communauté.<br><br>En amassant de la réputation, vous gagnez le respect de la communauté et vous obtiendrez certains privilèges. Vous pouvez en trouver la liste complète ci-dessous.",

localization/locale_ruru.php

@@ -1151,6 +1151,7 @@
         'Miscellaneous' => "Разное",
         'Azeroth'       => "Азерот",
         'CosmicMap'     => "Звёздная карта",
+        'floorN'        => "Уровень %d"
     ),
     'privileges' => array(
         'main'          => "Здесь на AoWoW вы можете зарабатывать <a href=\"?reputation\">репутацию</a>. Основной источник получения репутации — увеличение рейтинга ваших комментариев другими пользователями.<br><br>Репутация примерно измеряет количество вашего вклада в сообщество.<br><br>По мере того, как вы зарабатываете репутацию, вы получаете доверие сообщества и особые привилегии. Полный список привилегий расположен ниже.",

localization/locale_zhcn.php

@@ -1150,7 +1150,8 @@
         'Battlegrounds' => "战场",
         'Miscellaneous' => "其他",
         'Azeroth'       => "艾泽拉斯",
-        'CosmicMap'     => "宇宙地图"
+        'CosmicMap'     => "宇宙地图",
+        'floorN'        => "[Level %d]"
     ),
     'privileges' => array(
         'main'          => "在我们的网站上，你可以通过 <a href=\"?reputation\">声望</a>. 来获取特权。获取声望的主要途径是获得评论的赞同。<br><br>因此，声望是衡量你对社区的贡献程度的一个大致指标。<br><br>随着声望的积累，你将获得社区的信任，并被赋予额外的特权。以下是完整的特权列表。",

setup/tools/CLISetup.class.php

@@ -341,7 +341,7 @@ public static function run(string $cmd, &$args) : bool
                 return false;
         }
 
-        $args = array_pad($args, 4, []);
+        $args = array_pad($args, 4, null);
 
         $success = $us->run($args);
 

setup/tools/dbc.class.php

@@ -483,7 +483,7 @@ private function read()
 
         $this->writeToDB();
 
-        $this->endCLean();
+        $this->endClean();
 
         return true;
     }