Changeset 429

Timestamp:

04/27/08 20:49:18 (2 months ago)

Author:

eevee

Message:

Few small fixes for new breeding chains applet (#302).
Deals a little better with invalid moves/Pokemon, form actually works.

Location:

veekun/trunk

Files:

• lib/Vee/Controller/Dex/Utils.pm (modified) (2 diffs)
• templates/dex/utils/breeding_chains.tt (modified) (3 diffs)

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

@@ -247 +247 @@
     # XXX do the retrievals in Inflator code
     my $pokemon = $c->model('DBIC::Pokemon')->find($form->param_value('pokemon'));
-    warn join '|', $form->param_list('move');
     my @moves   = map { $c->model('DBIC::Moves')->find($_) } $form->param_list('move');
 
@@ -253 +252 @@
     my $version = 'dp';
 
+    ### Misc error handling
+
+    if ($pokemon->breeding_code == 255) {
+        $s->{error_msg} = $pokemon->name . ' cannot breed.';
+        return;
+    }
+
+    my @unlearnable_moves;
+    for my $move (@moves) {
+        my $method = $pokemon->move_method_string($move, $version);
+        if (not $method) {
+            push @unlearnable_moves, $move;
+        }
+    }
+    if (@unlearnable_moves) {
+        my @move_names = map { $_->name } @unlearnable_moves;
+        if (@move_names > 2) {
+            $move_names[-1] = 'or ' . $move_names[-1];
+        }
+        $s->{error_msg} = $pokemon->name . " cannot inherit "
+                        . join(', ', @move_names) . '.';
+        return;
+    }
+
+    # Find potential members of the genealogy
     my @learners = $c->model('DBIC::Pokemon')->search( {
         -or => [ {
+            -nest => \ "FIND_IN_SET('dp', pokemon_moves.versions)",
             'pokemon_moves.move_id' => $moves[0]->id,
             'pokemon_moves.method'  => [qw[ level egg machine ]],
-            -nest   => \ "FIND_IN_SET('dp', pokemon_moves.versions)",
-#            'pokemon.gender_rate' => $gender_restriction,
+            'gender_rate'           => { -not_in => [ 0, 254, 255 ] },
         }, {
             # Smeargle can, technically, learn anything

veekun/trunk/templates/dex/utils/breeding_chains.tt

@@ -2 +2 @@
 
 <h1>Breeding Chain Finder</h1>
+[% form.start %]
 <dl class="compact">
     <dt>Pok&eacute;mon</dt>
@@ -8 +9 @@
     <dd>[% form.get_field(name => 'move') %]</dd>
 </dl>
-  <p> <input type="submit" value="Find chains"/> <input type="reset" value="Reset form"/> </p>
+<p> <input type="submit" value="Find chains"/> <input type="reset" value="Reset form"/> </p>
+[% form.end %]
 [% RETURN IF NOT form.submitted OR form.has_errors %]
 
 <h1>Chains</h1>
+[% IF NOT flattened_tree %]
+<p> No breeding chains found. </p>
+[%     RETURN %]
+[% END %]
+
 <p> This tree is arranged by combinations of egg groups.  Any Pok&eacute;mon from a set may be used; since they have the same egg groups, they are all equally valid partners for all the Pok&eacute;mon in the sets above and below them. </p>
 
@@ -22 +29 @@
 [% color = 1 %]
 [% FOR node IN flattened_tree %]
-[%     indent_style = 'style="padding-left: ' _ (node.indent  * 2) _ 'em;"' %]
+[%     indent_style = 'style="padding-left: ' _ (node.indent * 32) _ 'px;"' %]
 [%     UNLESS loop.first %]
 <tr class="heading left">