Browse Source

anim tweaks

shuvit 7 months ago
parent
commit
abe83ee8e6

+ 2
- 2
assets/foliage.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:153bf3a6d853ea2d8d6af129f4641da130f1cf26d12d5b0f617ce4be3ce1815e
3
-size 3846380
2
+oid sha256:64344e5e7958e29b4763060fda8ac7a093fbbf071b8f3ccb0108fec5caa2c4b5
3
+size 8234136

+ 2
- 2
assets/materials/base_m_kit.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:50bf7c2728d43e6c7994da27dfde723e3d2fd15c3eb2ca614258945e730de00c
3
-size 38682600
2
+oid sha256:6c37e5a83e1644e6488940c883139290940717fc94f675b34431f2136b41e62f
3
+size 35553820

+ 3
- 0
assets/materials/textures/Sidewalk_A_N_i.png View File

@@ -0,0 +1,3 @@
1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:7e580928477b5c78f67fd81a11e39d95163cef243e0a63f24c91f268ceb100f1
3
+size 1783613

+ 3
- 0
assets/materials/textures/stair_tmp_amb.png View File

@@ -0,0 +1,3 @@
1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:6b2f573bd0a01f64dcf424afa8f9889b05476674236685dea43ffde1aed0f177
3
+size 15072

+ 1
- 1
assets/rails.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:295799d06166408def50692e019c6ed17981a525d5cc51d38a544222cdd242a8
2
+oid sha256:c9340cce6fc8b00fdd57bfd0d661505bde393f70b6c4d49246f7dc8c7c5d22e6
3 3
 size 474180

+ 2
- 2
assets/sc.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:1da571e13ba604f76f2aa9a05ff10e0567505d980cfceeebb2c2779716685b70
3
-size 7911544
2
+oid sha256:08d5cae24cf103e8ef094cb0acbabb08c8bd835776333dedb74b087728dd7420
3
+size 7926632

+ 2
- 2
assets/stairs_b.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:982da320581d0a0a7b403983b59b3a4819568d848b8a19acb58beecf0cf47b1b
3
-size 614848
2
+oid sha256:38d6cdadc6ce3fd8d20724e02920f781bca35f2b29a14896c4e0b70c1aa42697
3
+size 629188

+ 2
- 2
assets/stores.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:b67721bfe91d6bedba5a5a750ca2037a4c991473a97747b7e8967168ba24f700
3
-size 14630700
2
+oid sha256:012c50387b1c0b393d7d5d32b5d22f65d378155c7bd284f0051c989c77c52d14
3
+size 14585340

+ 2
- 2
assets/user10_working.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:a3ce21ce415b1a326da389f316a8d366eb53b623d3f5a0f5b0a4e490277fbd7e
3
-size 15590664
2
+oid sha256:b6e5e7f39ff8fbcee3e61f64f95006efbbec04beca5b2210e29d08af7f4a9144
3
+size 16293480

+ 3
- 0
assets/user11_working.blend View File

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

+ 3
- 0
assets/user12_working.blend View File

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

+ 2
- 2
assets/user2.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:09078add584edfde6caca8153f880778a58ead3268abc38a90b50b99a0590e43
3
-size 19108548
2
+oid sha256:a6f98dc5bac1cc3788b8ef427584e80684fd47ba913756d13c51bd1d9db08a2f
3
+size 14867824

+ 2
- 2
assets/wall.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:cc84352b791a1b1ddfa617dd616995dbda6b9641fc3ab52da642703f5c6a6e9a
3
-size 525228
2
+oid sha256:5c5c3c7be531148a4298c0e75c7d0fa6e5a04adc4537d0bc2974b970c346b94e
3
+size 479972

+ 2
- 2
characters/ken.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:983c5a1732d46eaf3089c7158a7f86a47a1bda5413406a8f994f9937d606fbbd
3
-size 2876436
2
+oid sha256:e5831d9cf377773a4db5172fb6a16fde1cfc1394fffc1be0adefd45b916fc1fa
3
+size 2869804

+ 6
- 6
config.ini View File

@@ -54,18 +54,18 @@ character = ken
54 54
 
55 55
 shirt_logo = 2
56 56
 
57
-shirt_color_r = 0.83
58
-shirt_color_g = 0.9
59
-shirt_color_b = 0.88
57
+shirt_color_r = 0.4
58
+shirt_color_g = 0.03
59
+shirt_color_b = 0.03
60 60
 
61 61
 shoe_color_r = 0.85
62
-shoe_color_g = 0
62
+shoe_color_g = 0.38
63 63
 shoe_color_b = 0
64 64
 #-----------------
65 65
 
66 66
 #deck settings
67 67
 ##############
68
-deck_index = 5
68
+deck_index = 7
69 69
 deck_color_r = 0.8
70 70
 deck_color_g = 0.8
71 71
 deck_color_b = 0.8
@@ -129,7 +129,7 @@ shadow_on = 0
129 129
 #physics
130 130
 ########
131 131
 JUMPHEIGHT = 980#940#880#840#800
132
-MAX_VEL = 6.7
132
+MAX_VEL = 6#6.7
133 133
 SPEEDUP = 0.055
134 134
 SPEEDPUMP = 0.14#.09
135 135
 SPEEDPUMPFAST = 0.16#.13

+ 16
- 16
scripts/actionsFSMlist.py View File

@@ -15,7 +15,7 @@ fak_grindlist = ['fak_5050', 'fak_fsboard', 'fak_tailg', 'fak_tailgr', 'fak_tail
15 15
 
16 16
 walk_exits = ['reg_walk', 'reg_walkFast', 'reg_idle', 'reg_jump', 'reg_onboard', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_idle6', 'reg_idle7', 'reg_walk_air', 'reg_walk_air_out', 'reg_sit', 'reg_dropin', 'reg_air', 'fak_walk', 'fak_walkFast', 'fak_idle', 'fak_jump', 'fak_onboard', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle6', 'fak_idle7', 'fak_walk_air', 'fak_walk_air_out', 'fak_sit', 'fak_air']
17 17
 
18
-lands = ['fak_roll', 'fak_turnRight', 'fak_turnLeft', 'fak_push', 'fak_push_goof', 'fak_pump', 'fak_nopos', 'fak_opos', 'fak_offboard', 'fak_manual_left', 'fak_manual_right', 'fak_manual', 'fak_nmanual', 'fak_nmanual_left', 'fak_nmanual_right'] + ['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_push', 'reg_push_goof', 'reg_pump', 'reg_nopos', 'reg_opos', 'reg_offboard', 'reg_manual_left', 'reg_manual_right', 'reg_manual', 'reg_nmanual', 'reg_nmanual_left', 'reg_nmanual_right']
18
+lands = ['fak_roll', 'fak_turnRight', 'fak_turnLeft', 'fak_push', 'fak_push_goof', 'fak_pump', 'fak_nopos', 'fak_opos', 'fak_offboard', 'fak_manual_left', 'fak_manual_right', 'fak_manual', 'fak_nmanual', 'fak_nmanual_left', 'fak_nmanual_right'] + ['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_push', 'reg_push_goof', 'reg_pump', 'reg_nopos', 'reg_opos', 'reg_offboard', 'reg_manual_left', 'reg_manual_right', 'reg_manual', 'reg_nmanual', 'reg_nmanual_left', 'reg_nmanual_right', 'reg_stop']
19 19
 
20 20
 class a_class:
21 21
 	def __init__(self, name, start, end, dname, dstart, dend, layer, speed, mode, blendin, intro, intro_frames, exits, fe, fef, opposite):
@@ -843,15 +843,15 @@ reg_air_nb = a_class(
843 843
 
844 844
 reg_air_nose = a_class(
845 845
 	#player armature action name, start, end frames
846
-	'reg_noseg.002', 5, 5,
846
+	'reg_noseg.002', 40, 80,
847 847
 	#deck action name, start, end frames  
848
-	'b_reg_noseg', 5, 5,
848
+	'b_reg_noseg', 1, 40,
849 849
 	#layer, speed, mode (0 = play, 1 = loop), blendin
850
-	1, 1, 1, 20,
850
+	1, 1, 1, 15,
851 851
 	#intro, length
852 852
 	None, 0,
853 853
 	#exits
854
-	['reg_offboard', 'reg_land', 'frontside_grab', 'backside_grab', 'frontside_nose_grab', 'backside_nose_grab', 'frontside_tail_grab', 'backside_tail_grab', 'reg_manual', 'reg_nmanual', 'reg_air_tail', 'reg_ollie_north', 'reg_ollie_south', 'reg_airwalk', 'reg_wall_r', 'reg_wall_l', 'reg_manual_left', 'reg_manual_right', 'reg_manual', 'reg_nmanual', 'reg_nmanual_left', 'reg_nmanual_right'],
854
+	['reg_offboard', 'reg_land', 'frontside_grab', 'backside_grab', 'frontside_nose_grab', 'backside_nose_grab', 'frontside_tail_grab', 'backside_tail_grab', 'reg_manual', 'reg_nmanual', 'reg_air_tail', 'reg_ollie_north', 'reg_ollie_south', 'reg_airwalk', 'reg_wall_r', 'reg_wall_l', 'reg_manual_left', 'reg_manual_right', 'reg_manual', 'reg_nmanual', 'reg_nmanual_left', 'reg_nmanual_right', 'reg_air'],
855 855
 	#force exit, frame
856 856
 	None, 0,
857 857
 	#opposite
@@ -859,15 +859,15 @@ reg_air_nose = a_class(
859 859
 
860 860
 reg_air_tail = a_class(
861 861
 	#player armature action name, start, end frames
862
-	'reg_tailg.001', 35, 35,
862
+	'reg_tailg.001', 40, 80,
863 863
 	#deck action name, start, end frames  
864
-	'b_reg_tailg', 35, 35,
864
+	'b_reg_tailg', 1, 40,
865 865
 	#layer, speed, mode (0 = play, 1 = loop), blendin
866
-	1, 1, 1, 20,
866
+	1, 1, 1, 15,
867 867
 	#intro, length
868 868
 	None, 0,
869 869
 	#exits
870
-	['reg_offboard', 'reg_land', 'frontside_grab', 'backside_grab', 'frontside_nose_grab', 'backside_nose_grab', 'frontside_tail_grab', 'backside_tail_grab', 'reg_manual', 'reg_nmanual', 'reg_air_nose', 'reg_ollie_north', 'reg_ollie_south', 'reg_airwalk', 'reg_wall_r', 'reg_wall_l', 'reg_manual_left', 'reg_manual_right', 'reg_manual', 'reg_nmanual', 'reg_nmanual_left', 'reg_nmanual_right'],
870
+	['reg_offboard', 'reg_land', 'frontside_grab', 'backside_grab', 'frontside_nose_grab', 'backside_nose_grab', 'frontside_tail_grab', 'backside_tail_grab', 'reg_manual', 'reg_nmanual', 'reg_air_nose', 'reg_ollie_north', 'reg_ollie_south', 'reg_airwalk', 'reg_wall_r', 'reg_wall_l', 'reg_manual_left', 'reg_manual_right', 'reg_manual', 'reg_nmanual', 'reg_nmanual_left', 'reg_nmanual_right', 'reg_air'],
871 871
 	#force exit, frame
872 872
 	None, 0,
873 873
 	#opposite
@@ -1754,9 +1754,9 @@ reg_5050 = a_class(
1754 1754
 
1755 1755
 reg_bsboard_in = a_class(
1756 1756
 	#player armature action name, start, end frames
1757
-	'reg_BS_Board2', 1, 40,
1757
+	'reg_BS_Board3', 1, 40,
1758 1758
 	#deck action name, start, end frames  
1759
-	'b_reg', 1, 40,
1759
+	'b_reg_board', 1, 40,
1760 1760
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1761 1761
 	1, 1, 0, 10,
1762 1762
 	#intro, length
@@ -1770,9 +1770,9 @@ reg_bsboard_in = a_class(
1770 1770
 
1771 1771
 reg_bsboard = a_class(
1772 1772
 	#player armature action name, start, end frames
1773
-	'reg_BS_Board2', 41, 80,
1773
+	'reg_BS_Board3', 41, 80,
1774 1774
 	#deck action name, start, end frames  
1775
-	'b_reg', 1, 1,
1775
+	'b_reg_board', 41, 80,
1776 1776
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1777 1777
 	1, .5, 1, 15,
1778 1778
 	#intro, length
@@ -2046,7 +2046,7 @@ reg_noseslide = a_class(
2046 2046
 	#player armature action name, start, end frames
2047 2047
 	'fak_tails', 41, 80,
2048 2048
 	#deck action name, start, end frames  
2049
-	'b_fak_tails', 1, 1,
2049
+	'b_fak_tails', 41, 80,
2050 2050
 	#layer, speed, mode (0 = play, 1 = loop), blendin
2051 2051
 	1, .5, 1, 15,
2052 2052
 	#intro, length
@@ -2887,9 +2887,9 @@ fak_manual_right = a_class(
2887 2887
 
2888 2888
 fak_nmanual = a_class(
2889 2889
 	#player armature action name, start, end frames
2890
-	'fak_nmanual', 10, 80,
2890
+	'fak_nmanual', 10, 70,
2891 2891
 	#deck action name, start, end frames  
2892
-	'b_reg_manual', 10, 80,
2892
+	'b_reg_manual', 10, 70,
2893 2893
 	#layer, speed, mode (0 = play, 1 = loop), blendin
2894 2894
 	1, 1, 1, 10,
2895 2895
 	#intro, length

+ 2
- 2
scripts/camera.py View File

@@ -358,9 +358,9 @@ def main(cont):
358 358
     sound_man.main(cont)
359 359
     
360 360
     if own['life'] % 2 == 1:
361
-        cars.Execute(cont)
361
+        #cars.Execute(cont)
362 362
         own['CamFSM'].Execute()
363
-        walkers.Execute(cont)
363
+        #walkers.Execute(cont)
364 364
     else:
365 365
         pass
366 366
 

+ 2
- 2
shuvit.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:81e6f6a85fa2051df8668efacb6b1e7c72e7374d2dfb678bb77146b23b12cf90
3
-size 117308004
2
+oid sha256:b5bd804e782edc2c4e456a82d07d7874b32d5aa37b8c45f1105df5118318bad1
3
+size 117364688

Loading…
Cancel
Save