Changeset 394 for veekun/trunk

Timestamp:

12/30/07 01:49:43 (11 months ago)

Author:

eevee

Message:

Location map is reborn. (#228)
Threw in some minor addenda regarding D/P file layout.

Location:

veekun/trunk

Files:

• lib/Vee/Controller/Dex.pm (modified) (2 diffs)
• static/dex/dp/hacking/files.tt (modified) (3 diffs)
• templates/dex/page/location.tt (modified) (1 diff)
• templates/dex/page/pokemon.tt (modified) (1 diff)
• templates/dex/page/pokemon/map.tt (deleted)
• templates/style/dex.tt (modified) (1 diff)

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

@@ -723 +723 @@
 }
 
-=head2 map
-
-=cut
-
-sub map : Chained('pokemon_chain') : Args(0) {
-    my ($self, $c) = @_;
-    my $s = $c->stash;
-    
-    my $poke = $c->req->captures->[0];
-    my $gen = 'dp';  # TODO: CHEAP HACK PLZ MAKE THIS WORK RITE -- do by generation but split if versions disagree?
-
-    my $row = get_row($c, 'Pokemon', $poke);
-    $c->vee_abort('There is no such Pokémon ', $poke, '.  If you are messing with my URLs, please stop.  If you came here via a link, please inform its owner that it is invalid.') unless $row;
-
-    $s->{encounters} = get_locations($row);
-    $s->{location_coords} = {
-        map { $_->name => $_->coordinates }
-            $c->model('DBIC::Locations')->search(undef)
-    };
-
-    $s->{this} = $row;
-
-    $s->{page_title} = $row->name . ' - Location Map';
-    $s->{crumbs}     = [
-        '<a href="' . $c->uri('Dex') . '">Pok&eacute;dex</a>',
-        '<a href="' . $c->uri('Dex', 'pokemon_list') . '">Pok&eacute;mon</a>',
-        '<a href="' . $c->uri('Dex', 'pokemon', lc $row->name) . '">' . $row->name . '</a>',
-        'Location Map',
-    ];
-
-    $s->{template} = 'dex/page/pokemon/map.tt';
-}
-
 ################################################################################
 
@@ -1420 +1387 @@
         if ($node->{param}) {
             $node->{blurb} .= ", or use $node->{param}";
-            $node->{item} = $1 eq 'day' ? 'gameui/day' : 'gameui/night';
+            $node->{item} = $1 eq 'day' ? 'gameui/daytime' : 'gameui/night';
         }
 

veekun/trunk/static/dex/dp/hacking/files.tt

@@ -281 +281 @@
   <dd>PLACEHOLDER: GBA 4bpp.  Graphics used in the animations for the transitions from the overworld to battles.</dd>
 <dt>graphic/fld_comact.narc</dt>
+  <dd>PLACEHOLDER: GBA 4bpp.  Appears to only contain an up arrow and a down arrow?</dd>
 <dt>graphic/font.narc</dt>
 <dt>graphic/fontoam.narc</dt>
@@ -286 +287 @@
 <dt>graphic/imageclip.narc</dt>
 <dt>graphic/mail_gra.narc</dt>
+  <dd>PLACEHOLDER: GBA 4bpp.  Background graphics for mail.</dd>
 <dt>graphic/menu_gra.narc</dt>
 <dt>graphic/mysign.narc</dt>
@@ -309 +311 @@
 <dt>graphic/waza_oshie_gra.narc</dt>
 <dt>graphic/winframe.narc</dt>
+  <dd>PLACEHOLDER: GBA 4bpp.  Borders, down arrow, and rotating clock animation used for dialog.</dd>
 <dt>graphic/worldtrade.narc</dt>
 <dt>graphic/zukan.narc</dt>

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

@@ -9 +9 @@
 [% FOREACH section IN encounters.keys %]
 
+[% IF section %]
 <h2>[% section %]</h2>
+[% END %]
 <table cellspacing="0" cellpadding="3" class="dex-table dex-locations">
 <tr class="heading">

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

@@ -276 +276 @@
 
 <h1>Locations</h1>
-[%# 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>
+[% MAP_SCALE = 1 # DO NOT SET THIS TO ANYTHING BUT 1 UNTIL BACKGROUND PROBLEM IS SOLVED %]
+<div class="dex-locations-map">
+    <img src="/dex-images/maps/sinnoh-dim.png" style="width: [% 216 * MAP_SCALE %]px;" alt=""/>
+[% FOR enc IN new_encounters %]
+[%     location = enc.location %]
+[%     NEXT IF done.${location.id} OR NOT location.coordinates%]
+[%     map_done.${location.id} = 1 %]
+    <a href="[% dex_uri('locations', location.name) %]" title="[% location.name %]" class="location">
+        <div class="name">[% location.name %]</div>
+[%         FOREACH loc IN location.coordinates.split(';');
+               coords = loc.split(' ');
+               left   = coords.shift * MAP_SCALE;
+               top    = coords.shift * MAP_SCALE;
+               width  = coords.shift * MAP_SCALE;
+               height = coords.shift * MAP_SCALE;
+%]
+        <div class="partition" style="top: [% top %]px; left: [% left %]px; width: [% width %]px; height: [% height %]px; background: url(/dex-images/maps/sinnoh.png) -[% left %]px -[% top %]px;" title="[% location_row.name %]"></div>
+[%     END %]
+    </a>
+[% END %]
+</div>
 
 <p>Sorry, Pearl players!  Only Diamond for the moment.</p>

veekun/trunk/templates/style/dex.tt

@@ -120 +120 @@
   .dex-natures td { text-align: center; padding-left: 1em; padding-right: 1em; }
 
-.dex-locations-map { position: relative; }
-.dex-locations-map img.map { float: left; margin-right: 16px; }
-.dex-locations-map .location { position: absolute; top: 0; left: 0; }
-.dex-locations-map .location .marker { visibility: hidden; }
-.dex-locations-map .location:hover .marker { visibility: visible; }
-.dex-locations-map .partition { position: absolute; z-index: 1; }
-.dex-locations-map .location:hover .partition { outline: 2px solid white; }
+.dex-locations-map { position: relative; float: right; }
+.dex-locations-map img.map { margin-right: 16px; }
+.dex-locations-map .location { }
+.dex-locations-map .location .name { position: absolute; visibility: hidden; right: 0; bottom: 0; width: 75%; padding-right: 1em; text-align: right; color: white; font-weight: bold; font-family: monospace; }
+.dex-locations-map .location:hover .name { visibility: visible; }
+.dex-locations-map .location:hover .name:hover { visibility: hidden; }
+.dex-locations-map .partition { position: absolute; z-index: 10; }
 
 /* Pokemon comparifier */