Browse Source

lands and animations

shuvit 2 months ago
parent
commit
70d26bd4d6

+ 1
- 1
assets/user2.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:2c257aae715f761b5176750760a35ab35e154f255290b83a304062d90f11534a
2
+oid sha256:229526f98ab6d87888ff8430e5b15e3cec23890d40b70d2b0ac3c5202dc9f82c
3 3
 size 36839716

+ 22
- 22
characters/annie.ini View File

@@ -4,35 +4,35 @@
4 4
 
5 5
 shirt_logo = 2
6 6
 
7
-shirt_color_r = 0.18
8
-shirt_color_g = 0.05
9
-shirt_color_b = 0.28
7
+shirt_color_r = 0.44
8
+shirt_color_g = 0.44
9
+shirt_color_b = 0.44
10 10
 
11
-shoe_color_r = 0.53
12
-shoe_color_g = 0.52
13
-shoe_color_b = 0.49
11
+shoe_color_r = 0.08
12
+shoe_color_g = 0.03
13
+shoe_color_b = 0
14 14
 #-----------------
15 15
 
16 16
 #deck settings
17 17
 ##############
18
-deck_index = 7
19
-deck_color_r = 0.46
20
-deck_color_g = 0
21
-deck_color_b = 1
18
+deck_index = 5
19
+deck_color_r = 0.8
20
+deck_color_g = 0.8
21
+deck_color_b = 0.8
22 22
 trucks_r = 0
23 23
 trucks_g = 0
24 24
 trucks_b = 0
25 25
 
26
-wheel1_r = 0.83
27
-wheel1_g = 0
28
-wheel1_b = 0.73
29
-wheel2_r = 0.83
30
-wheel2_g = 0
31
-wheel2_b = 0.73
32
-wheel3_r = 0.83
33
-wheel3_g = 0
34
-wheel3_b = 0.73
35
-wheel4_r = 0.83
36
-wheel4_g = 0
37
-wheel4_b = 0.73
26
+wheel1_r = 0.21
27
+wheel1_g = 0.21
28
+wheel1_b = 0.21
29
+wheel2_r = 0.21
30
+wheel2_g = 0.21
31
+wheel2_b = 0.21
32
+wheel3_r = 0.21
33
+wheel3_g = 0.21
34
+wheel3_b = 0.21
35
+wheel4_r = 0.21
36
+wheel4_g = 0.21
37
+wheel4_b = 0.21
38 38
 #-------------------

+ 26
- 26
config.ini View File

@@ -33,7 +33,7 @@ recorder_on = 1
33 33
 #camera 
34 34
 #######
35 35
 cam_height = -0.4
36
-focal_length = 10
36
+focal_length = 26
37 37
 cam_min = 2.9
38 38
 cam_max = 5.0
39 39
 cch_targetHeight = 0.5
@@ -53,37 +53,37 @@ character = annie
53 53
 
54 54
 shirt_logo = 2
55 55
 
56
-shirt_color_r = 0.18
57
-shirt_color_g = 0.05
58
-shirt_color_b = 0.28
56
+shirt_color_r = 0.44
57
+shirt_color_g = 0.44
58
+shirt_color_b = 0.44
59 59
 
60
-shoe_color_r = 0.53
61
-shoe_color_g = 0.52
62
-shoe_color_b = 0.49
60
+shoe_color_r = 0.08
61
+shoe_color_g = 0.03
62
+shoe_color_b = 0
63 63
 #-----------------
64 64
 
65 65
 #deck settings
66 66
 ##############
67
-deck_index = 7
68
-deck_color_r = 0.46
69
-deck_color_g = 0
70
-deck_color_b = 1
67
+deck_index = 5
68
+deck_color_r = 0.8
69
+deck_color_g = 0.8
70
+deck_color_b = 0.8
71 71
 trucks_r = 0
72 72
 trucks_g = 0
73 73
 trucks_b = 0
74 74
 
75
-wheel1_r = 0.83
76
-wheel1_g = 0
77
-wheel1_b = 0.73
78
-wheel2_r = 0.83
79
-wheel2_g = 0
80
-wheel2_b = 0.73
81
-wheel3_r = 0.83
82
-wheel3_g = 0
83
-wheel3_b = 0.73
84
-wheel4_r = 0.83
85
-wheel4_g = 0
86
-wheel4_b = 0.73
75
+wheel1_r = 0.21
76
+wheel1_g = 0.21
77
+wheel1_b = 0.21
78
+wheel2_r = 0.21
79
+wheel2_g = 0.21
80
+wheel2_b = 0.21
81
+wheel3_r = 0.21
82
+wheel3_g = 0.21
83
+wheel3_b = 0.21
84
+wheel4_r = 0.21
85
+wheel4_g = 0.21
86
+wheel4_b = 0.21
87 87
 #-------------------
88 88
 
89 89
 #2d filter settings
@@ -96,7 +96,7 @@ BC_CONTRAST = 1.06
96 96
 
97 97
 #HDR
98 98
 hdr = 1
99
-avgL = 0.91
99
+avgL = 0.77
100 100
 HDRamount = 0.03
101 101
 
102 102
 #Ambient Occlusion
@@ -118,8 +118,8 @@ FXAA_SPAN_MAX = 8.0
118 118
 
119 119
 #sun settings
120 120
 #############
121
-sun_strength = 1.6
122
-ambient_strength = 0.66
121
+sun_strength = 2.05
122
+ambient_strength = 0.61
123 123
 sun_rot_x = 0.05
124 124
 sun_rot_y = 0.05
125 125
 shadow_on = 0

BIN
scripts/__pycache__/co_ActionState.cpython-36.pyc View File


BIN
scripts/__pycache__/controller2.cpython-36.pyc View File


BIN
scripts/__pycache__/grindV2.cpython-36.pyc View File


BIN
scripts/__pycache__/walk.cpython-36.pyc View File


+ 11
- 7
scripts/co_ActionState.py View File

@@ -81,7 +81,7 @@ def main():
81 81
         own['requestAction'] = 'empty'              
82 82
 #================
83 83
     #stance change detection
84
-    if (requestAction == 'reg_roll' and l_actionState in ('fak_roll', 'fak_land', 'fak_pump_out', 'fak_nopos_out', 'fak_opos_out', 'fak_air-roll', 'fak_fs_powerslide_out', 'fak_bs_powerslide_out', 'fak_nmanual_out', 'fak_manual_out', 'fak_tailslide_out', 'fak_noseslide_out', 'fak_5050_out')) or l_actionState == 'fak_land' and (requestAction in ['reg_turnLeft', 'reg_turnRight', 'reg_turnLeft_out', 'reg_turnRight_out', 'reg_opos', 'reg_nopos', 'reg_pump', 'reg_push', 'reg_push_goof', 'fak_5050-roll']) and requestAction not in ['reg_push', 'reg_push_goof', 'fak_push', 'fak_push_goof'] or (requestAction in ('reg_turnLeft', 'reg_turnRight') and l_actionState in ('fak_turnLeft', 'fak_turnRight')):
84
+    if (requestAction == 'reg_roll' and l_actionState in ('fak_roll', 'fak_land', 'fak_landL', 'fak_landLb', 'fak_landR', 'fak_landRb', 'fak_pump_out', 'fak_nopos_out', 'fak_opos_out', 'fak_air-roll', 'fak_fs_powerslide_out', 'fak_bs_powerslide_out', 'fak_nmanual_out', 'fak_manual_out', 'fak_tailslide_out', 'fak_noseslide_out', 'fak_5050_out')) or l_actionState == 'fak_land' and (requestAction in ['reg_turnLeft', 'reg_turnRight', 'reg_turnLeft_out', 'reg_turnRight_out', 'reg_opos', 'reg_nopos', 'reg_pump', 'reg_push', 'reg_push_goof', 'fak_5050-roll']) and requestAction not in ['reg_push', 'reg_push_goof', 'fak_push', 'fak_push_goof'] or (requestAction in ('reg_turnLeft', 'reg_turnRight') and l_actionState in ('fak_turnLeft', 'fak_turnRight')):
85 85
         #print('fak-reg_roll')
86 86
         requestAction = 'fak-reg_roll'
87 87
         own['requestAction'] = 'fak-reg_roll' 
@@ -101,9 +101,9 @@ def main():
101 101
         requestAction = 'fak-reg_roll'                     
102 102
     
103 103
     
104
-    if requestAction in ['reg_push', 'reg_push_goof'] and l_actionState == 'fak_land':
104
+    if requestAction in ['reg_push', 'reg_push_goof', 'reg_turnRight', 'reg_turnLeft'] and l_actionState == 'fak_land':
105 105
         requestAction = 'fak-reg_roll'
106
-    if requestAction in ['fak_push', 'fak_push_goof'] and l_actionState in ['reg_land', 'reg_landL', 'reg_landR',  'reg_landLb', 'reg_landRb']:
106
+    if requestAction in ['fak_push', 'fak_push_goof', 'fak_turnRight', 'fak_turnLeft'] and l_actionState in ['reg_land', 'reg_landL', 'reg_landR',  'reg_landLb', 'reg_landRb']:
107 107
         requestAction = 'reg-fak_roll'         
108 108
     
109 109
     if requestAction == 'reg_5050' and (l_actionState == 'fak_5050' or l_actionState == 'fak_air' or l_actionState in fak_fliplist) or (l_actionState == 'fak-reg_5050' and actionTimer > 1):
@@ -936,7 +936,7 @@ def main():
936 936
             
937 937
         if l_actionState == 'fak_air_nose to nmanual' and requestAction in ['reg_land', 'fak_land'] and own['actionTimer'] > 1:
938 938
             requestAction = 'fak_air_nose to nmanual'            
939
-
939
+        
940 940
         if requestAction in ['fak_land', 'reg_land']:  
941 941
             requestAction = own['lland']
942 942
         if l_actionState == 'reg_air-roll' and requestAction == 'fak_landL':
@@ -958,7 +958,11 @@ def main():
958 958
         if l_actionState == 'fak_air-roll' and requestAction == 'reg_landRb':
959 959
             requestAction = 'fak_landRb'            
960 960
         if l_actionState == 'fak_air-roll' and requestAction == 'reg_land':
961
-            requestAction = 'fak_land'                
961
+            requestAction = 'fak_land'           
962
+
963
+
964
+
965
+       #if own['jump_stance'] == 0 and requestAction == 'fak_land'          
962 966
 #---------------------------------------------------                                                                                  
963 967
                                                                                   
964 968
                                                                                                                                                         
@@ -4479,7 +4483,7 @@ def main():
4479 4483
                 #own['actionTimer'] = 0
4480 4484
                 #if l_actionState == 'reg_roll':
4481 4485
                 if l_actionState != 'reg_5050' and l_actionState != 'fak-reg_5050':    
4482
-                    skater.playAction('reg_air', 40,34, layer=trans_layer, play_mode=0, speed=.5)
4486
+                    skater.playAction('reg_5050', 50,70, layer=trans_layer, play_mode=0, speed=.5)
4483 4487
                 else:
4484 4488
                     skater.playAction('reg_5050', 1,30, layer=loop_layer, play_mode=1, speed=.5)
4485 4489
                     deck.playAction('a_reg', 1,30, layer=loop_layer, play_mode=1, speed=.5)
@@ -5100,7 +5104,7 @@ def main():
5100 5104
     if trans_playing:
5101 5105
         cur_frame = skater.getActionFrame(trans_layer)  
5102 5106
         cur_frame = round(cur_frame, 2)     
5103
-    print('oG: ', og_request, 'rA:', requestAction, '|aS:', own['actionState'], 'q', queueAction, own['actionTimer'], 'cf', cur_frame)
5107
+    #print('oG: ', og_request, 'rA:', requestAction, '|aS:', own['actionState'], 'q', queueAction, own['actionTimer'], 'cf', cur_frame)
5104 5108
     #print('rA:', requestAction, '|aS:', own['actionState'], own['actionTimer'], 'cf', cur_frame)
5105 5109
     cur_frame = skater.getActionFrame(trans_layer)
5106 5110
     #print(cur_frame)

+ 59
- 31
scripts/controller2.py View File

@@ -243,11 +243,11 @@ def main():
243 243
         balance = 0
244 244
     #print(balance)
245 245
     #if ground_since > 0 and ground_since < 5 and jump_timer < 30:
246
-    if ground_since > -1 and ground_since < 200:
246
+    if ground_since > -1 and ground_since < 60:
247 247
         #print(balance, 'balance')
248
-        sens = 1.8
249
-        sens2 = .2
250
-        sens3 = 1.2
248
+        sens = 2
249
+        sens2 = .8
250
+        sens3 = 1.5
251 251
         if balance > sens or balance < - sens:
252 252
             #fall
253 253
             #if ground_since > -1 and ground_since < 10:
@@ -3649,11 +3649,14 @@ def main():
3649 3649
                     own['requestAction'] = 'fak_fp_rback'
3650 3650
 
3651 3651
     def invert():
3652
-        if grindHit == True and own['grindpos'] == 'reg_board' and gsf < 10:
3653
-            if lBump == 1:
3654
-                own['invert_on'] = 1
3655
-                own.linearVelocity.x = 0
3656
-                own.linearVelocity.y = 0
3652
+        if grindHit == True and own['grindpos'] == 'reg_board' and gsf < 10 and lBump == 1 and rBump == 0:
3653
+            
3654
+            own['invert_on'] = 1
3655
+            own.linearVelocity.x = 0
3656
+            own.linearVelocity.y = 0
3657
+        else:
3658
+            if lBump == 0:
3659
+                own['invert_on'] = 0    
3657 3660
         if own["coping"] == 1 and own['invert_on'] == 1:
3658 3661
             if own['invert_on'] == 1 and own['last_invert'] == False:
3659 3662
                 cont.activate(own.actuators['invertOn_sound'])
@@ -3677,7 +3680,7 @@ def main():
3677 3680
 
3678 3681
     invert()
3679 3682
     footplant()
3680
-
3683
+    #print(own['invert_on'], 'invert_on')
3681 3684
     def reset_pos():
3682 3685
         #reset
3683 3686
         if ddPad == 1:
@@ -4067,8 +4070,8 @@ def main():
4067 4070
             cont.deactivate(own.actuators['grindoutLeft'])
4068 4071
         if (LAST_GRIND == True and jumping == None and sincegrinding > 35 and ground_since > 20) or own['invert_on'] == True and LAST_GRIND == 1:
4069 4072
             outloc = 0.022
4070
-            bsoutloc = .07
4071
-            bsoutvel = .1
4073
+            bsoutloc = .001#.07
4074
+            bsoutvel = .01#.1
4072 4075
             outrot = .06#2 #0.012
4073 4076
             outrot2 = .24
4074 4077
             outact = own.actuators["grindoutRight"]
@@ -4155,17 +4158,17 @@ def main():
4155 4158
                     if STANCE == True:
4156 4159
                         if own['footplant_on'] == True:
4157 4160
                             own.setLinearVelocity([(outvel.x + bsoutvel), outvel.y, outvel.z], 1)
4158
-                            cont.activate(own.actuators["grindoutRight"])
4161
+                            #cont.activate(own.actuators["grindoutRight"])
4159 4162
                         if own['grind_out_type'] == None:
4160 4163
                             own['grind_out_type'] = 'bs fak forward'
4161
-                        own.applyRotation((0, .15, 0), True)
4164
+                        #own.applyRotation((0, .15, 0), True)
4162 4165
                     if STANCE == False:
4163 4166
                         if own['footplant_on'] == True:
4164 4167
                             own.setLinearVelocity([(outvel.x + -bsoutvel), outvel.y, outvel.z], 1)
4165
-                            cont.activate(own.actuators["grindoutRight"])
4168
+                            #cont.activate(own.actuators["grindoutRight"])
4166 4169
                         if own['grind_out_type'] == None:
4167 4170
                             own['grind_out_type'] = 'bs reg forward'
4168
-                        own.applyRotation((0, -.15, 0), True)
4171
+                        #own.applyRotation((0, -.15, 0), True)
4169 4172
                     own["grindoutturn"] = gotcd
4170 4173
                     own['invert_on'] = 0
4171 4174
             if lq1on or lq2on or lq3on or lq4on or lq5on or lq6on or lq7on or lq8on:
@@ -4187,7 +4190,7 @@ def main():
4187 4190
         reg_rot = 0.02#2
4188 4191
         reg_rot2 = .26
4189 4192
         reg_move2 = .13
4190
-        bsforce = 50
4193
+        bsforce = 1#50
4191 4194
         bs_dloc = .04
4192 4195
         outvel = own.linearVelocity
4193 4196
         if own["coping"] == 1:
@@ -4529,12 +4532,13 @@ def main():
4529 4532
         if localHitDist < .4:
4530 4533
             if own['jump_timer'] < 30:
4531 4534
                 own.localLinearVelocity.z *= .9
4535
+
4532 4536
         #if localHitDist < .287:
4533
-        if localHitDist < .32:
4537
+        if localHitDist < .295:
4534 4538
             if own['jump_timer'] < 30:
4535 4539
                 own.localLinearVelocity.z = 0
4536
-            #own.applyMovement((0, 0, (.287 - (localHitDist))), True)
4537
-            own.applyMovement((0, 0, (.32 - (localHitDist))), True)
4540
+            own.applyMovement((0, 0, (.295 - (localHitDist))), True)
4541
+            #own.applyMovement((0, 0, (.32 - (localHitDist))), True)
4538 4542
             #own.applyMovement((0, 0, (.5 - localHitDist)), True)
4539 4543
             #print('moving new ray a')
4540 4544
             #if localRay[2] != [0, 0, -1] and grindHit == 0:
@@ -4580,9 +4584,12 @@ def main():
4580 4584
         End = Vector.copy(own.worldPosition + (own.worldOrientation.col[Axis]*Distance))
4581 4585
         Start = Vector.copy(own.worldPosition)
4582 4586
         localRay_v = own.rayCast(End, Start, 0, 'vert', 1, 0, 0, 61439)
4583
-        if localRay_v[0] and own['LAST_GRIND'] == False and rBump == 0 and ((own['framenum'] - own['last_transition_frame'] < 10) or (own['framenum'] - own['last_vert_frame'] < 10)):
4587
+
4588
+        if lBump == 1 and rBump == 1:
4589
+            own.alignAxisToVect([0.0, 0.0, 1.0], 2, .05)  
4590
+        if localRay_v[0] and own['LAST_GRIND'] == False and rBump == 0 and lBump == 0 and ((own['framenum'] - own['last_transition_frame'] < 10) or (own['framenum'] - own['last_vert_frame'] < 10)):
4584 4591
             own['vert'] = 1
4585
-            print('vert hit')
4592
+            #print('vert hit')
4586 4593
             own['last_vert_frame'] = own['framenum']
4587 4594
             localHitDist = Vector.copy(Start - localRay_v[1]).length
4588 4595
             own.linearVelocity.x *= .98
@@ -4624,7 +4631,7 @@ def main():
4624 4631
             print('rayb hit')
4625 4632
 
4626 4633
 
4627
-    if not aligned:
4634
+    if not aligned or (lBump == 1):
4628 4635
         own.alignAxisToVect([0.0, 0.0, 1.0], 2, .00003)
4629 4636
 
4630 4637
     if own.linearVelocity.x > 12:
@@ -4636,34 +4643,55 @@ def main():
4636 4643
 
4637 4644
 
4638 4645
 
4646
+    if own['actionState'] in ['frontside_grab_out', 'backside_grab_out', 'frontside_nose_grab_out', 'frontside_tail_grab_out', 'backside_nose_grab_out', 'backside_tail_grab_out', 'reg_walk_air_out', 'reg_air-walk_air', 'reg_judo_out', 'reg_frigid_out', 'reg_fsonefoot_out', 'reg_onefoot_out', 'reg_airwalk_out'] and own['requestAction'] in ['fak_land', 'reg_land']:
4647
+        own['requestAction'] = 'reg_land'
4648
+
4649
+    elif own['actionState'] in ['fak_backside_grab_out', 'fak_frontside_grab_out', 'fak_frontside_nose_grab_out', 'fak_frontside_tail_grab_out', 'fak_backside_nose_grab_out', 'fak_backside_tail_grab_out', 'fak_walk_air_out', 'fak_air-walk_air', 'fak_judo_out', 'fak_frigid_out', 'fak_fsonefoot_out', 'fak_onefoot_out'] and own['requestAction'] in  ['reg_land', 'fak_land']:
4650
+        own['requestAction'] = 'fak_land'   
4651
+
4652
+
4653
+
4654
+
4639 4655
     if own['requestAction'] == 'reg_land':
4640 4656
         print('*****************ra', land_overRideL, land_overRideR, land_overRideLb, land_overRideRb)
4641 4657
         if land_overRideL == True:
4642 4658
             own['requestAction'] = 'reg_landL'
4643 4659
             print('requesting unbalanced land1')
4660
+            own['lland'] = own['requestAction']
4644 4661
         elif land_overRideR == True:
4645 4662
             own['requestAction'] = 'reg_landR'
4646 4663
             print('requesting unbalanced land2')
4647
-        if land_overRideLb == True:
4664
+            own['lland'] = own['requestAction']
4665
+        elif land_overRideLb == True:
4648 4666
             own['requestAction'] = 'reg_landLb'
4649 4667
             print('requesting unbalanced land1b')
4668
+            own['lland'] = own['requestAction']
4650 4669
         elif land_overRideRb == True:
4651 4670
             own['requestAction'] = 'reg_landRb'
4652 4671
             print('requesting unbalanced land2b')
4672
+            own['lland'] = own['requestAction']
4673
+        else:
4674
+            own['lland'] = own['requestAction']    
4653 4675
 
4654 4676
     if own['requestAction'] == 'fak_land':
4655 4677
         print('*****************ra', land_overRideL, land_overRideR, land_overRideLb, land_overRideRb)
4656 4678
         if land_overRideL == True:
4657 4679
             own['requestAction'] = 'fak_landL'
4658
-            print('requesting unbalanced land1')
4680
+            print('requesting unbalanced landf1')
4681
+            own['lland'] = own['requestAction']
4659 4682
         elif land_overRideR == True:
4660 4683
             own['requestAction'] = 'fak_landR'
4661
-            print('requesting unbalanced land2')
4662
-        if land_overRideLb == True:
4684
+            print('requesting unbalanced landf2')
4685
+            own['lland'] = own['requestAction']
4686
+        elif land_overRideLb == True:
4663 4687
             own['requestAction'] = 'fak_landLb'
4664
-            print('requesting unbalanced land1b')
4688
+            print('requesting unbalanced landf1b')
4689
+            own['lland'] = own['requestAction']
4665 4690
         elif land_overRideRb == True:
4666 4691
             own['requestAction'] = 'fak_landRb'
4667
-            print('requesting unbalanced land2b')
4668
-    if own['requestAction'] in ['fak_land', 'reg_land', 'fak_landL', 'reg_landR', 'fak_landRb', 'reg_landLb']:
4669
-        own['lland'] = own['requestAction']
4692
+            print('requesting unbalanced landf2b')
4693
+            own['lland'] = own['requestAction']
4694
+        else:
4695
+            own['lland'] = own['requestAction']    
4696
+    # if own['requestAction'] in ['fak_land', 'reg_land', 'fak_landL', 'fak_landLb', 'reg_landR', 'reg_landRb', 'fak_landR' 'fak_landRb', 'reg_landL', 'reg_landLb']:
4697
+        

+ 9
- 3
scripts/grindV2.py View File

@@ -109,7 +109,7 @@ def main():
109 109
     
110 110
     if (framenum - own['last_vert_frame'] < 40) and own['vert'] == 0:
111 111
         no_grind = 1
112
-        print('no_grind = 1 last vert = ', (framenum - own['last_vert_frame']))
112
+        #print('no_grind = 1 last vert = ', (framenum - own['last_vert_frame']))
113 113
     if dict['rBump'] == 1 or (framenum - own['last_vert_frame'] > 40):
114 114
         no_grind = 0
115 115
 
@@ -118,6 +118,10 @@ def main():
118 118
 
119 119
     if grindold == 1:
120 120
         no_grind = 0
121
+    if dict['lBump'] and dict['rBump']:
122
+        no_grind = 1
123
+    elif dict['lBump']:
124
+        no_grind = 0        
121 125
 #---------###########___###########-----------
122 126
 #start new                     #######
123 127
 ##----------##############----------############
@@ -541,12 +545,13 @@ def main():
541 545
         if invert_on:
542 546
             invertpos(detectedObjects)
543 547
             own['inverting'] = True
548
+            print('calling invert funct')
544 549
         else:
545 550
             own['inverting'] = False
546 551
         grind_dist = .8#.6
547 552
         skipper = 0
548 553
         #print(lastobj.worldPosition)
549
-        if dist < grind_dist and dropin == 0 and manual == 0 and no_grind == 0 and own['grindoutturn'] == 0 and own['manual'] == 0 and own['gt_cd2'] < 40 and invert_on == False and own['air_mover'] == False and no_grind_pull == 0 and own['last_invert'] == False and own['grindjumpturn'] == 0 and grind_jump == 0 and own['airup'] == 0:
554
+        if dist < grind_dist and dropin == 0 and manual == 0 and no_grind == 0 and own['grindoutturn'] == 0 and own['manual'] == 0 and own['gt_cd2'] < 40 and invert_on == False and own['air_mover'] == False and no_grind_pull == 0 and own['last_invert'] == False and own['grindjumpturn'] == 0 and grind_jump == 0 and (own['airup'] == 0 or dict['rBump'] == 1 or dict['lBump'] == 1):
550 555
             #print("grinding")
551 556
             grind_height_dif = (own.worldPosition[2] - nearestObject.worldPosition[2]) - .287
552 557
             #worldPos = own.worldPosition
@@ -647,9 +652,10 @@ def main():
647 652
         if own['grindOld'] == 0 and ray.triggered == 0:
648 653
             own['aligntimer'] = 0
649 654
 
650
-    def invertpos():
655
+    def invertpos(xyz):
651 656
         minDist = None
652 657
         nearestObject = None
658
+        print('doing invert funct')
653 659
         for obj in invertObjs:
654 660
             dist = own.getDistanceTo(obj)
655 661
             if (minDist is None or dist < minDist):

+ 2
- 2
scripts/walk.py View File

@@ -1235,9 +1235,9 @@ def main(cont):
1235 1235
 
1236 1236
         gdist = ((own.worldPosition.z - r_ground.hitPosition[2]))  
1237 1237
         #print(gdist)
1238
-        if gdist < .3 and gdist > .1:
1238
+        if gdist < .28 and gdist > .1:
1239 1239
             #move = 2.875 - gdist
1240
-            move = (.3 - gdist)*.5
1240
+            move = (.28 - gdist)*.5
1241 1241
             #move = (own.worldPosition.z + gdist)
1242 1242
             if move > 0:
1243 1243
                 own.worldPosition.z = own.worldPosition.z + move

+ 2
- 2
shuvit.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:146e177ff6c51f8476150c3ae08c0df75f7274c9893e79a4fbab99622939c07f
3
-size 145082860
2
+oid sha256:25104724a66fbae95b6511ec52b9b86f2472fca54ff98ba8612bdda6be2b8b29
3
+size 142303020

Loading…
Cancel
Save