shuvit 4 years ago
parent
commit
6a4b43f660
6 changed files with 13 additions and 10 deletions
  1. 2
    2
      assets/user12_working.blend
  2. 3
    0
      assets/user13_working.blend
  3. 2
    2
      assets/user2.blend
  4. 2
    2
      config.ini
  5. 2
    2
      scripts/grindV2.py
  6. 2
    2
      shuvit.blend

+ 2
- 2
assets/user12_working.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:b129b9e42888ad62bb3a8ffea3c7a80e5580aefacd3b6f9e9819fb98edbaae70
3
-size 22627492
2
+oid sha256:c78a170b42c71b057855cfe911641fc61e8ece63fae989d96532a30baee78084
3
+size 23764064

+ 3
- 0
assets/user13_working.blend View File

@@ -0,0 +1,3 @@
1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:9331175d234fc81cf0ef8a46f0698763225a429933c0dba6267dc26ed0b807bc
3
+size 23764680

+ 2
- 2
assets/user2.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:4d65932c2d1756a2376fc3f52f8592e569bdcfc4d0b64f6eca57e24817a1b52b
3
-size 23764064
2
+oid sha256:9a03fe622aa1645b016e3c82a49a0d4f786e53f90eeab03d5ece8141e6889b19
3
+size 23764680

+ 2
- 2
config.ini View File

@@ -135,8 +135,8 @@ SPEEDPUMP = 0.14#.09
135 135
 SPEEDPUMPFAST = 0.16#.13
136 136
 PUMP_SPEED_SENS = 0.4
137 137
 PUMP_SENS = 0.98
138
-ACCEL = 10
139
-CRUISE = 9
138
+ACCEL = 5#10
139
+CRUISE = 6#9
140 140
 COUNTDOWN = 20#pump and speed stuff
141 141
 pump_downforce = -0.0
142 142
 

+ 2
- 2
scripts/grindV2.py View File

@@ -685,7 +685,7 @@ def main():
685 685
             print('calling invert funct')
686 686
         else:
687 687
             own['inverting'] = False
688
-        grind_dist = .8#.6
688
+        grind_dist = .7#.8#.6
689 689
         skipper = 0
690 690
         #print(lastobj.worldPosition)
691 691
         #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):
@@ -719,7 +719,7 @@ def main():
719 719
                                 stre = .15
720 720
                                 #own.alignAxisToVect(hitNormal, 2, stre)
721 721
                             #own.worldPosition = [nearpos.x, nearpos.y, nearpos.z + .2975]
722
-                            own.worldPosition.lerp(own.worldPosition, nearpos, .025)
722
+                            own.worldPosition.lerp(own.worldPosition, nearpos, .0025)
723 723
                             print('new moving world')
724 724
                     
725 725
     else:

+ 2
- 2
shuvit.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:a8a239dbad17109248fd7bdb2833c5d10d778a815ab45161cdfafd1914a18284
3
-size 117363908
2
+oid sha256:818cc2238c8e439a2aec8f3d1c90de2077a91632b7d64f375c1450cfea1f9c0b
3
+size 117092396

Loading…
Cancel
Save