Merge pull request #138 from coderwilson/DEV

FINAL version for RPGLB

Author: coderwilson

blitz.py

@@ -54,7 +54,7 @@ def selectAction():
 
 
 def selectPassTarget():
-    return memory.main.blitzMenuNum() in [226, 236]
+    return memory.main.blitzMenuNum() in [226, 228, 236]
 
 
 def selectShotType():

character_names.json

@@ -1,10 +1,10 @@
 {
 "Tidus": "",
-"Valefor": "Birb",
-"Ifrit": "GoodBoi",
-"Ixion": "Horse",
-"Shiva": "BRRRRRR",
-"Bahamut": "Chad",
+"Valefor": "",
+"Ifrit": "",
+"Ixion": "",
+"Shiva": "",
+"Bahamut": "",
 "Anima": "",
 "Yojimbo": "",
 "Magus Sisters": ""

oblitzRNG/results.json

@@ -1 +1 @@
-{"999": {"999": {"duration": 987, "victory": false}, "9999": {"duration": 987, "victory": false}}, "41": {"732817399": {"duration": 425, "victory": true}, "437965591": {"duration": 441, "victory": true}, "1121309474": {"duration": 416, "victory": true}, "1609778543": {"duration": 418, "victory": true}, "1969442720": {"duration": 408, "victory": true}, "21364948": {"duration": 416, "victory": true}, "3072483500": {"duration": 441, "victory": true}, "212130967": {"duration": 466, "victory": true}, "2854911983": {"duration": 465, "victory": true}, "1843819959": {"duration": 885, "victory": true}, "4274649753": {"duration": 457, "victory": false}}, "142": {"2589917226": {"duration": 478, "victory": true}, "2233281548": {"duration": 606, "victory": true}}, "220": {"1565856760": {"duration": 472, "victory": false}}, "2": {"1966922524": {"duration": 419, "victory": true}}, "3": {"2678665148": {"duration": 419, "victory": true}, "2215463905": {"duration": 427, "victory": true}}, "4": {"3182373216": {"duration": 490, "victory": false}}, "5": {"592628288": {"duration": 462, "victory": true}}, "6": {"1924873241": {"duration": 461, "victory": true}}, "160": {"1000859538": {"duration": 423, "victory": true}, "1698424181": {"duration": 439, "victory": false}, "2236189384": {"duration": 519, "victory": true}, "3402007241": {"duration": 2128, "victory": true}, "2075628333": {"duration": 421, "victory": true}, "460717379": {"duration": 432, "victory": true}, "432681887": {"duration": 435, "victory": false}, "756435162": {"duration": 555, "victory": false}, "604826814": {"duration": 469, "victory": true}, "158909603": {"duration": 556, "victory": true}, "542814761": {"duration": 568, "victory": true}}, "31": {"3854190182": {"duration": 444, "victory": false}, "3926051679": {"duration": 475, "victory": true}, "2521512239": {"duration": 433, "victory": false}, "3258925411": {"duration": 416, "victory": true}, "1192479822": {"duration": 566, "victory": true}, "2966631798": {"duration": 407, "victory": true}, "411041882": {"duration": 438, "victory": true}, "1604092182": {"duration": 590, "victory": true}, "3465740531": {"duration": 469, "victory": false}, "3908942739": {"duration": 495, "victory": false}, "1081025765": {"duration": 486, "victory": false}, "1619771589": {"duration": 472, "victory": false}, "2105018092": {"duration": 454, "victory": false}, "1714145855": {"duration": 504, "victory": true}, "332190114": {"duration": 451, "victory": false}, "3738373951": {"duration": 516, "victory": false}, "980825690": {"duration": 472, "victory": true}, "4239405515": {"duration": 521, "victory": false}, "2341070643": {"duration": 535, "victory": false}, "2660353227": {"duration": 628, "victory": true}, "2822736185": {"duration": 470, "victory": true}, "3366427508": {"duration": 533, "victory": false}, "1276890636": {"duration": 437, "victory": false}, "886305782": {"duration": 434, "victory": false}, "1051281977": {"duration": 630, "victory": true}, "2021978880": {"duration": 437, "victory": false}, "1164258492": {"duration": 518, "victory": false}, "1680547812": {"duration": 472, "victory": false}, "1277936441": {"duration": 585, "victory": true}, "1622783550": {"duration": 640, "victory": true}, "498024112": {"duration": 446, "victory": true}, "952515814": {"duration": 450, "victory": true}, "710964158": {"duration": 542, "victory": false}, "893081387": {"duration": 605, "victory": true}, "13631848": {"duration": 516, "victory": false}, "233887295": {"duration": 505, "victory": false}, "1749012693": {"duration": 490, "victory": false}, "1390135519": {"duration": 444, "victory": true}}, "219": {"2515895644": {"duration": 441, "victory": true}}}
+{"999": {"999": {"duration": 987, "victory": false}, "9999": {"duration": 987, "victory": false}}}

vars.py

@@ -14,7 +14,7 @@ def setStartVars(self):
         self.csrValue = True              # Set automatically on new game. For testing (loading a save file) set for your environment.
         self.nemesisValue = False         # Set based on if you're doing any% (False) or Nemesis% (True)
         self.forceLoop = False            # After game is finished, start again on next seed.
-        self.blitzLoop = False            # Loop on the same seed immediately after Blitzball.
+        self.blitzLoop = True             # Loop on the same seed immediately after Blitzball.
         self.blitzLossForceReset = False  # True = reset after blitz loss
         self.setSeed = True               # If you are using Rossy's patch, set to True. Otherwise set to False
         self.kilikaSkip = True            # True == Tidus OD on Evrae instead of Seymour. New strat.