small ting

Startup.py

@@ -140,5 +140,8 @@ def main():
     dict['spawned_npcs'] = []
     dict['JUMPHEIGHT'] = 800
     dict['MAX_VEL'] = 6.7
+    dict['char_loaded'] = 0
+    dict['man_sens_l'] = .03
+    dict['man_sens_r'] = .08
 
 main()

co_ActionState.py

@@ -714,9 +714,9 @@ def main():
         if l_actionState == 'reg_pump_left-left' and requestAction not in [ 'reg_pump_left-left', 'reg_pump_left-leftb']:
             requestAction = 'reg_pump_left'        
             
-        if l_actionState == 'reg_pump_right_out' and requestAction == 'reg_turnRight':
+        if l_actionState == 'reg_pump_right_out' and requestAction in ['reg_turnRight', 'reg_turnLeft']:
             requestAction = 'reg_pump'
-        if l_actionState == 'reg_pump_left_out' and requestAction == 'reg_turnLeft':
+        if l_actionState == 'reg_pump_left_out' and requestAction in ['reg_turnLeft', 'reg_turnRight']:
             requestAction = 'reg_pump'    
                       
         if l_actionState == 'reg_pump_out' and requestAction == 'reg_pump_right':

controller2.py

@@ -350,7 +350,7 @@ def main():
                 pass
             own["vib_Countdown"] = 14
             cont.activate(own.actuators["Vibration"])
-            if own['manual_v2'] == 0 and grindDar == 0:           
+            if own['manual_v2'] == 0 and grindDar == 0:          
                 if STANCE == 0:
                     own['requestAction'] = 'reg_land'
                 elif STANCE == 1:
@@ -378,7 +378,7 @@ def main():
             own['requestAction'] = 'fak_roll'
 
     #check manual_v2
-    if (rUD > .03 and rUD < .08) or (rUD < -.03 and rUD > -.08):
+    if (rUD > dict['man_sens_l'] and rUD < dict['man_sens_r']) or (rUD < -dict['man_sens_l'] and rUD > -dict['man_sens_r']):
     #if (rUD > .04 and rUD < .07):
         #print("zoned")    
         timer = own['manual_v2_timer']
@@ -454,14 +454,14 @@ def main():
     #check manual
     ####
     #reg
-    if rUD > .03 and rUD < .08 and STANCE == 0 and rLR < .035 and rLR > -.035:
+    if rUD > dict['man_sens_l'] and rUD < dict['man_sens_r'] and STANCE == 0 and rLR < .035 and rLR > -.035:
         timer = own["reg_manual_timer"]
         timer = timer + 1
         own["reg_manual_timer"] = timer
         if timer > 20 and rUD < .04:
             own["reg_manual"] = 0
             #print("reg_man off")
-    if rUD <= .03 and (STANCE == 1 or STANCE == 0) and rUD >= -.04:
+    if rUD <= dict['man_sens_l'] and (STANCE == 1 or STANCE == 0) and rUD >= -.04:
         own["reg_manual_timer"] = 0
         own["reg_manual"] = 0 
         #print("reg_man off2")   
@@ -471,70 +471,57 @@ def main():
     ######
     if own["reg_manual_timer"] == 0:
         own["reg_manual"] = 0 
-    if own['last_reg_manual'] == 1 and own['reg_manual'] == 0:
-        #killall()   
-        pass
           
     ####   
     #fak
-    if rUD > .03 and rUD < .08 and STANCE == 1 and rLR < .035 and rLR > -.035:
+    if rUD > dict['man_sens_l'] and rUD < dict['man_sens_r'] and STANCE == 1 and rLR < .035 and rLR > -.035:
         timer = own["fak_manual_timer"]
         timer = timer + 1
         own["fak_manual_timer"] = timer
         if timer > 20:
             own["fak_manual"] = 0
-    if rUD <= .03 and (STANCE == 1 or STANCE == 0) and rUD >= -.04:
+    if rUD <= dict['man_sens_l'] and (STANCE == 1 or STANCE == 0) and rUD >= -.04:
         own["fak_manual_timer"] = 0
         own["fak_manual"] = 0
     if own["fak_manual_timer"] > 10 and own["reg_manual"] == 0:
         own["fak_manual"] = 1
     if own["fak_manual_timer"] == 0:
-        own["fak_manual"] = 0 
-    if own['last_fak_manual'] == 1 and own['fak_manual'] == 0:
-        #killall() 
-        pass  
-    #print(own["reg_manual"], own["fak_manual"])    
+        own["fak_manual"] = 0  
      
     #####
     #reg nmanual
-    if rUD < -.03 and rUD > -.08 and STANCE == 0 and rLR < .035 and rLR > -.035:
+    if rUD < -dict['man_sens_l'] and rUD > -dict['man_sens_r'] and STANCE == 0 and rLR < .035 and rLR > -.035:
         timer = own["reg_nmanual_timer"]
         timer = timer + 1
         own["reg_nmanual_timer"] = timer
         if timer > 20:
             own["reg_nmanual"] = 0
-    if rUD >= -.03 and (STANCE == 1 or STANCE == 0) and rUD <= .04:
+    if rUD >= -dict['man_sens_l'] and (STANCE == 1 or STANCE == 0) and rUD <= .04:
         own["reg_nmanual_timer"] = 0
         own["reg_nmanual"] = 0
 
     if own["reg_nmanual_timer"] > 10 and own["fak_nmanual"] == 0 and own['reg_manual'] == 0 and own['fak_manual'] == 0:  
         if own['last_fak_manual'] == False and own['last_reg_manual'] == False and own['last_fak_manual'] == False:
             own["reg_nmanual"] = 1
-            #print("baaad", own['reg_manual'], own['last_reg_manual'])
 
     if own["reg_nmanual_timer"] == 0:
         own["reg_nmanual"] = 0 
-    if own['last_reg_nmanual'] == 1 and own['reg_nmanual'] == 0:
-        pass
-        #killall()   
      
     #####
     #fak nmanual
     #print (rUD)
-    if rUD < -.03 and rUD > -.08 and STANCE == 1 and rLR < .035 and rLR > -.035:
+    if rUD < -dict['man_sens_l'] and rUD > -dict['man_sens_r'] and STANCE == 1 and rLR < .035 and rLR > -.035:
         timer = own["fak_nmanual_timer"]
         timer = timer + 1
         own["fak_nmanual_timer"] = timer
         if timer > 20:
             own["fak_nmanual"] = 0
-    if rUD >= -.03 and (STANCE == 1 or STANCE == 0) and rUD <= .04:
+    if rUD >= -dict['man_sens_l'] and (STANCE == 1 or STANCE == 0) and rUD <= .04:
         own["fak_nmanual_timer"] = 0
         own["fak_nmanual"] = 0
-        #print('@@@@@@@@@fak_man_off_1')
     if own["fak_nmanual_timer"] > 10 and own["reg_nmanual"] == 0 and own['fak_manual'] == 0 and own ['reg_manual'] == 0:
         own["fak_nmanual"] = 1
     if own["fak_nmanual_timer"] == 0 and own['reg_manual'] == 0:
-        #if own['flip_manual_stance'] == 0:
         own["fak_nmanual"] = 0 
     if own['last_fak_nmanual'] == 1 and own['fak_nmanual'] == 0:
         pass  

load_char.py

@@ -36,7 +36,7 @@ def main(cont):
     actu = cont.actuators['start_level']
     dict = bge.logic.globalDict
     mainDir = bge.logic.expandPath("//")
-    
+ #   if dict['char_loaded'] == 0:
     fileName = mainDir + "characters/" + str(dict["character"]) + '.blend'    
     
     path = bge.logic.expandPath(fileName)
@@ -50,6 +50,7 @@ def main(cont):
     
     path = bge.logic.expandPath(fileName)
     bge.logic.LibLoad(path, 'Scene') 
+#        dict['char_loaded'] = 1
     
     
 #    fileName = mainDir + "characters/sun.blend"