Changeset 195

Timestamp:

06/01/07 01:19:19 (3 years ago)

Author:

latiass

Message:

This is an attempt to fix a very haunting issue: the alt-forms bug (#40). This may or may not be hacky, but alt-forms are hacky in nature, so... not much I can do. Seems to work, and also somewhat removes the dependency of @PokemonNames?.

Location:

veekun/trunk

Files:

• lib/Vee/Dex.pm (modified) (1 diff)
• root/dex-images/icons/386-normal.png (added)
• root/dex-images/icons/386.png (deleted)
• root/dex-images/icons/413-grass.png (added)
• root/dex-images/icons/413.png (deleted)
• templates/dex/page/move.tt (modified) (5 diffs)
• templates/index.tt (modified) (1 diff)

veekun/trunk/lib/Vee/Dex.pm

@@ -212 +212 @@
         columns => [qw/id name alt_form name_romaji name_jp/],
     });
-    @PokemonNames  = map { $_->name . ($_->alt_form ? ' (' . $_->alt_form . ')' : '') } @pokenames;
+    @PokemonNames  = map { $_->name } @pokenames;
     @PokemonRomaji = map { $_->name_romaji } @pokenames;
     @PokemonKana   = map { $_->name_jp     } @pokenames;

veekun/trunk/templates/dex/page/move.tt

@@ -194 +194 @@
 [%         FOREACH p IN pokemon.tutor.$ver %]
 [%             pokeid = p.pokeid %]
-<a href="[% dex_uri('pokemon', PokemonNames.$pokeid) %]" class="dex-pokelist"><img src="/dex-images/icons/[% pokeid.pad(3) %].png" alt="[% PokemonNames.$pokeid %]" title="[% PokemonNames.$pokeid %]"/></a>
+[%             altform = p.pokemon.alt_form %]
+<a href="[% IF altform; dex_uri('pokemon', p.pokemon.name, { alt_form => altform }); ELSE; dex_uri('pokemon', p.pokemon.name); END %]" class="dex-pokelist"><img src="/dex-images/icons/[% IF altform; p.pokemon.real_id.pad(3); '-'; altform; ELSE; pokeid.pad(3); END %].png" alt="[% p.pokemon.name %][% IF altform; ' ['; altform; ']'; END %]" title="[% p.pokemon.name %]"/></a>
 [%         END %]
 </fieldset>
@@ -209 +210 @@
 [%         FOREACH p IN pokemon.egg.$ver %]
 [%             pokeid = p.pokeid %]
-<a href="[% dex_uri('pokemon', PokemonNames.$pokeid) %]" class="dex-pokelist"><img src="/dex-images/icons/[% pokeid.pad(3) %].png" alt="[% PokemonNames.$pokeid %]" title="[% PokemonNames.$pokeid %]"/></a>
+[%             altform = p.pokemon.alt_form %]
+<a href="[% IF altform; dex_uri('pokemon', p.pokemon.name, { alt_form => altform }); ELSE; dex_uri('pokemon', p.pokemon.name); END %]" class="dex-pokelist"><img src="/dex-images/icons/[% IF altform; p.pokemon.real_id.pad(3); '-'; altform; ELSE; pokeid.pad(3); END %].png" alt="[% p.pokemon.name %][% IF altform; ' ['; altform; ']'; END %]" title="[% p.pokemon.name %]"/></a>
 [%         END %]
 </fieldset>
@@ -224 +226 @@
 [%         FOREACH p IN pokemon.machine.$ver %]
 [%             pokeid = p.pokeid %]
-<a href="[% dex_uri('pokemon', PokemonNames.$pokeid) %]" class="dex-pokelist"><img src="/dex-images/icons/[% pokeid.pad(3) %].png" alt="[% PokemonNames.$pokeid %]" title="[% PokemonNames.$pokeid %]"/></a>
+[%             altform = p.pokemon.alt_form %]
+<a href="[% IF altform; dex_uri('pokemon', p.pokemon.name, { alt_form => altform }); ELSE; dex_uri('pokemon', p.pokemon.name); END %]" class="dex-pokelist"><img src="/dex-images/icons/[% IF altform; p.pokemon.real_id.pad(3); '-'; altform; ELSE; pokeid.pad(3); END %].png" alt="[% p.pokemon.name %][% IF altform; ' ['; altform; ']'; END %]" title="[% p.pokemon.name %]"/></a>
 [%         END %]
 </fieldset>
@@ -233 +236 @@
 
 [% IF pokemon.level %]
-[% level_pokemon = {}; FOREACH ver IN pokemon.level.keys; FOREACH p IN pokemon.level.$ver; level_pokemon.${p.pokeid}.$ver = p.level; END; END %]
+[% altform = {}; %]
+[% level_pokemon = {}; FOREACH ver IN pokemon.level.keys; FOREACH p IN pokemon.level.$ver; level_pokemon.${p.pokeid}.$ver = p.level; level_pokemon.${p.pokeid}.altform = p.pokemon.alt_form; level_pokemon.${p.pokeid}.name = p.pokemon.name; END; END %]
 <h2>By leveling up</h2>
 <table cellspacing="0" class="dex-table dex-pokemon">
@@ -245 +249 @@
 [%     color = 1 %]
 [%     FOREACH pokeid IN level_pokemon.keys %]
-<tr class="color[% color %]"> <td class="name"><a href="[% dex_uri('pokemon', PokemonNames.$pokeid) %]">[% PokemonNames.$pokeid %]</a></td>
+[%     altform = level_pokemon.$pokeid.altform %]
+<tr class="color[% color %]"> <td class="name"><a href="[% IF altform; dex_uri('pokemon', level_pokemon.$pokeid.name, { alt_form => altform }); ELSE; dex_uri('pokemon', level_pokemon.$pokeid.name); END %]">[% level_pokemon.$pokeid.name %][% IF altform; ' ['; altform; ']'; END %]</a></td>
  [%+ FOREACH version IN learn_versions %]<td class="level">[% level_pokemon.$pokeid.$version.defined ? (level_pokemon.$pokeid.$version + 0 == 1 ? '--' : level_pokemon.$pokeid.$version + 0) : '' %]</td>[% END %]
 </tr>

veekun/trunk/templates/index.tt

@@ -111 +111 @@
     <div class="front-box">
         <a href="http://trac.veekun.com/browser/veekun/trunk" class="heading"><img src="/images/icons/index/svn.png" alt="" class="icon"/>Subversion</a>
-        <p class="svncommit-revision"> <em>Last Subversion commit:</em> <a href="http://trac.veekun.com/browser/veekun?rev=[% recent_revision.revision.replace('r','') %]">[% recent_revision.revision %]</a> </p>
+        <p class="svncommit-revision"> <em>Last Subversion commit:</em> <a href="http://trac.veekun.com/changeset/[% recent_revision.revision.replace('r','') %]">[% recent_revision.revision %]</a> </p>
         <p class="svncommit-log">[% recent_revision.log | nohtml %]</p>
         <p class="svncommit-stamp">by [% recent_revision.user %] on [% recent_revision.time %]</p>