Browse Source

more vars

shuvit 3 years ago
parent
commit
0d273c48ce
1 changed files with 18 additions and 17 deletions
  1. 18
    17
      controller2.py

+ 18
- 17
controller2.py View File

@@ -446,7 +446,7 @@ def main():
446 446
     #check manual
447 447
     ####
448 448
     #reg
449
-    if rUD > dict['man_sens_l'] and rUD < dict['man_sens_r'] and STANCE == 0 and rLR < .035 and rLR > -.035:
449
+    if rUD > dict['man_sens_l'] and rUD < dict['man_sens_r'] and STANCE == 0 and rLR < dict['man_sens_side'] and rLR > -dict['man_sens_side']:
450 450
         timer = own["reg_manual_timer"]
451 451
         timer = timer + 1
452 452
         own["reg_manual_timer"] = timer
@@ -464,7 +464,7 @@ def main():
464 464
           
465 465
     ####   
466 466
     #fak
467
-    if rUD > dict['man_sens_l'] and rUD < dict['man_sens_r'] and STANCE == 1 and rLR < .035 and rLR > -.035:
467
+    if rUD > dict['man_sens_l'] and rUD < dict['man_sens_r'] and STANCE == 1 and rLR < dict['man_sens_side'] and rLR > -dict['man_sens_side']:
468 468
         timer = own["fak_manual_timer"]
469 469
         timer = timer + 1
470 470
         own["fak_manual_timer"] = timer
@@ -480,7 +480,7 @@ def main():
480 480
      
481 481
     #####
482 482
     #reg nmanual
483
-    if rUD < -dict['man_sens_l'] and rUD > -dict['man_sens_r'] and STANCE == 0 and rLR < .035 and rLR > -.035:
483
+    if rUD < -dict['man_sens_l'] and rUD > -dict['man_sens_r'] and STANCE == 0 and rLR < dict['man_sens_side'] and rLR > -dict['man_sens_side']:
484 484
         timer = own["reg_nmanual_timer"]
485 485
         timer = timer + 1
486 486
         own["reg_nmanual_timer"] = timer
@@ -500,7 +500,7 @@ def main():
500 500
     #####
501 501
     #fak nmanual
502 502
     #print (rUD)
503
-    if rUD < -dict['man_sens_l'] and rUD > -dict['man_sens_r'] and STANCE == 1 and rLR < .035 and rLR > -.035:
503
+    if rUD < -dict['man_sens_l'] and rUD > -dict['man_sens_r'] and STANCE == 1 and rLR < dict['man_sens_side'] and rLR > -dict['man_sens_side']:
504 504
         timer = own["fak_nmanual_timer"]
505 505
         timer = timer + 1
506 506
         own["fak_nmanual_timer"] = timer
@@ -1818,14 +1818,16 @@ def main():
1818 1818
         speed = 20
1819 1819
         
1820 1820
     def turn():   
1821
-        rotamt = .02
1821
+        #rotamt = .02
1822
+        rotamt = dict['turn_rotation']
1822 1823
         linVelocity2 = own.getLinearVelocity(True)
1823
-        speed = .004
1824
+        #speed = .004
1825
+        speed = dict['turn_addx']
1824 1826
         manual = 0
1825 1827
         if own['manual_v2'] == 1:     
1826 1828
             manual = 1       
1827 1829
             if abs(linVelocity.x) < 2:
1828
-                speed = .005
1830
+                speed = dict['turn_addx'] + .001
1829 1831
                 
1830 1832
         jumpstance = own['jump_stance']
1831 1833
         if lLR > turnsens or lLR < -turnsens:
@@ -1894,19 +1896,17 @@ def main():
1894 1896
                 if STANCE == 1:   
1895 1897
                     own.setLinearVelocity([linVelocity2.x + speed, linVelocity2.y, linVelocity2.z], 1)        
1896 1898
              
1897
-    #air
1899
+    #air   
1898 1900
         if r_ground.triggered == False and (lLR > turnsens or dict['kb_ra'] == 2) and (grindHit == False or (manual == 1 and grindHit == True)) and own["wallride"] == None:
1899
-            rotamt = .07
1900 1901
             if STANCE == 0:
1901
-                own.applyRotation([0,0,-rotamt], 1)
1902
+                own.applyRotation([0,0,-dict['turn_air_rotation']], 1)
1902 1903
             if STANCE == 1:
1903
-                own.applyRotation([0,0,-rotamt], 1) 
1904
+                own.applyRotation([0,0,-dict['turn_air_rotation']], 1) 
1904 1905
         if r_ground.triggered == False and (lLR < -turnsens or dict['kb_la'] == 2) and (grindHit == False or (manual == 1 and grindHit == True)) and own["wallride"] == None:
1905
-            rotamt = .07
1906 1906
             if STANCE == 0:
1907
-                own.applyRotation([0,0,rotamt], 1)
1907
+                own.applyRotation([0,0,dict['turn_air_rotation']], 1)
1908 1908
             if STANCE == 1:
1909
-                own.applyRotation([0,0,rotamt], 1)                      
1909
+                own.applyRotation([0,0,dict['turn_air_rotation']], 1)                      
1910 1910
 
1911 1911
     ###########
1912 1912
     def grindsound():
@@ -2334,7 +2334,7 @@ def main():
2334 2334
         try:
2335 2335
             if 'grass' in r_ground.hitObject:
2336 2336
                 linVel = own.getLinearVelocity(True)
2337
-                linvelx = linVel.x * .98
2337
+                linvelx = linVel.x * dict['grass_mult']
2338 2338
                 own.setLinearVelocity((linvelx, linVel.y, linVel.z), 1)
2339 2339
         except:
2340 2340
             pass    
@@ -3592,7 +3592,8 @@ def main():
3592 3592
         lgf = own['last_grind_frame']
3593 3593
         frame = own['framenum']
3594 3594
         frames_since_grinding = frame - lgf
3595
-        ylimit = .84
3595
+        #ylimit = .84
3596
+        ylimit = dict['ylimit']
3596 3597
         #print(ground_since, 'ground_since')
3597 3598
         if ground_since < 20 and ground_since > 1 and grindHit == 0 and own['jump_timer'] < 40:
3598 3599
             ylimit = ylimit + ((ground_since - 15) * -.005)
@@ -4342,7 +4343,7 @@ def main():
4342 4343
     own["sel"] = bkBut  
4343 4344
 
4344 4345
     if r_ground.triggered and own["jump_timer"] < 20:
4345
-        force2 = [0.0, 0, -10]
4346
+        force2 = [0.0, 0, dict['antibounce']]
4346 4347
         own.applyForce(force2, True)
4347 4348
     if (grindDar == False and r_ground.triggered and own['grindTouch'] == False) or own['jump_timer'] > 40:
4348 4349
         own['grindType'] = ''

Loading…
Cancel
Save