Browse Source

breaking things

shuvit 6 years ago
parent
commit
5d3d7c507f
3 changed files with 104 additions and 52 deletions
  1. 77
    32
      co_ActionState.py
  2. 21
    14
      controller2.py
  3. 6
    6
      grindV2.py

+ 77
- 32
co_ActionState.py
File diff suppressed because it is too large
View File


+ 21
- 14
controller2.py View File

367
         own['requestAction'] = 'fak_roll'
367
         own['requestAction'] = 'fak_roll'
368
 
368
 
369
 #check manual_v2
369
 #check manual_v2
370
-if (rUD > .04 and rUD < .07) or (rUD < -.04 and rUD > -.07):
370
+if (rUD > .03 and rUD < .08) or (rUD < -.03 and rUD > -.08):
371
 #if (rUD > .04 and rUD < .07):
371
 #if (rUD > .04 and rUD < .07):
372
     #print("zoned")    
372
     #print("zoned")    
373
     timer = own['manual_v2_timer']
373
     timer = own['manual_v2_timer']
419
 #check manual
419
 #check manual
420
 ####
420
 ####
421
 #reg
421
 #reg
422
-if rUD > .04 and rUD < .07 and STANCE == 0 and rLR < .035 and rLR > -.035:
422
+if rUD > .03 and rUD < .08 and STANCE == 0 and rLR < .035 and rLR > -.035:
423
     timer = own["reg_manual_timer"]
423
     timer = own["reg_manual_timer"]
424
     timer = timer + 1
424
     timer = timer + 1
425
     own["reg_manual_timer"] = timer
425
     own["reg_manual_timer"] = timer
426
     if timer > 20 and rUD < .04:
426
     if timer > 20 and rUD < .04:
427
         own["reg_manual"] = 0
427
         own["reg_manual"] = 0
428
         #print("reg_man off")
428
         #print("reg_man off")
429
-if rUD <= .04 and (STANCE == 1 or STANCE == 0) and rUD >= -.04:
429
+if rUD <= .03 and (STANCE == 1 or STANCE == 0) and rUD >= -.04:
430
     own["reg_manual_timer"] = 0
430
     own["reg_manual_timer"] = 0
431
     own["reg_manual"] = 0 
431
     own["reg_manual"] = 0 
432
     #print("reg_man off2")   
432
     #print("reg_man off2")   
442
       
442
       
443
 ####   
443
 ####   
444
 #fak
444
 #fak
445
-if rUD > .04 and rUD < .07 and STANCE == 1 and rLR < .035 and rLR > -.035:
445
+if rUD > .03 and rUD < .08 and STANCE == 1 and rLR < .035 and rLR > -.035:
446
     timer = own["fak_manual_timer"]
446
     timer = own["fak_manual_timer"]
447
     timer = timer + 1
447
     timer = timer + 1
448
     own["fak_manual_timer"] = timer
448
     own["fak_manual_timer"] = timer
449
     if timer > 20:
449
     if timer > 20:
450
         own["fak_manual"] = 0
450
         own["fak_manual"] = 0
451
-if rUD <= .04 and (STANCE == 1 or STANCE == 0) and rUD >= -.04:
451
+if rUD <= .03 and (STANCE == 1 or STANCE == 0) and rUD >= -.04:
452
     own["fak_manual_timer"] = 0
452
     own["fak_manual_timer"] = 0
453
     own["fak_manual"] = 0
453
     own["fak_manual"] = 0
454
 if own["fak_manual_timer"] > 10 and own["reg_manual"] == 0:
454
 if own["fak_manual_timer"] > 10 and own["reg_manual"] == 0:
462
  
462
  
463
 #####
463
 #####
464
 #reg nmanual
464
 #reg nmanual
465
-if rUD < -.04 and rUD > -.07 and STANCE == 0 and rLR < .035 and rLR > -.035:
465
+if rUD < -.03 and rUD > -.08 and STANCE == 0 and rLR < .035 and rLR > -.035:
466
     timer = own["reg_nmanual_timer"]
466
     timer = own["reg_nmanual_timer"]
467
     timer = timer + 1
467
     timer = timer + 1
468
     own["reg_nmanual_timer"] = timer
468
     own["reg_nmanual_timer"] = timer
469
     if timer > 20:
469
     if timer > 20:
470
         own["reg_nmanual"] = 0
470
         own["reg_nmanual"] = 0
471
-if rUD >= -.04 and (STANCE == 1 or STANCE == 0) and rUD <= .04:
471
+if rUD >= -.03 and (STANCE == 1 or STANCE == 0) and rUD <= .04:
472
     own["reg_nmanual_timer"] = 0
472
     own["reg_nmanual_timer"] = 0
473
     own["reg_nmanual"] = 0
473
     own["reg_nmanual"] = 0
474
 
474
 
486
 #####
486
 #####
487
 #fak nmanual
487
 #fak nmanual
488
 #print (rUD)
488
 #print (rUD)
489
-if rUD < -.04 and rUD > -.07 and STANCE == 1 and rLR < .035 and rLR > -.035:
489
+if rUD < -.03 and rUD > -.08 and STANCE == 1 and rLR < .035 and rLR > -.035:
490
     timer = own["fak_nmanual_timer"]
490
     timer = own["fak_nmanual_timer"]
491
     timer = timer + 1
491
     timer = timer + 1
492
     own["fak_nmanual_timer"] = timer
492
     own["fak_nmanual_timer"] = timer
493
     if timer > 20:
493
     if timer > 20:
494
         own["fak_nmanual"] = 0
494
         own["fak_nmanual"] = 0
495
-if rUD >= -.04 and (STANCE == 1 or STANCE == 0) and rUD <= .04:
495
+if rUD >= -.03 and (STANCE == 1 or STANCE == 0) and rUD <= .04:
496
     own["fak_nmanual_timer"] = 0
496
     own["fak_nmanual_timer"] = 0
497
     own["fak_nmanual"] = 0
497
     own["fak_nmanual"] = 0
498
     #print('@@@@@@@@@fak_man_off_1')
498
     #print('@@@@@@@@@fak_man_off_1')
2371
     grindpos = own['grindpos']
2371
     grindpos = own['grindpos']
2372
     GRAB_ON = own["GRAB_ON"]
2372
     GRAB_ON = own["GRAB_ON"]
2373
     wr = own["wallride"]
2373
     wr = own["wallride"]
2374
-    if rUD > .040 and r_ground.triggered == False and GRAB_ON == False and wr == None and jump_timer < 20:
2374
+    jump_timer = own['jump_timer']
2375
+    if rUD > .040 and r_ground.triggered == False and GRAB_ON == False and wr == None and jump_timer < 30:
2375
         killact(2)
2376
         killact(2)
2376
         killact(4)
2377
         killact(4)
2377
         if STANCE == 0:
2378
         if STANCE == 0:
2378
-            own['requestAction'] = 'reg_air_tail'    
2379
+            own['requestAction'] = 'reg_air_tail'
2380
+            print("reg_air_tail")    
2379
         else:
2381
         else:
2380
             own['requestAction'] = 'fak_air_tail' 
2382
             own['requestAction'] = 'fak_air_tail' 
2381
-    elif rUD < -.040 and r_ground.triggered == False and GRAB_ON == False and wr == None and jump_timer < 20:
2383
+            print("fak_air_tail")
2384
+    elif rUD < -.040 and r_ground.triggered == False and GRAB_ON == False and wr == None and jump_timer < 30:
2382
         killact(2)
2385
         killact(2)
2383
         killact(4)
2386
         killact(4)
2384
         if STANCE == 0:
2387
         if STANCE == 0:
2385
             own['requestAction'] = 'reg_air_nose' 
2388
             own['requestAction'] = 'reg_air_nose' 
2389
+            print("reg_air_nose")
2386
         else:
2390
         else:
2387
             own['requestAction'] = 'fak_air_nose' 
2391
             own['requestAction'] = 'fak_air_nose' 
2392
+            print("fak_air_nose")
2388
 
2393
 
2389
 def air_turn_boost():
2394
 def air_turn_boost():
2390
     pass
2395
     pass
4260
     force2 = [0.0, 0, -10]
4265
     force2 = [0.0, 0, -10]
4261
     own.applyForce(force2, True)
4266
     own.applyForce(force2, True)
4262
 #print('grindtouch = ',  own['grindTouch'])
4267
 #print('grindtouch = ',  own['grindTouch'])
4263
-if grindDar == False and r_ground.triggered and own['grindTouch'] == False:
4264
-    own['grindType'] = ''
4268
+if (grindDar == False and r_ground.triggered and own['grindTouch'] == False) or own['jump_timer'] > 40:
4269
+    own['grindType'] = ''
4270
+    
4271
+#print(own['grindType'])    

+ 6
- 6
grindV2.py View File

180
         #print(rot)
180
         #print(rot)
181
         
181
         
182
         if (rot == 90 or rot == -270) and STANCE == True:
182
         if (rot == 90 or rot == -270) and STANCE == True:
183
-            print("90 fak stance")
183
+            #print("90 fak stance")
184
             own['stance'] = 1
184
             own['stance'] = 1
185
             STANCE = 1
185
             STANCE = 1
186
         if (rot == 90 or rot == -270) and STANCE == False:
186
         if (rot == 90 or rot == -270) and STANCE == False:
187
-            print("90 fak stance")
187
+            #print("90 fak stance")
188
             own['stance'] = 1
188
             own['stance'] = 1
189
             STANCE = 1
189
             STANCE = 1
190
         if (rot == -90 or rot == 270) and STANCE == True:
190
         if (rot == -90 or rot == 270) and STANCE == True:
191
-            print("-90 reg stance")
191
+            #print("-90 reg stance")
192
             own['stance'] = 0
192
             own['stance'] = 0
193
             STANCE = 0
193
             STANCE = 0
194
         if (rot == -90 or rot == 270) and STANCE == False:
194
         if (rot == -90 or rot == 270) and STANCE == False:
195
-            print("-90 reg stance")                        
195
+            #print("-90 reg stance")                        
196
             own['stance'] = 0
196
             own['stance'] = 0
197
             STANCE = 0
197
             STANCE = 0
198
-        print("stance: ", STANCE)
198
+        #print("stance: ", STANCE)
199
     def grindrotvel(obj):        
199
     def grindrotvel(obj):        
200
         skipconst = 1
200
         skipconst = 1
201
         #print("set jumponinit")              
201
         #print("set jumponinit")              
609
 
609
 
610
         #grind
610
         #grind
611
         #print(dist)
611
         #print(dist)
612
-        if dist < grind_dist and dropin == 0 and grind_jump == 0 and manual == 0 and no_grind == 0 and own['airup'] == 0 and own['grindoutturn'] == 0 and own['grindjumpturn'] == 0 and own['manual'] == 0 and own['gt_cd2'] < 50 and invert_on == False and own['air_mover'] == False and no_grind_pull == 0:
612
+        if dist < grind_dist and dropin == 0 and grind_jump == 0 and manual == 0 and no_grind == 0 and own['airup'] == 0 and own['grindoutturn'] == 0 and own['grindjumpturn'] == 0 and own['manual'] == 0 and own['gt_cd2'] < 55 and invert_on == False and own['air_mover'] == False and no_grind_pull == 0:
613
             #print("grind")    
613
             #print("grind")    
614
             hitObject, hitPoint, hitNormal = own.rayCast(nearestObject.worldPosition, own.worldPosition, .0, 'grind')
614
             hitObject, hitPoint, hitNormal = own.rayCast(nearestObject.worldPosition, own.worldPosition, .0, 'grind')
615
             if grindold == 0:
615
             if grindold == 0:

Loading…
Cancel
Save