High crit moves, route file tidyup

pokemon-speedrunning · Aug 22, 2016 · 2deb54d · 2deb54d
1 parent 7119199
commit 2deb54d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/red_nidoran.txt b/red_nidoran.txt
@@ -107,15 +107,15 @@ buy 3 REPEL
 
 // SS ANNE
 // Bubblebeam normally always goes over Water Gun
-use TM11
-lm BUBBLEBEAM
-um MEGAPUNCH
 0x3A40B -v 2//ss anne rival fight (for squirtle)
 get HM01
 
 //SURGE
 swap POKEBALL REPEL
 use TM28
+use TM11
+lm BUBBLEBEAM
+um POISONSTING
 0x3A3C1 -v 2 //SURGE fight
 get BIKEVOUCHER
 
@@ -135,7 +135,7 @@ um HORNATTACK
 use REPEL
 0x39F22 -v 2 //maniac (cubone for redbar)
 0x39F1A -v 2 //maniac (L25 slowpoke)
-0x39EC2 // jrtrainerf (oddish troll)
+0x39EC2 -v 2 // jrtrainerf (oddish troll)
 use REPEL
 use REPEL
 0x39F81  // hiker
@@ -176,7 +176,7 @@ use SUPERREPEL
 swap ETHER XACCURACY
 use TM48
 lm ROCKSLIDE
-um POISONSTING
+um MEGAPUNCH
 
 //LAVENDER TOWER
 0x3A42B -xacc -v 2 //rival fight (for squirtles)

diff --git a/src/DamageCalculator.java b/src/DamageCalculator.java
@@ -338,7 +338,12 @@ private static String summary_help(Pokemon p1, Pokemon p2, StatModifier mod1, St
             int realmaxDmg = Math.max(maxDmg, critMaxDmg);
 
             if (Settings.includeCrits) {
+
                 double critChance = (p1.getSpecies().getBaseSpd() / 2) / 256.0;
+                if (m.getName().equalsIgnoreCase("Crabhammer") || m.getName().equalsIgnoreCase("Karate Chop")
+                        || m.getName().equalsIgnoreCase("Razor Leaf") || m.getName().equalsIgnoreCase("Slash")) {
+                    critChance = Math.min((p1.getSpecies().getBaseSpd() / 2) * 8, 255) / 256.0;
+                }
 
                 for (int hits = 1; hits <= 5; hits++) {
                     if (realminDmg * hits < oppHP && realmaxDmg * hits >= oppHP) {