shuvit 6 years ago
parent
commit
79ee12da20
6 changed files with 65 additions and 45 deletions
  1. 2
    1
      Startup.py
  2. 3
    3
      co_ActionState.py
  3. 39
    22
      controller2.py
  4. 6
    3
      inputs.py
  5. 2
    2
      pause.py
  6. 13
    14
      walk.py

+ 2
- 1
Startup.py View File

122
     dict['rTrig'] = 0.0 
122
     dict['rTrig'] = 0.0 
123
     
123
     
124
     dict['last_ltsBut'] = 0.0
124
     dict['last_ltsBut'] = 0.0
125
-    dict['last_rtsBut'] = 0.0    
125
+    dict['last_rtsBut'] = 0.0   
126
+    dict['last_ldPad'] = 0 
126
     
127
     
127
     #dict['shirt_color'] = [.5,1,1,1]
128
     #dict['shirt_color'] = [.5,1,1,1]
128
     
129
     

+ 3
- 3
co_ActionState.py View File

1696
             if requestAction == 'fak_nollie_hardflip':
1696
             if requestAction == 'fak_nollie_hardflip':
1697
                 actionState = 'fak_nollie_hardflip'
1697
                 actionState = 'fak_nollie_hardflip'
1698
                 own['actionTimer'] = 38  
1698
                 own['actionTimer'] = 38  
1699
-                skater.playAction("fak_hardflip", flip_start_frame,20, layer=flip_layer, play_mode=0, speed=.5)
1700
-                deck.playAction("a_fak_hardflip", flip_start_frame,20, layer=flip_layer, play_mode=0, speed=.5)
1701
-                trucks.playAction("a_fak_hardflip", flip_start_frame,20, layer=flip_layer, play_mode=0, speed=.5)                                                  
1699
+                skater.playAction("fak_nollie_hardflip", flip_start_frame,20, layer=flip_layer, play_mode=0, speed=.5)
1700
+                deck.playAction("a_reg_hardflip.001", flip_start_frame,20, layer=flip_layer, play_mode=0, speed=.5)
1701
+                trucks.playAction("a_reg_hardflip.001", flip_start_frame,20, layer=flip_layer, play_mode=0, speed=.5)                                                  
1702
                 
1702
                 
1703
                      
1703
                      
1704
             #reg_jump
1704
             #reg_jump

+ 39
- 22
controller2.py View File

788
                     reg_nmanual_on()                     
788
                     reg_nmanual_on()                     
789
             if own["Pump"] == False:
789
             if own["Pump"] == False:
790
                 
790
                 
791
-                if lLR < -turnsens and STANCE == 0:            
791
+                if (lLR < -turnsens or dict['kb_la'] == 2) and STANCE == 0:
792
                     reg_stance_left_on()
792
                     reg_stance_left_on()
793
-                if lLR > -turnsens or LAST_GRIND != grindHit:
793
+                if lLR > -turnsens or LAST_GRIND != grindHit or dict['kb_la'] == 0:
794
                     reg_stance_left_off()    
794
                     reg_stance_left_off()    
795
-                if lLR > turnsens and STANCE == 0:
795
+                if (lLR > turnsens or dict['kb_ra'] == 2) and STANCE == 0:
796
                     reg_stance_right_on()
796
                     reg_stance_right_on()
797
-                if lLR < turnsens or LAST_GRIND != grindHit:
797
+                if lLR < turnsens or LAST_GRIND != grindHit or dict['kb_ra'] == 0:
798
                     reg_stance_right_off()   
798
                     reg_stance_right_off()   
799
-                if lLR < -turnsens and STANCE == 1:            
799
+                if (lLR < -turnsens or dict['kb_la'] == 2) and STANCE == 1: 
800
                     fak_stance_left_on()
800
                     fak_stance_left_on()
801
-                if lLR > -turnsens or LAST_GRIND != grindHit:
801
+                if lLR > -turnsens or LAST_GRIND != grindHit or dict['kb_la'] == 0:
802
                     fak_stance_left_off()    
802
                     fak_stance_left_off()    
803
-                if lLR > turnsens and STANCE == 1:
803
+                if (lLR > turnsens or dict['kb_ra'] == 2) and STANCE == 1:
804
                     fak_stance_right_on()
804
                     fak_stance_right_on()
805
-                if lLR < turnsens or LAST_GRIND != grindHit:
805
+                if lLR < turnsens or LAST_GRIND != grindHit or dict['kb_ra'] == 0:
806
                     fak_stance_right_off()                       
806
                     fak_stance_right_off()                       
807
         #air
807
         #air
808
         playing = deck.isPlayingAction(fliplay)
808
         playing = deck.isPlayingAction(fliplay)
1945
                 if STANCE == 1:   
1945
                 if STANCE == 1:   
1946
                     own.setLinearVelocity([linVelocity2.x + speed, linVelocity2.y, linVelocity2.z], 1)        
1946
                     own.setLinearVelocity([linVelocity2.x + speed, linVelocity2.y, linVelocity2.z], 1)        
1947
     #medium
1947
     #medium
1948
-        if lLR > (turnsens * 1.3) and (grindHit == False or (manual == 1 and grindHit == True)):
1948
+        if (lLR > (turnsens * 1.3) or dict['kb_ra'] == 2) and (grindHit == False or (manual == 1 and grindHit == True)):
1949
             #turn left
1949
             #turn left
1950
             if rot.z < .4:
1950
             if rot.z < .4:
1951
                 rotation = [ 0.0, 0.0, (-rotamt * 5)] 
1951
                 rotation = [ 0.0, 0.0, (-rotamt * 5)] 
1961
                     own.setLinearVelocity([linVelocity2.x - speed, linVelocity2.y, linVelocity2.z], 1)
1961
                     own.setLinearVelocity([linVelocity2.x - speed, linVelocity2.y, linVelocity2.z], 1)
1962
                 if STANCE == 1:   
1962
                 if STANCE == 1:   
1963
                     own.setLinearVelocity([linVelocity2.x + speed, linVelocity2.y, linVelocity2.z], 1)  
1963
                     own.setLinearVelocity([linVelocity2.x + speed, linVelocity2.y, linVelocity2.z], 1)  
1964
-        if lLR < (-turnsens * 1.3) and (grindHit == False or (manual == 1 and grindHit == True)):
1964
+        if (lLR < (-turnsens * 1.3) or dict['kb_la'] == 2) and (grindHit == False or (manual == 1 and grindHit == True)):
1965
             #turn right
1965
             #turn right
1966
             if rot.z < .4:
1966
             if rot.z < .4:
1967
                 rotation = [ 0.0, 0.0, (rotamt * 5)]
1967
                 rotation = [ 0.0, 0.0, (rotamt * 5)]
1979
                     own.setLinearVelocity([linVelocity2.x + speed, linVelocity2.y, linVelocity2.z], 1)        
1979
                     own.setLinearVelocity([linVelocity2.x + speed, linVelocity2.y, linVelocity2.z], 1)        
1980
              
1980
              
1981
     #air
1981
     #air
1982
-        if r_ground.triggered == False and lLR > turnsens and (grindHit == False or (manual == 1 and grindHit == True)) and own["wallride"] == None:
1982
+        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:
1983
             rotamt = .07
1983
             rotamt = .07
1984
             if STANCE == 0:
1984
             if STANCE == 0:
1985
                 own.applyRotation([0,0,-rotamt], 1)
1985
                 own.applyRotation([0,0,-rotamt], 1)
1986
             if STANCE == 1:
1986
             if STANCE == 1:
1987
                 own.applyRotation([0,0,-rotamt], 1) 
1987
                 own.applyRotation([0,0,-rotamt], 1) 
1988
-        if r_ground.triggered == False and lLR < -turnsens and (grindHit == False or (manual == 1 and grindHit == True)) and own["wallride"] == None:
1988
+        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:
1989
             rotamt = .07
1989
             rotamt = .07
1990
             if STANCE == 0:
1990
             if STANCE == 0:
1991
                 own.applyRotation([0,0,rotamt], 1)
1991
                 own.applyRotation([0,0,rotamt], 1)
2893
         q4oncd = q4oncd - 1
2893
         q4oncd = q4oncd - 1
2894
         own["Q4oncd"] = q4oncd
2894
         own["Q4oncd"] = q4oncd
2895
     #q5
2895
     #q5
2896
-    if rUD > .070:
2896
+    if rUD > .070 or dict['kb_space'] == 2:
2897
         if q4on == 0 and q6on == 0:
2897
         if q4on == 0 and q6on == 0:
2898
             #print("q5on")
2898
             #print("q5on")
2899
             q5on = 1
2899
             q5on = 1
2900
             q5oncd = countdown
2900
             q5oncd = countdown
2901
             own["Q5oncd"] = q5oncd
2901
             own["Q5oncd"] = q5oncd
2902
         oposin()  
2902
         oposin()  
2903
+        print('oposin')
2903
     ground_since = own["framenum"] - own['lF_air_frame']    
2904
     ground_since = own["framenum"] - own['lF_air_frame']    
2904
-    if (rTrig > 0.02 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:
2905
+    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:
2905
         pump()
2906
         pump()
2906
     else:
2907
     else:
2907
         own["lastPump"] = False 
2908
         own["lastPump"] = False 
3060
         q3oncd = q3oncd - 1
3061
         q3oncd = q3oncd - 1
3061
         own["Q3oncd"] = q3oncd
3062
         own["Q3oncd"] = q3oncd
3062
 
3063
 
3064
+
3065
+###keyboard fliptricks
3066
+    if dict['kb_space'] == 3:
3067
+        if dict['kb_a'] == 2:
3068
+            kickflip()
3069
+        elif dict['kb_d'] == 2:
3070
+            heelflip()    
3071
+        elif dict['kb_w'] == 2:
3072
+            fsshuvit()
3073
+        elif dict['kb_s'] == 2:
3074
+            shuvit()            
3075
+        else:
3076
+            aollie()    
3077
+
3078
+
3063
 ##########################################
3079
 ##########################################
3064
     #trick calls
3080
     #trick calls
3065
 ##########################################
3081
 ##########################################
3449
         own['hippy'] = 1
3465
         own['hippy'] = 1
3450
 
3466
 
3451
     hippy_jump()    
3467
     hippy_jump()    
3452
-    if since_a > cush and aBut == 1 and lasta == 1 and (lTrig < 0.02 and rTrig < 0.02) and own['last_hippy'] == 0:
3453
-        if xBut == 0 and hippy == 0 and lastaBut_ground == True:
3468
+    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:
3469
+        print('push')
3470
+        if xBut == 0 and hippy == 0 and (lastaBut_ground == True or dict['kb_ua'] == 2):
3454
             push()
3471
             push()
3455
     if since_x > cush and xBut == 1 and lastx == 1 and (lTrig < 0.02 and rTrig < 0.02) and own['last_hippy'] == 0:
3472
     if since_x > cush and xBut == 1 and lastx == 1 and (lTrig < 0.02 and rTrig < 0.02) and own['last_hippy'] == 0:
3456
         if aBut == 0 and hippy == 0 and lastxBut_ground == True:
3473
         if aBut == 0 and hippy == 0 and lastxBut_ground == True:
3482
     ####
3499
     ####
3483
 
3500
 
3484
     #y button
3501
     #y button
3485
-    if own['lasty'] == 1 and yBut ==0:
3502
+    if (own['lasty'] == 1 and yBut ==0) or dict['kb_q'] == 3:
3486
         offboard()        
3503
         offboard()        
3487
 
3504
 
3488
     if own["GRAB_ON"] == True:
3505
     if own["GRAB_ON"] == True:
3680
         getoffboard = own['getoffboard']
3697
         getoffboard = own['getoffboard']
3681
         if getoffboard == 1 and own['fall'] == False:    
3698
         if getoffboard == 1 and own['fall'] == False:    
3682
             own['getoffboard'] = 0 
3699
             own['getoffboard'] = 0 
3683
-        if yBut == False and lasty == True:
3700
+        if (yBut == False and lasty == True) or dict['kb_q'] == 3:
3684
             own['getoffboard'] = 1        
3701
             own['getoffboard'] = 1        
3685
 
3702
 
3686
     def switchcam():
3703
     def switchcam():
4002
             if 'reg' in own['l_actionState']:
4019
             if 'reg' in own['l_actionState']:
4003
                 STANCE = 0          
4020
                 STANCE = 0          
4004
             if own['grindpos'] == 'reg_5050':
4021
             if own['grindpos'] == 'reg_5050':
4005
-                if lq3on == 1 or lq2on:
4022
+                if lq3on == 1 or lq2on or dict['kb_ra'] == 2:
4006
                     if own['gt_cd2'] == 0:
4023
                     if own['gt_cd2'] == 0:
4007
                         own['gt_cd2'] = 60
4024
                         own['gt_cd2'] = 60
4008
 
4025
 
4013
                         if own['grind_out_type'] == None:
4030
                         if own['grind_out_type'] == None:
4014
                              own['grind_out_type'] = 'reg right'                    
4031
                              own['grind_out_type'] = 'reg right'                    
4015
                     own["grindoutturn"] = gotcd    
4032
                     own["grindoutturn"] = gotcd    
4016
-                if lq7on == 1 or lq8on:
4033
+                if lq7on == 1 or lq8on or dict['kb_la'] == 2:
4017
                     if own['gt_cd2'] == 0:
4034
                     if own['gt_cd2'] == 0:
4018
                         own['gt_cd2'] = 60                
4035
                         own['gt_cd2'] = 60                
4019
                     if STANCE == True:
4036
                     if STANCE == True:
4048
                 outvel = own.getLinearVelocity(1)
4065
                 outvel = own.getLinearVelocity(1)
4049
                 outact.dLoc = [0, 0, 0]
4066
                 outact.dLoc = [0, 0, 0]
4050
                 outact.dRot = [0, 0, 0]
4067
                 outact.dRot = [0, 0, 0]
4051
-                if lq5on == 1:
4068
+                if lq5on == 1 or dict['kb_da'] == 2:
4052
                     if own['gt_cd2'] == 0:
4069
                     if own['gt_cd2'] == 0:
4053
                         own['gt_cd2'] = 60                 
4070
                         own['gt_cd2'] = 60                 
4054
                     if STANCE == True:
4071
                     if STANCE == True:
4065
                              own['grind_out_type'] = 'bs reg back'
4082
                              own['grind_out_type'] = 'bs reg back'
4066
                     own["grindoutturn"] = gotcd 
4083
                     own["grindoutturn"] = gotcd 
4067
                     own['invert_on'] = 0  
4084
                     own['invert_on'] = 0  
4068
-                if lq1on == 1:
4085
+                if lq1on == 1 or dict['kb_ua'] == 2:
4069
                     if own['gt_cd2'] == 0:
4086
                     if own['gt_cd2'] == 0:
4070
                         own['gt_cd2'] = 60                 
4087
                         own['gt_cd2'] = 60                 
4071
                     if STANCE == True:
4088
                     if STANCE == True:

+ 6
- 3
inputs.py View File

59
     kb_q = events.QKEY
59
     kb_q = events.QKEY
60
     kb_e = events.EKEY
60
     kb_e = events.EKEY
61
     kb_z = events.ZKEY
61
     kb_z = events.ZKEY
62
-    kb_c = events.CKEY      
62
+    kb_c = events.CKEY 
63
+    kb_q = events.QKEY      
63
     kb_en = events.ENTERKEY   
64
     kb_en = events.ENTERKEY   
64
     kb_la = events.LEFTARROWKEY
65
     kb_la = events.LEFTARROWKEY
65
     kb_ra = events.RIGHTARROWKEY
66
     kb_ra = events.RIGHTARROWKEY
77
     dict['last_kb_q'] = dict['kb_q']
78
     dict['last_kb_q'] = dict['kb_q']
78
     dict['last_kb_e'] = dict['kb_e']
79
     dict['last_kb_e'] = dict['kb_e']
79
     dict['last_kb_z'] = dict['kb_z']
80
     dict['last_kb_z'] = dict['kb_z']
80
-    dict['last_kb_c'] = dict['kb_c']  
81
+    dict['last_kb_c'] = dict['kb_c'] 
82
+    dict['last_kb_q'] = dict['kb_q']  
81
     dict['last_kb_en'] = dict['kb_en']  
83
     dict['last_kb_en'] = dict['kb_en']  
82
     dict['last_kb_la'] = dict['kb_la']
84
     dict['last_kb_la'] = dict['kb_la']
83
     dict['last_kb_ra'] = dict['kb_ra']
85
     dict['last_kb_ra'] = dict['kb_ra']
93
     dict['kb_q'] = keyboard[kb_q]
95
     dict['kb_q'] = keyboard[kb_q]
94
     dict['kb_e'] = keyboard[kb_e]
96
     dict['kb_e'] = keyboard[kb_e]
95
     dict['kb_z'] = keyboard[kb_z]
97
     dict['kb_z'] = keyboard[kb_z]
96
-    dict['kb_c'] = keyboard[kb_c]    
98
+    dict['kb_c'] = keyboard[kb_c] 
99
+    dict['kb_q'] = keyboard[kb_q]    
97
     dict['kb_en'] = keyboard[kb_en]
100
     dict['kb_en'] = keyboard[kb_en]
98
     dict['kb_la'] = keyboard[kb_la]
101
     dict['kb_la'] = keyboard[kb_la]
99
     dict['kb_ra'] = keyboard[kb_ra]
102
     dict['kb_ra'] = keyboard[kb_ra]

+ 2
- 2
pause.py View File

61
     dict = bge.logic.globalDict
61
     dict = bge.logic.globalDict
62
 #    resume = scene.objects["resume"]
62
 #    resume = scene.objects["resume"]
63
 #    settings = scene.objects["settings"]
63
 #    settings = scene.objects["settings"]
64
-    level = scene.objects["level"]
65
-    dict['level'] = level
64
+    #level = scene.objects["level"]
65
+#    dict['level'] = level
66
 #    levelselect = scene.objects["levelselect"]
66
 #    levelselect = scene.objects["levelselect"]
67
 #    restart = scene.objects["restart"]
67
 #    restart = scene.objects["restart"]
68
 #    exit = scene.objects["exit"]
68
 #    exit = scene.objects["exit"]

+ 13
- 14
walk.py View File

180
     wf = 0
180
     wf = 0
181
    
181
    
182
    
182
    
183
-if dict['kb_lsh'] == 2 and dict['kb_w'] == 2:   
183
+if dict['kb_lsh'] == 2 and dict['kb_ua'] == 2:   
184
     print('wtf')   
184
     print('wtf')   
185
    
185
    
186
-if ((lup == 1 and aBut == 0) or (dict['kb_w'] == 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:
186
+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:
187
     own['walking'] = "regular"
187
     own['walking'] = "regular"
188
     walking = "regular"
188
     walking = "regular"
189
-elif ((lup == 1 and aBut == 1) or (dict['kb_lsh'] == 2 and dict['kb_w'] == 2)) and yBut == False and (r_ground.positive or own['stair_counter'] > 0) and xBut == 0 and wf == 0 and dict['kb_space'] != 2:
189
+elif ((lup == 1 and aBut == 1) or (dict['kb_lsh'] == 2 and dict['kb_ua'] == 2)) and yBut == False and (r_ground.positive or own['stair_counter'] > 0) and xBut == 0 and wf == 0 and dict['kb_space'] != 2:
190
     own['walking'] = "fast"
190
     own['walking'] = "fast"
191
     walking = "fast"
191
     walking = "fast"
192
 else:
192
 else:
222
         #print("set 0 vel")    
222
         #print("set 0 vel")    
223
     
223
     
224
 #old walking
224
 #old walking
225
-if (lup == 1 and aBut == 0) or (dict['kb_w'] == 2 and dict['kb_lsh'] == 0)  and yBut == False and (r_ground.positive or own['stair_counter'] > 0) and xBut == 0:
225
+if (lup == 1 and aBut == 0) or (dict['kb_ua'] == 2 and dict['kb_lsh'] == 0)  and yBut == False and (r_ground.positive or own['stair_counter'] > 0) and xBut == 0:
226
     own.actuators["walkondirt"].volume = .2
226
     own.actuators["walkondirt"].volume = .2
227
     own.actuators["walkondirt"].pitch = 1
227
     own.actuators["walkondirt"].pitch = 1
228
     cont.activate(own.actuators["walkondirt"])
228
     cont.activate(own.actuators["walkondirt"])
241
         else:
241
         else:
242
             own['requestAction'] = 'fak_walk'
242
             own['requestAction'] = 'fak_walk'
243
        
243
        
244
-elif ((lup == 1 and aBut == 1) or (dict['kb_lsh'] == 2 and dict['kb_w'] == 2)) and yBut == False and (r_ground.positive or own['stair_counter'] > 0) and xBut == 0:
244
+elif ((lup == 1 and aBut == 1) or (dict['kb_lsh'] == 2 and dict['kb_ua'] == 2)) and yBut == False and (r_ground.positive or own['stair_counter'] > 0) and xBut == 0:
245
     own.actuators["walkondirt"].volume = .2
245
     own.actuators["walkondirt"].volume = .2
246
     own.actuators["walkondirt"].pitch = 1.3
246
     own.actuators["walkondirt"].pitch = 1.3
247
     cont.activate(own.actuators["walkondirt"])
247
     cont.activate(own.actuators["walkondirt"])
267
     cont.deactivate(own.actuators["walkondirt"])       
267
     cont.deactivate(own.actuators["walkondirt"])       
268
 
268
 
269
 #turning
269
 #turning
270
-if lRight == 1 or dict['kb_d'] == 2:
270
+if lRight == 1 or dict['kb_ra'] == 2:
271
     cont.activate(own.actuators['right'])
271
     cont.activate(own.actuators['right'])
272
 else:
272
 else:
273
     cont.deactivate(own.actuators['right'])    
273
     cont.deactivate(own.actuators['right'])    
274
     
274
     
275
-if lLeft == 1 or dict['kb_a'] == 2:
275
+if lLeft == 1 or dict['kb_la'] == 2:
276
     cont.activate(own.actuators['left'])    
276
     cont.activate(own.actuators['left'])    
277
 else:
277
 else:
278
     cont.deactivate(own.actuators['left'])        
278
     cont.deactivate(own.actuators['left'])        
280
 
280
 
281
 
281
 
282
 #in air        
282
 #in air        
283
-if (lup == 1 or dict['kb_w'] != 0) and r_ground.positive == False:
283
+if (lup == 1 or dict['kb_ua'] != 0) and r_ground.positive == False:
284
     
284
     
285
     if stance == 0:
285
     if stance == 0:
286
         cont.deactivate(own.actuators['forward'])
286
         cont.deactivate(own.actuators['forward'])
388
         pass       
388
         pass       
389
         
389
         
390
 def getonboard():
390
 def getonboard():
391
+    print(dict['kb_q'])
391
     getonboard = own['getonboard']
392
     getonboard = own['getonboard']
392
     fliplay2 = 50#8560
393
     fliplay2 = 50#8560
393
-    if yBut == True:
394
+    if yBut == True or dict['kb_q'] == 2:
394
         fliplay3 = fliplay2 + 1 
395
         fliplay3 = fliplay2 + 1 
395
         if dropinCol.positive == True: 
396
         if dropinCol.positive == True: 
396
             nearestObject = None
397
             nearestObject = None
448
         fliplay3 = 6000 
449
         fliplay3 = 6000 
449
         onboard_speed = .1                                      
450
         onboard_speed = .1                                      
450
         own['getonboard'] = 0 
451
         own['getonboard'] = 0 
451
-    if (yBut == False and lasty == True) or yBut == True and dropinCol.positive:
452
+    if (yBut == False and lasty == True) or (yBut == True or dict['kb_q'] == 2) and dropinCol.positive:
452
         deckact = deck.actuators["Visibility"]
453
         deckact = deck.actuators["Visibility"]
453
         trucksact = trucks.actuators["Visibility"]
454
         trucksact = trucks.actuators["Visibility"]
454
         wheel1act = wheel1.actuators["Visibility"]
455
         wheel1act = wheel1.actuators["Visibility"]
470
         own['throw_deck'] = False 
471
         own['throw_deck'] = False 
471
         throw_deck_empty = scene.objects["throw_deck_empty"]
472
         throw_deck_empty = scene.objects["throw_deck_empty"]
472
         throw_deck_empty['kill_deck'] = 1 
473
         throw_deck_empty['kill_deck'] = 1 
473
-    if (yBut == False and lasty == True):               
474
+    if (yBut == False and lasty == True) or dict['kb_q'] == 3:               
474
         own['getonboard'] = 1       
475
         own['getonboard'] = 1       
475
 
476
 
476
 def nextframe():
477
 def nextframe():
721
 def focus_deck():
722
 def focus_deck():
722
     since_air = own['framenum'] - own['lF_air_frame']
723
     since_air = own['framenum'] - own['lF_air_frame']
723
     if cb_td.positive and since_air < 10:
724
     if cb_td.positive and since_air < 10:
724
-        print('focus!!!!!')
725
         object = 'focus_deckA'
725
         object = 'focus_deckA'
726
         object2 = 'focus_deckB'            
726
         object2 = 'focus_deckB'            
727
         other = throw_deck_empty
727
         other = throw_deck_empty
731
         scene.addObject(object2, other, 0)
731
         scene.addObject(object2, other, 0)
732
                 
732
                 
733
     if own['throw_deck'] == True:
733
     if own['throw_deck'] == True:
734
-        if dict['ldPad'] == False and dict['last_ldPad'] == True:
735
-            #focus  
734
+        if dict['ldPad'] == False and dict['last_ldPad'] == True: 
736
             object = 'focus_deckA'
735
             object = 'focus_deckA'
737
             object2 = 'focus_deckB'            
736
             object2 = 'focus_deckB'            
738
             other = throw_deck_empty
737
             other = throw_deck_empty

Loading…
Cancel
Save