Changeset 230

Timestamp:

06/09/07 03:54:12 (3 years ago)

Author:

eevee

Message:

Fixed Hidden Power calculations and added them to the IV calculator on the off chance that the user narrows down all the IVs exactly.

Location:

veekun/trunk

Files:

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

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

@@ -330 +330 @@
             $nature_change[ $nature_updown->{down} ] = 0.9;
         }
+
+        my $all_exact = 1;
         for my $s (0 .. $#StatColumns) {
             my $stat = $StatColumns[$s];
@@ -346 +348 @@
             $iv_ranges[$s]{min} = first_index { $_ } @{ $ivs[$s] };
             $iv_ranges[$s]{max} =  last_index { $_ } @{ $ivs[$s] };
+            $all_exact = 0
+                if $iv_ranges[$s]{min} != $iv_ranges[$s]{max}
+                or $iv_ranges[$s]{min} == -1;
 
             # entire range of possible stats for this Pokemon
@@ -356 +361 @@
         $s->{possible_stats} = \@possible_stats;
 
+        # TODO: improve this a bit since even at L100 you rarely get perfect results
+        if ($all_exact) {
+            $s->{hp_power} = ingame_hp_power( map { $_->{min} } @iv_ranges );
+            $s->{hp_type}  = ingame_hp_type ( map { $_->{min} } @iv_ranges );
+        }
+
         $s->{nature}         = $p->{nature};
         $s->{pokemon}        = $pokemon;

veekun/trunk/lib/Vee/Dex.pm

@@ -198 +198 @@
 our (@PokemonJohto, @PokemonHoenn, @PokemonSinnoh);
 our (@MoveData, $DamagingMoveCount);
-our (%TypeData, @TypeNames, %OldTypeOrder);
+our (%TypeData, @TypeNames, %OldTypeOrder, @NewTypeOrder);
 our (@AbilityNames, @ItemNames);
 our (@TMs, %MoveTMs);
@@ -227 +227 @@
     @TypeNames = sort keys %TypeData;
     %OldTypeOrder = map { $_->internalid + 1 => $_->name } values %TypeData;  # for Compat.pm
+    @NewTypeOrder = map { $_->name } sort { $a->id <=> $b->id } grep { $_->id >= 0 } values %TypeData;
 
     @AbilityNames = $schema->resultset('Abilities')->search({ id => { '<', 200 } }, { order_by => 'id ASC', columns => ['name'] })->get_column('name')->all;
@@ -647 +648 @@
 
 # 31-base hidden power power
-# stupidly complicated
 sub ingame_hp_power {
-    my (%ivs) = @_;
-
-    my @ivs = @ivs{qw/ stat_hp stat_at stat_de stat_sp stat_sa stat_sd /};
+    my (@ivs) = @_;
+
+    # speed is in the middle as far as the game is concerned
+    @ivs = @ivs[ 0, 1, 2, 5, 3, 4 ];
 
     my $sum = 0;
@@ -659 +660 @@
 
     return int($sum * 40 / 63) + 30;
+}
+
+# 31-base hidden power type
+sub ingame_hp_type {
+    my (@ivs) = @_;
+
+    # speed is in the middle as far as the game is concerned
+    @ivs = @ivs[ 0, 1, 2, 5, 3, 4 ];
+
+    my $sum = 0;
+    for my $i (0 .. 5) {
+        $sum += ($ivs[$i] & 0x01) << $i;
+    }
+
+    # +1 is to skip normal and make fighting (normally 1) be zero
+    return $NewTypeOrder[ int($sum * 15 / 63) + 1 ];
 }
 

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

@@ +1 @@
+[% PROCESS 'dex/common.tt' %]
+
 <h1>Calculator</h1>
 <p>See below for instructions and hints.</p>
@@ -9 +11 @@
     <dd>[% form.get_tag('level') %]</dd>
     <dt>Nature</dt>
-    <dd>[% form.get_tag('nature') %]</dd>
+    <dd>
+        [% form.get_tag('nature') %]
+[% IF form.submitted AND Natures.$nature %]
+        <p class="typemod-25">  +10%: [% StatNames.${ Natures.$nature.up   } %] </p>
+        <p class="typemod-400"> -10%: [% StatNames.${ Natures.$nature.down } %] </p>
+[% END %]
+    </dd>
 </dl>
 <table class="dex-table dex-statcalc" cellspacing="0">
@@ -42 +50 @@
     <td class="stat">[% pokemon.${StatColumns.$s} %]</td>
     <td class="possible-stats[% nature_class %]">[% possible_stats.$s %]</td>
-    [%         IF iv_ranges.$s.min >= 0 %]
+[%         IF 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">
@@ -57 +65 @@
 [% END %]
 </table>
+
+[% IF hp_power %]
+<p> <a href="[% dex_uri('moves', 'Hidden Power') %]">Hidden Power</a> for this Pok&eacute;mon will be [% type_name(hp_type) %] and have [% hp_power %] power. </p>
+[% END %]
+
 <hr/>
-<p>
-    <input type="submit" value="Calculate"/>
-    <input type="reset" value="Reset"/>
-</p>
+
+<ul>
+    <li> <input type="submit" value="Calculate IVs"/> from stats and, optionally, effort </li>
+    <li> <input type="reset" value="Reset"/> form </li>
+</ul>
 </form>