Changeset 393

Timestamp:

12/29/07 21:29:06 (11 months ago)

Author:

eevee

Message:

Locations mini-commit.
- Redid location pages to match the new format.
- Removed incorrect header text from Pokemon pages.
- Fixed up EncounterSet?->simplest_method to return more display-friendly data (thus merging together buckets with the same rarity), and corrected the old documentation. Also removed old inaccessible code.
- Refactored sections into their own database table.
- Refactored method-cell code into its own macro.

Location:

veekun/trunk

Files:

• lib/Vee/Controller/Dex.pm (modified) (1 diff)
• lib/Vee/Dex/EncounterSet.pm (modified) (5 diffs)
• lib/Vee/Schema/LocationEncounters.pm (modified) (2 diffs)
• lib/Vee/Schema/LocationSections.pm (added)
• lib/Vee/Schema/Locations.pm (modified) (1 diff)
• lib/Vee/Schema/Pokemon.pm (modified) (1 diff)
• root/dex-images/gameui/daytime.png (moved) (moved from veekun/trunk/root/dex-images/gameui/day.png)
• root/dex-images/gameui/morning.png (added)
• templates/dex/common.tt (modified) (1 diff)
• templates/dex/page/location.tt (modified) (1 diff)
• templates/dex/page/pokemon.tt (modified) (1 diff)

veekun/trunk/lib/Vee/Controller/Dex.pm

@@ -993 +993 @@
 
     my %encounters;
-    my $encounters_rs = $row->encounters_rs({
-        method => { '!=' => [qw/ surfing old-rod good-rod super-rod /] },  # temporary
-    }, {
-        order_by => 'section ASC, method = "grass" DESC',
-    });
-    while (my $encounter_row = $encounters_rs->next) {
-        my $arrayref = $encounters{ $encounter_row->section }
-                                ->{ $encounter_row->method  } ||= [];
-    
-        # copy the grass values over for replacement rows whose mechanics we're
-        # pretty sure about
-        @$arrayref = @{ dclone $encounters{ $encounter_row->section }{grass} }
-            if not @$arrayref and
-                (grep { $encounter_row->method eq $_ } qw/ daytime night poketore swarm /
-                or $encounter_row->method =~ /^ds-/);
-
-        if (defined $arrayref->[ $encounter_row->rarity ]) {
-            $arrayref->[ $encounter_row->rarity ]{pokemon} =
-                $encounter_row->pokemon_id;
-        } else {
-            $arrayref->[ $encounter_row->rarity ] = {
-                pokemon => $encounter_row->pokemon_id,
-                level   => $encounter_row->level,
-            };
-        }
-    }
-
-    my %pokemon;
-#    my $rarity_key = ($method =~ /rod|surfing/) ? 'locsurfpercents' : 'locpercents';
-    my $rarity_ct = scalar @{ $Generations[-1]{locpercents} };
-    for my $section (keys %encounters) {
-        for my $method (keys %{ $encounters{$section} }) {
-            my @poke_list = @{ $encounters{$section}{$method} };
-
-            # if this isn't a full list, leave it alone and return
-            if (@poke_list != $rarity_ct or not defined $poke_list[0]) {
-# WRONG:                $pokemon{$section}{$method} = [ uniq map { $_->{pokemon} } grep { $_ } @poke_list ];
-                next;
-            }
-
-            for my $index (0 .. $rarity_ct - 1) {
-                $pokemon{$section}{ $poke_list[$index]{pokemon} }
-                         { $poke_list[$index]{level} }{$method} +=
-                    $Generations[-1]{locpercents}[$index];
-            }
-        }
-    }
-       
+
+    my $sections_rs = $row->sections_rs;
+    while (my $section = $sections_rs->next) {
+        my $grouped_pokemon_rs = $section->encounters_rs( {
+            version  => 'diamond',
+        }, {
+            group_by => 'pokemon_id',
+        } );
+
+        while (my $enc_pokemon = $grouped_pokemon_rs->next) {
+            my $encounters_rs = $section->encounters_rs( {
+                version     => 'diamond',
+                pokemon_id  => $enc_pokemon->pokemon->id,
+            } );
+            $encounters_rs->reset;
+
+            push @{ $encounters{$section->name} }, Vee::Dex::EncounterSet->new(
+                $encounters_rs,
+                $enc_pokemon->pokemon,
+            );
+        }
+
+        @{ $encounters{$section->name} } = sort {
+            $a->pokemon->name cmp $b->pokemon->name
+        } @{ $encounters{$section->name} };
+    }
+
     $s->{this}       = $row;
-    $s->{encounters} = \%pokemon;
+    $s->{encounters} = \%encounters;
 }
 

veekun/trunk/lib/Vee/Dex/EncounterSet.pm

@@ -7 +7 @@
 
 use List::Util qw/sum/;
+use List::MoreUtils qw/uniq/;
 
 use Vee::Dex;
@@ -153 +154 @@
     $self->pokemon($pokemon);
     my $arbitrary_row = $rs->first;
-    $self->location($arbitrary_row->location);
+    $self->location($arbitrary_row->section->location);
     $self->section($arbitrary_row->section);
     $rs->reset;
@@ -170 +171 @@
     # }
 
+#    warn $self->location->name, ' [', $self->section->name, "]\n";
     while (my $enc = $rs->next) {
+#        warn join ' ', $enc->method, $enc->pokemon->name, $enc->rarity, $enc->level;
         my ($slot_category, $slot_bucket);
         if ($WaterMethods{ $enc->method }) {
@@ -277 +280 @@
 follows:
 
-    level  => [ $min, $max ],
-    rarity => $rarity,
-    method => { $category => $bucket },
+    level    => [ $min, $max ],
+    category => $category,
+    rarities => [
+        { rarity => $rarity, buckets => \@buckets },
+        ...
+    ],
+    buckets  => {
+        $bucket => $rarity,
+        ...
+    },
 
 C<$min> and C<$max> are the minimum and maximum levels at which the Pokemon
 can appear with this method.
 
-C<$category> and C<$bucket> are the category and bucket, respectively, in which
-this Pokemon most simply appears.  Note that in the case of C<$category> being
-C<'time'> or C<'dual-slot'>, C<$bucket> may be an arrayref.
-
-C<$rarity> is the total rarity for this Pokemon with the given method(s).
-
-Pokemon and an arrayref of the level range at which it appears, in the form
-C<[$lo, $hi]>.  If a tie between methods should arise, the first item will be
-an arrayref.
-
-If the Pokemon appears at all three times of day while walking around, C<undef>
-will be returned as the method name.
+C<$category> is the method category in which this Pokemon most simply appears.
+
+The C<buckets> key contains a hashref mapping buckets to rarities.
+
+The C<rarities> key contains an arrayref of hashrefs, each containing a rarity
+and a list of buckets with that rarity, in order from most common to rarest.
+This is convenient for compact display.
 
 =cut
@@ -332 +337 @@
 
         if (%bucket_rarities) {
+            my @grouped_rarities;
+
+            # Show these in order of most likely to least likely, and group any
+            # that have the same rarity
+            for my $rarity (sort { $b <=> $a } uniq values %bucket_rarities) {
+                my @buckets = grep {
+                    $bucket_rarities{$_} == $rarity
+                } keys %bucket_rarities;
+
+                # Sort buckets by the order defined in @SimpleMethods
+                my $o = 0;
+                my %order = map { $_ => $o++ } @$buckets;
+                @buckets = sort { $order{$a} <=> $order{$b} } @buckets;
+                
+                push @grouped_rarities, {
+                    buckets => \@buckets,
+                    rarity  => $rarity,
+                };
+            }
+
             return {
                 level    => [ $all_min, $all_max ],
                 category => $category,
-                rarities => \%bucket_rarities,
+                rarities => \@grouped_rarities,
+                buckets  => \%bucket_rarities,
             };
-        }
-    }
-
-    return;
-
-    my %time_rarities;
-    for my $time (qw/ morning daytime night /) {
-        $time_rarities{$time} = $self->rarity(time => $time);
-    }
-
-    my $times_ct = grep { $_ } values %time_rarities;
-    if ($times_ct == 3) {
-        return undef, 100;
-    } elsif ($times_ct) {
-        my @times = grep { $time_rarities{$_} } keys %time_rarities;
-        my $times_ref = @times > 1 ? \@times : $times[0];
-        return $times_ref, 100;
-    }
-
-    my @attempts = (
-        [ swarm => 1 ],
-        [ radar => 1 ],
-    );
-
-    for my $att (@attempts) {
-        my $rarity = $self->rarity(@$att);
-        if ($rarity) {
-            return $att->[0], $rarity;
         }
     }

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

@@ -13 +13 @@
 __PACKAGE__->load_components('Core');
 __PACKAGE__->table('location_encounters');
-__PACKAGE__->add_columns(qw/ location_id rarity version section pokemon_id method min_level max_level /);
-__PACKAGE__->set_primary_key(qw/ location_id rarity /);
+__PACKAGE__->add_columns(qw/ section_id rarity version pokemon_id method min_level max_level /);
+__PACKAGE__->set_primary_key(qw/ section_id rarity /);
 
 __PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokemon_id');
-__PACKAGE__->belongs_to(location => 'Vee::Schema::Locations', 'location_id');
+__PACKAGE__->belongs_to(section => 'Vee::Schema::LocationSections', 'section_id');
 
 =head1 METHODS
@@ -30 +30 @@
 sub level {
     my ($self) = @_;
-    
+
     my $level;
     my ($min, $max) = ($self->min_level, $self->max_level);

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

@@ -16 +16 @@
 __PACKAGE__->set_primary_key('id');
 
-__PACKAGE__->has_many(encounters => 'Vee::Schema::LocationEncounters', 'location_id');
+__PACKAGE__->has_many(sections => 'Vee::Schema::LocationSections', 'location_id');
 
 =head1 SEE ALSO

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

@@ -162 +162 @@
     my @encounter_sets;
 
-    my $sections_rs = $self->encounters_rs( undef, {
-        group_by => 'location_id, section',
+    my $grouped_sections_rs = $self->encounters_rs( undef, {
+        group_by => 'section_id',
     } );
 
-    while (my $section = $sections_rs->next) {
-        my $encounters_rs = $section->location->encounters_rs( {
+    while (my $enc_section = $grouped_sections_rs->next) {
+        my $encounters_rs = $enc_section->section->encounters_rs( {
             version     => 'diamond',
-            section     => $section->section,
+            section_id  => $enc_section->section->id,
         } );
 

veekun/trunk/templates/dex/common.tt

@@ -118 +118 @@
 [%- END %]
 
+[%# n.b.: this takes the structure returned from EncSet->simplest_method %]
+[% MACRO simple_method_cells(simple_method) BLOCK %]
+    <td> [% simple_method.level.0 %][% IF simple_method.level.0 != simple_method.level.1; ' - '; simple_method.level.1; END %] </td>
+[%     category = simple_method.category %]
+<td>
+[%     FOR hashref IN simple_method.rarities %]
+[%         FOR bucket IN hashref.buckets %]
+[%             SWITCH category %]
+[%             CASE 'time' %]<img src="/dex-images/gameui/[% bucket %].png" alt="[% bucket | ucfirst %]" title="[% bucket | ucfirst %]"/>
+[%             CASE 'swarm' %]<img src="/dex-images/items/teachy-tv.png" alt="Swarm" title="Swarm"/>
+[%             CASE 'water' %]<img src="/dex-images/items/[% bucket == 'surfing' ? 'hm-water' : bucket %].png" alt="[% bucket %]" title="[% bucket %]"/>
+[%             CASE 'pokeradar' %]<img src="/dex-images/items/poke-radar.png" alt="Pok&eacute; Radar" title="Pok&eacute; Radar"/>
+[%             CASE 'dualslot' %][% Icons.$bucket %]
+[%             END %]
+[%             ' ' %]
+[%         END %]
+[%         hashref.rarity %]%
+[%         '; ' UNLESS loop.last %]
+[%     END %]
+</td>
 [% END %]
+
+[% END %]

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

@@ -4 +4 @@
 
 <h1>[% this.name %] Pok&eacute;mon</h1>
-<p><strong>ATTN:</strong> This page sucks at the moment, doesn't include everything, and does weird things for places where the Diamond and Pearl encounters are different.  It should suffice for most uses, but be wary.</p>
-<p>Radar, swarm, and dual slot percentages assume that it is morning.</p>
-[% FOR section IN encounters.keys.sort %]
-[%     IF section %]
+
+<p>Sorry, Pearl players!  Only Diamond for the moment.</p>
+
+[% FOREACH section IN encounters.keys %]
+
 <h2>[% section %]</h2>
-[%     END %]
-<table class="dex-table dex-locations" cellspacing="0"
+<table cellspacing="0" cellpadding="3" class="dex-table dex-locations">
 <tr class="heading">
-    <th class="name">Pok&eacute;mon</th>
-    <th class="levels">Lv</th>
-[%     FOR method_pair IN known_methods %]
-    <th>[% method_pair.1 %]</th>
-[%     END %]
+    <th> Pok&eacute;mon </th>
+    <th> Level </th>
+    <th> Method </th>
 </tr>
 [%     color = 1 %]
-[%     last_pokemon = 0 %]
-[%     FOR p IN encounters.$section.keys.nsort %]
-[%         FOR level IN encounters.$section.$p.keys.nsort %]
-[%             IF p != encounters.$section.keys.nsort.0 AND loop.first %]
-<tr> <td colspan="[% 2 + known_methods.size %]" class="hbar"></td> </tr>
-[%             END %]
+[%     FOREACH enc IN encounters.$section %]
 <tr class="color[% color %]">
-    <td class="name">[% IF loop.first %]<a href="[% dex_uri('pokemon', PokemonNames.$p) %]">[% PokemonNames.$p %]</a>[% END %]</td>
-    <td class="levels">[% level %]</td>
-[%             FOR method_pair IN known_methods %]
-    <td>[% chance = encounters.$section.$p.$level.${ method_pair.0 }; chance _ '%' IF chance %]</td>
-[%             END %]
+    <td> <a href="[% dex_uri('pokemon', enc.pokemon.name) %]">[% enc.pokemon.name %]</a> </td>
+[%         simple_method_cells(enc.simplest_method.hash) %]
 </tr>
-[%             color = 3 - color %]
-[%         END %]
+[%         color = 3 - color %]
 [%     END %]
 </table>
 [% END %]
+

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

@@ -276 +276 @@
 
 <h1>Locations</h1>
-<!--<p><a href="[% dex_uri('pokemon', this.name) %]/map"><img src="/images/see-also.png" alt="See also:"/> Location map</a></p>-->
-<p>Location map returning eventually...</p>
-[%# TODO: this is kinda hacky! %]
-<p>Numbers are levels.  Bars are relative rarity.  Hover for a percentage.</p>
-<p>Swarms, the Pok&eacute;radar, and dual-slot icons are shown if [% this.name %] shows up during the event but <em>not</em> normally.  See the location page for gritty details.</p>
-
-<table cellspacing="0" cellpadding="3" class="dex-table dex-locations" style="display: inline-table;">
+[%# TODO fix ghastly links %]
+<p><a href="[% dex_uri('pokemon', this.name) %]/map"><img src="/images/see-also.png" alt="See also:"/> Location map</a></p>
+
+<p>Sorry, Pearl players!  Only Diamond for the moment.</p>
+
+<table cellspacing="0" cellpadding="3" class="dex-table dex-locations">
 <tr class="heading">
     <th> Area </th>
     <th> Section </th>
     <th> Level </th>
-    <th> Morn </th>
-    <th> Day </th>
-    <th> Night </th>
+    <th> Method </th>
 </tr>
 [% color = 1 %]
 [% FOREACH enc IN new_encounters %]
 <tr class="color[% color %]">
-    <td> [% enc.location.name %] </td>
-    <td> [% enc.section %] </td>
-[%     SET simple_method = enc.simplest_method.hash %]
-    <td> [% simple_method.level.0 %][% IF simple_method.level.0 != simple_method.level.1; ' - '; simple_method.level.1; END %] </td>
-[%     category = simple_method.category %]
-[%     SWITCH category %]
-[%     CASE 'time' %]
-    <td> [% simple_method.rarities.morning %]% </td>
-    <td> [% simple_method.rarities.daytime %]% </td>
-    <td> [% simple_method.rarities.night %]% </td>
-[%     CASE 'swarm' %]
-    <td colspan="3"><img src="/dex-images/items/teachy-tv.png" alt="Swarm" title="Swarm"/> [% simple_method.rarities.1 %]%</td>
-[%     CASE 'water' %]
-    <td colspan="3">[% FOR rod IN simple_method.rarities.keys %]<img src="/dex-images/items/[% rod == 'surfing' ? 'hm-water' : rod %].png" alt="[% rod %]" title="[% rod %]"/> [% simple_method.rarities.$rod %]%[% '; ' UNLESS loop.last %][% END %] </td>
-[%     CASE 'pokeradar' %]
-    <td colspan="3"><img src="/dex-images/items/poke-radar.png" alt="Radar" title="Radar"/> [% simple_method.rarities.1 %]%</td>
-[%     CASE 'dualslot' %]
-    <td colspan="3">[% FOR ver IN simple_method.rarities.keys %][% Icons.$ver %] [%+ simple_method.rarities.$ver %]%[% '; ' UNLESS loop.last %][% END %]</td>
-[%     CASE %]
-    <td colspan="3">unknown: [% category %]: [% simple_method.rarities.keys.sort.join %]</td>
-[%     END %]
+    <td> <a href="[% dex_uri('locations', enc.location.name) %]">[% enc.location.name %]</a> </td>
+    <td> [% enc.section.name %] </td>
+[%     simple_method_cells(enc.simplest_method.hash) %]
 </tr>
 [%     color = 3 - color %]