Browse Source

controllerless tweaks

shuvit 8 months ago
parent
commit
91e237bac4
35 changed files with 37 additions and 14 deletions
  1. BIN
      __pycache__/_version.cpython-36.pyc
  2. BIN
      __pycache__/configobj.cpython-36.pyc
  3. 2
    2
      assets/user2.blend
  4. BIN
      custom_shaders/__pycache__/custom_shader_base.cpython-36.pyc
  5. BIN
      custom_shaders/__pycache__/custom_shader_utils.cpython-36.pyc
  6. BIN
      custom_shaders/__pycache__/wind.cpython-36.pyc
  7. BIN
      scripts/__pycache__/Manager.cpython-36.pyc
  8. BIN
      scripts/__pycache__/Record.cpython-36.pyc
  9. BIN
      scripts/__pycache__/Settings.cpython-36.pyc
  10. BIN
      scripts/__pycache__/SortData.cpython-36.pyc
  11. BIN
      scripts/__pycache__/Startup.cpython-36.pyc
  12. BIN
      scripts/__pycache__/active_camera_loc.cpython-36.pyc
  13. BIN
      scripts/__pycache__/co_ActionState.cpython-36.pyc
  14. BIN
      scripts/__pycache__/colors.cpython-36.pyc
  15. BIN
      scripts/__pycache__/controller2.cpython-36.pyc
  16. BIN
      scripts/__pycache__/grindV2.cpython-36.pyc
  17. BIN
      scripts/__pycache__/inputs.cpython-36.pyc
  18. BIN
      scripts/__pycache__/joy_sens.cpython-36.pyc
  19. BIN
      scripts/__pycache__/load_char.cpython-36.pyc
  20. BIN
      scripts/__pycache__/logo_fades.cpython-36.pyc
  21. BIN
      scripts/__pycache__/menuV3.cpython-36.pyc
  22. BIN
      scripts/__pycache__/pause_menu2.cpython-36.pyc
  23. BIN
      scripts/__pycache__/scene_init.cpython-36.pyc
  24. BIN
      scripts/__pycache__/stance.cpython-36.pyc
  25. BIN
      scripts/__pycache__/walk.cpython-36.pyc
  26. 1
    1
      scripts/actionPlayer.py
  27. 3
    3
      scripts/camera.py
  28. 0
    1
      scripts/controller2.py
  29. 1
    2
      scripts/ragdoll.py
  30. 28
    3
      scripts/walk.py
  31. 2
    2
      shuvit.blend
  32. BIN
      six/__pycache__/__init__.cpython-36.pyc
  33. BIN
      six/__pycache__/six.cpython-36.pyc
  34. BIN
      tinytag/__pycache__/__init__.cpython-36.pyc
  35. BIN
      tinytag/__pycache__/tinytag.cpython-36.pyc

BIN
__pycache__/_version.cpython-36.pyc View File


BIN
__pycache__/configobj.cpython-36.pyc View File


+ 2
- 2
assets/user2.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:2eafbae67d1da6a9ea8d25ad7fa95ffc228ede670c38f2648f6c39ce8593dde7
3
-size 100660584
2
+oid sha256:3128d3d0f960cae9b6d6e292718cf7b76967adad99cb75176ebd91909175a4ff
3
+size 98062056

BIN
custom_shaders/__pycache__/custom_shader_base.cpython-36.pyc View File


BIN
custom_shaders/__pycache__/custom_shader_utils.cpython-36.pyc View File


BIN
custom_shaders/__pycache__/wind.cpython-36.pyc View File


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


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


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


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


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


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


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


BIN
scripts/__pycache__/colors.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__/inputs.cpython-36.pyc View File


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


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


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


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


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


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


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


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


+ 1
- 1
scripts/actionPlayer.py View File

@@ -221,7 +221,7 @@ def main(cont):
221 221
 	if aState == check_state:
222 222
 		action = getattr(actionsFSMlist, check_state)
223 223
 		actionPlayer(action)
224
-		print('checking onbaord state')
224
+		#print('checking onbaord state')
225 225
 		#if own['stateTimer'] > 10:
226 226
 			#newState = check_exit(aState, rA, timer, actionsFSMlist.reg_onboard)
227 227
 		if own['stateTimer'] > getattr(action, 'fef'):	

+ 3
- 3
scripts/camera.py View File

@@ -93,14 +93,14 @@ def main(cont):
93 93
             camempty['hitdown'] = False
94 94
             if cam_height > (cam_def_height + .08) and zdist > -.2 and raised == 0:
95 95
                 cam.height = cam_height - .02
96
-                print('raising a')
96
+                #print('raising a')
97 97
         if cam_height < -.6 and cam_moved == 0 and LAST_GRIND == False and zdist > -.2 and raised == 0 and walk == 0:
98 98
             cam_height = .1
99
-            print('raising b')
99
+            #print('raising b')
100 100
         if LAST_GRIND == True and walk == 0:
101 101
             if cam.height < -.5 or zdist < -.2:
102 102
                 cam.height = cam.height + .013
103
-                print('raising c')
103
+                #print('raising c')
104 104
             if cam.height >= -.5 and not down.triggered:
105 105
                 pass
106 106
 

+ 0
- 1
scripts/controller2.py View File

@@ -4796,7 +4796,6 @@ def main():
4796 4796
 
4797 4797
 
4798 4798
 
4799
-
4800 4799
  
4801 4800
 
4802 4801
 

+ 1
- 2
scripts/ragdoll.py View File

@@ -171,7 +171,7 @@ def main():
171 171
                     own['rd_incer'] = 0
172 172
                     own['rd_set_vel'] = False
173 173
             
174
-            if dict['yBut'] == 1:                
174
+            if dict['yBut'] == 1 or dict['kb_q'] == 2:                
175 175
                 print('turn off ragdoll')
176 176
                 zero_constraints(own, scene)
177 177
                 scene.objects[armature].setParent(own, False, True)
@@ -186,7 +186,6 @@ def main():
186 186
                 own.worldPosition.z += .4
187 187
                 cont.activate(cont.actuators['walk']) 
188 188
 
189
-
190 189
             if dict['lUD'] < -.08:
191 190
                 physBody = own['rd_rb']
192 191
                 excludes = ['npc_ed_arm_phys_hand.R', 'npc_ed_arm_phys_hand.L', 'npc_ed_arm_phys_forearm.fk.L', 'npc_ed_arm_phys_forearm.fk.R', 'npc_ed_arm_phys_upper_arm.fk.L', 'npc_ed_arm_phys_upper_arm.fk.R']

+ 28
- 3
scripts/walk.py View File

@@ -371,7 +371,7 @@ def main(cont):
371 371
 
372 372
     def onboard():
373 373
         if own['walk'] == 0:
374
-            #print("start walking")
374
+            print("start walking")
375 375
             own['walk_idling'] = 0
376 376
             if own['framenum'] > 100 and own['fall'] == False:
377 377
                 cont.activate(own.actuators['pop'])
@@ -498,7 +498,8 @@ def main(cont):
498 498
             onboard_speed = .1                                      
499 499
             own['getonboard'] = 0 
500 500
             own['walk_idling'] = 0
501
-        if (yBut == False and lasty == True) or (yBut == True or dict['kb_q'] == 2) and dropinCol.positive:
501
+        if (yBut == False and lasty == True) or (yBut == True or dict['kb_q'] == 3) and dropinCol.positive:
502
+            print('getting on board')
502 503
             deckact = deck.actuators["Visibility"]
503 504
             trucksact = trucks.actuators["Visibility"]
504 505
             wheel1act = wheel1.actuators["Visibility"]
@@ -520,9 +521,33 @@ def main(cont):
520 521
             own['throw_deck'] = False 
521 522
             throw_deck_empty = scene.objects["throw_deck_empty"]
522 523
             throw_deck_empty['kill_deck'] = 1 
523
-        if ((yBut == False and lasty == True) or dict['kb_q'] == 3):# and cont.sensors["vehicleNear"].positive == False:               
524
+        if ((yBut == False and lasty == True) or dict['kb_q'] == 3):# and cont.sensors["vehicleNear"].positive == False: 
525
+            print('secondary get on board')              
524 526
             own['getonboard'] = 1 
525 527
             own['walk_idling'] = 0      
528
+            deckact = deck.actuators["Visibility"]
529
+            trucksact = trucks.actuators["Visibility"]
530
+            wheel1act = wheel1.actuators["Visibility"]
531
+            wheel2act = wheel2.actuators["Visibility"]
532
+            wheel3act = wheel3.actuators["Visibility"]
533
+            wheel4act = wheel4.actuators["Visibility"]        
534
+            deckact.visibility = True
535
+            trucksact.visibility = True
536
+            wheel1act.visibility = True
537
+            wheel2act.visibility = True
538
+            wheel3act.visibility = True
539
+            wheel4act.visibility = True  
540
+            cont.activate(deck.actuators['Visibility'])
541
+            cont.activate(trucks.actuators['Visibility'])
542
+            cont.activate(wheel1.actuators['Visibility'])
543
+            cont.activate(wheel2.actuators['Visibility'])
544
+            cont.activate(wheel3.actuators['Visibility'])
545
+            cont.activate(wheel4.actuators['Visibility']) 
546
+            own['throw_deck'] = False 
547
+            throw_deck_empty = scene.objects["throw_deck_empty"]
548
+            throw_deck_empty['kill_deck'] = 1 
549
+
550
+
526 551
 
527 552
     def nextframe():
528 553
         framenumber = own["framenum"]

+ 2
- 2
shuvit.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:26bade36d45bac69d13b8ed04482c295a8ff3697eeb3d73f61b0f99bd014b3e0
3
-size 136246472
2
+oid sha256:51ec3d0444f485a827e6774f21d9eb3e2949864c7ad82545638133b36ed32a8d
3
+size 137194504

BIN
six/__pycache__/__init__.cpython-36.pyc View File


BIN
six/__pycache__/six.cpython-36.pyc View File


BIN
tinytag/__pycache__/__init__.cpython-36.pyc View File


BIN
tinytag/__pycache__/tinytag.cpython-36.pyc View File


Loading…
Cancel
Save