Changeset 198

Timestamp:

06/01/07 01:40:17 (3 years ago)

Author:

eevee

Message:

Little bit of cleanup for the potential alt_form mass-fix.

Location:

veekun/trunk

Files:

• lib/Vee/Dex.pm (modified) (2 diffs)
• root/dex-images/icons/386.png (copied) (copied from veekun/trunk/root/dex-images/icons/386.png)
• root/dex-images/icons/413.png (copied) (copied from veekun/trunk/root/dex-images/icons/413.png)

veekun/trunk/lib/Vee/Dex.pm

@@ -210 +210 @@
     }, {
         order_by => 'id ASC',
-        columns => [qw/id name alt_form name_romaji name_jp/],
+        columns => [qw/id name name_romaji name_jp/],
     });
-    @PokemonNames  = map { $_->name } @pokenames;
+    @PokemonNames  = map { $_->name        } @pokenames;
     @PokemonRomaji = map { $_->name_romaji } @pokenames;
     @PokemonKana   = map { $_->name_jp     } @pokenames;
@@ -264 +264 @@
     # create an index of fuzzy matches
     our %FuzzyMatches;
-    $FuzzyMatches{ lc $TypeNames[$_]       } = { type => 'type',    id => $_, name => $TypeNames[$_]       } for 0 .. $#TypeNames;
+    $FuzzyMatches{ lc $_->name_jp          } =
+    $FuzzyMatches{ lc $_->name_romaji      } =
+    $FuzzyMatches{ lc $_->name             } = { type => 'pokemon', id => $_->id, name => $_->name } for @pokenames;
+
     $FuzzyMatches{ lc $movekana[$_]        } =
     $FuzzyMatches{ lc $moveromaji[$_]      } =
     $FuzzyMatches{ lc $MoveData[$_]->name  } = { type => 'move',    id => $_, name => $MoveData[$_]->name  } for 1 .. $#MoveData;
+
+    $FuzzyMatches{ lc $TypeNames[$_]       } = { type => 'type',    id => $_, name => $TypeNames[$_]       } for 0 .. $#TypeNames;
     $FuzzyMatches{ lc $AbilityNames[$_]    } = { type => 'ability', id => $_, name => $AbilityNames[$_]    } for 1 .. $#AbilityNames;
     $FuzzyMatches{ lc $itemnames[$_]       } = { type => 'item',    id => $_ + 1, name => $itemnames[$_]   } for 0 .. $#itemnames;
-
-    # @pokenames is used over @PokemonNames here, due to the alt_name being embedded in @PokemonNames entries
-    $FuzzyMatches{ lc $_->name_jp       } =
-    $FuzzyMatches{ lc $_->name_romaji   } =
-    $FuzzyMatches{ lc $_->name          } = { type => 'pokemon', id => $_->id, name => $_->name } for @pokenames;
 
     return 1;