Browse Source

characters and anims

shuvit 1 week ago
parent
commit
c6cacdf562

+ 3
- 0
assets/bld_kits/test1.blend View File

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

+ 3
- 0
assets/bld_kits/wall_a_window_ao.png View File

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

+ 3
- 0
assets/bld_kits/wall_a_window_dif.png View File

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

+ 3
- 0
assets/bld_kits/wall_a_window_norm.png View File

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

+ 1
- 1
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:fcf8b75332373b727633a58789cee2807fedba5e91734d64427b5887ce2d34a1
2
+oid sha256:9a6163026a34d578ea6e4e9dae41d73b7ac32f19075cda30f13910a75bae3714
3 3
 size 43913880

+ 3
- 0
assets/materials/characters.blend View File

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

+ 1
- 1
assets/nav_points
File diff suppressed because it is too large
View File


+ 2
- 2
assets/roads.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:fe325b25aa6538776e4353502377f46a89a213f9bbbcf23325efbc1a2eacb6be
3
-size 38132636
2
+oid sha256:2e247580efb10db5846657716d44f431dca0b0b151cd7b044330a6a07bb31a7d
3
+size 38013944

+ 2
- 2
assets/user2.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:0a6c6de794fe00a7519740369793bd56366bc92ca7de9db7d967ee279f8df0ba
3
-size 13310152
2
+oid sha256:f6650f00c63291f6ff711a6baee137a02db7359719597a178907810ed5763743
3
+size 13371644

+ 2
- 2
assets/user7_working.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:97c45edaf1a6874e3828b4bf98111702306f315918a2d745e1c585d7cf9e8482
3
-size 10603800
2
+oid sha256:3079593f4ad8c3e6da37363d2d5aec9b516d178a3719d9287774eb66df0d6001
3
+size 10592552

+ 1
- 1
assets/walker_nav_points
File diff suppressed because it is too large
View File


+ 3
- 0
characters/jose.blend View File

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

+ 1
- 0
characters/jose.ini View File

@@ -0,0 +1 @@
1
+

+ 3
- 0
characters/ken.blend View File

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

+ 1
- 0
characters/ken.ini View File

@@ -0,0 +1 @@
1
+

+ 12
- 12
config.ini View File

@@ -15,7 +15,7 @@ profile = 0
15 15
 resx = 1920
16 16
 resy = 1080
17 17
 fullscreen_on = 1
18
-music_player = 1
18
+music_player = 0
19 19
 vsync_on = 0
20 20
 #----------
21 21
 
@@ -50,17 +50,17 @@ walk_focal_length = 14
50 50
 #character settings
51 51
 ###################
52 52
 
53
-character = annie
53
+character = ken
54 54
 
55 55
 shirt_logo = 2
56 56
 
57
-shirt_color_r = 0.38
58
-shirt_color_g = 0.0
59
-shirt_color_b = 0
57
+shirt_color_r = 0.61
58
+shirt_color_g = 0.61
59
+shirt_color_b = 0.0
60 60
 
61
-shoe_color_r = 0.03
62
-shoe_color_g = 0.03
63
-shoe_color_b = 0.03
61
+shoe_color_r = 0.92
62
+shoe_color_g = 0.0
63
+shoe_color_b = 0
64 64
 #-----------------
65 65
 
66 66
 #deck settings
@@ -92,13 +92,13 @@ wheel4_b = 0.21
92 92
 
93 93
 #brightness / contrast
94 94
 bc = 1
95
-BC_BRIGHTNESS = 1.05
96
-BC_CONTRAST = 1.06
95
+BC_BRIGHTNESS = 1.11
96
+BC_CONTRAST = 1.13
97 97
 
98 98
 #HDR
99 99
 hdr = 1
100
-avgL = 0.72
101
-HDRamount = 0.3
100
+avgL = 0.81
101
+HDRamount = 0.25
102 102
 
103 103
 #Ambient Occlusion
104 104
 ao = 1

+ 2
- 1
scripts/actionPlayer.py View File

@@ -206,7 +206,7 @@ def actionPlayer(ac):
206 206
 	# 	print('zeroing blend')
207 207
 	skater.playAction(name, start,end, layer=layer, play_mode=mode, speed=speed, blendin=blendin)
208 208
 	deck.playAction(dname, dstart,dend, layer=layer, play_mode=mode, speed=speed, blendin=blendin)
209
-	#print('playing', name, get_frame(ac))
209
+	print('playing', name, get_frame(ac))
210 210
 	#if skater.isPlayingAction(3):
211 211
 		#print(skater.getActionFrame(3))
212 212
 
@@ -470,6 +470,7 @@ def main(cont):
470 470
 
471 471
 	#-----------------------
472 472
 	#print(own['aState'], newState, rA)
473
+	#print()
473 474
 	if newState != '':
474 475
 		own['aState'] = newState 
475 476
 	own['l_aState'] = og_state

+ 138
- 97
scripts/actionsFSMlist.py View File

@@ -1,5 +1,6 @@
1 1
 TRANS_LAYER = 12
2 2
 MAIN_LAYER = 10
3
+fliplay = 3
3 4
 
4 5
 reg_fliplist = ['reg_ollie', 'reg_nollie', 'reg_nollie', 'reg_kickflip', 'reg_varial_kickflip', 'reg_nollie_varial_kickflip', 'reg_nollie_varial_heelflip', 'fak_nollie_varial_heelflip', 'reg_varial_heelflip', 'reg_nollie_kickflip',  'reg_heelflip', 'reg_nollie_heelflip', 'reg_shuvit', 'reg_shuvit360', 'reg_fsshuvit360', 'reg_nollie_shuvit', 'fak_nollie_shuvit', 'reg_fsshuvit', 'fak_fsshuvit',  'reg_nollie_fsshuvit', 'reg_nollie_shuvit360', 'reg_nollie_fsshuvit', 'reg_brfoot', 'reg_frfoot', 'reg_blfoot', 'reg_flfoot', 'reg_inward_heelflip', 'reg_hardflip', 'reg_nollie_inward_heelflip', 'reg_nollie_hardflip', 'reg_offboard', 'reg_nollie_fsshuvit_360'] 
5 6
 fak_fliplist = ['fak_ollie', 'fak_nollie', 'fak_nollie', 'fak_kickflip', 'fak_varial_kickflip', 'fak_nollie_varial_kickflip', 'fak_nollie_varial_heelflip', 'fak_nollie_varial_heelflip', 'fak_varial_heelflip', 'fak_nollie_kickflip',  'fak_heelflip','fak_nollie_heelflip', 'fak_shuvit', 'fak_shuvit360', 'fak_fsshuvit360', 'fak_nollie_shuvit', 'fak_nollie_shuvit', 'fak_fsshuvit', 'fak_fsshuvit',  'fak_nollie_fsshuvit', 'fak_nollie_shuvit360', 'fak_nollie_fsshuvit', 'fak_brfoot', 'fak_frfoot', 'fak_blfoot', 'fak_flfoot', 'fak_inward_heelflip', 'fak_hardflip', 'fak_nollie_inward_heelflip', 'fak_nollie_hardflip', 'fak_offboard', 'fak_nollie_fsshuvit_360']     
@@ -37,7 +38,7 @@ reg_walk = a_class(
37 38
 	#player armature action name, start, end frames
38 39
 	'reg_nwalk2', 0, 30,
39 40
 	#deck action name, start, end frames  
40
-	'b_reg_walk', 0, 35,
41
+	'b_reg_walk', 0, 30,
41 42
 	#layer, speed, mode (0 = play, 1 = loop), blendin
42 43
 	1, .5, 0, 20,
43 44
 	#intro, length
@@ -52,9 +53,9 @@ reg_walk = a_class(
52 53
 
53 54
 reg_walkFast = a_class(
54 55
 	#player armature action name, start, end frames, start, end frames
55
-	'reg_run', 0, 30,
56
+	'reg_run.001', 51, 90,
56 57
 	#deck action name, start, end frames  
57
-	'b_reg_walk', 0, 35,
58
+	'b_reg_run', 51, 90,
58 59
 	#layer, speed, mode (0 = play, 1 = loop), blendin
59 60
 	1, 1, 0, 10, 
60 61
 	#intro, length
@@ -73,7 +74,7 @@ reg_idle = a_class(
73 74
 	#deck action name, start, end frames  
74 75
 	'b_reg_idle1', 1, 120,
75 76
 	#layer, speed, mode (0 = play, 1 = loop), blendin
76
-	1, .5, 0, 20,
77
+	1, .5, 1, 20,
77 78
 	#intro, length
78 79
 	None, 0,
79 80
 	#exits
@@ -213,8 +214,8 @@ reg_walk_air = a_class(
213 214
 	None, 0,
214 215
 	#exits
215 216
 	#['reg_walk_air_out', 'reg_onboard', 'reg_walk', 'reg_walkFast'],
216
-	#walk_exits,
217
-	'reg_walk_air_out',
217
+	walk_exits,
218
+	#'reg_walk_air_out',
218 219
 	#force exit, frame
219 220
 	None, 0,
220 221
 	#opposite
@@ -330,7 +331,7 @@ reg_turnLeft = a_class(
330 331
 	#intro, length
331 332
 	None, 0,
332 333
 	#exits
333
-	['reg_roll', 'reg_opos', 'reg_nopos', 'reg_pump', 'reg_pump_left', 'reg_pump_right', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right'],
334
+	['reg_roll', 'reg_opos', 'reg_nopos', 'reg_pump', 'reg_pump_left', 'reg_pump_right', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right', 'fak_turnRight'],
334 335
 	#force exit, frame
335 336
 	None, 0,
336 337
 	#opposite
@@ -346,7 +347,7 @@ reg_turnRight = a_class(
346 347
 	#intro, length
347 348
 	None, 0,
348 349
 	#exits
349
-	['reg_roll', 'reg_opos', 'reg_nopos', 'reg_pump','reg_pump_left', 'reg_pump_right',  'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right'],
350
+	['reg_roll', 'reg_opos', 'reg_nopos', 'reg_pump','reg_pump_left', 'reg_pump_right',  'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right', 'fak_turnLeft'],
350 351
 	#force exit, frame
351 352
 	None, 0,
352 353
 	#opposite
@@ -847,15 +848,15 @@ reg_air_tail = a_class(
847 848
 #**********************#
848 849
 #**********************#
849 850
 #**********************#
850
-fliplay = 3
851
+
851 852
 
852 853
 reg_ollie = a_class(
853 854
 	#player armature action name, start, end frames
854
-	'reg_ollie', 1, 20,
855
+	'reg_ollie', 1, 40,
855 856
 	#deck action name, start, end frames  
856
-	'b_reg_ollie', 1, 20,
857
+	'b_reg_ollie', 1, 40,
857 858
 	#layer, speed, mode (0 = play, 1 = loop), blendin
858
-	fliplay, .5, 0, 10,
859
+	fliplay, 1, 0, 10,
859 860
 	#intro, length
860 861
 	None, 0,
861 862
 	#exits
@@ -1045,9 +1046,9 @@ reg_nollie = a_class(
1045 1046
 	#intro, length
1046 1047
 	None, 0,
1047 1048
 	#exits
1048
-	['reg_offboard', 'reg_air'],
1049
+	['reg_offboard', 'reg_air_nb'],
1049 1050
 	#force exit, frame
1050
-	'reg_air', 30,
1051
+	'reg_air_nb', 38,
1051 1052
 	#opposite
1052 1053
 	None)
1053 1054
 
@@ -1061,9 +1062,9 @@ reg_nollie_kickflip = a_class(
1061 1062
 	#intro, length
1062 1063
 	None, 0,
1063 1064
 	#exits
1064
-	['reg_offboard', 'reg_air'],
1065
+	['reg_offboard', 'reg_air_nb'],
1065 1066
 	#force exit, frame
1066
-	'reg_air', 30,
1067
+	'reg_air_nb', 38,
1067 1068
 	#opposite
1068 1069
 	None)
1069 1070
 
@@ -1077,73 +1078,73 @@ reg_nollie_heelflip = a_class(
1077 1078
 	#intro, length
1078 1079
 	None, 0,
1079 1080
 	#exits
1080
-	['reg_offboard', 'reg_air'],
1081
+	['reg_offboard', 'reg_air_nb'],
1081 1082
 	#force exit, frame
1082
-	'reg_air', 30,
1083
+	'reg_air_nb', 38,
1083 1084
 	#opposite
1084 1085
 	None)
1085 1086
 
1086 1087
 reg_nollie_shuvit = a_class(
1087 1088
 	#player armature action name, start, end frames
1088
-	'nollie_shuvit', 1, 20,
1089
+	'nollie_shuvit', 1, 40,
1089 1090
 	#deck action name, start, end frames  
1090
-	'b_fak_shuvit', 1, 20,
1091
+	'b_fak_shuvit', 1, 40,
1091 1092
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1092
-	3, .5, 0, 10,
1093
+	3, 1, 0, 10,
1093 1094
 	#intro, length
1094 1095
 	None, 0,
1095 1096
 	#exits
1096
-	['reg_offboard', 'reg_air'],
1097
+	['reg_offboard', 'reg_air_nb'],
1097 1098
 	#force exit, frame
1098
-	'reg_air', 30,
1099
+	'reg_air_nb', 38,
1099 1100
 	#opposite
1100 1101
 	None)
1101 1102
 
1102 1103
 reg_nollie_fsshuvit = a_class(
1103 1104
 	#player armature action name, start, end frames
1104
-	'nollie_fsshuvit', 1, 20,
1105
+	'nollie_fsshuvit', 1, 40,
1105 1106
 	#deck action name, start, end frames  
1106
-	'b_fak_fsshuvit', 1, 20,
1107
+	'b_fak_fsshuvit', 1, 40,
1107 1108
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1108
-	3, .5, 0, 10,
1109
+	3, 1, 0, 10,
1109 1110
 	#intro, length
1110 1111
 	None, 0,
1111 1112
 	#exits
1112
-	['reg_offboard', 'reg_air'],
1113
+	['reg_offboard', 'reg_air_nb'],
1113 1114
 	#force exit, frame
1114
-	'reg_air', 30,
1115
+	'reg_air_nb', 38,
1115 1116
 	#opposite
1116 1117
 	None)
1117 1118
 
1118 1119
 reg_nollie_shuvit360 = a_class(
1119 1120
 	#player armature action name, start, end frames
1120
-	'nollie_fsshuvit', 1, 20,
1121
+	'nollie_fsshuvit', 1, 40,
1121 1122
 	#deck action name, start, end frames  
1122
-	'b_fak_360fsshuvit', 1, 20,
1123
+	'b_fak_360fsshuvit', 1, 40,
1123 1124
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1124
-	3, .5, 0, 10,
1125
+	3, 1, 0, 10,
1125 1126
 	#intro, length
1126 1127
 	None, 0,
1127 1128
 	#exits
1128
-	['reg_offboard', 'reg_air'],
1129
+	['reg_offboard', 'reg_air_nb'],
1129 1130
 	#force exit, frame
1130
-	'reg_air', 30,
1131
+	'reg_air', 38,
1131 1132
 	#opposite
1132 1133
 	None)
1133 1134
 
1134 1135
 reg_nollie_fsshuvit_360 = a_class(
1135 1136
 	#player armature action name, start, end frames
1136
-	'nollie_fsshuvit', 1, 20,
1137
+	'nollie_fsshuvit', 1, 40,
1137 1138
 	#deck action name, start, end frames  
1138
-	'b_fak_360shuvit', 1, 20,
1139
+	'b_fak_360shuvit', 1, 40,
1139 1140
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1140
-	3, .5, 0, 10,
1141
+	3, 1, 0, 10,
1141 1142
 	#intro, length
1142 1143
 	None, 0,
1143 1144
 	#exits
1144
-	['reg_offboard', 'reg_air'],
1145
+	['reg_offboard', 'reg_air_nb'],
1145 1146
 	#force exit, frame
1146
-	'reg_air', 30,
1147
+	'reg_air', 38,
1147 1148
 	#opposite
1148 1149
 	None)
1149 1150
 
@@ -1751,15 +1752,31 @@ reg_fsboard = a_class(
1751 1752
 	#opposite
1752 1753
 	None)
1753 1754
 
1755
+reg_noseg_in = a_class(
1756
+	#player armature action name, start, end frames
1757
+	'reg_noseg.002', 1, 40,
1758
+	#deck action name, start, end frames  
1759
+	'b_reg_noseg', 1, 40,
1760
+	#layer, speed, mode (0 = play, 1 = loop), blendin
1761
+	1, 1, 0, 10,
1762
+	#intro, length
1763
+	None, 0,
1764
+	#exits
1765
+	['reg_noseg'],
1766
+	#force exit, frame
1767
+	'reg_noseg', 39,
1768
+	#opposite
1769
+	'fak_noseg')
1770
+
1754 1771
 reg_noseg = a_class(
1755 1772
 	#player armature action name, start, end frames
1756
-	'reg_noseg.002', 11, 40,
1773
+	'reg_noseg.002', 41, 80,
1757 1774
 	#deck action name, start, end frames  
1758
-	'b_reg_noseg', 10, 10,
1775
+	'b_reg_noseg', 41, 80,
1759 1776
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1760 1777
 	1, .5, 1, 15,
1761 1778
 	#intro, length
1762
-	None, 0,
1779
+	'reg_noseg_in', 40,
1763 1780
 	#exits
1764 1781
 	['reg_air', 'reg_roll'],
1765 1782
 	#force exit, frame
@@ -1799,15 +1816,31 @@ reg_nosegl = a_class(
1799 1816
 	#opposite
1800 1817
 	None)
1801 1818
 
1819
+reg_tailg_in = a_class(
1820
+	#player armature action name, start, end frames
1821
+	'reg_tailg.001', 1, 40,
1822
+	#deck action name, start, end frames  
1823
+	'b_reg_tailg', 1, 40,
1824
+	#layer, speed, mode (0 = play, 1 = loop), blendin
1825
+	1, 1, 0, 10,
1826
+	#intro, length
1827
+	None, 0,
1828
+	#exits
1829
+	['reg_tailg'],
1830
+	#force exit, frame
1831
+	'reg_tailg', 39,
1832
+	#opposite
1833
+	'fak_tailg')
1834
+
1802 1835
 reg_tailg = a_class(
1803 1836
 	#player armature action name, start, end frames
1804
-	'reg_tailg.001', 30, 1,
1837
+	'reg_tailg.001', 41, 80,
1805 1838
 	#deck action name, start, end frames  
1806
-	'b_reg_tailg', 1, 1,
1839
+	'b_reg_tailg', 41, 80,
1807 1840
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1808 1841
 	1, .5, 1, 15,
1809 1842
 	#intro, length
1810
-	None, 0,
1843
+	'reg_tailg_in', 40,
1811 1844
 	#exits
1812 1845
 	['reg_air', 'reg_roll'],
1813 1846
 	#force exit, frame
@@ -2054,9 +2087,9 @@ revert4 = a_class(
2054 2087
 
2055 2088
 fak_walk = a_class(
2056 2089
 	#player armature action name, start, end frames
2057
-	'fak_nwalk', 0, 35,
2090
+	'fak_walk_new', 0, 30,
2058 2091
 	#deck action name, start, end frames  
2059
-	'b_fak_walk', 0, 35,
2092
+	'b_fak_walk', 0, 30,
2060 2093
 	#layer, speed, mode (0 = play, 1 = loop), blendin
2061 2094
 	1, .5, 0, 20,
2062 2095
 	#intro, length
@@ -2070,11 +2103,11 @@ fak_walk = a_class(
2070 2103
 
2071 2104
 fak_walkFast = a_class(
2072 2105
 	#player armature action name, start, end frames, start, end frames
2073
-	'fak_nwalk', 0, 35,
2106
+	'fak_run', 51, 90,
2074 2107
 	#deck action name, start, end frames  
2075
-	'b_fak_walk', 0, 35,
2108
+	'b_fak_run', 51, 90,
2076 2109
 	#layer, speed, mode (0 = play, 1 = loop), blendin
2077
-	1, 1, 0, 0, 
2110
+	1, 1, 0, 10, 
2078 2111
 	#intro, length
2079 2112
 	None, 0,
2080 2113
 	#exits
@@ -2090,11 +2123,12 @@ fak_idle = a_class(
2090 2123
 	#deck action name, start, end frames  
2091 2124
 	'b_fak_idle1', 1, 120,
2092 2125
 	#layer, speed, mode (0 = play, 1 = loop), blendin
2093
-	1, .5, 0, 20,
2126
+	1, .5, 1, 20,
2094 2127
 	#intro, length
2095 2128
 	None, 0,
2096 2129
 	#exits
2097
-	['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle5', 'fak_idle6', 'fak_idle7', 'fak_jump', 'fak_sit', 'fak_onboard'],
2130
+	#['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle5', 'fak_idle6', 'fak_idle7', 'fak_jump', 'fak_sit', 'fak_onboard'],
2131
+	walk_exits,
2098 2132
 	#force exit, frame
2099 2133
 	None, 0,
2100 2134
 	#opposite
@@ -2106,11 +2140,12 @@ fak_idle2 = a_class(
2106 2140
 	#deck action name, start, end frames  
2107 2141
 	'b_fak_walk', 1, 1,
2108 2142
 	#layer, speed, mode (0 = play, 1 = loop), blendin
2109
-	1, .5, 1, 20,
2143
+	1, .5, 0, 20,
2110 2144
 	#intro, length
2111 2145
 	None, 0,
2112 2146
 	#exits
2113
-	['fak_walk', 'fak_idle', 'fak_idle3', 'fak_idle4', 'fak_idle5', 'fak_idle6', 'fak_idle7', 'fak_jump', 'fak_onboard'],
2147
+	#['fak_walk', 'fak_idle', 'fak_idle3', 'fak_idle4', 'fak_idle5', 'fak_idle6', 'fak_idle7', 'fak_jump', 'fak_onboard'],
2148
+	walk_exits,
2114 2149
 	#force exit, frame
2115 2150
 	None, 0,
2116 2151
 	#opposite
@@ -2122,11 +2157,12 @@ fak_idle3 = a_class(
2122 2157
 	#deck action name, start, end frames  
2123 2158
 	'b_fak_walk', 1, 1,
2124 2159
 	#layer, speed, mode (0 = play, 1 = loop), blendin
2125
-	1, .5, 1, 20,
2160
+	1, .5, 0, 20,
2126 2161
 	#intro, length
2127 2162
 	None, 0,
2128 2163
 	#exits
2129
-	['fak_walk', 'fak_idle2', 'fak_idle', 'fak_idle4', 'fak_idle5', 'fak_idle6', 'fak_idle7', 'fak_jump', 'fak_onboard'],
2164
+	#['fak_walk', 'fak_idle2', 'fak_idle', 'fak_idle4', 'fak_idle5', 'fak_idle6', 'fak_idle7', 'fak_jump', 'fak_onboard'],
2165
+	walk_exits,
2130 2166
 	#force exit, frame
2131 2167
 	None, 0,
2132 2168
 	#opposite
@@ -2138,11 +2174,12 @@ fak_idle4 = a_class(
2138 2174
 	#deck action name, start, end frames  
2139 2175
 	'b_fak_idle4', 1, 120,
2140 2176
 	#layer, speed, mode (0 = play, 1 = loop), blendin
2141
-	1, .5, 1, 20,
2177
+	1, .5, 0, 20,
2142 2178
 	#intro, length
2143 2179
 	None, 0,
2144 2180
 	#exits
2145
-	['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle', 'fak_idle5', 'fak_idle6', 'fak_idle7', 'fak_jump', 'fak_onboard'],
2181
+	#['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle', 'fak_idle5', 'fak_idle6', 'fak_idle7', 'fak_jump', 'fak_onboard'],
2182
+	walk_exits,
2146 2183
 	#force exit, frame
2147 2184
 	None, 0,
2148 2185
 	#opposite
@@ -2154,11 +2191,12 @@ fak_idle5 = a_class(
2154 2191
 	#deck action name, start, end frames  
2155 2192
 	'b_fak_idle5', 1, 120,
2156 2193
 	#layer, speed, mode (0 = play, 1 = loop), blendin
2157
-	1, .5, 1, 20,
2194
+	1, .5, 0, 20,
2158 2195
 	#intro, length
2159 2196
 	None, 0,
2160 2197
 	#exits
2161
-	['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle6', 'fak_idle7', 'fak_idle', 'fak_jump', 'fak_onboard'],
2198
+	#['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle6', 'fak_idle7', 'fak_idle', 'fak_jump', 'fak_onboard'],
2199
+	walk_exits,
2162 2200
 	#force exit, frame
2163 2201
 	None, 0,
2164 2202
 	#opposite
@@ -2170,11 +2208,12 @@ fak_idle6 = a_class(
2170 2208
 	#deck action name, start, end frames  
2171 2209
 	'b_fak_idle6', 1, 120,
2172 2210
 	#layer, speed, mode (0 = play, 1 = loop), blendin
2173
-	1, .5, 1, 20,
2211
+	1, .5, 0, 20,
2174 2212
 	#intro, length
2175 2213
 	None, 0,
2176 2214
 	#exits
2177
-	['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle7', 'fak_idle', 'fak_jump', 'fak_onboard'],
2215
+	#['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle7', 'fak_idle', 'fak_jump', 'fak_onboard'],
2216
+	walk_exits,
2178 2217
 	#force exit, frame
2179 2218
 	None, 0,
2180 2219
 	#opposite
@@ -2186,11 +2225,12 @@ fak_idle7 = a_class(
2186 2225
 	#deck action name, start, end frames  
2187 2226
 	'b_fak_idle7', 1, 1,
2188 2227
 	#layer, speed, mode (0 = play, 1 = loop), blendin
2189
-	1, .5, 1, 20,
2228
+	1, .5, 0, 20,
2190 2229
 	#intro, length
2191 2230
 	None, 0,
2192 2231
 	#exits
2193
-	['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle6', 'fak_idle', 'fak_jump', 'fak_onboard'],
2232
+	#['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle6', 'fak_idle', 'fak_jump', 'fak_onboard'],
2233
+	walk_exits,
2194 2234
 	#force exit, frame
2195 2235
 	None, 0,
2196 2236
 	#opposite
@@ -2222,7 +2262,8 @@ fak_walk_air = a_class(
2222 2262
 	#intro, length
2223 2263
 	None, 0,
2224 2264
 	#exits
2225
-	['fak_walk_air_out', 'fak_onboard'],
2265
+	#['fak_walk_air_out', 'fak_onboard'],
2266
+	walk_exits,
2226 2267
 	#force exit, frame
2227 2268
 	None, 0,
2228 2269
 	#opposite
@@ -2334,7 +2375,7 @@ fak_turnLeft = a_class(
2334 2375
 	#intro, length
2335 2376
 	None, 0,
2336 2377
 	#exits
2337
-	['fak_roll', 'fak_opos', 'fak_nopos', 'fak_pump', 'fak_pump_left', 'fak_pump_right', 'fak_push', 'fak_push_goof', 'fak_powerslide', 'fak_fs_powerslide', 'fak_manual', 'fak_nmanual', 'fak_offboard', 'fak_air', 'fak_air_nose', 'fak_air_tail', 'fak_manual_left', 'fak_manual_right', 'fak_nmanual_left', 'fak_nmanual_right'],
2378
+	['fak_roll', 'fak_opos', 'fak_nopos', 'fak_pump', 'fak_pump_left', 'fak_pump_right', 'fak_push', 'fak_push_goof', 'fak_powerslide', 'fak_fs_powerslide', 'fak_manual', 'fak_nmanual', 'fak_offboard', 'fak_air', 'fak_air_nose', 'fak_air_tail', 'fak_manual_left', 'fak_manual_right', 'fak_nmanual_left', 'fak_nmanual_right', 'reg_turnRight'],
2338 2379
 	#force exit, frame
2339 2380
 	None, 0,
2340 2381
 	#opposite
@@ -2350,7 +2391,7 @@ fak_turnRight = a_class(
2350 2391
 	#intro, length
2351 2392
 	None, 0,
2352 2393
 	#exits
2353
-	['fak_roll', 'fak_opos', 'fak_nopos', 'fak_pump', 'fak_pump_left', 'fak_pump_right', 'fak_push', 'fak_push_goof', 'fak_powerslide', 'fak_fs_powerslide', 'fak_manual', 'fak_nmanual', 'fak_offboard', 'fak_air', 'fak_air_nose', 'fak_air_tail', 'fak_manual_left', 'fak_manual_right', 'fak_nmanual_left', 'fak_nmanual_right'],
2394
+	['fak_roll', 'fak_opos', 'fak_nopos', 'fak_pump', 'fak_pump_left', 'fak_pump_right', 'fak_push', 'fak_push_goof', 'fak_powerslide', 'fak_fs_powerslide', 'fak_manual', 'fak_nmanual', 'fak_offboard', 'fak_air', 'fak_air_nose', 'fak_air_tail', 'fak_manual_left', 'fak_manual_right', 'fak_nmanual_left', 'fak_nmanual_right', 'reg_turnLeft'],
2354 2395
 	#force exit, frame
2355 2396
 	None, 0,
2356 2397
 	#opposite
@@ -2440,11 +2481,11 @@ fak_pump_right = a_class(
2440 2481
 
2441 2482
 fak_push = a_class(
2442 2483
 	#player armature action name, start, end frames
2443
-	'fak_push', 1, 35,
2484
+	'fak_push', 1, 70,
2444 2485
 	#deck action name, start, end frames  
2445 2486
 	'b_reg', 1, 1,
2446 2487
 	#layer, speed, mode (0 = play, 1 = loop), blendin
2447
-	1, .5, 0, 10,
2488
+	1, 1, 0, 10,
2448 2489
 	#intro, length
2449 2490
 	None, 0,
2450 2491
 	#exits
@@ -3039,17 +3080,17 @@ fak_varial_heelflip = a_class(
3039 3080
 
3040 3081
 fak_nollie = a_class(
3041 3082
 	#player armature action name, start, end frames
3042
-	'fak_nollie', 1, 20,
3083
+	'fak_nollie', 1, 40,
3043 3084
 	#deck action name, start, end frames  
3044
-	'b_reg_ollie', 1, 20,
3085
+	'b_reg_ollie', 1, 40,
3045 3086
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3046
-	3, .5, 0, 10,
3087
+	3, 1, 0, 10,
3047 3088
 	#intro, length
3048 3089
 	None, 0,
3049 3090
 	#exits
3050
-	['fak_offboard', 'fak_air'],
3091
+	['fak_offboard', 'fak_air_nb'],
3051 3092
 	#force exit, frame
3052
-	'fak_air', 30,
3093
+	'fak_air_nb', 38,
3053 3094
 	#opposite
3054 3095
 	None)
3055 3096
 
@@ -3063,9 +3104,9 @@ fak_nollie_kickflip = a_class(
3063 3104
 	#intro, length
3064 3105
 	None, 0,
3065 3106
 	#exits
3066
-	['fak_offboard', 'fak_air'],
3107
+	['fak_offboard', 'fak_air_nb'],
3067 3108
 	#force exit, frame
3068
-	'fak_air', 30,
3109
+	'fak_air_nb', 38,
3069 3110
 	#opposite
3070 3111
 	None)
3071 3112
 
@@ -3079,73 +3120,73 @@ fak_nollie_heelflip = a_class(
3079 3120
 	#intro, length
3080 3121
 	None, 0,
3081 3122
 	#exits
3082
-	['fak_offboard', 'fak_air'],
3123
+	['fak_offboard', 'fak_air_nb'],
3083 3124
 	#force exit, frame
3084
-	'fak_air', 30,
3125
+	'fak_air_nb', 30,
3085 3126
 	#opposite
3086 3127
 	None)
3087 3128
 
3088 3129
 fak_nollie_shuvit = a_class(
3089 3130
 	#player armature action name, start, end frames
3090
-	'fak_nollie_shuvit', 1, 20,
3131
+	'fak_nollie_shuvit', 1, 40,
3091 3132
 	#deck action name, start, end frames  
3092
-	'b_reg_fsshuvit', 1, 20,
3133
+	'b_reg_fsshuvit', 1, 40,
3093 3134
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3094
-	3, .5, 0, 10,
3135
+	3, 1, 0, 10,
3095 3136
 	#intro, length
3096 3137
 	None, 0,
3097 3138
 	#exits
3098
-	['fak_offboard', 'fak_air'],
3139
+	['fak_offboard', 'fak_air_nb'],
3099 3140
 	#force exit, frame
3100
-	'fak_air', 30,
3141
+	'fak_air', 38,
3101 3142
 	#opposite
3102 3143
 	None)
3103 3144
 
3104 3145
 fak_nollie_fsshuvit = a_class(
3105 3146
 	#player armature action name, start, end frames
3106
-	'fak_nollie_fsshuvit', 1, 20,
3147
+	'fak_nollie_fsshuvit', 1, 40,
3107 3148
 	#deck action name, start, end frames  
3108
-	'b_reg_shuvit', 1, 20,
3149
+	'b_reg_shuvit', 1, 40,
3109 3150
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3110
-	3, .5, 0, 10,
3151
+	fliplay, 1, 0, 10,
3111 3152
 	#intro, length
3112 3153
 	None, 0,
3113 3154
 	#exits
3114
-	['fak_offboard', 'fak_air'],
3155
+	['fak_offboard', 'fak_air_nb'],
3115 3156
 	#force exit, frame
3116
-	'fak_air', 30,
3157
+	'fak_air_nb', 38,
3117 3158
 	#opposite
3118 3159
 	None)
3119 3160
 
3120 3161
 fak_nollie_shuvit360 = a_class(
3121 3162
 	#player armature action name, start, end frames
3122
-	'fak_nollie_fsshuvit', 1, 20,
3163
+	'fak_nollie_fsshuvit', 1, 40,
3123 3164
 	#deck action name, start, end frames  
3124
-	'b_reg_360shuvit', 1, 20,
3165
+	'b_reg_360shuvit', 1, 40,
3125 3166
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3126
-	3, .5, 0, 10,
3167
+	3, 1, 0, 10,
3127 3168
 	#intro, length
3128 3169
 	None, 0,
3129 3170
 	#exits
3130
-	['fak_offboard', 'fak_air'],
3171
+	['fak_offboard', 'fak_air_nb'],
3131 3172
 	#force exit, frame
3132
-	'fak_air', 30,
3173
+	'fak_air_nb', 38,
3133 3174
 	#opposite
3134 3175
 	None)
3135 3176
 
3136 3177
 fak_nollie_fsshuvit_360 = a_class(
3137 3178
 	#player armature action name, start, end frames
3138
-	'fak_nollie_fsshuvit', 1, 20,
3179
+	'fak_nollie_fsshuvit', 1, 40,
3139 3180
 	#deck action name, start, end frames  
3140
-	'b_fak_360shuvit', 1, 20,
3181
+	'b_fak_360shuvit', 1, 40,
3141 3182
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3142
-	3, .5, 0, 10,
3183
+	3, 1, 0, 10,
3143 3184
 	#intro, length
3144 3185
 	None, 0,
3145 3186
 	#exits
3146
-	['fak_offboard', 'fak_air'],
3187
+	['fak_offboard', 'fak_air_nb'],
3147 3188
 	#force exit, frame
3148
-	'fak_air', 30,
3189
+	'fak_air_nb', 38,
3149 3190
 	#opposite
3150 3191
 	None)
3151 3192
 

+ 1
- 1
scripts/astar.py View File

@@ -99,7 +99,7 @@ class Astar:
99 99
         self.life += 1
100 100
         if self.state == 'searching':
101 101
             self.search()
102
-            print('open', len(self.open))
102
+            #print('open', len(self.open))
103 103
             if self.life > 2000:
104 104
                 print('path failed', self.current_searcher)
105 105
                 self.messenger.dispatch('path found', ['failed', self.current_searcher, []])

+ 32
- 0
scripts/bpy_misc/ragdoll_constraints_2.py View File

@@ -0,0 +1,32 @@
1
+import bpy
2
+context = bpy.context
3
+
4
+
5
+
6
+BoneList = ["upper_arm.fk.R", "upper_arm.fk.L", "head", "neck", "clavicle.R", "clavicle.L", "deltoid.R", "deltoid.L", "forearm.fk.R", "forearm.fk.L", "hand.fk.R", "hand.fk.L", "chest", "spine-1", "spine", "root", "hips", "foot.ik.R", "foot.ik.L"]
7
+TargetBone = "Char4:Shoes02.R"
8
+
9
+
10
+for BoneName in BoneList:
11
+    bpy.data.objects["Char4"].data.bones[BoneName].select = True    
12
+    
13
+
14
+print(context.selected_pose_bones)
15
+
16
+for pb in context.selected_pose_bones:
17
+    cl = (pb.constraints.get("rd_cl")
18
+            or pb.constraints.new(type='COPY_LOCATION'))
19
+    # set some properties
20
+    cl.name = "rd_cl"
21
+    cl.target = bpy.data.objects[TargetBone]
22
+    cl.influence = 0
23
+
24
+    cr = (pb.constraints.get("rd_cr")
25
+            or pb.constraints.new(type='COPY_ROTATION'))
26
+    # set some properties
27
+    cr.name = "rd_cr"
28
+    cr.target = bpy.data.objects[TargetBone]
29
+    cr.influence = 0
30
+
31
+
32
+

+ 3
- 3
scripts/cars.py View File

@@ -90,15 +90,15 @@ class Car:
90 90
 		if self == message[1]:
91 91
 			self.path = message[2]
92 92
 			if self.path != []:
93
-				print(self.start_empty.type, 'target type')
93
+				#print(self.start_empty.type, 'target type')
94 94
 				if self.start_empty.type == 'perp':
95 95
 					self.FSM.FSM.ToTransition('toExitPerpPark')
96 96
 				else:
97 97
 					self.FSM.FSM.ToTransition('toExitParallelPark')
98
-					print('setting goal available after failure', self.FSM.owner.target.obj.worldPosition)
98
+					#print('setting goal available after failure', self.FSM.owner.target.obj.worldPosition)
99 99
 					self.FSM.owner.target.status = 'available'
100 100
 			else:
101
-				print('path failed for', self)
101
+				#print('path failed for', self)
102 102
 				self.FSM.FSM.ToTransition('toEnterParallelPark')
103 103
 
104 104
 		

+ 58
- 58
scripts/colors.py View File

@@ -82,41 +82,41 @@ def main():
82 82
     #print("set color", deck.color)
83 83
 
84 84
 
85
-    logo = dict['shirt_logo']
86
-    logo1 = shirt.meshes[0].materials[0].textures[6]
87
-    logo2 = shirt.meshes[0].materials[0].textures[7] 
88
-    logo3 = shirt.meshes[0].materials[0].textures[5]   
89
-    try:
90
-        if logo == 1:
91
-            logo1.diffuseIntensity = 1
92
-            logo2.diffuseIntensity = 0
93
-            logo1.diffuseFactor = 1
94
-            logo2.diffuseFactor = 0
95
-            logo3.diffuseIntensity = 0
96
-            logo3.diffuseFactor = 0
97
-        if logo == 2:
98
-            logo1.diffuseIntensity = 0
99
-            logo1.diffuseFactor = 0
100
-            logo2.diffuseIntensity = 1 
101
-            logo2.diffuseFactor = 1   
102
-            logo3.diffuseIntensity = 0
103
-            logo3.diffuseFactor = 0        
104
-        if logo == 3:
105
-            logo1.diffuseIntensity = 0
106
-            logo1.diffuseFactor = 0
107
-            logo2.diffuseIntensity = 0 
108
-            logo2.diffuseFactor = 0                   
109
-            logo3.diffuseIntensity = 1
110
-            logo3.diffuseFactor = 1        
111
-        if logo == 0:
112
-            logo1.diffuseIntensity = 0
113
-            logo2.diffuseIntensity = 0            
114
-            logo1.diffuseFactor = 0
115
-            logo2.diffuseFactor = 0
116
-            logo3.diffuseIntensity = 0
117
-            logo3.diffuseFactor = 0        
118
-    except:
119
-        pass    
85
+    # logo = dict['shirt_logo']
86
+    # logo1 = shirt.meshes[0].materials[0].textures[6]
87
+    # logo2 = shirt.meshes[0].materials[0].textures[7] 
88
+    # logo3 = shirt.meshes[0].materials[0].textures[5]   
89
+    # try:
90
+    #     if logo == 1:
91
+    #         logo1.diffuseIntensity = 1
92
+    #         logo2.diffuseIntensity = 0
93
+    #         logo1.diffuseFactor = 1
94
+    #         logo2.diffuseFactor = 0
95
+    #         logo3.diffuseIntensity = 0
96
+    #         logo3.diffuseFactor = 0
97
+    #     if logo == 2:
98
+    #         logo1.diffuseIntensity = 0
99
+    #         logo1.diffuseFactor = 0
100
+    #         logo2.diffuseIntensity = 1 
101
+    #         logo2.diffuseFactor = 1   
102
+    #         logo3.diffuseIntensity = 0
103
+    #         logo3.diffuseFactor = 0        
104
+    #     if logo == 3:
105
+    #         logo1.diffuseIntensity = 0
106
+    #         logo1.diffuseFactor = 0
107
+    #         logo2.diffuseIntensity = 0 
108
+    #         logo2.diffuseFactor = 0                   
109
+    #         logo3.diffuseIntensity = 1
110
+    #         logo3.diffuseFactor = 1        
111
+    #     if logo == 0:
112
+    #         logo1.diffuseIntensity = 0
113
+    #         logo2.diffuseIntensity = 0            
114
+    #         logo1.diffuseFactor = 0
115
+    #         logo2.diffuseFactor = 0
116
+    #         logo3.diffuseIntensity = 0
117
+    #         logo3.diffuseFactor = 0        
118
+    # except:
119
+    #     pass    
120 120
 
121 121
 main()
122 122
 
@@ -155,28 +155,28 @@ def update_shirt_tex():
155 155
     import glob
156 156
     import platform
157 157
     scene = bge.logic.getCurrentScene()
158
-    dict = bge.logic.globalDict
159
-    #deck = scene.objects["deck"]
160
-    shirt = scene.objects["Char4:Zshirtt1"]
161
-    mainDir = bge.logic.expandPath("//")
162
-    fileName2 = mainDir + "textures\\shirt\\*.png"  
163
-    if platform.system() == 'Linux':
164
-        fileName2 = mainDir + 'textures//shirt//*.png'  
165
-    shirtList = glob.glob(fileName2)
166
-    dict['shirtList'] = shirtList  
167
-    #print(shirtList, 'shirtList')
168
-    ID = texture.materialID(shirt, 'MAshirt')
169
-    shirt_texture = texture.Texture(shirt, ID)
170
-    new_source2 = texture.ImageFFmpeg(shirtList[dict["shirt_logo"]])
171
-    bge.logic.texture2 = shirt_texture
172
-    bge.logic.texture2.source = new_source2
173
-    bge.logic.texture2.refresh(False)
174
-    shirt_name = shirtList[dict['shirt_logo']]
175
-    shirt_name = shirt_name.replace(mainDir, '')
176
-    shirt_name = shirt_name.replace('textures\shirt', '' )
177
-    shirt_name = shirt_name.replace('.png', '')   
178
-    shirt_name = shirt_name.replace("\\", "")  
179
-    print('shirt texture updted to ', shirt_name)
180
-    dict['shirt_name'] = shirt_name    
158
+    # dict = bge.logic.globalDict
159
+    # #deck = scene.objects["deck"]
160
+    # shirt = scene.objects["Char4:Zshirtt1"]
161
+    # mainDir = bge.logic.expandPath("//")
162
+    # fileName2 = mainDir + "textures\\shirt\\*.png"  
163
+    # if platform.system() == 'Linux':
164
+    #     fileName2 = mainDir + 'textures//shirt//*.png'  
165
+    # shirtList = glob.glob(fileName2)
166
+    # dict['shirtList'] = shirtList  
167
+    # #print(shirtList, 'shirtList')
168
+    # ID = texture.materialID(shirt, 'MAshirt')
169
+    # shirt_texture = texture.Texture(shirt, ID)
170
+    # new_source2 = texture.ImageFFmpeg(shirtList[dict["shirt_logo"]])
171
+    # bge.logic.texture2 = shirt_texture
172
+    # bge.logic.texture2.source = new_source2
173
+    # bge.logic.texture2.refresh(False)
174
+    # shirt_name = shirtList[dict['shirt_logo']]
175
+    # shirt_name = shirt_name.replace(mainDir, '')
176
+    # shirt_name = shirt_name.replace('textures\shirt', '' )
177
+    # shirt_name = shirt_name.replace('.png', '')   
178
+    # shirt_name = shirt_name.replace("\\", "")  
179
+    # print('shirt texture updted to ', shirt_name)
180
+    # dict['shirt_name'] = shirt_name    
181 181
 
182 182
 

+ 32
- 25
scripts/controller2.py View File

@@ -1732,40 +1732,48 @@ def main():
1732 1732
         local = True
1733 1733
         #print("push")
1734 1734
         linVelocity15 = own.linearVelocity
1735
-        if linVelocity15.x < MAX_VEL and linVelocity15.x >= -0 and onGround and own['hippy'] == 0 and own['last_hippy'] == 0 and own['last_footplant'] == False:
1736
-            countdown = COUNTDOWN
1737
-            yvel = linVelocity15.x + SPEEDUP
1738
-            own['countdown'] = countdown
1739
-            force = [(yvel), 0, linVelocity15.z]
1740
-            own.setLinearVelocity(force, local)
1735
+        #if linVelocity15.x < MAX_VEL and linVelocity15.x >= -0 and onGround and own['hippy'] == 0 and own['last_hippy'] == 0 and own['last_footplant'] == False:
1736
+        if linVelocity15.x >= -0 and onGround and own['hippy'] == 0 and own['last_hippy'] == 0 and own['last_footplant'] == False:    
1737
+            if linVelocity15.x < MAX_VEL:
1738
+                countdown = COUNTDOWN
1739
+                yvel = linVelocity15.x + SPEEDUP
1740
+                own['countdown'] = countdown
1741
+                force = [(yvel), 0, linVelocity15.z]
1742
+                own.setLinearVelocity(force, local)
1741 1743
             own['requestAction'] = 'fak_push_goof'
1742 1744
         #switch
1743
-        if linVelocity15.x > -MAX_VEL and linVelocity15.x < 0 and onGround and own['hippy'] == 0 and own['last_hippy'] == 0:
1744
-            countdown = COUNTDOWN
1745
-            yvel = linVelocity15.x - SPEEDUP
1746
-            own['countdown'] = countdown
1747
-            force = [(yvel), 0, linVelocity15.z]
1748
-            own.setLinearVelocity(force, local)
1745
+        #if linVelocity15.x > -MAX_VEL and linVelocity15.x < 0 and onGround and own['hippy'] == 0 and own['last_hippy'] == 0:
1746
+        if linVelocity15.x < 0 and onGround and own['hippy'] == 0 and own['last_hippy'] == 0:    
1747
+            if linVelocity15.x > -MAX_VEL:
1748
+                countdown = COUNTDOWN
1749
+                yvel = linVelocity15.x - SPEEDUP
1750
+                own['countdown'] = countdown
1751
+                force = [(yvel), 0, linVelocity15.z]
1752
+                own.setLinearVelocity(force, local)
1749 1753
             own['requestAction'] = 'reg_push'
1750 1754
 
1751 1755
     def push_goof():
1752 1756
         linVelocity15 = own.linearVelocity
1753 1757
         local = True
1754 1758
         #print("push goof")
1755
-        if linVelocity15.x < MAX_VEL and linVelocity15.x >= -0 and onGround and own['hippy'] == 0 and own['last_hippy'] == 0:
1756
-            countdown = COUNTDOWN
1757
-            yvel = linVelocity15.x + SPEEDUP
1758
-            own['countdown'] = countdown
1759
-            force = [(yvel), 0, linVelocity15.z]
1760
-            own.setLinearVelocity(force, local)
1759
+        #if linVelocity15.x < MAX_VEL and linVelocity15.x >= -0 and onGround and own['hippy'] == 0 and own['last_hippy'] == 0:
1760
+        if  linVelocity15.x >= -0 and onGround and own['hippy'] == 0 and own['last_hippy'] == 0:    
1761
+            if linVelocity15.x < MAX_VEL:
1762
+                countdown = COUNTDOWN
1763
+                yvel = linVelocity15.x + SPEEDUP
1764
+                own['countdown'] = countdown
1765
+                force = [(yvel), 0, linVelocity15.z]
1766
+                own.setLinearVelocity(force, local)
1761 1767
             own['requestAction'] = 'fak_push'
1762 1768
         #switch
1763
-        if linVelocity15.x > -MAX_VEL and linVelocity15.x < 0 and onGround and own['hippy'] == 0 and own['last_hippy'] == 0:
1764
-            countdown = COUNTDOWN
1765
-            yvel = linVelocity15.x - SPEEDUP
1766
-            own['countdown'] = countdown
1767
-            force = [(yvel), 0, linVelocity15.z]
1768
-            own.setLinearVelocity(force, local)
1769
+        #if linVelocity15.x > -MAX_VEL and linVelocity15.x < 0 and onGround and own['hippy'] == 0 and own['last_hippy'] == 0:
1770
+        if  linVelocity15.x < 0 and onGround and own['hippy'] == 0 and own['last_hippy'] == 0:    
1771
+            if linVelocity15.x > -MAX_VEL:
1772
+                countdown = COUNTDOWN
1773
+                yvel = linVelocity15.x - SPEEDUP
1774
+                own['countdown'] = countdown
1775
+                force = [(yvel), 0, linVelocity15.z]
1776
+                own.setLinearVelocity(force, local)
1769 1777
             own['requestAction'] = 'reg_push_goof'
1770 1778
 
1771 1779
     def brfoot():
@@ -4429,4 +4437,3 @@ def main():
4429 4437
     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']:
4430 4438
         own['requestAction'] = 'fak_land'   
4431 4439
 
4432
-

+ 6
- 5
scripts/walk.py View File

@@ -177,9 +177,10 @@ def main(cont):
177 177
 
178 178
 
179 179
     #turning
180
+    walk_turn_amt = .005#.05
180 181
     turning = False
181 182
     if r_ground.positive:
182
-        num = .5
183
+        num = .4#.5
183 184
         tilt = .015
184 185
         if STANCE == 1:
185 186
             num *= -1
@@ -189,9 +190,9 @@ def main(cont):
189 190
             own.linearVelocity.y = num
190 191
             if own['stair_counter'] > 0:
191 192
                 if STANCE == 0:
192
-                    own.applyRotation([0,0,.05], True)
193
+                    own.applyRotation([0,0,walk_turn_amt], True)
193 194
                 else:
194
-                    own.applyRotation([0,0,-.05], True)                
195
+                    own.applyRotation([0,0,-walk_turn_amt], True)                
195 196
             else:
196 197
                 own.applyRotation([-tilt, 0, 0], True)
197 198
             turning = True
@@ -204,9 +205,9 @@ def main(cont):
204 205
             own.linearVelocity.y = -num
205 206
             if own['stair_counter'] > 0:
206 207
                 if STANCE == 0:
207
-                    own.applyRotation([0,0,.05], True)
208
+                    own.applyRotation([0,0,walk_turn_amt], True)
208 209
                 else:
209
-                    own.applyRotation([0,0,-.05], True)                                
210
+                    own.applyRotation([0,0,-walk_turn_amt], True)                                
210 211
             else:        
211 212
                 own.applyRotation([tilt, 0, 0], True)        
212 213
             turning = True

+ 2
- 2
scripts/walkers.py View File

@@ -116,8 +116,8 @@ class WalkerManager:
116 116
 		self.pub = observer.Publisher(['path found', 'working'])
117 117
 		self.navmesh2 =  astar.Astar('walker_nav_points', self.pub)
118 118
 		self.walkers = []
119
-		self.max_walkers = 5
120
-		self.max_active = 3
119
+		self.max_walkers = 16
120
+		self.max_active = 8
121 121
 		self.targets = []
122 122
 		self.target_loc = None
123 123
 		self.idle_spots = get_idle_spots()

+ 2
- 2
shuvit.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:54017e8b853bf6bb08847789140d3e26cfc38ec713a3efc6c4b36a6d8e23baaf
3
-size 120713088
2
+oid sha256:6efaa344eb53c78de432aabe5f90c307a6f7fd1ab18c9d798074c652096c0e85
3
+size 119057520

+ 2
- 2
shuvit23.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:c7a95ab819b4cb0ae5c46b4662e8f139e79f02cec48ad8a5240e7b2a584897e4
3
-size 120592856
2
+oid sha256:c4525b06504fa5bd9909cf1439fc46b88c96dd2dac83a9b8964e5dceaf9d1855
3
+size 119057520

+ 3
- 0
textures/shirt/shuvi2t.png View File

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

+ 3
- 0
textures/shirt/shuvit - Copy.png View File

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

+ 2
- 2
textures/shirt/shuvit.png View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:31ce64438f9135677ec5df13b83896ccd695988aad009577e6f8337e88b70102
3
-size 275659
2
+oid sha256:85f7ada8aff13726f311d2a95ce72aee2ebf157955cb72fd73fccc785722129f
3
+size 356267

+ 2
- 2
textures/tshirt02_logo1.png View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:0ac4f1f240bf2aaa480fa725a09c0d9b46d1ab832a0e5d9f1821f5d872958d9f
3
-size 63355
2
+oid sha256:85f7ada8aff13726f311d2a95ce72aee2ebf157955cb72fd73fccc785722129f
3
+size 356267

+ 3
- 0
textures/tshirt02_logo5.png View File

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

Loading…
Cancel
Save