Changeset 201

Timestamp:

06/02/07 03:19:11 (3 years ago)

Author:

eevee

Message:

Some improvements to item pages. (#10)
Also fixed brokenness with held items, again..

Location:

veekun/trunk

Files:

• lib/Vee/Dex.pm (modified) (5 diffs)
• lib/Vee/Schema/Items.pm (modified) (1 diff)
• script/pokedex.sql (modified) (6 diffs)
• templates/dex/common.tt (modified) (1 diff)
• templates/dex/list/items.tt (modified) (2 diffs)
• templates/dex/page/item.tt (modified) (2 diffs)

veekun/trunk/lib/Vee/Dex.pm

@@ -199 +199 @@
 our (@MoveData, $DamagingMoveCount);
 our (%TypeData, @TypeNames, %OldTypeOrder);
-our (@AbilityNames);
+our (@AbilityNames, @ItemNames);
 our (@TMs, %MoveTMs);
 our %FuzzyMatches;
@@ -229 +229 @@
 
     @AbilityNames = $schema->resultset('Abilities')->search({ id => { '<', 200 } }, { order_by => 'id ASC', columns => ['name'] })->get_column('name')->all;
+    @ItemNames    = $schema->resultset('Items')    ->search(undef,                  { order_by => 'id ASC', columns => ['name'] })->get_column('name')->all;
 
     # so I can use one-based ids with these
@@ -239 +240 @@
     unshift @MoveData, {};
     unshift @AbilityNames, undef;
+    unshift @ItemNames, undef;
 
     # machines
@@ -257 +259 @@
 
     # temporary, just for the below code; possibly to be promoted later
-    my @itemnames = $schema->resultset('Items')->search(undef, { order_by => 'id ASC', columns => [qw/name/] })->get_column('name')->all;
     my @movenames = $schema->resultset('Moves')->search(undef, { order_by => 'id ASC', columns => [qw/name_romaji name_jp/] });
     my @movekana   = ( undef, map { $_->name_jp     } @movenames );
@@ -274 +275 @@
     $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;
+    $FuzzyMatches{ lc $ItemNames[$_]       } = { type => 'item',    id => $_, name => $ItemNames[$_]       } for 1 .. $#ItemNames;
 
     # TODO: hack!  remove this when I get kana/romaji for everything

veekun/trunk/lib/Vee/Schema/Items.pm

@@ -14 +14 @@
 __PACKAGE__->add_unique_constraint(["id"], undef);
 
+sub display_name {
+    my ($self) = @_;
+
+    my $name = $self->name;
+    $name =~ s/Poke/Poké/;
+    return $name;
+}
+
 1;
 

veekun/trunk/script/pokedex.sql

@@ -4183 +4183 @@
 (60,60,'X Accuracy',950,0,0,0,0,30,0,'31',19,0,0,1,0,0,0,0,0,1,0,6,0,0,0,0,0,0,0,0,1,1,0,'An item that raises the accuracy of a Pokémon in battle. It wears off if the Pokémon is withdrawn.'),
 (61,61,'X Special',350,0,0,0,0,30,0,'31',19,0,0,1,0,0,0,16,0,0,0,6,0,0,0,0,0,0,0,0,1,1,0,'An item that raises the Sp. Atk stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.'),
-(62,62,'X Sp.',350,0,0,0,0,30,0,'31',19,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'An item that raises the Sp. Def stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.'),
-(63,63,'Poké Doll',1000,0,0,0,0,30,0,'31',19,0,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'A doll that attracts Pokémon. Use it to flee from any battle with a wild Pokémon.'),
+(62,62,'X Sp. Def',350,0,0,0,0,30,0,'31',19,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'An item that raises the Sp. Def stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.'),
+(63,63,'Poke Doll',1000,0,0,0,0,30,0,'31',19,0,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'A doll that attracts Pokémon. Use it to flee from any battle with a wild Pokémon.'),
 (64,64,'Fluffy Tail',1000,0,0,0,0,30,0,'31',19,0,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'An item that attracts Pokémon. Use it to flee from any battle with a wild Pokémon.'),
 (65,65,'Blue Flute',100,0,0,0,0,30,0,'31',67,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'A blue flute made from blown glass. Its melody awakens a single Pokémon from sleep.'),
@@ -4319 +4319 @@
 (196,219,'Mental Herb',100,53,0,0,25,10,0,'31',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'An item to be held by a Pokémon. It snaps the holder out of infatuation. It can be used only once.'),
 (197,220,'Choice Band',100,54,0,0,0,10,0,'31',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'An item to be held by a Pokémon. This headband ups Attack, but allows the use of only one kind of move.'),
-(198,221,'King’s Rock',100,55,10,0,26,30,0,'31',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'An item to be held by a Pokémon. It may cause the foe to flinch when the holder inflicts damage.'),
+(198,221,'King\'s Rock',100,55,10,0,26,30,0,'31',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'An item to be held by a Pokémon. It may cause the foe to flinch when the holder inflicts damage.'),
 (199,222,'SilverPowder',100,56,20,0,0,10,0,'31',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'An item to be held by a Pokémon. It is a shiny, silver powder that ups the power of Bug-type moves.'),
 (200,223,'Amulet Coin',100,57,10,0,0,30,0,'31',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'An item to be held by a Pokémon. It doubles a battle\'s prize money if the holding Pokémon joins in.'),
@@ -4529 +4529 @@
 (406,429,'Loot Sack',0,0,0,0,0,0,0,'191',3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'A sturdy, spacious bag that is used to carry loot obtained in the coal mine.'),
 (407,430,'Rule Book',0,0,0,0,0,0,0,'191',3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'It lists the rules for holding battles. For linked battles, you may choose which set of rules you wish to use.'),
-(408,431,'Poké Radar',0,0,0,0,0,0,0,'255',3,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'A tool that can search out Pokémon that are hiding in grass. Its battery is recharged as you walk.'),
+(408,431,'Poke Radar',0,0,0,0,0,0,0,'255',3,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'A tool that can search out Pokémon that are hiding in grass. Its battery is recharged as you walk.'),
 (409,432,'Point Card',0,0,0,0,0,0,0,'255',3,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'A card that lists the Battle Points you have earned. '),
 (410,433,'Journal',0,0,0,0,0,0,0,'255',3,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'A notebook that keeps a day-to-day record of your adventure so far. '),
@@ -4550 +4550 @@
 (427,450,'Bicycle',0,0,0,0,0,0,0,'255',3,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'A folding Bicycle that enables much faster movement than the Running Shoes.'),
 (428,451,'Suite Key',0,0,0,0,0,0,0,'191',3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'A key to one of the suites at the luxury hotel by a lake. For some odd reason, it often disappears.'),
-(429,452,'Oak’s Letter',0,0,0,0,0,0,0,'191',3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'A letter from Prof. Oak. Written in it is a request for you to go to Rt. 224.'),
+(429,452,'Oak\'s Letter',0,0,0,0,0,0,0,'191',3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'A letter from Prof. Oak. Written in it is a request for you to go to Rt. 224.'),
 (430,453,'Lunar Wing',0,0,0,0,0,0,0,'191',3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'A feather that glows like the moon. It is said to possess the power to dispel nightmares.'),
 (431,454,'Member Card',0,0,0,0,0,0,0,'191',3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'A card needed for entering the inn in Canalave City. Oddly, the last date marked on it was 50 years ago.'),
@@ -14422 +14422 @@
 LOCK TABLES pokemon_items WRITE;
 /*!40000 ALTER TABLE pokemon_items DISABLE KEYS */;
-INSERT INTO pokemon_items VALUES (12,222,5),
-(15,245,5),
-(19,200,5),
-(20,200,5),
-(22,244,5),
-(25,155,50),
-(25,236,5),
-(26,155,5),
-(27,217,5),
-(28,217,5),
+INSERT INTO pokemon_items VALUES (12,199,5),
+(15,222,5),
+(19,177,5),
+(20,177,5),
+(22,221,5),
+(25,132,50),
+(25,213,5),
+(26,132,5),
+(27,194,5),
+(28,194,5),
 (35,81,5),
-(35,154,50),
+(35,131,50),
 (36,81,5),
-(36,154,50),
-(37,152,55),
-(38,152,55),
+(36,131,50),
+(37,129,55),
+(38,129,55),
 (46,86,50),
 (46,87,5),
 (47,86,50),
 (47,87,5),
-(49,295,5),
-(50,237,5),
-(51,237,5),
-(52,217,5),
-(53,217,5),
-(56,193,5),
-(57,193,5),
-(58,152,55),
-(59,152,55),
-(61,221,5),
-(62,221,5),
-(63,248,5),
-(64,248,5),
-(65,248,5),
-(72,245,5),
-(73,245,5),
-(74,229,5),
-(75,229,5),
-(76,229,5),
-(77,191,5),
-(78,191,5),
-(79,279,5),
-(80,221,5),
-(81,233,5),
-(82,233,5),
-(83,259,5),
-(84,244,5),
-(85,244,5),
+(49,272,5),
+(50,214,5),
+(51,214,5),
+(52,194,5),
+(53,194,5),
+(56,170,5),
+(57,170,5),
+(58,129,55),
+(59,129,55),
+(61,198,5),
+(62,198,5),
+(63,225,5),
+(64,225,5),
+(65,225,5),
+(72,222,5),
+(73,222,5),
+(74,206,5),
+(75,206,5),
+(76,206,5),
+(77,168,5),
+(78,168,5),
+(79,256,5),
+(80,198,5),
+(81,210,5),
+(82,210,5),
+(83,236,5),
+(84,221,5),
+(85,221,5),
 (88,92,5),
 (89,92,5),
@@ -14476 +14476 @@
 (91,88,50),
 (91,89,5),
-(104,258,5),
-(105,258,5),
-(108,279,5),
-(109,228,5),
-(110,228,5),
+(104,235,5),
+(105,235,5),
+(108,256,5),
+(109,205,5),
+(110,205,5),
 (113,110,50),
-(113,231,5),
-(116,235,5),
-(117,235,5),
+(113,208,5),
+(116,212,5),
+(117,212,5),
 (120,90,50),
 (120,91,5),
 (121,90,50),
 (121,91,5),
-(122,154,5),
-(124,153,55),
-(125,322,50),
-(126,323,5),
-(132,257,5),
-(132,274,50),
-(143,234,55),
-(147,235,5),
-(148,235,5),
-(149,235,5),
-(151,157,55),
-(161,155,5),
-(162,155,50),
-(162,158,5),
-(170,227,5),
-(171,227,5),
-(172,155,5),
+(122,131,5),
+(124,130,55),
+(125,299,50),
+(126,300,5),
+(132,234,5),
+(132,251,50),
+(143,211,55),
+(147,212,5),
+(148,212,5),
+(149,212,5),
+(151,134,55),
+(161,132,5),
+(162,132,50),
+(162,135,5),
+(170,204,5),
+(171,204,5),
+(172,132,5),
 (173,81,5),
-(173,154,50),
-(186,221,5),
-(191,192,5),
-(193,265,5),
-(199,221,5),
-(203,156,5),
-(208,233,5),
-(211,245,5),
-(213,155,55),
-(215,217,5),
-(215,286,50),
-(222,238,5),
-(230,235,5),
-(231,185,5),
-(232,185,5),
-(238,153,55),
-(239,322,50),
-(240,323,5),
+(173,131,50),
+(186,198,5),
+(191,169,5),
+(193,242,5),
+(199,198,5),
+(203,133,5),
+(208,210,5),
+(211,222,5),
+(213,132,55),
+(215,194,5),
+(215,263,50),
+(222,215,5),
+(230,212,5),
+(231,162,5),
+(232,162,5),
+(238,130,55),
+(239,299,50),
+(240,300,5),
 (241,33,55),
 (242,110,50),
-(242,231,5),
+(242,208,5),
 (250,44,55),
-(251,157,55),
-(261,151,5),
-(262,151,5),
-(263,155,5),
-(264,155,50),
-(264,158,5),
-(267,295,5),
-(269,295,5),
-(276,195,5),
-(277,195,5),
-(284,222,5),
-(285,190,5),
-(286,190,5),
-(293,150,5),
-(294,150,5),
-(295,150,5),
-(297,221,5),
-(299,238,5),
-(300,154,5),
-(301,154,5),
-(303,184,5),
-(304,238,5),
-(305,238,5),
-(306,238,5),
-(315,245,5),
+(251,134,55),
+(261,128,5),
+(262,128,5),
+(263,132,5),
+(264,132,50),
+(264,135,5),
+(267,272,5),
+(269,272,5),
+(276,172,5),
+(277,172,5),
+(284,199,5),
+(285,167,5),
+(286,167,5),
+(293,127,5),
+(294,127,5),
+(295,127,5),
+(297,198,5),
+(299,215,5),
+(300,131,5),
+(301,131,5),
+(303,161,5),
+(304,215,5),
+(305,215,5),
+(306,215,5),
+(315,222,5),
 (316,89,5),
 (317,89,5),
-(318,226,5),
-(319,226,5),
-(322,152,55),
-(323,152,55),
-(325,194,5),
-(326,194,5),
-(327,150,5),
-(328,237,5),
-(331,288,5),
-(332,288,5),
-(335,217,5),
+(318,203,5),
+(319,203,5),
+(322,129,55),
+(323,129,55),
+(325,171,5),
+(326,171,5),
+(327,127,5),
+(328,214,5),
+(331,265,5),
+(332,265,5),
+(335,194,5),
 (337,81,5),
 (338,80,5),
-(345,296,5),
-(346,296,5),
-(351,243,55),
-(352,156,5),
-(353,247,5),
-(354,247,5),
-(355,196,5),
-(356,196,5),
-(358,198,5),
-(361,199,5),
-(362,199,5),
+(345,273,5),
+(346,273,5),
+(351,220,55),
+(352,133,5),
+(353,224,5),
+(354,224,5),
+(355,173,5),
+(356,173,5),
+(358,175,5),
+(361,176,5),
+(362,176,5),
 (366,89,5),
-(367,226,5),
-(368,227,5),
-(369,227,5),
+(367,203,5),
+(368,204,5),
+(369,204,5),
 (370,93,50),
-(371,250,5),
-(372,250,5),
-(373,250,5),
-(374,233,5),
-(375,233,5),
-(376,233,5),
+(371,227,5),
+(372,227,5),
+(373,227,5),
+(374,210,5),
+(375,210,5),
+(376,210,5),
 (385,91,55),
-(396,188,5),
-(397,188,5),
-(398,188,5),
-(400,155,50),
-(400,158,5),
-(401,277,5),
-(402,277,5),
-(406,245,5),
-(407,245,5),
-(413,222,5),
-(414,222,5),
+(396,165,5),
+(397,165,5),
+(398,165,5),
+(400,132,50),
+(400,135,5),
+(401,254,5),
+(402,254,5),
+(406,222,5),
+(407,222,5),
+(413,199,5),
+(414,199,5),
 (415,94,55),
-(416,245,5),
-(418,186,5),
-(419,186,5),
-(420,239,5),
-(421,239,5),
-(427,189,5),
-(428,189,5),
-(431,149,5),
-(432,149,5),
-(433,198,5),
-(434,151,5),
-(435,151,5),
-(436,233,5),
-(437,233,5),
-(439,154,5),
+(416,222,5),
+(418,163,5),
+(419,163,5),
+(420,216,5),
+(421,216,5),
+(427,166,5),
+(428,166,5),
+(431,126,5),
+(432,126,5),
+(433,175,5),
+(434,128,5),
+(435,128,5),
+(436,210,5),
+(437,210,5),
+(439,131,5),
 (440,110,50),
-(440,256,5),
-(441,277,5),
-(443,197,5),
-(444,197,5),
-(445,197,5),
-(446,234,55),
-(451,245,5),
-(452,245,5),
-(453,281,5),
-(454,281,5),
-(456,187,5),
-(457,187,5),
-(459,246,5),
-(460,246,5),
-(461,217,5),
-(461,286,50),
-(462,233,5),
-(463,279,5),
-(466,322,50),
-(467,323,5),
-(469,265,5),
-(476,238,5),
-(477,196,5),
-(478,199,5),
-(492,157,55),
-(499,222,5),
-(500,222,5);
+(440,233,5),
+(441,254,5),
+(443,174,5),
+(444,174,5),
+(445,174,5),
+(446,211,55),
+(451,222,5),
+(452,222,5),
+(453,258,5),
+(454,258,5),
+(456,164,5),
+(457,164,5),
+(459,223,5),
+(460,223,5),
+(461,194,5),
+(461,263,50),
+(462,210,5),
+(463,256,5),
+(466,299,50),
+(467,300,5),
+(469,242,5),
+(476,215,5),
+(477,173,5),
+(478,176,5),
+(492,134,55),
+(499,199,5),
+(500,199,5);
 /*!40000 ALTER TABLE pokemon_items ENABLE KEYS */;
 UNLOCK TABLES;

veekun/trunk/templates/dex/common.tt

@@ -100 +100 @@
     <td class="stat">[% stat_avg / 6 | format('%.01f') %]</td>
 [%+ END %]
+
+[% MACRO item_sprite(item_name) BLOCK %]
+[%     IF ( matches = item_name.match('^(TM|HM)(\d\d)$') ) %]
+[%         tm_num = matches.1 %]
+[%         SET tm_num = tm_num + 100 IF matches.0 == 'HM' %]
+[%         item_file = matches.0 _ "-" _ MoveData.${TMs.3.$tm_num}.type | lower %]
+[%     ELSE %]
+[% matches.join %]
+[%         item_file = item_name.replace(' ', '-').replace('[^-a-zA-Z0-9]', '') | lower %]
+[%     END -%]
+<img src="/dex-images/items/[% item_file %].png" alt=""/>
+[%- END %]
+
 [% END %]

veekun/trunk/templates/dex/list/items.tt

@@ -4 +4 @@
 <table class="dex-table dex-squished" cellspacing="0">
 <tr class="heading">
+    <th class="number"></th>
     <th class="number"> Id </th>
     <th class="name"> Name </th>
@@ -10 +11 @@
 [% WHILE (item = items_rs.next) %]
 <tr class="color[% color %]">
+    <td class="number"> [% item_sprite(item.name) %] </td>
     <td class="number"> [% item.id %] </td>
-    <td class="name"> <a href="[% dex_uri('items', item.name) %]">[% item.name %]</a> </td>
+    <td class="name"> <a href="[% dex_uri('items', item.name) %]">[% item.display_name %]</a> </td>
 [%     color = 3 - color %]
 [% END %]

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

@@ -1 +1 @@
 [% PROCESS 'dex/common.tt' %]
 
-[%# nextid = this.id % MoveData.max + 1; previd = (this.id - 2) % MoveData.max + 1 -%]
-<!--
+[% nextid = this.id % ItemNames.max + 1; previd = (this.id - 2) % ItemNames.max + 1 -%]
+
 <p class="dex-navigation">
-    <a href="[% dex_uri('moves', MoveData.$nextid.name) %]" class="next blocklink"> Next: #[% nextid %]<br/>[% MoveData.$nextid.name %] </a>
-    <a href="[% dex_uri('moves', MoveData.$previd.name) %]" class="prev blocklink"> Prev: #[% previd %]<br/>[% MoveData.$previd.name %] </a>
-    [% this.id %]<br/>[% this.name %]
-    </p>
--->
+    <a href="[% dex_uri('items', ItemNames.$nextid) %]" class="next blocklink"> [% item_sprite(ItemNames.$nextid) %] Next:<br/>[% ItemNames.$nextid %] </a>
+    <a href="[% dex_uri('items', ItemNames.$previd) %]" class="prev blocklink"> [% item_sprite(ItemNames.$previd) %] Prev:<br/>[% ItemNames.$previd %] </a>
+    [% item_sprite(this.name) %]<br/>[% this.display_name %]
+</p>
 
 <div class="warning">WARNING: I don't know what a lot of these numbers are yet,
@@ -16 +15 @@
 <h1>General</h1>
 <div class="dex-summary dex-summary-half">
-    <div class="name">[% this.name %]</div>
+    <div class="name">[% this.display_name %]</div>
 </div>
 <div class="dex-long-box">