Changeset 108

Timestamp:

04/22/07 04:16:57 (3 years ago)

Author:

eevee

Message:

Added better encounter support.. still a ways to go, though.

Location:

veekun/branches/layout

Files:

• lib/Vee/Controller/Dex.pm (modified) (6 diffs)
• lib/Vee/Dex.pm (modified) (1 diff)
• templates/dex/page/pokemon.tt (modified) (4 diffs)

veekun/branches/layout/lib/Vee/Controller/Dex.pm

@@ -11 +11 @@
 use List::MoreUtils qw/uniq/;
 use Storable qw/dclone/;
+use Data::Dumper;
 
 =head1 NAME
@@ -412 +413 @@
     my $encounters_rs = $row->encounters_rs(undef, {
         prefetch  => 'location',
-        group_by  => [qw/ location_id section method /],
+        group_by  => [qw/ version location_id section method /],
 
         # this minor hackery will essentially collapse multiple rows for a
@@ -430 +431 @@
     my (%loc_seen_methods, $loc_any_sections, %loc_bases);
     while (my $encounter = $encounters_rs->next) {
-        my $sec_ref = $locations{ $encounter->location->name }{ $encounter->section } ||= {};
+        my $sec_ref = $locations{ $encounter->version }{ $encounter->location->name }{ $encounter->section } ||= {};
 
         my $is_replacement = grep { $encounter->method eq $_ } qw/ daytime night /;
@@ -439 +440 @@
         my @rarities = split / /, $encounter->rarity;
 
-        # this assumes that the levels are already in the database, although
-        # it will quietly assume otherwise if they happen to be zero, in which
-        # case the levels will just potentially be off a bit.
+        # this assumes that the levels are already in the database!
         # sql: UPDATE location_encounters l INNER JOIN location_encounters l2 USING (location_id, section, rarity) SET l.min_level = l2.min_level, l.max_level = l2.max_level WHERE l.method IN ('daytime', 'night') AND l2.method = 'grass';
 
         if ($is_replacement and
-            my $base_ref = $loc_bases{ $encounter->location->name }{ $encounter->section })
+            my $base_ref = $loc_bases{ $encounter->version }{ $encounter->location->name }{ $encounter->section })
         {
             @rarities = uniq @rarities, split / /, $base_ref->rarity;
-            warn $encounter->section; warn @rarities; warn $base_ref->rarity;
             
+            # TODO: lol this doesn't work all that well
             $min = min $min, $base_ref->min_level;
-            $max = min $max, $base_ref->max_level;
+            $max = max $max, $base_ref->max_level;
         }
 
@@ -469 +468 @@
             rarity => $rarity,
         };
-        $loc_bases{ $encounter->location->name }{ $encounter->section } = $encounter
+        $loc_bases{ $encounter->version }{ $encounter->location->name }{ $encounter->section } = $encounter
             if $encounter->method eq 'grass';
 
@@ -475 +474 @@
         $loc_any_sections = 1 if $encounter->section;
     }
+
+    local $Data::Dumper::Sortkeys = 1;
+    if ( Dumper($locations{diamond}) eq Dumper($locations{pearl}) ) {
+        %locations = ( dp => $locations{diamond} );
+    }
+
     $s->{encounters} = \%locations;
 

veekun/branches/layout/lib/Vee/Dex.pm

@@ -39 +39 @@
     { games => 'Gold/Silver/Crystal',             short => 'new',  abbr => 'gsc', maxid => 251, maxmoveid => 251, region => 'Johto', },
     { games => 'Ruby/Sapphire/Emerald/Fire/Leaf', short => 'rusa', abbr => 'rse', maxid => 386, maxmoveid => 354, region => 'Hoenn', locpercents => [qw/20 20 10 10 10 10 5 5 4 4 1 1/], },
-    { games => 'Diamond/Pearl',                   short => 'dp',   abbr => 'dp',  maxid => 493, maxmoveid => 470, region => 'Shinou', locpercents => [qw/20 20 10 10 10 10 5 5 4 4 1 1/], },
+    { games => 'Diamond/Pearl',                   short => 'dp',   abbr => 'dp',  maxid => 493, maxmoveid => 470, region => 'Sinnoh', locpercents => [qw/20 20 10 10 10 10 5 5 4 4 1 1/], locsurfpercents => [qw/60 30 5 4 1/], },
 );
 

veekun/branches/layout/templates/dex/page/pokemon.tt

@@ -322 +322 @@
 
 <h1>Locations</h1>
-<p> <a href="[% dex_uri('pokemon', this.name) %]/map[%# TODO %]"><img src="/images/see-also.png" alt="See also:"/> Location map</a> </p>
+<p> Location map will return shortly... </p>
+[%# TODO: this is hacky! %]
+[% FOR version IN encounters.keys.sort %]
+[%     IF version != 'dp' %]
+<h2>[% Icons.${ version.substr(0, 1) } %] [% version | ucfirst %]</h2>
+[%     END %]
 [% IF location_columns.keys.size %]
 <table cellspacing="0" cellpadding="3" class="dex-table dex-locations">
@@ -379 +384 @@
 [% END %]
 [% color = 1 %]
-[% FOR location IN encounters.keys.sort %]
-[%     FOR section IN encounters.$location.keys.sort %]
-[%         methods = encounters.$location.$section %]
+[% FOR location IN encounters.$version.keys.sort %]
+[%     FOR section IN encounters.$version.$location.keys.sort %]
+[%             methods = encounters.$version.$location.$section %]
 <tr class="color[% color %]">
     <td class="dex-locations-zone">[% location %]</td>[% IF location_columns.section %] <td class="dex-locations-zone">[% section %]</td>[% END %]
 [% IF location_columns.grass %]
-    <td>[% methods.grass.level %][% IF methods.grass.rarity %]<div class="minibar" title="[% methods.grass.rarity %]%"><div class="minibar-bar" style="width: [% methods.grass.rarity %]%;"></div></div>[% END %]</td>
+    <td>[% methods.grass.level %][% IF methods.grass.rarity %]<div class="minibar" title="[% methods.grass.rarity %]%"><div class="fill" style="width: [% methods.grass.rarity %]%;"></div></div>[% END %]</td>
 [% END %]
 [% IF location_columns.daytime %]
-    <td>[% IF methods.daytime %][% methods.daytime.level %][% IF methods.daytime.rarity %]<div class="minibar" title="[% methods.daytime.rarity %]%"><div class="minibar-bar" style="width: [% methods.daytime.rarity %]%;"></div></div>[% END %][% END %]</td>
+    <td>[% IF methods.daytime %][% methods.daytime.level %][% IF methods.daytime.rarity %]<div class="minibar" title="[% methods.daytime.rarity %]%"><div class="fill" style="width: [% methods.daytime.rarity %]%;"></div></div>[% END %][% END %]</td>
 [% END %]
 [% IF location_columns.night %]
-    <td>[% IF methods.night %][% methods.night.level %][% IF methods.night.rarity %]<div class="minibar" title="[% methods.night.rarity %]%"><div class="minibar-bar" style="width: [% methods.night.rarity %]%;"></div></div>[% END %][% END %]</td>
+    <td>[% IF methods.night %][% methods.night.level %][% IF methods.night.rarity %]<div class="minibar" title="[% methods.night.rarity %]%"><div class="fill" style="width: [% methods.night.rarity %]%;"></div></div>[% END %][% END %]</td>
 [% END %]
 [%         FOR m IN ['surfing', 'old-rod', 'good-rod', 'super-rod'] %]
@@ -403 +408 @@
     <td>[% IF methods.poketore %]<img src="/dex-images/items/poketore.png" alt="poketore"/>[% END %]</td>
 [% END %]
-[%         IF location_columns.dualslot %] 
+[% IF location_columns.dualslot %] 
     <td class="dex-locations-ds">[% Icons.ru IF methods.${'ds-ruby'} %]</td>
     <td class="dex-locations-ds">[% Icons.sa IF methods.${'ds-sapphire'} %]</td>
@@ -411 +416 @@
 [% END %]
 </tr>
-[%         color = 3 - color %]
+[%             color = 3 - color %]
 [%     END %]
 [% END %]
 </table>
 [% ELSE %]
-<p> This Pok&eacute;mon is not available in the wild in D/P. </p>
+<p> This Pok&eacute;mon is not available in the wild. </p>
+[% END %]
 [% END %]
 <!-- ####################################################################### -->