shuvit 6 vuotta sitten
vanhempi
commit
f5210099ec
2 muutettua tiedostoa jossa 139 lisäystä ja 27 poistoa
  1. 110
    12
      co_ActionState.py
  2. 29
    15
      controller2.py

+ 110
- 12
co_ActionState.py
File diff suppressed because it is too large
Näytä tiedosto


+ 29
- 15
controller2.py Näytä tiedosto

@@ -95,6 +95,8 @@ def main():
95 95
     aBut_ground = own['aBut_ground']
96 96
     xBut_ground = own['xBut_ground']
97 97
     own['last_manual_v2'] = own['manual_v2']
98
+    lRequest = own['requestAction']
99
+    lAs = own['actionState']
98 100
 
99 101
 
100 102
     #current frame stuff
@@ -390,38 +392,49 @@ def main():
390 392
             if STANCE == 0:
391 393
                 if rUD > .04 and rUD < .07:
392 394
                     #print("reg manual")
393
-                    own['manual_v2_type'] = 'reg manual'
394
-                    own['requestAction'] = 'reg_manual'    
395
-                    
395
+                    own['manual_v2_type'] = 'reg manual'     
396 396
                 if rUD < -.04 and rUD > -.07:
397
-                    #print("reg nose manual")
398 397
                     own['manual_v2_type'] = 'reg nose manual'
399
-                    own['requestAction'] = 'reg_nose_manual' 
400
-                    
398
+
401 399
             if STANCE == 1:
402 400
                 if rUD > .04 and rUD < .07:
403
-                    #print("fak manual")
404 401
                     own['manual_v2_type'] = 'fak manual'
405
-                    own['requestAction'] = 'fak_manual'     
406
-                    
402
+                    if lRequest == 'reg_air_tail to manual':
403
+                        #print('chaaaaange init')
404
+                        own['manual_v2_type'] = 'fak nose manual'
407 405
                 if rUD < -.04 and rUD > -.07:
408
-                    #print("fak nose manual")
409 406
                     own['manual_v2_type'] = 'fak nose manual'
410
-                    own['requestAction'] = 'fak_nose_manual' 
407
+
411 408
                                 
412 409
         else:
413 410
             #print("flip stance")
414
-            if STANCE == 0:
411
+            if own['jump_stance'] == 0:
412
+                print('flipstance 0')
415 413
                 if own['manual_v2_type'] == 'fak manual':
416 414
                     own['manual_v2_type'] = 'reg nose manual'
417 415
                 if own['manual_v2_type'] == 'fak nose manual':
418 416
                     own['manual_v2_type'] = 'reg manual'
419
-            if STANCE == 1:
417
+                if lAs == 'fak_air_tail to manual' and own['manual_v2_type'] == 'reg manual':
418
+                    print('---requesting reg nose manual')
419
+                    own['manual_v2_type'] = 'reg nose manual' 
420
+                if lAs == 'fak_air_nose to nmanual' and own['manual_v2_type'] == 'reg nose manual':
421
+                    print('---requesting reg nose manual')
422
+                    own['manual_v2_type'] = 'reg manual'                                          
423
+            if own['jump_stance'] == 1:
424
+                print('flipstance 1')
420 425
                 if own['manual_v2_type'] == 'reg manual':
421 426
                     own['manual_v2_type'] = 'fak nose manual'
422 427
                 if own['manual_v2_type'] == 'reg nose manual':
423
-                    own['manual_v2_type'] = 'fak manual'                                
424
-       
428
+                    #print("asdfasdfasdfsdfasdfasdf")
429
+                    own['manual_v2_type'] = 'fak manual'   
430
+                if lAs == 'reg_air_tail to manual' and own['manual_v2_type'] == 'fak manual':
431
+                    print('---requesting fak nose manual')
432
+                    own['manual_v2_type'] = 'fak nose manual'
433
+                if lAs == 'reg_air_nose to nmanual' and own['manual_v2_type'] == 'fak nose manual':
434
+                    print('---requesting fak nose manual')
435
+                    own['manual_v2_type'] = 'fak manual'                    
436
+                  
437
+ 
425 438
     #check manual
426 439
     ####
427 440
     #reg
@@ -547,6 +560,7 @@ def main():
547 560
     def fak_manual_on():
548 561
         #killall()
549 562
         own['requestAction'] = 'fak_manual'
563
+        #print('fuck fuck fuck')
550 564
         if own["fak_manual_timer"] == 41:
551 565
             killact(3000)
552 566
             killact(3001)

Loading…
Peruuta
Tallenna