Browse Source

more boards

shuvit 1 month ago
parent
commit
6b9e9d5988

+ 2
- 2
assets/kits/ramps.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:69486a9653ba9b6ff283d37f7361834aa4e86ca862cd0066d6eff7216528a9a2
3
-size 187177596
2
+oid sha256:2d4bed47956024b6fdda2f3f743b37b059ce591e0fbc12d3e86cc26c27f8ba9c
3
+size 149841436

+ 2
- 2
assets/user2.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:5d18b6d23d5036071d2ad1e69914972a407fe156c2ee7c0aacb2001953447121
3
-size 36998636
2
+oid sha256:6b45e74dfb02e4dbe0d0ba1780b93fb7108790789abde9facc21bb96f14ee5be
3
+size 36760708

+ 2
- 2
characters/annie.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:e5fc44ffff8d435709d07ff460cdf378652558c26839a9132e3228a065f17ff2
3
-size 4327008
2
+oid sha256:62488f6e97a8cf5eba6a05a323c5abed146dfd19020d21453e77239b64ae094e
3
+size 4267184

+ 5
- 5
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
 #----------
20 20
 
21 21
 #level
@@ -118,10 +118,10 @@ FXAA_SPAN_MAX = 8.0
118 118
 
119 119
 #sun settings
120 120
 #############
121
-sun_strength = 1.45
122
-ambient_strength = 0.52
123
-sun_rot_x = 0.05
124
-sun_rot_y = 0.05
121
+sun_strength = 1.05
122
+ambient_strength = 0.4
123
+sun_rot_x = -0.05
124
+sun_rot_y = -0.05
125 125
 shadow_on = 0
126 126
 #------------
127 127
 

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


+ 124
- 6
scripts/actionPlayer.py View File

@@ -6,6 +6,8 @@ zero_blend = False
6 6
 
7 7
 def actionPlayer(ac):
8 8
 	scene = bge.logic.getCurrentScene()
9
+	cont = bge.logic.getCurrentController()
10
+	own = cont.owner
9 11
 	skater = dict['p1']
10 12
 	deck = dict['p1d']
11 13
 	a = getattr(actionsFSMlist.reg_walk, 'name')
@@ -20,12 +22,15 @@ def actionPlayer(ac):
20 22
 	speed = getattr(ac, 'speed')
21 23
 	blendin = getattr(ac, 'blendin')
22 24
 	#--------------------------------
23
-	if zero_blend:
24
-		blendin = 0
25
-		#print('zeroing blend')
25
+	#if zero_blend:
26
+	# if own['l_actionState'] != None and own['l_actionState'] in 'revert1':	
27
+	# 	blendin = 0
28
+	# 	print('zeroing blend')
26 29
 	skater.playAction(name, start,end, layer=layer, play_mode=mode, speed=speed, blendin=blendin)
27 30
 	deck.playAction(dname, dstart,dend, layer=layer, play_mode=mode, speed=speed, blendin=blendin)
28 31
 	#print('playing', name, get_frame(ac))
32
+	if skater.isPlayingAction(3):
33
+		print(skater.getActionFrame(3))
29 34
 
30 35
 def get_frame(ac):
31 36
 	skater = dict['p1']
@@ -76,7 +81,7 @@ def check_land(rA, aState, own):
76 81
 		own['stateTimer'] = 0
77 82
 		own['aState'] = rA
78 83
 	#otherwise, force land, offboard or fliptrick
79
-	elif 'land' in rA or 'onboard' in rA or 'offboard' in rA or rA in actionsFSMlist.reg_fliplist or rA in actionsFSMlist.fak_fliplist:
84
+	elif 'land' in rA or 'onboard' in rA or 'offboard' in rA or rA in actionsFSMlist.reg_fliplist or rA in actionsFSMlist.fak_fliplist or rA in actionsFSMlist.revertlist:
80 85
 		#print('landing________________________', rA)
81 86
 		aState = rA
82 87
 		own['stateTimer'] = 0
@@ -137,6 +142,18 @@ def main(cont):
137 142
 		action = getattr(actionsFSMlist, check_state)
138 143
 		actionPlayer(action)
139 144
 		newState = check_exit(aState, rA, timer, action)
145
+
146
+	check_state = 'reg_idle6'
147
+	if aState == check_state:
148
+		action = getattr(actionsFSMlist, check_state)
149
+		actionPlayer(action)
150
+		newState = check_exit(aState, rA, timer, action)
151
+
152
+	check_state = 'reg_idle7'
153
+	if aState == check_state:
154
+		action = getattr(actionsFSMlist, check_state)
155
+		actionPlayer(action)
156
+		newState = check_exit(aState, rA, timer, action)		
140 157
 	
141 158
 	check_state = 'reg_jump'
142 159
 	if aState == check_state:
@@ -507,7 +524,28 @@ def main(cont):
507 524
 		action = getattr(actionsFSMlist, check_state)
508 525
 		actionPlayer(action)
509 526
 		if own['stateTimer'] > getattr(action, 'fef'):	
510
-			newState = getattr(action, 'force_exit')															
527
+			newState = getattr(action, 'force_exit')	
528
+
529
+	check_state = 'reg_inward_heelflip'
530
+	if aState == check_state:
531
+		action = getattr(actionsFSMlist, check_state)
532
+		actionPlayer(action)
533
+		if own['stateTimer'] > getattr(action, 'fef'):	
534
+			newState = getattr(action, 'force_exit')
535
+
536
+	check_state = 'reg_varial_kickflip'
537
+	if aState == check_state:
538
+		action = getattr(actionsFSMlist, check_state)
539
+		actionPlayer(action)
540
+		if own['stateTimer'] > getattr(action, 'fef'):	
541
+			newState = getattr(action, 'force_exit')																	
542
+
543
+	check_state = 'reg_varial_heelflip'
544
+	if aState == check_state:
545
+		action = getattr(actionsFSMlist, check_state)
546
+		actionPlayer(action)
547
+		if own['stateTimer'] > getattr(action, 'fef'):	
548
+			newState = getattr(action, 'force_exit')																		
511 549
 
512 550
 
513 551
 
@@ -720,6 +758,48 @@ def main(cont):
720 758
 
721 759
 
722 760
 
761
+	check_state = 'revert1'
762
+	if aState == check_state:
763
+		action = getattr(actionsFSMlist, check_state)
764
+		actionPlayer(action)
765
+		if own['stateTimer'] > getattr(action, 'fef'):	
766
+			newState = getattr(action, 'force_exit')	
767
+
768
+	check_state = 'revert2'
769
+	if aState == check_state:
770
+		action = getattr(actionsFSMlist, check_state)
771
+		actionPlayer(action)
772
+		if own['stateTimer'] > getattr(action, 'fef'):	
773
+			newState = getattr(action, 'force_exit')	
774
+
775
+
776
+	check_state = 'fak_revert1'
777
+	if aState == check_state:
778
+		action = getattr(actionsFSMlist, check_state)
779
+		actionPlayer(action)
780
+		if own['stateTimer'] > getattr(action, 'fef'):	
781
+			newState = getattr(action, 'force_exit')	
782
+
783
+	check_state = 'fak_revert2'
784
+	if aState == check_state:
785
+		action = getattr(actionsFSMlist, check_state)
786
+		actionPlayer(action)
787
+		if own['stateTimer'] > getattr(action, 'fef'):	
788
+			newState = getattr(action, 'force_exit')	
789
+
790
+	check_state = 'revert3'
791
+	if aState == check_state:
792
+		action = getattr(actionsFSMlist, check_state)
793
+		actionPlayer(action)
794
+		if own['stateTimer'] > getattr(action, 'fef'):	
795
+			newState = getattr(action, 'force_exit')	
796
+
797
+	check_state = 'revert4'
798
+	if aState == check_state:
799
+		action = getattr(actionsFSMlist, check_state)
800
+		actionPlayer(action)
801
+		if own['stateTimer'] > getattr(action, 'fef'):	
802
+			newState = getattr(action, 'force_exit')	
723 803
 
724 804
 
725 805
 
@@ -792,6 +872,18 @@ def main(cont):
792 872
 		action = getattr(actionsFSMlist, check_state)
793 873
 		actionPlayer(action)
794 874
 		newState = check_exit(aState, rA, timer, action)
875
+
876
+	check_state = 'fak_idle5'
877
+	if aState == check_state:
878
+		action = getattr(actionsFSMlist, check_state)
879
+		actionPlayer(action)
880
+		newState = check_exit(aState, rA, timer, action)
881
+
882
+	check_state = 'fak_idle6'
883
+	if aState == check_state:
884
+		action = getattr(actionsFSMlist, check_state)
885
+		actionPlayer(action)
886
+		newState = check_exit(aState, rA, timer, action)		
795 887
 	
796 888
 	check_state = 'fak_jump'
797 889
 	if aState == check_state:
@@ -1157,7 +1249,33 @@ def main(cont):
1157 1249
 		if own['stateTimer'] > getattr(action, 'fef'):	
1158 1250
 			newState = getattr(action, 'force_exit')												
1159 1251
 
1252
+	check_state = 'fak_hardflip'
1253
+	if aState == check_state:
1254
+		action = getattr(actionsFSMlist, check_state)
1255
+		actionPlayer(action)
1256
+		if own['stateTimer'] > getattr(action, 'fef'):	
1257
+			newState = getattr(action, 'force_exit')
1258
+
1259
+	check_state = 'fak_inward_heelflip'
1260
+	if aState == check_state:
1261
+		action = getattr(actionsFSMlist, check_state)
1262
+		actionPlayer(action)
1263
+		if own['stateTimer'] > getattr(action, 'fef'):	
1264
+			newState = getattr(action, 'force_exit')	
1265
+
1266
+	check_state = 'fak_varial_kickflip'
1267
+	if aState == check_state:
1268
+		action = getattr(actionsFSMlist, check_state)
1269
+		actionPlayer(action)
1270
+		if own['stateTimer'] > getattr(action, 'fef'):	
1271
+			newState = getattr(action, 'force_exit')	
1160 1272
 
1273
+	check_state = 'fak_varial_heelflip'
1274
+	if aState == check_state:
1275
+		action = getattr(actionsFSMlist, check_state)
1276
+		actionPlayer(action)
1277
+		if own['stateTimer'] > getattr(action, 'fef'):	
1278
+			newState = getattr(action, 'force_exit')	
1161 1279
 
1162 1280
 
1163 1281
 #-----------
@@ -1414,5 +1532,5 @@ def main(cont):
1414 1532
 	own['l_aState'] = og_state
1415 1533
 	own['l_actionState'] = og_state
1416 1534
 	#own['l_aState'] = newState
1417
-	#print(own['l_aState'], '----l_aState', own['aState'], 'rA', rA)
1535
+	print(own['l_aState'], '----l_aState', own['aState'], 'rA', rA)
1418 1536
 	state_timer(own)

+ 329
- 38
scripts/actionsFSMlist.py View File

@@ -4,7 +4,10 @@ MAIN_LAYER = 10
4 4
 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 5
 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']     
6 6
 
7
+revertlist = ['revert1', 'revert2', 'fak_revert1', 'fak_revert2', 'revert3', 'revert4']
8
+
7 9
 reg_manuallist = ['reg_manual', 'reg_nmanual', 'fak_manual', 'fak_nmanual']
10
+
8 11
 reg_grindlist = ['reg_5050', 'reg_fsboard', 'reg_tailg', 'reg_tailgr', 'reg_tailgl', 'reg_noseg', 'reg_nosegr', 'reg_nosegl', 'reg_noseslide', 'reg_tailslide']
9 12
 
10 13
 fak_grindlist = ['fak_5050', 'fak_fsboard', 'fak_tailg', 'fak_tailgr', 'fak_tailgl', 'fak_noseg', 'fak_nosegr', 'fak_nosegl', 'fak_noseslide', 'fak_tailslide']
@@ -38,7 +41,7 @@ reg_walk = a_class(
38 41
 	#intro, length
39 42
 	None, 0,
40 43
 	#exits
41
-	['reg_walkFast', 'reg_idle', 'reg_jump', 'reg_onboard', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_walk_air', 'reg_walk_air_out'],
44
+	['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'],
42 45
 	#force exit, frame
43 46
 	None, 0,
44 47
 	#opposite
@@ -64,13 +67,13 @@ reg_idle = a_class(
64 67
 	#player armature action name, start, end frames
65 68
 	'reg_idle1', 1, 120,
66 69
 	#deck action name, start, end frames  
67
-	'b_reg_walk', 1, 1,
70
+	'b_reg_idle1', 1, 120,
68 71
 	#layer, speed, mode (0 = play, 1 = loop), blendin
69 72
 	1, .5, 0, 20,
70 73
 	#intro, length
71 74
 	None, 0,
72 75
 	#exits
73
-	['reg_walk', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_idle5', 'reg_jump', 'reg_sit', 'reg_onboard'],
76
+	['reg_walk', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_idle5', 'reg_idle6', 'reg_idle7', 'reg_jump', 'reg_sit', 'reg_onboard'],
74 77
 	#force exit, frame
75 78
 	None, 0,
76 79
 	#opposite
@@ -78,15 +81,15 @@ reg_idle = a_class(
78 81
 
79 82
 reg_idle2 = a_class(
80 83
 	#player armature action name, start, end frames
81
-	'reg_idle2', 1, 120,
84
+	'reg_idle2_', 1, 120,
82 85
 	#deck action name, start, end frames  
83
-	'b_reg_walk', 1, 1,
86
+	'b_reg_idle2', 1, 120,
84 87
 	#layer, speed, mode (0 = play, 1 = loop), blendin
85
-	1, .5, 1, 20,
88
+	1, .5, 0, 20,
86 89
 	#intro, length
87 90
 	None, 0,
88 91
 	#exits
89
-	['reg_walk', 'reg_idle', 'reg_idle3', 'reg_idle4', 'reg_idle5', 'reg_jump', 'reg_onboard'],
92
+	['reg_walk', 'reg_idle', 'reg_idle3', 'reg_idle4', 'reg_idle5', 'reg_idle6', 'reg_idle7', 'reg_jump', 'reg_onboard'],
90 93
 	#force exit, frame
91 94
 	None, 0,
92 95
 	#opposite
@@ -96,13 +99,13 @@ reg_idle3 = a_class(
96 99
 	#player armature action name, start, end frames
97 100
 	'reg_idle3', 1, 120,
98 101
 	#deck action name, start, end frames  
99
-	'b_reg_walk', 1, 1,
102
+	'b_reg_idle3', 1, 120,
100 103
 	#layer, speed, mode (0 = play, 1 = loop), blendin
101
-	1, .5, 1, 20,
104
+	1, .5, 0, 20,
102 105
 	#intro, length
103 106
 	None, 0,
104 107
 	#exits
105
-	['reg_walk', 'reg_idle2', 'reg_idle', 'reg_idle4', 'reg_idle5', 'reg_jump', 'reg_onboard'],
108
+	['reg_walk', 'reg_idle2', 'reg_idle', 'reg_idle4', 'reg_idle5', 'reg_idle6', 'reg_idle7', 'reg_jump', 'reg_onboard'],
106 109
 	#force exit, frame
107 110
 	None, 0,
108 111
 	#opposite
@@ -112,13 +115,13 @@ reg_idle4 = a_class(
112 115
 	#player armature action name, start, end frames
113 116
 	'reg_idle4', 1, 120,
114 117
 	#deck action name, start, end frames  
115
-	'b_reg_walk', 1, 1,
118
+	'b_reg_idle4', 1, 120,
116 119
 	#layer, speed, mode (0 = play, 1 = loop), blendin
117
-	1, .5, 1, 20,
120
+	1, .5, 0, 20,
118 121
 	#intro, length
119 122
 	None, 0,
120 123
 	#exits
121
-	['reg_walk', 'reg_idle2', 'reg_idle3', 'reg_idle', 'reg_idle5', 'reg_jump', 'reg_onboard'],
124
+	['reg_walk', 'reg_idle2', 'reg_idle3', 'reg_idle', 'reg_idle5', 'reg_idle6', 'reg_idle7', 'reg_jump', 'reg_onboard'],
122 125
 	#force exit, frame
123 126
 	None, 0,
124 127
 	#opposite
@@ -128,13 +131,45 @@ reg_idle5 = a_class(
128 131
 	#player armature action name, start, end frames
129 132
 	'reg_idle5', 1, 120,
130 133
 	#deck action name, start, end frames  
131
-	'b_reg_walk', 1, 1,
134
+	'b_reg_idle5', 1, 120,
132 135
 	#layer, speed, mode (0 = play, 1 = loop), blendin
133
-	1, .5, 1, 20,
136
+	1, .5, 0, 20,
137
+	#intro, length
138
+	None, 0,
139
+	#exits
140
+	['reg_walk', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_idle', 'reg_idle6', 'reg_idle7', 'reg_jump', 'reg_onboard'],
141
+	#force exit, frame
142
+	None, 0,
143
+	#opposite
144
+	None)
145
+
146
+reg_idle6 = a_class(
147
+	#player armature action name, start, end frames
148
+	'reg_idle6', 1, 120,
149
+	#deck action name, start, end frames  
150
+	'b_reg_idle6', 1, 120,
151
+	#layer, speed, mode (0 = play, 1 = loop), blendin
152
+	1, .5, 0, 20,
134 153
 	#intro, length
135 154
 	None, 0,
136 155
 	#exits
137
-	['reg_walk', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_idle', 'reg_jump', 'reg_onboard'],
156
+	['reg_walk', 'reg_idle2', 'reg_idle3', 'reg_idle', 'reg_idle5', 'reg_idle4', 'reg_idle7', 'reg_jump', 'reg_onboard'],
157
+	#force exit, frame
158
+	None, 0,
159
+	#opposite
160
+	None)
161
+
162
+reg_idle7 = a_class(
163
+	#player armature action name, start, end frames
164
+	'reg_idle7', 1, 120,
165
+	#deck action name, start, end frames  
166
+	'b_reg_idle7', 1, 120,
167
+	#layer, speed, mode (0 = play, 1 = loop), blendin
168
+	1, .5, 0, 20,
169
+	#intro, length
170
+	None, 0,
171
+	#exits
172
+	['reg_walk', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_idle5', 'reg_idle6', 'reg_idle', 'reg_jump', 'reg_onboard'],
138 173
 	#force exit, frame
139 174
 	None, 0,
140 175
 	#opposite
@@ -160,7 +195,7 @@ reg_walk_air = a_class(
160 195
 	#player armature action name, start, end frames
161 196
 	'reg_walk_air', 10, 10,
162 197
 	#deck action name, start, end frames  
163
-	'b_reg_jump', 10, 10,
198
+	'b_reg_walk_air', 10, 10,
164 199
 	#layer, speed, mode (0 = play, 1 = loop), blendin
165 200
 	1, .5, 0, 5,
166 201
 	#intro, length
@@ -176,7 +211,7 @@ reg_walk_air_out = a_class(
176 211
 	#player armature action name, start, end frames
177 212
 	'reg_walk_air', 10, 40,
178 213
 	#deck action name, start, end frames  
179
-	'b_reg_jump', 10, 10,
214
+	'b_reg_walk_air', 10, 40,
180 215
 	#layer, speed, mode (0 = play, 1 = loop), blendin
181 216
 	1, 1.5, 1, 5,
182 217
 	#intro, length
@@ -856,10 +891,57 @@ reg_hardflip = a_class(
856 891
 	#exits
857 892
 	['reg_offboard'],
858 893
 	#force exit, frame
859
-	'reg_air', 38,
894
+	'reg_air_nb', 38,
895
+	#opposite
896
+	None)
897
+
898
+reg_inward_heelflip = a_class(
899
+	#player armature action name, start, end frames
900
+	'reg_inward_heelflip', 1, 40,
901
+	#deck action name, start, end frames  
902
+	'b_reg_inward_heelflip', 1, 40,
903
+	#layer, speed, mode (0 = play, 1 = loop), blendin
904
+	3, 1, 0, 10,
905
+	#intro, length
906
+	None, 0,
907
+	#exits
908
+	['reg_offboard'],
909
+	#force exit, frame
910
+	'reg_air_nb', 38,
911
+	#opposite
912
+	None)
913
+
914
+reg_varial_kickflip = a_class(
915
+	#player armature action name, start, end frames
916
+	'reg_varialkickflip', 1, 40,
917
+	#deck action name, start, end frames  
918
+	'b_reg_varialkickflip', 1, 40,
919
+	#layer, speed, mode (0 = play, 1 = loop), blendin
920
+	3, 1, 0, 10,
921
+	#intro, length
922
+	None, 0,
923
+	#exits
924
+	['reg_offboard'],
925
+	#force exit, frame
926
+	'reg_air_nb', 38,
860 927
 	#opposite
861 928
 	None)
862 929
 
930
+reg_varial_heelflip = a_class(
931
+	#player armature action name, start, end frames
932
+	'reg_varialheelflip', 1, 40,
933
+	#deck action name, start, end frames  
934
+	'b_reg_varialheelflip', 1, 40,
935
+	#layer, speed, mode (0 = play, 1 = loop), blendin
936
+	3, 1, 0, 10,
937
+	#intro, length
938
+	None, 0,
939
+	#exits
940
+	['reg_offboard'],
941
+	#force exit, frame
942
+	'reg_air_nb', 38,
943
+	#opposite
944
+	None)
863 945
 
864 946
 
865 947
 
@@ -1576,6 +1658,121 @@ reg_noseslide = a_class(
1576 1658
 	None)
1577 1659
 
1578 1660
 
1661
+revert1 = a_class(
1662
+	#player armature action name, start, end frames
1663
+	'revert1', 1, 10,
1664
+	#deck action name, start, end frames  
1665
+	'b_revert1', 1, 10,
1666
+	#layer, speed, mode (0 = play, 1 = loop), blendin
1667
+	4, .3, 0, 0,
1668
+	#intro, length
1669
+	None, 0,
1670
+	#exits
1671
+	['reg_roll', 'fak_roll'],
1672
+	#force exit, frame
1673
+	'fak_roll', 11,
1674
+	#opposite
1675
+	None)
1676
+
1677
+revert2 = a_class(
1678
+	#player armature action name, start, end frames
1679
+	'revert2', 1, 10,
1680
+	#deck action name, start, end frames  
1681
+	'b_revert2', 1, 10,
1682
+	#layer, speed, mode (0 = play, 1 = loop), blendin
1683
+	4, .3, 0, 0,
1684
+	#intro, length
1685
+	None, 0,
1686
+	#exits
1687
+	['reg_roll', 'fak_roll'],
1688
+	#force exit, frame
1689
+	'fak_roll', 11,
1690
+	#opposite
1691
+	None)
1692
+
1693
+fak_revert1 = a_class(
1694
+	#player armature action name, start, end frames
1695
+	'fak_revert1', 1, 10,
1696
+	#deck action name, start, end frames  
1697
+	'b_revert1', 1, 10,
1698
+	#layer, speed, mode (0 = play, 1 = loop), blendin
1699
+	4, .3, 0, 0,
1700
+	#intro, length
1701
+	None, 0,
1702
+	#exits
1703
+	['reg_roll', 'fak_roll'],
1704
+	#force exit, frame
1705
+	'reg_roll', 11,
1706
+	#opposite
1707
+	None)
1708
+
1709
+fak_revert2 = a_class(
1710
+	#player armature action name, start, end frames
1711
+	'fak_revert2', 1, 10,
1712
+	#deck action name, start, end frames  
1713
+	'b_revert1', 1, 10,
1714
+	#layer, speed, mode (0 = play, 1 = loop), blendin
1715
+	4, .3, 0, 0,
1716
+	#intro, length
1717
+	None, 0,
1718
+	#exits
1719
+	['reg_roll', 'fak_roll'],
1720
+	#force exit, frame
1721
+	'reg_roll', 11,
1722
+	#opposite
1723
+	None)
1724
+
1725
+revert3 = a_class(
1726
+	#player armature action name, start, end frames
1727
+	'revert1', 1, 10,
1728
+	#deck action name, start, end frames  
1729
+	'b_revert1', 1, 10,
1730
+	#layer, speed, mode (0 = play, 1 = loop), blendin
1731
+	4, .3, 0, 0,
1732
+	#intro, length
1733
+	None, 0,
1734
+	#exits
1735
+	['reg_roll', 'fak_roll'],
1736
+	#force exit, frame
1737
+	'fak_roll', 11,
1738
+	#opposite
1739
+	None)
1740
+
1741
+revert4 = a_class(
1742
+	#player armature action name, start, end frames
1743
+	'revert2', 1, 10,
1744
+	#deck action name, start, end frames  
1745
+	'b_revert2', 1, 10,
1746
+	#layer, speed, mode (0 = play, 1 = loop), blendin
1747
+	4, .3, 0, 0,
1748
+	#intro, length
1749
+	None, 0,
1750
+	#exits
1751
+	['reg_roll', 'fak_roll'],
1752
+	#force exit, frame
1753
+	'fak_roll', 11,
1754
+	#opposite
1755
+	None)
1756
+
1757
+
1758
+
1759
+
1760
+
1761
+
1762
+
1763
+
1764
+
1765
+
1766
+
1767
+
1768
+
1769
+
1770
+
1771
+
1772
+
1773
+
1774
+
1775
+
1579 1776
 
1580 1777
 
1581 1778
 
@@ -1643,7 +1840,7 @@ fak_walk = a_class(
1643 1840
 	#intro, length
1644 1841
 	None, 0,
1645 1842
 	#exits
1646
-	['fak_walkFast', 'fak_idle', 'fak_jump', 'fak_onboard', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_walk_air', 'fak_walk_air_out'],
1843
+	['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'],
1647 1844
 	#force exit, frame
1648 1845
 	None, 0,
1649 1846
 	#opposite
@@ -1669,13 +1866,13 @@ fak_idle = a_class(
1669 1866
 	#player armature action name, start, end frames
1670 1867
 	'fak_idle1', 1, 120,
1671 1868
 	#deck action name, start, end frames  
1672
-	'b_fak_walk', 1, 1,
1869
+	'b_fak_idle1', 1, 120,
1673 1870
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1674 1871
 	1, .5, 0, 20,
1675 1872
 	#intro, length
1676 1873
 	None, 0,
1677 1874
 	#exits
1678
-	['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle5', 'fak_jump', 'fak_sit', 'fak_onboard'],
1875
+	['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle5', 'fak_idle6', 'fak_idle7', 'fak_jump', 'fak_sit', 'fak_onboard'],
1679 1876
 	#force exit, frame
1680 1877
 	None, 0,
1681 1878
 	#opposite
@@ -1691,7 +1888,7 @@ fak_idle2 = a_class(
1691 1888
 	#intro, length
1692 1889
 	None, 0,
1693 1890
 	#exits
1694
-	['fak_walk', 'fak_idle', 'fak_idle3', 'fak_idle4', 'fak_idle5', 'fak_jump', 'fak_onboard'],
1891
+	['fak_walk', 'fak_idle', 'fak_idle3', 'fak_idle4', 'fak_idle5', 'fak_idle6', 'fak_idle7', 'fak_jump', 'fak_onboard'],
1695 1892
 	#force exit, frame
1696 1893
 	None, 0,
1697 1894
 	#opposite
@@ -1707,7 +1904,7 @@ fak_idle3 = a_class(
1707 1904
 	#intro, length
1708 1905
 	None, 0,
1709 1906
 	#exits
1710
-	['fak_walk', 'fak_idle2', 'fak_idle', 'fak_idle4', 'fak_idle5', 'fak_jump', 'fak_onboard'],
1907
+	['fak_walk', 'fak_idle2', 'fak_idle', 'fak_idle4', 'fak_idle5', 'fak_idle6', 'fak_idle7', 'fak_jump', 'fak_onboard'],
1711 1908
 	#force exit, frame
1712 1909
 	None, 0,
1713 1910
 	#opposite
@@ -1717,13 +1914,13 @@ fak_idle4 = a_class(
1717 1914
 	#player armature action name, start, end frames
1718 1915
 	'fak_idle4', 1, 120,
1719 1916
 	#deck action name, start, end frames  
1720
-	'b_fak_walk', 1, 1,
1917
+	'b_fak_idle4', 1, 120,
1721 1918
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1722 1919
 	1, .5, 1, 20,
1723 1920
 	#intro, length
1724 1921
 	None, 0,
1725 1922
 	#exits
1726
-	['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle', 'fak_idle5', 'fak_jump', 'fak_onboard'],
1923
+	['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle', 'fak_idle5', 'fak_idle6', 'fak_idle7', 'fak_jump', 'fak_onboard'],
1727 1924
 	#force exit, frame
1728 1925
 	None, 0,
1729 1926
 	#opposite
@@ -1733,13 +1930,45 @@ fak_idle5 = a_class(
1733 1930
 	#player armature action name, start, end frames
1734 1931
 	'fak_idle5', 1, 120,
1735 1932
 	#deck action name, start, end frames  
1736
-	'b_fak_walk', 1, 1,
1933
+	'b_fak_idle5', 1, 120,
1934
+	#layer, speed, mode (0 = play, 1 = loop), blendin
1935
+	1, .5, 1, 20,
1936
+	#intro, length
1937
+	None, 0,
1938
+	#exits
1939
+	['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle6', 'fak_idle7', 'fak_idle', 'fak_jump', 'fak_onboard'],
1940
+	#force exit, frame
1941
+	None, 0,
1942
+	#opposite
1943
+	None)
1944
+
1945
+fak_idle6 = a_class(
1946
+	#player armature action name, start, end frames
1947
+	'fak_idle6', 1, 120,
1948
+	#deck action name, start, end frames  
1949
+	'b_fak_idle6', 1, 120,
1950
+	#layer, speed, mode (0 = play, 1 = loop), blendin
1951
+	1, .5, 1, 20,
1952
+	#intro, length
1953
+	None, 0,
1954
+	#exits
1955
+	['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle7', 'fak_idle', 'fak_jump', 'fak_onboard'],
1956
+	#force exit, frame
1957
+	None, 0,
1958
+	#opposite
1959
+	None)
1960
+
1961
+fak_idle7 = a_class(
1962
+	#player armature action name, start, end frames
1963
+	'fak_idle7', 1, 120,
1964
+	#deck action name, start, end frames  
1965
+	'b_fak_idle7', 1, 1,
1737 1966
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1738 1967
 	1, .5, 1, 20,
1739 1968
 	#intro, length
1740 1969
 	None, 0,
1741 1970
 	#exits
1742
-	['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle', 'fak_jump', 'fak_onboard'],
1971
+	['fak_walk', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle6', 'fak_idle', 'fak_jump', 'fak_onboard'],
1743 1972
 	#force exit, frame
1744 1973
 	None, 0,
1745 1974
 	#opposite
@@ -1765,7 +1994,7 @@ fak_walk_air = a_class(
1765 1994
 	#player armature action name, start, end frames
1766 1995
 	'fak_walk_air', 10, 10,
1767 1996
 	#deck action name, start, end frames  
1768
-	'b_fak_jump', 10, 10,
1997
+	'b_fak_walk_air', 10, 10,
1769 1998
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1770 1999
 	1, .5, 0, 5,
1771 2000
 	#intro, length
@@ -1781,7 +2010,7 @@ fak_walk_air_out = a_class(
1781 2010
 	#player armature action name, start, end frames
1782 2011
 	'fak_walk_air', 10, 40,
1783 2012
 	#deck action name, start, end frames  
1784
-	'b_fak_jump', 10, 10,
2013
+	'b_fak_walk_air', 10, 40,
1785 2014
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1786 2015
 	1, 1.5, 1, 5,
1787 2016
 	#intro, length
@@ -1827,11 +2056,11 @@ fak_sit = a_class(
1827 2056
 
1828 2057
 fak_onboard = a_class(
1829 2058
 	#player armature action name, start, end frames
1830
-	'fak_noffboard', 20, 1,
2059
+	'fak_noffboard', 10, 1,
1831 2060
 	#deck action name, start, end frames  
1832
-	'b_fak_offboard', 20, 1,
2061
+	'b_fak_offboard', 10, 1,
1833 2062
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1834
-	1, 1, 1, 5,
2063
+	1, .5, 0, 5,
1835 2064
 	#intro, length
1836 2065
 	None, 0,
1837 2066
 	#exits
@@ -1843,11 +2072,11 @@ fak_onboard = a_class(
1843 2072
 
1844 2073
 fak_offboard = a_class(
1845 2074
 	#player armature action name, start, end frames
1846
-	'fak_noffboard', 1, 40,
2075
+	'fak_noffboard', 1, 30,
1847 2076
 	#deck action name, start, end frames  
1848
-	'b_fak_offboard', 1, 40,
2077
+	'b_fak_offboard', 1, 30,
1849 2078
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1850
-	1, 1, 1, 5,
2079
+	1, .5, 0, 5,
1851 2080
 	#intro, length
1852 2081
 	None, 0,
1853 2082
 	#exits
@@ -1958,7 +2187,7 @@ fak_pump_left = a_class(
1958 2187
 	#player armature action name, start, end frames
1959 2188
 	'nfak_pump_left', 10, 30,
1960 2189
 	#deck action name, start, end frames  
1961
-	'b_fak_left', 1, 10,
2190
+	'b_reg_right', 1, 10,
1962 2191
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1963 2192
 	1, .5, 1, 15,
1964 2193
 	#intro, length
@@ -1975,7 +2204,7 @@ fak_pump_right = a_class(
1975 2204
 	#player armature action name, start, end frames
1976 2205
 	'nfak_pump_right', 10, 30,
1977 2206
 	#deck action name, start, end frames  
1978
-	'b_fak_right', 1, 10,
2207
+	'b_reg_left', 1, 10,
1979 2208
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1980 2209
 	1, .5, 1, 15,
1981 2210
 	#intro, length
@@ -2449,8 +2678,70 @@ fak_fsshuvit360 = a_class(
2449 2678
 	#opposite
2450 2679
 	None)
2451 2680
 
2681
+fak_hardflip = a_class(
2682
+	#player armature action name, start, end frames
2683
+	'fak_hardflip', 1, 40,
2684
+	#deck action name, start, end frames  
2685
+	'b_fak_hardflip', 1, 40,
2686
+	#layer, speed, mode (0 = play, 1 = loop), blendin
2687
+	3, 1, 0, 10,
2688
+	#intro, length
2689
+	None, 0,
2690
+	#exits
2691
+	['fak_offboard'],
2692
+	#force exit, frame
2693
+	'fak_air_nb', 38,
2694
+	#opposite
2695
+	None)
2696
+
2697
+fak_inward_heelflip = a_class(
2698
+	#player armature action name, start, end frames
2699
+	'fak_inward_heelflip', 1, 40,
2700
+	#deck action name, start, end frames  
2701
+	'b_fak_inward_heelflip', 1, 40,
2702
+	#layer, speed, mode (0 = play, 1 = loop), blendin
2703
+	3, 1, 0, 10,
2704
+	#intro, length
2705
+	None, 0,
2706
+	#exits
2707
+	['fak_offboard'],
2708
+	#force exit, frame
2709
+	'fak_air_nb', 38,
2710
+	#opposite
2711
+	None)
2452 2712
 
2453 2713
 
2714
+fak_varial_kickflip = a_class(
2715
+	#player armature action name, start, end frames
2716
+	'fak_varialkickflip', 1, 40,
2717
+	#deck action name, start, end frames  
2718
+	'b_fak_varialkickflip', 1, 40,
2719
+	#layer, speed, mode (0 = play, 1 = loop), blendin
2720
+	3, 1, 0, 10,
2721
+	#intro, length
2722
+	None, 0,
2723
+	#exits
2724
+	['fak_offboard'],
2725
+	#force exit, frame
2726
+	'fak_air_nb', 38,
2727
+	#opposite
2728
+	None)
2729
+
2730
+fak_varial_heelflip = a_class(
2731
+	#player armature action name, start, end frames
2732
+	'fak_varialheelflip', 1, 40,
2733
+	#deck action name, start, end frames  
2734
+	'b_fak_varialheelflip', 1, 40,
2735
+	#layer, speed, mode (0 = play, 1 = loop), blendin
2736
+	3, 1, 0, 10,
2737
+	#intro, length
2738
+	None, 0,
2739
+	#exits
2740
+	['fak_offboard'],
2741
+	#force exit, frame
2742
+	'fak_air_nb', 38,
2743
+	#opposite
2744
+	None)
2454 2745
 
2455 2746
 #-----------------------
2456 2747
 

+ 2
- 2
scripts/controller2.py View File

@@ -3304,8 +3304,8 @@ def main():
3304 3304
             JUMPSTRENGTH = 1
3305 3305
         if JUMPSTRENGTH >= 7:
3306 3306
             JUMPSTRENGTH = .9
3307
-        #aollie()
3308
-        hardflip()
3307
+        aollie()
3308
+        #varial_heelflip()
3309 3309
         reset_rtimers()
3310 3310
         q1oncd = 0
3311 3311
         q2oncd = 0

+ 2
- 1
scripts/ragdoll.py View File

@@ -140,7 +140,8 @@ def main():
140 140
             cont.actuators['Camera'].height = 2.0
141 141
             cont.actuators['Camera'].min = 4.0
142 142
             cont.actuators['Camera'].max = 8.0
143
-            cont.actuators['Camera'].damping = .000001
143
+            #cont.actuators['Camera'].damping = .000001
144
+            cont.actuators['Camera'].damping = .99
144 145
             cont.activate(cont.actuators['Camera']) 
145 146
             #print(own['rd_set_vel'], 'vel setter')
146 147
             if own['rd_set_vel'] == True:

+ 3
- 3
scripts/trick_text.py View File

@@ -7,7 +7,7 @@ def main(cont):
7 7
     own = cont.owner
8 8
     dict = bge.logic.globalDict
9 9
     trick_string = dict.get('trick_string')
10
-    print(trick_string, "textstring")
10
+    #print(trick_string, "textstring")
11 11
     print_text_timer = own['print_text_timer']
12 12
     print_text_timer2 = own['print_text_timer2']
13 13
     print_text_timer3 = own['print_text_timer3']
@@ -17,7 +17,7 @@ def main(cont):
17 17
     print_text = ''
18 18
     timer_length = 300
19 19
     #set strings
20
-    show_tricks = 1
20
+    show_tricks = 0
21 21
     if show_tricks == 1:
22 22
         if trick_string != None:
23 23
             if old_print_text == '':
@@ -88,7 +88,7 @@ def main(cont):
88 88
         old_print_text3 = own['print_text3']
89 89
         output_text = str(old_print_text) + str(old_print_text2) + str(old_print_text3) 
90 90
         own.text = output_text
91
-        print('setting text', output_text)
91
+        #print('setting text', output_text)
92 92
         
93 93
     #print("1: ", old_print_text, "2: ", old_print_text2, "3: ", old_print_text3)    
94 94
     #print(print_text_timer, " : timer")

+ 2
- 2
shuvit.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:14030fb9bc541c161b2052969ed3417ac458d184986b4e9845fce5f99bf6f491
3
-size 146861528
2
+oid sha256:33e3c5ed51f18d1b07c3d6ba29e7b4f9469b0267bd9b878b318caa91661649fd
3
+size 146591652

Loading…
Cancel
Save