manual lands fix

Settings.py

@@ -83,8 +83,8 @@ def readSettings():
     dict['bloom_on'] = int(data[53]) 
     dict['cam_height'] = float(data[55]) 
     dict['focal_length'] = int(data[56])        
-    
-    
+    dict['cam_min'] = float(data[57])
+    dict['cam_max'] = float(data[58])
     
     
     #print('bc = ', dict['bc'])        
@@ -156,8 +156,9 @@ def writeSettings():
         writing.write(str(dict["bloom_on"])+"\n")  
         writing.write(str("//cam")+"\n")
         writing.write(str(dict["cam_height"])+"\n") 
-        writing.write(str(dict["focal_length"])+"\n")                 
-        
+        writing.write(str(dict["focal_length"])+"\n") 
+        writing.write(str(dict["cam_min"])+"\n")                 
+        writing.write(str(dict["cam_max"])+"\n") 
         
         
         #writing.write(str(own["framerate"])+"\n")

co_ActionState.py

@@ -438,22 +438,22 @@ def main():
 
 
         #print(requestAction)
-        if l_actionState == 'reg_air_tail to manual' and requestAction == 'fak_nmanual':
+        if l_actionState == 'reg_air_tail to manual' and requestAction in ['fak_nmanual', 'fak_manual']:
             requestAction = 'reg-fak_nmanual'
-        if l_actionState == 'fak_air_tail to manual' and requestAction == 'reg_nmanual':
+        if l_actionState == 'fak_air_tail to manual' and requestAction in ['reg_nmanual', 'reg_manual']:
             requestAction = 'fak-reg_nmanual' 
-        if l_actionState == 'fak_air_tail to nmanual' and requestAction == 'reg_nmanual':
+        if l_actionState == 'fak_air_tail to nmanual' and requestAction in ['reg_nmanual', 'reg_manual']:
             requestAction = 'fak-reg_manual'   
             
-        if l_actionState == 'reg_air_nose to nmanual' and requestAction == 'fak_manual':
+        if l_actionState == 'reg_air_nose to nmanual' and requestAction in ['fak_manual', 'fak_nmanual']:
             requestAction = 'reg-fak_manual'
-        if l_actionState == 'fak_air_nose to nmanual' and requestAction == 'reg_manual':
+        if l_actionState == 'fak_air_nose to nmanual' and requestAction in ['reg_manual', 'reg_nmanual']:
             requestAction = 'fak-reg_manual' 
             
             
-#        if l_actionState == 'fak_air_nose to nmanual' and requestAction == 'reg_nmanual':
+#        if l_actionState == 'fak_air_nose to nmanual' and requestAction in ['reg_nmanual', 'reg_manual']:
 #            requestAction = 'fak-reg_manual'  
-#            #print('this???')
+            #print('this???')
 #        if l_actionState == 'fak-reg_manual' and requestAction == 'reg_nmanual':
 #            requestAction = 'reg_manual'                
             
@@ -3830,7 +3830,7 @@ def main():
         cur_frame = skater.getActionFrame(trans_layer)  
         cur_frame = round(cur_frame, 2)     
     #print("oG: ", og_request, "rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'], 'cf', cur_frame)
-    #print("rA:", requestAction, "|aS:", own['actionState'], own['actionTimer'], 'cf', cur_frame)
+    print("rA:", requestAction, "|aS:", own['actionState'], own['actionTimer'], 'cf', cur_frame)
     cur_frame = skater.getActionFrame(trans_layer)
     #print(cur_frame)
     def printplaying():

controller2.py

@@ -442,17 +442,24 @@ def main():
                     #print('---requesting fak nose manual')
                     own['manual_v2_type'] = 'fak manual' 
                     
-        if STANCE == 0 and own['manual_v2_type'] == 'fak manual':
+        if STANCE == 0 and (own['manual_v2_type'] == 'fak manual' or own['actionState'] == 'fak-reg_nmanual'):
             #print('change manual stance')
             own['manual_v2_type'] = 'reg nose manual' 
-        if STANCE == 1 and own['manual_v2_type'] == 'reg manual':
+            
+            
+            
+            
+        if STANCE == 1 and (own['manual_v2_type'] == 'reg manual' or own['actionState'] == 'reg-fak_nmanual'):
             #print('change manual stance')                        
             own['manual_v2_type'] = 'fak nose manual'
 
-        if STANCE == 0 and own['manual_v2_type'] == 'fak nose manual':
+
+
+
+        if STANCE == 0 and (own['manual_v2_type'] == 'fak nose manual' or own['actionState'] == 'fak-reg_manual'):
             #print('change manual stance')
             own['manual_v2_type'] = 'reg manual' 
-        if STANCE == 1 and own['manual_v2_type'] == 'reg nose manual':
+        if STANCE == 1 and (own['manual_v2_type'] == 'reg nose manual' or own['actionState'] == 'reg-fak_manual'):
             #print('change manual stance')                        
             own['manual_v2_type'] = 'fak manual'  
             

menuV3.py

@@ -21,7 +21,9 @@ def endpoint(funct, motion, dict, cont):
     shoeL = scene.objects['Char4:Shoes02.L']
     deck = scene.objects["deck"]
     throw_deck = scene.objectsInactive["throw_deck"] 
-    cam = scene.objects['Camera.003']       
+    cam = scene.objects['Camera.003']
+    cam2 = scene.objects['freecam']
+    cam3 = scene.objects['followcam']       
     c_move = .025 #color move amount  
     if funct == 'exit':
         #print("exit function", motion)
@@ -457,7 +459,20 @@ def endpoint(funct, motion, dict, cont):
             b -= 2    
         dict['focal_length'] = b                   
         
-        
+    if funct == 'min dist':
+        b = dict['cam_min']
+        if motion == 'inc':
+            b += .1
+        else:
+            b -= .1    
+        dict['cam_min'] = round(b,2) 
+    if funct == 'max dist':
+        b = dict['cam_max']
+        if motion == 'inc':
+            b += .1
+        else:
+            b -= .1    
+        dict['cam_max'] = round(b,2)                 
         
         
     #levels
@@ -601,7 +616,7 @@ def endpoint(funct, motion, dict, cont):
 def get_c_list(dict):
     #main menu
     if dict['mlevel'] == 0:
-        dict['current_list'] = ['settings', 'level', 'replay', 'restart', 'exit']
+        dict['current_list'] = ['settings', 'level', 'replay', 'exit']
         
     #opt = dict['current_list'][dict['current_index']]
     
@@ -660,9 +675,14 @@ def get_inputs(dict, cont):
     obj['sound'] = aud.Factory(bge.logic.expandPath('//sounds/select.wav'))
     obj['sound_a'] = aud.Factory(bge.logic.expandPath('//sounds/a.wav'))
     obj['sound_b'] = aud.Factory(bge.logic.expandPath('//sounds/b.wav')) 
-    
+
+    obj['sound'] = obj['sound'].pitch(.8)
+    obj['sound_a'] = obj['sound_a'].pitch(.8)
+    obj['sound_b'] = obj['sound_b'].pitch(.8)   
+    sound = aud.Factory(bge.logic.expandPath('//sounds/select.wav')) 
+    sound = sound.pitch(.8)
+
     if keyboard.events[bge.events.LEFTARROWKEY] == JUST_ACTIVATED or (dict['bBut'] == False and dict['last_bBut'] == True):
-        
         aud.device().play(obj['sound_b'])
         if dict['current_index'] not in dict['menu_end_points']:
             #print('lkey')
@@ -677,9 +697,7 @@ def get_inputs(dict, cont):
                 dict['current_index'] = dict['lv2_index']
         else:
             pass
-#            funct = dict['current_index']
-#            motion = 'dec'
-#            endpoint(funct, motion, dict)                               
+                              
         #a
     if (keyboard.events[bge.events.RIGHTARROWKEY] == JUST_ACTIVATED) or (dict['aBut'] == False and dict['last_aBut'] == True):
         aud.device().play(obj['sound_a'])
@@ -773,7 +791,7 @@ def init(own, dict):
     dict['mlevel'] = 0
     dict['current_opt'] = ''
     dict['pause_menu_text'] = ''
-    dict['menu_end_points'] = ['exit', 'restart', 'shirt color r', 'shirt color g', 'shirt color b', 'shoe color r', 'shoe color g', 'shoe color b','deck color r', 'deck color g', 'deck color b', 'shirt logo', 'brightness / contrast on', 'brightness value', 'contrast value', 'hdr on', 'avgL', 'hdr strength', 'ao on', 'ao radius', 'ao width', 'ao only', 'dof on', 'sun strength', 'sun rot x', 'sun rot y', 'shadow on', 'ambient strength', 'Demo Scene', 'Empty Lot', 'Park A', 'Training', 'Spine', 'Warehouse', '1920x1080', '1280x720', '1024x768', '800x600', 'fullscreen', 'bloom on', 'cam height', 'focal length', 'min dist', 'max dist']
+    dict['menu_end_points'] = ['exit', 'restart', 'shirt color r', 'shirt color g', 'shirt color b', 'shoe color r', 'shoe color g', 'shoe color b','deck color r', 'deck color g', 'deck color b', 'shirt logo', 'brightness / contrast on', 'brightness value', 'contrast value', 'hdr on', 'avgL', 'hdr strength', 'ao on', 'ao radius', 'ao width', 'ao only', 'dof on', 'sun strength', 'sun rot x', 'sun rot y', 'shadow on', 'ambient strength', 'Demo Scene', 'Empty Lot', 'Park A', 'Training', 'Spine', 'Warehouse', '1920x1080', '1280x720', '1024x768', '800x600', 'fullscreen', 'bloom on', 'cam height', 'focal length', 'min dist', 'max dist', 'enter replay', 'recorder on', 'record length']
     
 def output(dict):
     try:
@@ -869,9 +887,14 @@ def output(dict):
             outp = outp + ': ' + str(dict['bloom_on'])  
             
         if dict['current_opt'] ==  'cam height':
-            outp = outp + ': ' + str(dict['cam_height']) 
+            outp = outp + '(-0.4): ' + str(dict['cam_height']) 
         if dict['current_opt'] ==  'focal length':
-            outp = outp + ': ' + str(dict['focal_length'])                                                                         
+            outp = outp + '(16): ' + str(dict['focal_length'])  
+        
+        if dict['current_opt'] ==  'min dist':
+            outp = outp + '(1.6): ' + str(dict['cam_min'])  
+        if dict['current_opt'] ==  'max dist':
+            outp = outp + '(2.4): ' + str(dict['cam_max'])                                                                                         
             
     dict['pause_menu_text'] = outp
 def main(cont):

walk.py

@@ -177,11 +177,7 @@ else:
     
 wf = 1
 if own['last_walk_frame'] - own['last_roll_frame'] > 55:
-    wf = 0
-   
-   
-if dict['kb_lsh'] == 2 and dict['kb_ua'] == 2:   
-    print('wtf')   
+    wf = 0   
    
 if ((lup == 1 and aBut == 0) or (dict['kb_ua'] == 2 and dict['kb_lsh'] == 0)) and (r_ground.positive or own['stair_counter'] > 0) and xBut == 0 and wf == 0 and dict['kb_space'] == 0:
     own['walking'] = "regular"
@@ -388,7 +384,7 @@ def dropin():
         pass       
         
 def getonboard():
-    print(dict['kb_q'])
+    #print(dict['kb_q'])
     getonboard = own['getonboard']
     fliplay2 = 50#8560
     if yBut == True or dict['kb_q'] == 2: