Changeset 523 for veekun

Timestamp:

08/25/09 10:39:32 (7 months ago)

Author:

eevee

Message:

Fixed IV calculator bitching about impossible nonexistent input, which also fixes a bunch of nonnumeric warnings.

Location:

veekun/trunk

Files:

• lib/Vee/Controller/Dex/Utils.pm (modified) (3 diffs)
• templates/dex/utils/iv.tt (modified) (1 diff)

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

@@ -476 +476 @@
 
         # ok done with that validation nonsense
-            
+
         my (@ivs, @iv_ranges, @possible_stats);
         my @nature_change = (1) x 6;
@@ -492 +492 @@
             my $func = ($stat =~ /hp/) ? \&ingame_hp : \&ingame_stats;
 
+            # entire range of possible stats for this Pokemon
+            $possible_stats[$s] =
+                int( $nature_change[$s] * $func->($base, $p->{level}, 0,  $effort) ) . ' - ' .
+                int( $nature_change[$s] * $func->($base, $p->{level}, 31, $effort) );
+
+            # bail if there was no input provided
+            if (not $p->{$stat}) {
+                next;
+            }
+
             # possible IVs; doing this inversely is very difficult due to rounding
             for my $iv (0 .. 31) {
@@ -505 +515 @@
                 if $iv_ranges[$s]{min} != $iv_ranges[$s]{max}
                 or $iv_ranges[$s]{min} == -1;
-
-            # entire range of possible stats for this Pokemon
-            $possible_stats[$s] =
-                int( $nature_change[$s] * $func->($base, $p->{level}, 0,  $effort) ) . ' - ' .
-                int( $nature_change[$s] * $func->($base, $p->{level}, 31, $effort) );
         }
         $s->{ivs}            = \@ivs;

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

@@ -55 +55 @@
     <td class="stat">[% pokemon.${StatColumns.$s} %]</td>
     <td class="possible-stats[% nature_class %]">[% possible_stats.$s %]</td>
-[%         IF iv_ranges.$s.min >= 0 %]
+[%         IF NOT iv_ranges.$s%]
+    <td colspan="2">No input</td>
+[%         ELSIF iv_ranges.$s.min >= 0 %]
     <td class="possible-ivs">[% iv_ranges.$s.min %][% IF iv_ranges.$s.min != iv_ranges.$s.max %] - [% iv_ranges.$s.max %][% END %]</td>
     <td class="iv-graph"><div class="iv-bar">