Changeset 429 for veekun/trunk/lib/Vee/Controller

Timestamp:

04/27/08 20:49:18 (23 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.

Files:

• veekun/trunk/lib/Vee/Controller/Dex/Utils.pm (modified) (2 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