shuvit 6 years ago
parent
commit
0f2be7ff1f
3 changed files with 385 additions and 62 deletions
  1. 367
    48
      co_ActionState.py
  2. 16
    12
      controller2.py
  3. 2
    2
      grindV2.py

+ 367
- 48
co_ActionState.py
File diff suppressed because it is too large
View File


+ 16
- 12
controller2.py View File

@@ -2027,19 +2027,23 @@ def grind():
2027 2027
         if grindpos == "reg_5050" and own['grindType'] == "empty":
2028 2028
             own['grindType'] = grindpos
2029 2029
         if own['grindType'] == "empty" and grindpos == 'reg_board':
2030
-            if jumpstance == 1:
2031
-                own['grindType'] = "fak_bsboard"
2032
-                own["stance"] = True
2033
-                STANCE = True
2034
-            elif jumpstance == 0:    
2030
+            if STANCE == 0:
2035 2031
                 own['grindType'] = "reg_bsboard"
2036
-                own["stance"] = False
2037
-                STANCE = False
2038
-            elif jumpstance == 3:
2039
-                if STANCE == True:
2040
-                    own['grindType'] = "fak_bsboard"
2041
-                else:
2042
-                    own['grindType'] = "reg_bsboard"        
2032
+            else:
2033
+                own['grindType'] = "fak_bsboard"    
2034
+#            if jumpstance == 1:
2035
+#                own['grindType'] = "fak_bsboard"
2036
+#                own["stance"] = True
2037
+#                STANCE = True
2038
+#            elif jumpstance == 0:    
2039
+#                own['grindType'] = "reg_bsboard"
2040
+#                own["stance"] = False
2041
+#                STANCE = False
2042
+#            elif jumpstance == 3:
2043
+#                if STANCE == True:
2044
+#                    own['grindType'] = "fak_bsboard"
2045
+#                else:
2046
+#                    own['grindType'] = "reg_bsboard"        
2043 2047
         if STANCE == True:    
2044 2048
             if own['grindType'] == "reg_bsboard":
2045 2049
                 own['grind_stance'] = 0

+ 2
- 2
grindV2.py View File

@@ -207,7 +207,7 @@ def main():
207 207
         #print("J grindvect: ", grindvect, "align: ", align)
208 208
         #z align
209 209
         #print("zalign") 
210
-        player.alignAxisToVect(grinder_vectz, 2, .2)                                                  
210
+        player.alignAxisToVect(grinder_vectz, 2, .25)                                                  
211 211
         
212 212
         if rot >= 0 and rot < 45:
213 213
             player.alignAxisToVect(grinder_vect, 0, align_strength)
@@ -609,7 +609,7 @@ def main():
609 609
             grind_height_dif = (own.worldPosition[2] - nearestObject.worldPosition[2]) - .287
610 610
             #print(grind_height_dif)
611 611
             worldPos = own.worldPosition
612
-            if grind_height_dif > -.02:#02:
612
+            if grind_height_dif > -.05:#02:
613 613
                 #print("############################upping z")
614 614
                 #own.worldPosition = [worldPos.x, worldPos.y, worldPos.z + .1]
615 615
 

Loading…
Cancel
Save