Browse Source

v0.1.2b freeze

shuvit 5 years ago
parent
commit
ce8a00cac9
4 changed files with 11 additions and 12 deletions
  1. 1
    1
      co_ActionState.py
  2. 7
    6
      controller2.py
  3. 2
    2
      menuV3.py
  4. 1
    3
      walk.py

+ 1
- 1
co_ActionState.py View File

@@ -3813,7 +3813,7 @@ def main():
3813 3813
     if trans_playing:
3814 3814
         cur_frame = skater.getActionFrame(trans_layer)  
3815 3815
         cur_frame = round(cur_frame, 2)     
3816
-    print("oG: ", og_request, "rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'], 'cf', cur_frame)
3816
+    #print("oG: ", og_request, "rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'], 'cf', cur_frame)
3817 3817
     #print("rA:", requestAction, "|aS:", own['actionState'], own['actionTimer'], 'cf', cur_frame)
3818 3818
     cur_frame = skater.getActionFrame(trans_layer)
3819 3819
     #print(cur_frame)

+ 7
- 6
controller2.py View File

@@ -290,7 +290,8 @@ def main():
290 290
             trucks.stopAction(x) 
291 291
 
292 292
     def reset_rtimers_done():
293
-        print('rtimer reset:', q1oncd, q2oncd, q3oncd, q4oncd, q5oncd, q6oncd, q7oncd, q8oncd)
293
+        pass
294
+        #print('rtimer reset:', q1oncd, q2oncd, q3oncd, q4oncd, q5oncd, q6oncd, q7oncd, q8oncd)
294 295
 
295 296
     def reset_rtimers():
296 297
         own["Q1oncd"] = 0
@@ -2796,7 +2797,7 @@ def main():
2796 2797
             q5oncd = countdown
2797 2798
             own["Q5oncd"] = q5oncd
2798 2799
         oposin()  
2799
-        print('oposin')
2800
+        #print('oposin')
2800 2801
     ground_since = own["framenum"] - own['lF_air_frame']    
2801 2802
     if ((rTrig > 0.02 or dict['kb_lsh'] == 2) and GRAB_ON == False and r_ground.triggered == 1) or (lTrig > 0.02 and GRAB_ON == False and r_ground.triggered == 1) and ground_since > 10:
2802 2803
         pump()
@@ -3361,7 +3362,7 @@ def main():
3361 3362
 
3362 3363
     hippy_jump()    
3363 3364
     if ((since_a > cush and aBut == 1 and lasta == 1) or dict['kb_ua'] == 2) and (lTrig < 0.02 and rTrig < 0.02) and own['last_hippy'] == 0:
3364
-        print('push')
3365
+        #print('push')
3365 3366
         if xBut == 0 and hippy == 0 and (lastaBut_ground == True or dict['kb_ua'] == 2):
3366 3367
             push()
3367 3368
     if since_x > cush and xBut == 1 and lastx == 1 and (lTrig < 0.02 and rTrig < 0.02) and own['last_hippy'] == 0:
@@ -4067,7 +4068,7 @@ def main():
4067 4068
                         STANCE = False
4068 4069
             if own['grind_out_type'] == 'bs reg back' or own['grind_out_type'] == 'bs fak forward':
4069 4070
                 if own['gt_cd2'] > 50:
4070
-                    print('a')
4071
+                    #print('a')
4071 4072
                     if STANCE == True:
4072 4073
                         own.applyForce([bsforce, 0, 0], True)
4073 4074
                     if STANCE == False:
@@ -4075,7 +4076,7 @@ def main():
4075 4076
                     own.applyMovement([bs_dloc,0,0], True)    
4076 4077
             if own['grind_out_type'] == 'bs fak back' or own['grind_out_type'] == 'bs reg forward':
4077 4078
                 if own['gt_cd2'] > 50:
4078
-                    print('b')
4079
+                    #print('b')
4079 4080
                     if STANCE == True:
4080 4081
                         own.applyForce([-bsforce, 0, 0], True)
4081 4082
                     if STANCE == False:
@@ -4255,7 +4256,7 @@ def main():
4255 4256
         linvelx = linVelocity.x
4256 4257
         lastx = own["linvelx"]
4257 4258
         if frames_since_ground < 10 and (abs(lastx) - abs(linvelx)) > .5:
4258
-            print('**_____________land boost')
4259
+            #print('land boost')
4259 4260
             force = (lastx, linVelocity.y, linVelocity.z )                    
4260 4261
             own.setLinearVelocity(force, True)                 
4261 4262
     

+ 2
- 2
menuV3.py View File

@@ -653,7 +653,7 @@ def get_c_list(dict):
653 653
     if dict['mlevel'] == 2:
654 654
         if dict['lv1_opt'] == 'resolution':
655 655
         #if opt == 'settings':
656
-            dict['current_list'] = ['1920x1080', '1280x720', '1024x768', '800x600', 'fullscreen']               
656
+            dict['current_list'] = ['fullscreen']               
657 657
     if dict['mlevel'] == 2:
658 658
         if dict['lv1_opt'] == 'graphics':
659 659
         #if opt == 'settings':
@@ -812,7 +812,7 @@ def init(own, dict):
812 812
     dict['mlevel'] = 0
813 813
     dict['current_opt'] = ''
814 814
     dict['pause_menu_text'] = ''
815
-    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', 'Shop', '1920x1080', '1280x720', '1024x768', '800x600', 'fullscreen', 'bloom on', 'cam height', 'focal length', 'min dist', 'max dist', 'enter replay', 'recorder on', 'record length', 'enter replay (press back button)', 'recorder on', 'record length (n/a)']
815
+    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', 'Shop', '1920x1080', '1280x720', '1024x768', '800x600', 'fullscreen', 'bloom on', 'cam height', 'focal length', 'min dist', 'max dist', 'enter replay', 'recorder on', 'record length', 'enter replay (press back button)', 'recorder on', 'record length (n/a)', 'physics']
816 816
     
817 817
 def output(dict):
818 818
     try:

+ 1
- 3
walk.py View File

@@ -240,14 +240,12 @@ elif ((lup == 1 and aBut == 1) or (dict['kb_lsh'] == 2 and dict['kb_ua'] == 2))
240 240
     if stance == 0 and skater.isPlayingAction(fliplay) == False:        
241 241
         if own['throw_deck'] == True:
242 242
             own['requestAction'] = 'reg_walkFast_nb'
243
-            skater.playAction("reg_nwalk_nb.001", 0,35, layer=25, play_mode=1, speed=1)
244 243
         else:
245 244
             own['requestAction'] = 'reg_walkFast'
246 245
          
247 246
     if stance == 1 and skater.isPlayingAction(fliplay) == False:        
248 247
         if own['throw_deck'] == True:
249
-            own['requestAction'] = 'fak_walkFast_nb'
250
-            skater.playAction("fak_nwalk_nb.001", 0,35, layer=24, play_mode=1, speed=1)           
248
+            own['requestAction'] = 'fak_walkFast_nb'          
251 249
         else:
252 250
             own['requestAction'] = 'fak_walkFast'             
253 251
 else:

Loading…
Cancel
Save