From 030d3735ef48908077db5c3c966e0ff2c96f4bf4 Mon Sep 17 00:00:00 2001
From: Michiel Sikma <michiel@sikma.org>
Date: Sun, 11 Dec 2016 00:19:51 +0100
Subject: [PATCH] Move egg and unknown pokemon to the 'pokemon' icon directory
 as special cases; update the script accordingly

---
 icons/etc/unknown-item-2.png   | Bin 183 -> 0 bytes
 icons/etc/unknown-item.png     | Bin 178 -> 184 bytes
 icons/etc/unknown-pkmn.png     | Bin 244 -> 0 bytes
 icons/{etc => pokemon}/egg.png | Bin
 icons/pokemon/unknown.png      | Bin 0 -> 308 bytes
 includes/defaults.php          |   2 +
 includes/iconstack.php         |  85 ++++++++++++++++++++++++++++++++-
 7 files changed, 86 insertions(+), 1 deletion(-)
 delete mode 100644 icons/etc/unknown-item-2.png
 delete mode 100644 icons/etc/unknown-pkmn.png
 rename icons/{etc => pokemon}/egg.png (100%)
 create mode 100755 icons/pokemon/unknown.png

diff --git a/icons/etc/unknown-item-2.png b/icons/etc/unknown-item-2.png
deleted file mode 100644
index b512dd2f3a6cecfb2aba6e1ee2aabbe62cbade26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3b)GJcAs)xyPQA@}K!L~g?p;%>
zCT)u*?Gn-M`sqU1&T`u(Fn>SJ&wo&5nFve#(kZvX4TYcA_$2Es<JcH+>DJA=M{c;}
zC9S#Q+Y_{hXR+QsZ}uy9`ixBtRi7Rb%l2?h()_=&;<j}0?psgFtBjBPA52}mYv-An
hZ?nR8?zZ5th_U+6d?j~*yC={k44$rjF6*2UngBR!M?C-l

diff --git a/icons/etc/unknown-item.png b/icons/etc/unknown-item.png
index 5016112b768fc78bb8f8e9259d5756baa1570cd8..8c8cd784a4684eadc101d64c36acc423e25f8a20 100644
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJdQTU}kch)?ryKG)C~`RO{J->d
z!oLM4+7Bizny^8zazXAQh6$53SpygrD#;oY=_oNQn7_MEGR2%>(MQJs#%EtQGfw0E
zGPU1SgkkZ{rXBnb{PQFkCN5ZgAZN}(rt()j%3N#b<{rKGC7nSh^$!1oO6P6-d$u=L
jweYW8@Q;=Cz!^5JIa6NA?ElRQbP9u~tDnm{r-UW|jlD&!

literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^av;pa3?$v++zf#fPk>K|>;M1%flMF(GJY7T!~<DO
zB|(0{3=CzH&sqR^!JaOTAr}702?|^->!PF>(p>)jXH9(a|Gz!sp^B~Yhi=%L{%4%A
zQQt(WcO%y^4&Jl#84_C@OIzKXd3k#4xKf`SmJGfq8EN2_p|Oi&SrShy3nRk;2JM}9
SxJ~#$_IkSdxvX<aXaWErur^l!

diff --git a/icons/etc/unknown-pkmn.png b/icons/etc/unknown-pkmn.png
deleted file mode 100644
index e6c9af059fd9b76f4602fef082054dedbdde7c11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 244
zcmV<Q01N+#P)<h;3K|Lk000e1NJLTq001Ze0015c1^@s6Ufo>X0002HNkl<ZSi|kt
zT?)V;2ms)Yyd&&b9j&)U4-OISN301`@MSRjwn{3ch=_=Y2zA`|Ra?5o(R7V-fo%il
zoa-#|C>CI)ls7fl_KrCWk^(hYT+b9Y0?uM-O*0$^gaKEuTwN2K1f+v=$PsWEDHQ=E
zKzeKKGa!cI0o?&dZO0{0N^{`KG}Aw*0h+d&*<H;&H^r?Wxm~@b|7jaHw~Kopwf)dA
uGsQ<yz2lbzbalF>YtY>l0I$JcUCbV!?Xw#?WW$#L0000<MNUMnLSTZKFJW~6

diff --git a/icons/etc/egg.png b/icons/pokemon/egg.png
similarity index 100%
rename from icons/etc/egg.png
rename to icons/pokemon/egg.png
diff --git a/icons/pokemon/unknown.png b/icons/pokemon/unknown.png
new file mode 100755
index 0000000000000000000000000000000000000000..bff28391f3da493d710bad5cac6ab8a3ec908b12
GIT binary patch
literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^8bB<^!3HGb?#A2&QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjK*5uqE{-7)?r;0N`C1Hkj#_Yi-~VJm2wQ2Q
z#?tvWuS^QpKY4mvgbv&0_rKqJ9($I2-sa>jnKzB*o9x82*G)7|-f&32Xq|r8l+!m_
z&pt7_#;?uUnZI%FgdO~00z%>&?@rhuYb__Fp0z3XQJL3qUH(qtr8OF1azg**tMydm
z{8!%jG{GY9)a(t96$=-sS*zw9?`uEenq#i=u35C@$o3n49(VY)Po};(lvX79x?8k%
zVlmJ{DNAE9?K<Vx#T(e?rR3Uu^U+K0Zrz;Ao_k|L&cp8=JU~w|c)I$ztaD0e0su`|
BcP9V<

literal 0
HcmV?d00001

diff --git a/includes/defaults.php b/includes/defaults.php
index e39f8df3..5b1ab989 100644
--- a/includes/defaults.php
+++ b/includes/defaults.php
@@ -55,6 +55,8 @@ $s['dir_pkmn'] = 'pokemon/';
 $s['dir_pkmn_regular'] = 'regular/';
 // Shiny sprites directory
 $s['dir_pkmn_shiny'] = 'shiny/';
+// Special sprites directory
+$s['dir_pkmn_special'] = '';
 // Female sprites directory
 $s['dir_pkmn_female'] = 'female/';
 // Right-facing sprites directory
diff --git a/includes/iconstack.php b/includes/iconstack.php
index 41bbf697..5abb95c4 100644
--- a/includes/iconstack.php
+++ b/includes/iconstack.php
@@ -561,6 +561,56 @@ class IconStack
                 $this->pkmn_stack[] = $item;
             }
         }
+        
+        // Add the special items (e.g. egg, unknown).
+        $special_items = $this->get_special_stack_items();
+        $this->pkmn_stack = array_merge($this->pkmn_stack, $special_items);
+    }
+    
+    /**
+     * Returns the special items for the Pokémon stack.
+     * Currently, just "egg" and "unknown". These have no shiny icons.
+     */
+    public function get_special_stack_items()
+    {
+        // Unhatched egg.
+        $egg = array(
+            'idx' => null,
+            'slug' => array(
+                'eng' => 'egg',
+                'jpn' => 'tamago',
+            ),
+            'icons' => array(
+                '.' => array(),
+            ),
+            'name' => array(
+                'eng' => 'Egg',
+                'jpn' => 'タマゴ',
+                'jpn_ro' => 'Tamago',
+            ),
+        );
+        
+        // Unknown (not Unown) or glitch Pokémon.
+        $unknown = array(
+            'idx' => null,
+            'slug' => array(
+                'eng' => 'unknown',
+                'jpn' => 'fumei',
+            ),
+            'icons' => array(
+                '.' => array(),
+            ),
+            'name' => array(
+                'eng' => 'Unknown',
+                'jpn' => 'ふめい',
+                'jpn_ro' => 'Fumei',
+            ),
+        );
+        
+        return array_merge(
+            $this->get_pkmn_stack_items('egg', $egg, true),
+            $this->get_pkmn_stack_items('unknown', $unknown, true)
+        );
     }
     
     /**
@@ -630,7 +680,7 @@ class IconStack
      *
      * @return mixed[] Pokémon icon stack data.
      */
-    private function get_pkmn_stack_items($id, $pkmn)
+    private function get_pkmn_stack_items($id, $pkmn, $special=false)
     {
         // Base info that's the same for each stack item.
         $base_info = array(
@@ -663,6 +713,39 @@ class IconStack
         uksort($pkmn['icons'], array($this, 'pkmn_variation_sort'));
         
         foreach ($pkmn['icons'] as $icon => $icon_data) {
+            // If this is a special icon (no variations, no shiny version),
+            // add only the plain icon and continue.
+            if ($special) {
+                $var = $this->get_icon_var_name(
+                    'pkmn',
+                    $pkmn['slug'],
+                    $icon,
+                    '.',
+                    'regular'
+                );
+                $pkmn_info = array_merge($base_info,
+                    array(
+                        'version' => 'regular',
+                        'subvariation' => null,
+                        'is_duplicate' => false,
+                    ),
+                    $this->get_pkmn_icon_fit(),
+                    array(
+                        'variation' => $icon,
+                        'var' => $var,
+                        'file' => (
+                            $dir_base.
+                            $dir_pkmn.
+                            Settings::get('dir_pkmn_special').
+                            $pkmn['slug'][Settings::get('img_slug_lang')].
+                            '.png'
+                        ),
+                    )
+                );
+                $tmp_stack[] = $pkmn_info;
+                continue;
+            }
+            
             // Loop through each icon twice: once for regular versions, and
             // (if requested), once more for shiny versions.
             // Every variation is added to the stack.