Add files via upload

Author: coderwilson

FFX_Battle.py

@@ -867,15 +867,15 @@ def Geneaux():
     FFX_Screen.awaitTurn()
     if not FFX_Screen.turnTidus():
         while not FFX_Screen.turnTidus():
-            if FFX_Screen.battleScreen():
+            if FFX_memory.battleScreen():
                 defend()
 
     attack('none')
 
     FFX_Screen.clickToBattle()
     if not FFX_Screen.turnYuna():
         while not FFX_Screen.turnYuna():
-            if FFX_Screen.battleScreen():
+            if FFX_memory.battleScreen():
                 defend()
 
     aeonSummon(0) # Summon Valefor

FFX_memory.py

@@ -3,6 +3,7 @@
 import time
 import FFX_Screen
 FFXC = FFX_Xbox.FFXC
+from math import cos, sin
 
 def float_from_integer(integer):
     return struct.unpack('!f', struct.pack('!I', integer))[0]
@@ -2220,8 +2221,8 @@ def eggX(eggNum):
     global process
     global baseValue
     eggNum += 23
-    basePointer = baseValue + 0x1FC44E4    # equivalent to the pointer FFX.exe+EA22A0
-    basePointerAddress = process.read(basePointer)    # pseudocode function to get the hex value from basePointer to figure out the address of the start of the actor array
+    basePointer = baseValue + 0x1FC44E4
+    basePointerAddress = process.read(basePointer)
     key = basePointerAddress + (0x880 * eggNum) + 0x0C
     retVal = float_from_integer(process.read(key))
     #print("Egg ", eggNum," X value: ", retVal)
@@ -2231,8 +2232,8 @@ def eggY(eggNum):
     global process
     global baseValue
     eggNum += 23
-    basePointer = baseValue + 0x1FC44E4    # equivalent to the pointer FFX.exe+EA22A0
-    basePointerAddress = process.read(basePointer)    # pseudocode function to get the hex value from basePointer to figure out the address of the start of the actor array
+    basePointer = baseValue + 0x1FC44E4
+    basePointerAddress = process.read(basePointer)
     key = basePointerAddress + (0x880 * eggNum) + 0x14
     retVal = float_from_integer(process.read(key))
     #print("Egg ", eggNum," Y value: ", retVal)
@@ -2300,3 +2301,71 @@ def buildEggs():
     for x in range(10):
         retArray[x] = egg(x)
     return retArray
+
+def iceX(actor):
+    global process
+    global baseValue
+    offset = actor + 7 #Icicle 0 is actor 7 in the array, incremented for each additional icicle.
+    
+    basePointer = baseValue + 0x1fc44e4
+    basePointerAddress = process.read(basePointer)
+    key = basePointerAddress + (0x880 * offset) + 0x0C
+    retVal = float_from_integer(process.read(key))
+    return retVal
+
+
+def iceY(actor):
+    global process
+    global baseValue
+    offset = actor + 7 #Icicle 0 is actor 7 in the array, incremented for each additional icicle.
+    
+    basePointer = baseValue + 0x1fc44e4
+    basePointerAddress = process.read(basePointer)
+    key = basePointerAddress + (0x880 * offset) + 0x14
+    retVal = float_from_integer(process.read(key))
+    return retVal
+
+def getIceDistance(iceNum):
+    global process
+    global baseValue
+    basePointer = baseValue + 0xF270B8
+    basePointerAddress = process.read(basePointer)
+    key = basePointerAddress + 0x1C0CC + (0x40 * iceNum)
+    retVal = float_from_integer(process.read(key))
+    return retVal
+
+def getIceLife(iceNum):
+    global process
+    global baseValue
+    basePointer = baseValue + 0xF270B8
+    basePointerAddress = process.read(basePointer)
+    key = basePointerAddress + 0x1C0CC + (0x40 * iceNum) + 4
+    retVal = process.readBytes(key,1)
+    return retVal
+
+
+class icicle:
+    def __init__(self, icenum):
+        self.num = icenum
+        self.x = iceX(self.num)
+        self.y = iceY(self.num)
+        #self.distance = getIceDistance(self.num)
+        #self.iceLife = getEggLife(icenum)
+        #self.eggPicked = getEggPicked(icenum)
+        
+        #if self.distance != 0: #Either we're in battle or the icicle is not active.
+        #    self.isActive = True
+        #else:
+        #    self.isActive = False
+        self.isActive = True
+
+    def reportVars(self):
+        varArray = [self.num, self.x, self.y]
+        print("Ice_num, X, Y")
+        print(varArray)
+
+def buildIcicles():
+    retArray = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+    for x in range(16):
+        retArray[x] = icicle(x)
+    return retArray

zz_eggHuntAuto.py

@@ -6,6 +6,7 @@
 import FFX_core
 import FFX_memory
 import FFX_Logs
+from math import copysign
 
 FFXC = FFX_Xbox.FFXC
 
@@ -46,6 +47,7 @@ def engage():
                         target = [-20,20]
                 #print("Building egg array")
                 eggArray = FFX_memory.buildEggs()
+                iceArray = FFX_memory.buildIcicles() #Added for additional pathing needs
                 currentTime = time.time()
                 if activeEgg == 99:
                     for marker in range(10): #Only print active eggs/icicles
@@ -88,19 +90,19 @@ def engage():
                     rX = right[0]
                     rY = right[1]
 
-                    Lx = fX*(eX-pX) + rX*(eY-pY)
-                    Ly = fY*(eX-pX) + rY(eY-pY)
-                    sumsUp = Lx+Ly
+                    Ly = fX * (eX-pX) + rX * (eY-pY)
+                    Lx = fY * (eX-pX) + rY * (eY-pY)
+                    sumsUp = abs(Lx)+abs(Ly)
                     if sumsUp == 0:
                         sumsUp = 0.01
                     Lx /= sumsUp
                     Ly /= sumsUp
-                    if Lx > Ly:
-                        Ly = Ly/Lx
-                        Lx = 1
-                    else:
-                        Lx = Lx/Ly
-                        Ly = 1
+                    if abs(Lx) > abs(Ly):
+                        Ly = copysign(Ly/Lx if Lx else 0, Ly)
+                        Lx = copysign(1, Lx)
+                    elif abs(Ly) > abs(Lx):
+                        Lx = copysign(Lx/Ly if Ly else 0, Lx)
+                        Ly = copysign(1, Ly)
 
                     FFXC.set_value('AxisLx', Lx)
                     FFXC.set_value('AxisLy', Ly)