Browse Source

action player cleaning

shuvit 1 year ago
parent
commit
30b903e8bf
6 changed files with 335 additions and 1203 deletions
  1. 12
    1
      scripts/Manager.py
  2. 266
    1165
      scripts/actionPlayer.py
  3. 36
    36
      scripts/actionsFSMlist.py
  4. 15
    0
      scripts/boneRecord.py
  5. 2
    1
      scripts/controller2.py
  6. 4
    0
      scripts/ragdoll.py

+ 12
- 1
scripts/Manager.py View File

@@ -740,4 +740,15 @@ def main():
740 740
         own['last_rtsBut'] = rtsBut
741 741
         own['last_playback'] = own['playback']
742 742
         own['last_objIndex'] = own['objIndex']
743
-        dict['playback'] = own['playback']
743
+        dict['playback'] = own['playback']
744
+
745
+    # if own["playback"] == True: 
746
+    #     la = 10
747
+    #     p = []
748
+    #     it = 0
749
+    #     while it < la:
750
+    #         if dict['p1'].isPlayingAction(it):
751
+    #             p.append(it)
752
+
753
+    #         it += 1
754
+    #     print(p)    

+ 266
- 1165
scripts/actionPlayer.py View File

@@ -5,6 +5,151 @@ import mathutils
5 5
 dict = bge.logic.globalDict
6 6
 zero_blend = False
7 7
 
8
+state_a = ['reg_idle',
9
+'reg_idle2',
10
+'reg_idle3',
11
+'reg_idle4',
12
+'reg_idle5',
13
+'reg_idle6',
14
+'reg_idle7',
15
+'reg_roll',
16
+'reg_turnLeft',
17
+'reg_turnRight',
18
+'reg_manual_left',
19
+'reg_manual_right',
20
+'reg_nmanual_left',
21
+'reg_nmanual_right',
22
+'reg_opos',
23
+'reg_nopos',
24
+'reg_pump',
25
+'reg_pump_left',
26
+'reg_pump_right',
27
+'reg_manual',
28
+'reg_nmanual',
29
+'reg_air',
30
+'reg_air_nb',
31
+'reg_air_nose',
32
+'reg_air_tail',
33
+'reg_5050',
34
+'reg_bsboard',
35
+'reg_fsboard',
36
+'reg_tailg',
37
+'reg_tailgr',
38
+'reg_tailgl',
39
+'reg_noseg',
40
+'reg_nosegr',
41
+'reg_nosegl',
42
+'reg_tailslide',
43
+'reg_noseslide',
44
+'fak_idle',
45
+'fak_idle2',
46
+'fak_idle3',
47
+'fak_idle4',
48
+'fak_idle5',
49
+'fak_idle6',
50
+'fak_idle7',
51
+'fak_roll',
52
+'fak_turnLeft',
53
+'fak_turnRight',
54
+'fak_manual_left',
55
+'fak_manual_right',
56
+'fak_nmanual_left',
57
+'fak_nmanual_right',
58
+'fak_opos',
59
+'fak_nopos',
60
+'fak_pump',
61
+'fak_pump_left',
62
+'fak_pump_right',
63
+'fak_manual',
64
+'fak_nmanual',
65
+'fak_air',
66
+'fak_air_nb',
67
+'fak_air_nose',
68
+'fak_air_tail',
69
+'fak_5050',
70
+'fak_bsboard',
71
+'fak_fsboard',
72
+'fak_tailg',
73
+'fak_tailgr',
74
+'fak_tailgl',
75
+'fak_noseg',
76
+'fak_nosegr',
77
+'fak_nosegl',
78
+'fak_tailslide',
79
+'fak_noseslide',
80
+'reg_ollie',
81
+'reg_kickflip',
82
+'reg_heelflip',
83
+'reg_shuvit',
84
+'reg_shuvit360',
85
+'reg_fsshuvit',
86
+'reg_fsshuvit360',
87
+'reg_nollie',
88
+'reg_nollie_kickflip',
89
+'reg_nollie_heelflip',
90
+'reg_nollie_shuvit',
91
+'reg_nollie_fsshuvit',
92
+'reg_nollie_shuvit360',
93
+'reg_nollie_fsshuvit_360',
94
+'reg_hardflip',
95
+'reg_inward_heelflip',
96
+'reg_varial_kickflip',
97
+'reg_varial_heelflip',
98
+'fak_ollie',
99
+'fak_kickflip',
100
+'fak_heelflip',
101
+'fak_shuvit',
102
+'fak_shuvit360',
103
+'fak_fsshuvit',
104
+'fak_fsshuvit360',
105
+'fak_nollie',
106
+'fak_nollie_kickflip',
107
+'fak_nollie_heelflip',
108
+'fak_nollie_shuvit',
109
+'fak_nollie_fsshuvit',
110
+'fak_nollie_shuvit360',
111
+'fak_nollie_fsshuvit_360',
112
+'fak_hardflip',
113
+'fak_inward_heelflip',
114
+'fak_varial_kickflip',
115
+'fak_varial_heelflip']
116
+
117
+state_b = ['reg_jump',
118
+'reg_walk_air',
119
+'reg_walk_air_out',
120
+'reg_onboard',
121
+'reg_offboard',
122
+'reg_brfoot',
123
+'reg_frfoot',
124
+'reg_blfoot',
125
+'reg_flfoot',
126
+'reg_land',
127
+'reg_landL',
128
+'reg_landLb',
129
+'reg_landR',
130
+'reg_landRb',
131
+'revert1',
132
+'revert2',
133
+'fak_revert1',
134
+'fak_revert2',
135
+'revert3',
136
+'revert4',
137
+'fak_jump',
138
+'fak_walk_air',
139
+'fak_walk_air_out',
140
+'fak_onboard',
141
+'fak_offboard',
142
+'fak_brfoot',
143
+'fak_frfoot',
144
+'fak_blfoot',
145
+'fak_flfoot',
146
+'fak_land',
147
+'fak_landL',
148
+'fak_landLb',
149
+'fak_landR',
150
+'fak_landRb']
151
+
152
+
8 153
 def actionPlayer(ac):
9 154
 	scene = bge.logic.getCurrentScene()
10 155
 	cont = bge.logic.getCurrentController()
@@ -51,22 +196,25 @@ def check_exit(aState, rA, timer, ac):
51 196
 	exits = getattr(ac, 'exits')
52 197
 	force = getattr(ac, 'force_exit')
53 198
 	fe = getattr(ac, 'fef')
199
+	rv = ''
54 200
 	
55
-	#print('?????????????rA, aState', rA, aState)
201
+	print('rA, aState', rA, aState, force, fe, timer)
56 202
 	if rA in exits:
57
-		return rA
203
+		rv = rA
58 204
 	#
59 205
 
60 206
 	elif ('fak' in rA and 'reg' in aState) or ('reg' in rA and 'fak' in aState):
61 207
 		#print('change stance')
62 208
 		if getattr(ac, 'opposite') != None:
63
-			return getattr(ac, 'opposite')
209
+			rv = getattr(ac, 'opposite')
64 210
 	else:
65
-		return aState
211
+		rv = aState
66 212
 
67 213
 	if force != None and fe >= timer:
68
-		#print('doing exit timer')
69
-		return force
214
+		print('doing exit timer')
215
+		rv = force
216
+
217
+	return rv
70 218
 
71 219
 def state_timer(own):
72 220
 	if own['aState'] == own['l_aState']:
@@ -109,75 +257,28 @@ def main(cont):
109 257
 	aState = check_land(rA, aState, own)
110 258
 	newState = aState
111 259
 	og_state = own['aState']
112
-	#print(aState, 'cur aState')
113 260
 
114
-	#if own['l_aState'] in actionsFSMlist.reg_fliplist:
115
-		#zero_blend = True
261
+	if aState in state_a:
116 262
 
117
-	#-----------------------
118
-	check_state = 'reg_idle'
119
-	if aState == check_state:
120
-		action = getattr(actionsFSMlist, check_state)
121
-		actionPlayer(action)
122
-		newState = check_exit(aState, rA, timer, action)
263
+		action = getattr(actionsFSMlist, aState)
264
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
265
+			intro = getattr(action, 'intro')
266
+			actionPlayer(getattr(actionsFSMlist, intro))	
267
+		else:
268
+			actionPlayer(action)
269
+		newState = check_exit(aState, rA, timer, action)		
123 270
 
124
-	check_state = 'reg_idle2'	
125
-	if aState == check_state:
126
-		action = getattr(actionsFSMlist, check_state)
271
+	if aState in state_b:
272
+		action = getattr(actionsFSMlist, aState)
127 273
 		actionPlayer(action)
128
-		newState = check_exit(aState, rA, timer, action)
274
+		if own['stateTimer'] > getattr(action, 'fef'):
275
+			newState = check_exit(aState, rA, timer, action)
129 276
 
130
-	check_state = 'reg_idle3'
131
-	if aState == check_state:
132
-		action = getattr(actionsFSMlist, check_state)
133
-		actionPlayer(action)
134
-		newState = check_exit(aState, rA, timer, action)
135
-	
136
-	check_state = 'reg_idle4'
137
-	if aState == check_state:
138
-		action = getattr(actionsFSMlist, check_state)
139
-		actionPlayer(action)
140
-		newState = check_exit(aState, rA, timer, action)
141 277
 
142
-	check_state = 'reg_idle5'
143
-	if aState == check_state:
144
-		action = getattr(actionsFSMlist, check_state)
145
-		actionPlayer(action)
146
-		newState = check_exit(aState, rA, timer, action)
147 278
 
148
-	check_state = 'reg_idle6'
149
-	if aState == check_state:
150
-		action = getattr(actionsFSMlist, check_state)
151
-		actionPlayer(action)
152
-		newState = check_exit(aState, rA, timer, action)
153 279
 
154
-	check_state = 'reg_idle7'
155
-	if aState == check_state:
156
-		action = getattr(actionsFSMlist, check_state)
157
-		actionPlayer(action)
158
-		newState = check_exit(aState, rA, timer, action)		
159
-	
160
-	check_state = 'reg_jump'
161
-	if aState == check_state:
162
-		action = getattr(actionsFSMlist, check_state)
163
-		actionPlayer(action)
164
-		if own['stateTimer'] > getattr(action, 'fef'):
165
-			newState = check_exit(aState, rA, timer, action)
166
-	
167
-	check_state = 'reg_walk_air'
168
-	if aState == check_state:
169
-		action = getattr(actionsFSMlist, check_state)
170
-		actionPlayer(action)
171
-		if aState != rA:
172
-			newState = getattr(action, 'exits')[0]
173
-	
174
-	check_state = 'reg_walk_air_out' 			
175
-	if aState == check_state:
176
-		action = getattr(actionsFSMlist, check_state)
177
-		actionPlayer(action)
178
-		#print(own['stateTimer'], getattr(action, 'fef'))
179
-		if own['stateTimer'] > getattr(action, 'fef'):	
180
-			newState = getattr(action, 'force_exit')
280
+
281
+###################################
181 282
 
182 283
 	check_state = 'reg_sit'
183 284
 	if aState == check_state:
@@ -215,97 +316,6 @@ def main(cont):
215 316
 
216 317
 		else:
217 318
 			actionPlayer(action)
218
-		#print(frame)
219
-
220
-	check_state = 'reg_onboard'
221
-	if aState == check_state:
222
-		action = getattr(actionsFSMlist, check_state)
223
-		actionPlayer(action)
224
-		#print('checking onbaord state')
225
-		#if own['stateTimer'] > 10:
226
-			#newState = check_exit(aState, rA, timer, actionsFSMlist.reg_onboard)
227
-		if own['stateTimer'] > getattr(action, 'fef'):	
228
-			newState = getattr(action, 'force_exit')			
229
-
230
-	check_state = 'reg_offboard'
231
-	if aState == check_state:
232
-		action = getattr(actionsFSMlist, check_state)
233
-		actionPlayer(action)
234
-		if own['stateTimer'] > 20:
235
-			newState = check_exit(aState, rA, timer, actionsFSMlist.reg_offboard)			
236
-
237
-	check_state = 'reg_roll'
238
-	if aState == check_state:
239
-		action = getattr(actionsFSMlist, check_state)
240
-		actionPlayer(action)
241
-		newState = check_exit(aState, rA, timer, action)
242
-
243
-	check_state = 'reg_turnLeft'
244
-	if aState == check_state:
245
-		action = getattr(actionsFSMlist, check_state)
246
-		actionPlayer(action)
247
-		newState = check_exit(aState, rA, timer, action)
248
-	
249
-	check_state = 'reg_turnRight'
250
-	if aState == check_state:
251
-		action = getattr(actionsFSMlist, check_state)
252
-		actionPlayer(action)
253
-		newState = check_exit(aState, rA, timer, action)
254
-
255
-	check_state = 'reg_manual_left'
256
-	if aState == check_state:
257
-		action = getattr(actionsFSMlist, check_state)
258
-		actionPlayer(action)
259
-		newState = check_exit(aState, rA, timer, action)
260
-	
261
-	check_state = 'reg_manual_right'
262
-	if aState == check_state:
263
-		action = getattr(actionsFSMlist, check_state)
264
-		actionPlayer(action)
265
-		newState = check_exit(aState, rA, timer, action)	
266
-
267
-	check_state = 'reg_nmanual_left'
268
-	if aState == check_state:
269
-		action = getattr(actionsFSMlist, check_state)
270
-		actionPlayer(action)
271
-		newState = check_exit(aState, rA, timer, action)
272
-	
273
-	check_state = 'reg_nmanual_right'
274
-	if aState == check_state:
275
-		action = getattr(actionsFSMlist, check_state)
276
-		actionPlayer(action)
277
-		newState = check_exit(aState, rA, timer, action)				
278
-
279
-	check_state = 'reg_opos'
280
-	if aState == check_state:
281
-		action = getattr(actionsFSMlist, check_state)
282
-		actionPlayer(action)
283
-		newState = check_exit(aState, rA, timer, action)		
284
-	
285
-	check_state = 'reg_nopos'
286
-	if aState == check_state:
287
-		action = getattr(actionsFSMlist, check_state)
288
-		actionPlayer(action)
289
-		newState = check_exit(aState, rA, timer, action)		
290
-
291
-	check_state = 'reg_pump'
292
-	if aState == check_state:
293
-		action = getattr(actionsFSMlist, check_state)
294
-		actionPlayer(action)
295
-		newState = check_exit(aState, rA, timer, action)
296
-
297
-	check_state = 'reg_pump_left'
298
-	if aState == check_state:
299
-		action = getattr(actionsFSMlist, check_state)
300
-		actionPlayer(action)
301
-		newState = check_exit(aState, rA, timer, action)				
302
-
303
-	check_state = 'reg_pump_right'
304
-	if aState == check_state:
305
-		action = getattr(actionsFSMlist, check_state)
306
-		actionPlayer(action)
307
-		newState = check_exit(aState, rA, timer, action)				
308
-
309 319
 
310 320
 	check_state = 'reg_push'
311 321
 	if aState == check_state:
@@ -345,447 +355,142 @@ def main(cont):
345 355
 			actionPlayer(action)
346 356
 		newState = check_exit(aState, rA, timer, actionsFSMlist.reg_fs_powerslide)				
347 357
 
348
-	check_state = 'reg_brfoot'
349
-	if aState == check_state:
350
-		action = getattr(actionsFSMlist, check_state)
351
-		actionPlayer(action)
352
-		if own['stateTimer'] > getattr(action, 'fef'):	
353
-			newState = getattr(action, 'force_exit')	
354
-	
355
-	check_state = 'reg_frfoot'
356
-	if aState == check_state:
357
-		action = getattr(actionsFSMlist, check_state)
358
-		actionPlayer(action)
359
-		if own['stateTimer'] > getattr(action, 'fef'):	
360
-			newState = getattr(action, 'force_exit')	
361 358
 
362
-	check_state = 'reg_blfoot'
363
-	if aState == check_state:
364
-		action = getattr(actionsFSMlist, check_state)
365
-		actionPlayer(action)
366
-		if own['stateTimer'] > getattr(action, 'fef'):	
367
-			newState = getattr(action, 'force_exit')	
368
-	
369
-	check_state = 'reg_flfoot'
370
-	if aState == check_state:
371
-		action = getattr(actionsFSMlist, check_state)
372
-		actionPlayer(action)
373
-		if own['stateTimer'] > getattr(action, 'fef'):	
374
-			newState = getattr(action, 'force_exit')				
359
+#-----------
360
+#grinds-----
361
+#-----------
375 362
 
376 363
 
377 364
 
378
-	check_state = 'reg_manual'
379
-	if aState == check_state:
380
-		action = getattr(actionsFSMlist, check_state)
381
-		actionPlayer(action)
382
-		newState = check_exit(aState, rA, timer, action)
365
+#-----------
366
+#grabs------
367
+#-----------
383 368
 
384
-	check_state = 'reg_nmanual'
385
-	if aState == check_state:
386
-		action = getattr(actionsFSMlist, check_state)
387
-		actionPlayer(action)
388
-		newState = check_exit(aState, rA, timer, action)
389 369
 
390
-	check_state = 'reg_land'
391
-	if aState == check_state:
392
-		action = getattr(actionsFSMlist, check_state)
393
-		actionPlayer(action)
394
-		if own['stateTimer'] > getattr(action, 'fef'):	
395
-			newState = getattr(action, 'force_exit')
396 370
 
397
-	check_state = 'reg_landL'
398
-	if aState == check_state:
399
-		action = getattr(actionsFSMlist, check_state)
400
-		actionPlayer(action)
401
-		if own['stateTimer'] > getattr(action, 'fef'):	
402
-			newState = getattr(action, 'force_exit')
403 371
 
404
-	check_state = 'reg_landLb'
372
+
373
+	check_state = 'frontside_grab'
405 374
 	if aState == check_state:
406 375
 		action = getattr(actionsFSMlist, check_state)
407
-		actionPlayer(action)
408
-		if own['stateTimer'] > getattr(action, 'fef'):	
409
-			newState = getattr(action, 'force_exit')
376
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
377
+			intro = getattr(action, 'intro')
378
+			actionPlayer(getattr(actionsFSMlist, intro))	
379
+		else:
380
+			actionPlayer(action)		
381
+		newState = check_exit(aState, rA, timer, action)
410 382
 
411
-	check_state = 'reg_landR'
383
+	check_state = 'backside_grab'
412 384
 	if aState == check_state:
413 385
 		action = getattr(actionsFSMlist, check_state)
414
-		actionPlayer(action)
415
-		if own['stateTimer'] > getattr(action, 'fef'):	
416
-			newState = getattr(action, 'force_exit')
417
-
418
-	check_state = 'reg_landRb'
386
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
387
+			intro = getattr(action, 'intro')
388
+			actionPlayer(getattr(actionsFSMlist, intro))	
389
+		else:
390
+			actionPlayer(action)		
391
+		newState = check_exit(aState, rA, timer, action)		
392
+		
393
+	check_state = 'frontside_nose_grab'
419 394
 	if aState == check_state:
420 395
 		action = getattr(actionsFSMlist, check_state)
421
-		actionPlayer(action)
422
-		if own['stateTimer'] > getattr(action, 'fef'):	
423
-			newState = getattr(action, 'force_exit')												
424
-
425
-	check_state = 'reg_air'
396
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
397
+			intro = getattr(action, 'intro')
398
+			actionPlayer(getattr(actionsFSMlist, intro))	
399
+		else:
400
+			actionPlayer(action)		
401
+		newState = check_exit(aState, rA, timer, action)
402
+	
403
+	check_state = 'backside_nose_grab'
426 404
 	if aState == check_state:
427 405
 		action = getattr(actionsFSMlist, check_state)
428
-		actionPlayer(action)
406
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
407
+			intro = getattr(action, 'intro')
408
+			actionPlayer(getattr(actionsFSMlist, intro))	
409
+		else:
410
+			actionPlayer(action)		
429 411
 		newState = check_exit(aState, rA, timer, action)
430
-
431
-	check_state = 'reg_air_nb'
412
+	
413
+	check_state = 'frontside_tail_grab'
432 414
 	if aState == check_state:
433 415
 		action = getattr(actionsFSMlist, check_state)
434
-		actionPlayer(action)
416
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
417
+			intro = getattr(action, 'intro')
418
+			actionPlayer(getattr(actionsFSMlist, intro))	
419
+		else:
420
+			actionPlayer(action)		
435 421
 		newState = check_exit(aState, rA, timer, action)
436 422
 
437
-
438
-	check_state = 'reg_air_nose'
423
+	check_state = 'backside_tail_grab'
439 424
 	if aState == check_state:
440 425
 		action = getattr(actionsFSMlist, check_state)
441
-		actionPlayer(action)
426
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
427
+			intro = getattr(action, 'intro')
428
+			actionPlayer(getattr(actionsFSMlist, intro))	
429
+		else:
430
+			actionPlayer(action)		
442 431
 		newState = check_exit(aState, rA, timer, action)
443 432
 
444
-	check_state = 'reg_air_tail'
433
+	check_state = 'reg_ollie_north'
445 434
 	if aState == check_state:
446 435
 		action = getattr(actionsFSMlist, check_state)
447
-		actionPlayer(action)
448
-		newState = check_exit(aState, rA, timer, action)				
436
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
437
+			intro = getattr(action, 'intro')
438
+			actionPlayer(getattr(actionsFSMlist, intro))	
439
+		else:
440
+			actionPlayer(action)		
441
+		newState = check_exit(aState, rA, timer, action)		
449 442
 
450
-	check_state = 'reg_ollie'
443
+	check_state = 'reg_ollie_south'
451 444
 	if aState == check_state:
452 445
 		action = getattr(actionsFSMlist, check_state)
453
-		actionPlayer(action)
454
-		if own['stateTimer'] > getattr(action, 'fef'):	
455
-			newState = getattr(action, 'force_exit')												
446
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
447
+			intro = getattr(action, 'intro')
448
+			actionPlayer(getattr(actionsFSMlist, intro))	
449
+		else:
450
+			actionPlayer(action)		
451
+		newState = check_exit(aState, rA, timer, action)
456 452
 
457
-	check_state = 'reg_kickflip'
453
+	check_state = 'reg_judo'
458 454
 	if aState == check_state:
459 455
 		action = getattr(actionsFSMlist, check_state)
460
-		actionPlayer(action)
461
-		if own['stateTimer'] > getattr(action, 'fef'):	
462
-			newState = getattr(action, 'force_exit')												
456
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
457
+			intro = getattr(action, 'intro')
458
+			actionPlayer(getattr(actionsFSMlist, intro))	
459
+		else:
460
+			actionPlayer(action)		
461
+		newState = check_exit(aState, rA, timer, action)
463 462
 
464
-	check_state = 'reg_heelflip'
463
+	check_state = 'reg_frigid'
465 464
 	if aState == check_state:
466 465
 		action = getattr(actionsFSMlist, check_state)
467
-		actionPlayer(action)
468
-		if own['stateTimer'] > getattr(action, 'fef'):	
469
-			newState = getattr(action, 'force_exit')
466
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
467
+			intro = getattr(action, 'intro')
468
+			actionPlayer(getattr(actionsFSMlist, intro))	
469
+		else:
470
+			actionPlayer(action)		
471
+		newState = check_exit(aState, rA, timer, action)
470 472
 
471
-	check_state = 'reg_shuvit'
473
+	check_state = 'reg_fsonefoot'
472 474
 	if aState == check_state:
473 475
 		action = getattr(actionsFSMlist, check_state)
474
-		actionPlayer(action)
475
-		if own['stateTimer'] > getattr(action, 'fef'):	
476
-			newState = getattr(action, 'force_exit')												
476
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
477
+			intro = getattr(action, 'intro')
478
+			actionPlayer(getattr(actionsFSMlist, intro))	
479
+		else:
480
+			actionPlayer(action)		
481
+		newState = check_exit(aState, rA, timer, action)
477 482
 
478
-	check_state = 'reg_shuvit360'
483
+	check_state = 'reg_onefoot'
479 484
 	if aState == check_state:
480 485
 		action = getattr(actionsFSMlist, check_state)
481
-		actionPlayer(action)
482
-		if own['stateTimer'] > getattr(action, 'fef'):	
483
-			newState = getattr(action, 'force_exit')												
486
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
487
+			intro = getattr(action, 'intro')
488
+			actionPlayer(getattr(actionsFSMlist, intro))	
489
+		else:
490
+			actionPlayer(action)		
491
+		newState = check_exit(aState, rA, timer, action)
484 492
 
485
-	check_state = 'reg_fsshuvit'
486
-	if aState == check_state:
487
-		action = getattr(actionsFSMlist, check_state)
488
-		actionPlayer(action)
489
-		if own['stateTimer'] > getattr(action, 'fef'):	
490
-			newState = getattr(action, 'force_exit')												
491
-
492
-	check_state = 'reg_fsshuvit360'
493
-	if aState == check_state:
494
-		action = getattr(actionsFSMlist, check_state)
495
-		actionPlayer(action)
496
-		if own['stateTimer'] > getattr(action, 'fef'):	
497
-			newState = getattr(action, 'force_exit')												
498
-#-nollie
499
-	check_state = 'reg_nollie'
500
-	if aState == check_state:
501
-		action = getattr(actionsFSMlist, check_state)
502
-		actionPlayer(action)
503
-		if own['stateTimer'] > getattr(action, 'fef'):	
504
-			newState = getattr(action, 'force_exit')												
505
-
506
-	check_state = 'reg_nollie_kickflip'
507
-	if aState == check_state:
508
-		action = getattr(actionsFSMlist, check_state)
509
-		actionPlayer(action)
510
-		if own['stateTimer'] > getattr(action, 'fef'):	
511
-			newState = getattr(action, 'force_exit')												
512
-
513
-	check_state = 'reg_nollie_heelflip'
514
-	if aState == check_state:
515
-		action = getattr(actionsFSMlist, check_state)
516
-		actionPlayer(action)
517
-		if own['stateTimer'] > getattr(action, 'fef'):	
518
-			newState = getattr(action, 'force_exit')												
519
-
520
-	check_state = 'reg_nollie_shuvit'
521
-	if aState == check_state:
522
-		action = getattr(actionsFSMlist, check_state)
523
-		actionPlayer(action)
524
-		if own['stateTimer'] > getattr(action, 'fef'):	
525
-			newState = getattr(action, 'force_exit')												
526
-
527
-	check_state = 'reg_nollie_fsshuvit'
528
-	if aState == check_state:
529
-		action = getattr(actionsFSMlist, check_state)
530
-		actionPlayer(action)
531
-		if own['stateTimer'] > getattr(action, 'fef'):	
532
-			newState = getattr(action, 'force_exit')												
533
-
534
-	check_state = 'reg_nollie_shuvit360'
535
-	if aState == check_state:
536
-		action = getattr(actionsFSMlist, check_state)
537
-		actionPlayer(action)
538
-		if own['stateTimer'] > getattr(action, 'fef'):	
539
-			newState = getattr(action, 'force_exit')												
540
-
541
-	check_state = 'reg_nollie_fsshuvit_360'
542
-	if aState == check_state:
543
-		action = getattr(actionsFSMlist, check_state)
544
-		actionPlayer(action)
545
-		if own['stateTimer'] > getattr(action, 'fef'):	
546
-			newState = getattr(action, 'force_exit')	
547
-
548
-	check_state = 'reg_hardflip'
549
-	if aState == check_state:
550
-		action = getattr(actionsFSMlist, check_state)
551
-		actionPlayer(action)
552
-		if own['stateTimer'] > getattr(action, 'fef'):	
553
-			newState = getattr(action, 'force_exit')	
554
-
555
-	check_state = 'reg_inward_heelflip'
556
-	if aState == check_state:
557
-		action = getattr(actionsFSMlist, check_state)
558
-		actionPlayer(action)
559
-		if own['stateTimer'] > getattr(action, 'fef'):	
560
-			newState = getattr(action, 'force_exit')
561
-
562
-	check_state = 'reg_varial_kickflip'
563
-	if aState == check_state:
564
-		action = getattr(actionsFSMlist, check_state)
565
-		actionPlayer(action)
566
-		if own['stateTimer'] > getattr(action, 'fef'):	
567
-			newState = getattr(action, 'force_exit')																	
568
-
569
-	check_state = 'reg_varial_heelflip'
570
-	if aState == check_state:
571
-		action = getattr(actionsFSMlist, check_state)
572
-		actionPlayer(action)
573
-		if own['stateTimer'] > getattr(action, 'fef'):	
574
-			newState = getattr(action, 'force_exit')																		
575
-
576
-
577
-
578
-
579
-#-----------
580
-#grinds-----
581
-#-----------
582
-
583
-
584
-
585
-
586
-
587
-	check_state = 'reg_5050'
588
-	if aState == check_state:
589
-		action = getattr(actionsFSMlist, check_state)
590
-		if own['stateTimer'] < getattr(action, 'intro_frames'):	
591
-			intro = getattr(action, 'intro')
592
-			actionPlayer(getattr(actionsFSMlist, intro))
593
-			print('doing intro')	
594
-		else:
595
-			actionPlayer(action)		
596
-		newState = check_exit(aState, rA, timer, action)	
597
-
598
-	check_state = 'reg_bsboard'
599
-	if aState == check_state:
600
-		action = getattr(actionsFSMlist, check_state)
601
-		actionPlayer(action)
602
-		newState = check_exit(aState, rA, timer, action)
603
-
604
-	check_state = 'reg_fsboard'
605
-	if aState == check_state:
606
-		action = getattr(actionsFSMlist, check_state)
607
-		actionPlayer(action)
608
-		newState = check_exit(aState, rA, timer, action)
609
-
610
-	check_state = 'reg_tailg'
611
-	if aState == check_state:
612
-		action = getattr(actionsFSMlist, check_state)
613
-		actionPlayer(action)
614
-		newState = check_exit(aState, rA, timer, action)
615
-
616
-	check_state = 'reg_tailgr'
617
-	if aState == check_state:
618
-		action = getattr(actionsFSMlist, check_state)
619
-		actionPlayer(action)
620
-		newState = check_exit(aState, rA, timer, action)
621
-
622
-	check_state = 'reg_tailgl'
623
-	if aState == check_state:
624
-		action = getattr(actionsFSMlist, check_state)
625
-		actionPlayer(action)
626
-		newState = check_exit(aState, rA, timer, action)
627
-
628
-	check_state = 'reg_noseg'
629
-	if aState == check_state:
630
-		action = getattr(actionsFSMlist, check_state)
631
-		actionPlayer(action)
632
-		newState = check_exit(aState, rA, timer, action)
633
-
634
-	check_state = 'reg_nosegr'
635
-	if aState == check_state:
636
-		action = getattr(actionsFSMlist, check_state)
637
-		actionPlayer(action)
638
-		newState = check_exit(aState, rA, timer, action)
639
-
640
-	check_state = 'reg_nosegl'
641
-	if aState == check_state:
642
-		action = getattr(actionsFSMlist, check_state)
643
-		actionPlayer(action)
644
-		newState = check_exit(aState, rA, timer, action)
645
-
646
-	check_state = 'reg_tailslide'
647
-	if aState == check_state:
648
-		action = getattr(actionsFSMlist, check_state)
649
-		actionPlayer(action)
650
-		newState = check_exit(aState, rA, timer, action)
651
-
652
-	check_state = 'reg_noseslide'
653
-	if aState == check_state:
654
-		action = getattr(actionsFSMlist, check_state)
655
-		actionPlayer(action)
656
-		newState = check_exit(aState, rA, timer, action)
657
-
658
-
659
-
660
-#-----------
661
-#grabs------
662
-#-----------
663
-
664
-
665
-
666
-
667
-
668
-	check_state = 'frontside_grab'
669
-	if aState == check_state:
670
-		action = getattr(actionsFSMlist, check_state)
671
-		if own['stateTimer'] < getattr(action, 'intro_frames'):	
672
-			intro = getattr(action, 'intro')
673
-			actionPlayer(getattr(actionsFSMlist, intro))	
674
-		else:
675
-			actionPlayer(action)		
676
-		newState = check_exit(aState, rA, timer, action)
677
-
678
-	check_state = 'backside_grab'
679
-	if aState == check_state:
680
-		action = getattr(actionsFSMlist, check_state)
681
-		if own['stateTimer'] < getattr(action, 'intro_frames'):	
682
-			intro = getattr(action, 'intro')
683
-			actionPlayer(getattr(actionsFSMlist, intro))	
684
-		else:
685
-			actionPlayer(action)		
686
-		newState = check_exit(aState, rA, timer, action)		
687
-		
688
-	check_state = 'frontside_nose_grab'
689
-	if aState == check_state:
690
-		action = getattr(actionsFSMlist, check_state)
691
-		if own['stateTimer'] < getattr(action, 'intro_frames'):	
692
-			intro = getattr(action, 'intro')
693
-			actionPlayer(getattr(actionsFSMlist, intro))	
694
-		else:
695
-			actionPlayer(action)		
696
-		newState = check_exit(aState, rA, timer, action)
697
-	
698
-	check_state = 'backside_nose_grab'
699
-	if aState == check_state:
700
-		action = getattr(actionsFSMlist, check_state)
701
-		if own['stateTimer'] < getattr(action, 'intro_frames'):	
702
-			intro = getattr(action, 'intro')
703
-			actionPlayer(getattr(actionsFSMlist, intro))	
704
-		else:
705
-			actionPlayer(action)		
706
-		newState = check_exit(aState, rA, timer, action)
707
-	
708
-	check_state = 'frontside_tail_grab'
709
-	if aState == check_state:
710
-		action = getattr(actionsFSMlist, check_state)
711
-		if own['stateTimer'] < getattr(action, 'intro_frames'):	
712
-			intro = getattr(action, 'intro')
713
-			actionPlayer(getattr(actionsFSMlist, intro))	
714
-		else:
715
-			actionPlayer(action)		
716
-		newState = check_exit(aState, rA, timer, action)
717
-
718
-	check_state = 'backside_tail_grab'
719
-	if aState == check_state:
720
-		action = getattr(actionsFSMlist, check_state)
721
-		if own['stateTimer'] < getattr(action, 'intro_frames'):	
722
-			intro = getattr(action, 'intro')
723
-			actionPlayer(getattr(actionsFSMlist, intro))	
724
-		else:
725
-			actionPlayer(action)		
726
-		newState = check_exit(aState, rA, timer, action)
727
-
728
-	check_state = 'reg_ollie_north'
729
-	if aState == check_state:
730
-		action = getattr(actionsFSMlist, check_state)
731
-		if own['stateTimer'] < getattr(action, 'intro_frames'):	
732
-			intro = getattr(action, 'intro')
733
-			actionPlayer(getattr(actionsFSMlist, intro))	
734
-		else:
735
-			actionPlayer(action)		
736
-		newState = check_exit(aState, rA, timer, action)		
737
-
738
-	check_state = 'reg_ollie_south'
739
-	if aState == check_state:
740
-		action = getattr(actionsFSMlist, check_state)
741
-		if own['stateTimer'] < getattr(action, 'intro_frames'):	
742
-			intro = getattr(action, 'intro')
743
-			actionPlayer(getattr(actionsFSMlist, intro))	
744
-		else:
745
-			actionPlayer(action)		
746
-		newState = check_exit(aState, rA, timer, action)
747
-
748
-	check_state = 'reg_judo'
749
-	if aState == check_state:
750
-		action = getattr(actionsFSMlist, check_state)
751
-		if own['stateTimer'] < getattr(action, 'intro_frames'):	
752
-			intro = getattr(action, 'intro')
753
-			actionPlayer(getattr(actionsFSMlist, intro))	
754
-		else:
755
-			actionPlayer(action)		
756
-		newState = check_exit(aState, rA, timer, action)
757
-
758
-	check_state = 'reg_frigid'
759
-	if aState == check_state:
760
-		action = getattr(actionsFSMlist, check_state)
761
-		if own['stateTimer'] < getattr(action, 'intro_frames'):	
762
-			intro = getattr(action, 'intro')
763
-			actionPlayer(getattr(actionsFSMlist, intro))	
764
-		else:
765
-			actionPlayer(action)		
766
-		newState = check_exit(aState, rA, timer, action)
767
-
768
-	check_state = 'reg_fsonefoot'
769
-	if aState == check_state:
770
-		action = getattr(actionsFSMlist, check_state)
771
-		if own['stateTimer'] < getattr(action, 'intro_frames'):	
772
-			intro = getattr(action, 'intro')
773
-			actionPlayer(getattr(actionsFSMlist, intro))	
774
-		else:
775
-			actionPlayer(action)		
776
-		newState = check_exit(aState, rA, timer, action)
777
-
778
-	check_state = 'reg_onefoot'
779
-	if aState == check_state:
780
-		action = getattr(actionsFSMlist, check_state)
781
-		if own['stateTimer'] < getattr(action, 'intro_frames'):	
782
-			intro = getattr(action, 'intro')
783
-			actionPlayer(getattr(actionsFSMlist, intro))	
784
-		else:
785
-			actionPlayer(action)		
786
-		newState = check_exit(aState, rA, timer, action)
787
-
788
-	check_state = 'reg_airwalk'
493
+	check_state = 'reg_airwalk'
789 494
 	if aState == check_state:
790 495
 		action = getattr(actionsFSMlist, check_state)
791 496
 		if own['stateTimer'] < getattr(action, 'intro_frames'):	
@@ -817,157 +522,6 @@ def main(cont):
817 522
 
818 523
 
819 524
 
820
-
821
-
822
-	check_state = 'revert1'
823
-	if aState == check_state:
824
-		action = getattr(actionsFSMlist, check_state)
825
-		actionPlayer(action)
826
-		if own['stateTimer'] > getattr(action, 'fef'):	
827
-			newState = getattr(action, 'force_exit')	
828
-
829
-	check_state = 'revert2'
830
-	if aState == check_state:
831
-		action = getattr(actionsFSMlist, check_state)
832
-		actionPlayer(action)
833
-		if own['stateTimer'] > getattr(action, 'fef'):	
834
-			newState = getattr(action, 'force_exit')	
835
-
836
-
837
-	check_state = 'fak_revert1'
838
-	if aState == check_state:
839
-		action = getattr(actionsFSMlist, check_state)
840
-		actionPlayer(action)
841
-		if own['stateTimer'] > getattr(action, 'fef'):	
842
-			newState = getattr(action, 'force_exit')	
843
-
844
-	check_state = 'fak_revert2'
845
-	if aState == check_state:
846
-		action = getattr(actionsFSMlist, check_state)
847
-		actionPlayer(action)
848
-		if own['stateTimer'] > getattr(action, 'fef'):	
849
-			newState = getattr(action, 'force_exit')	
850
-
851
-	check_state = 'revert3'
852
-	if aState == check_state:
853
-		action = getattr(actionsFSMlist, check_state)
854
-		actionPlayer(action)
855
-		if own['stateTimer'] > getattr(action, 'fef'):	
856
-			newState = getattr(action, 'force_exit')	
857
-
858
-	check_state = 'revert4'
859
-	if aState == check_state:
860
-		action = getattr(actionsFSMlist, check_state)
861
-		actionPlayer(action)
862
-		if own['stateTimer'] > getattr(action, 'fef'):	
863
-			newState = getattr(action, 'force_exit')	
864
-
865
-
866
-
867
-
868
-
869
-
870
-
871
-
872
-
873
-
874
-
875
-
876
-
877
-
878
-
879
-
880
-
881
-
882
-
883
-
884
-
885
-
886
-
887
-
888
-
889
-
890
-
891
-
892
-
893
-
894
-
895
-
896
-
897
-
898
-
899
-
900
-
901
-
902
-
903
-
904
-
905
-
906
-
907
-	check_state = 'fak_idle'
908
-	if aState == check_state:
909
-		action = getattr(actionsFSMlist, check_state)
910
-		actionPlayer(action)
911
-		newState = check_exit(aState, rA, timer, action)
912
-
913
-	check_state = 'fak_idle2'	
914
-	if aState == check_state:
915
-		action = getattr(actionsFSMlist, check_state)
916
-		actionPlayer(action)
917
-		newState = check_exit(aState, rA, timer, action)
918
-
919
-	check_state = 'fak_idle3'
920
-	if aState == check_state:
921
-		action = getattr(actionsFSMlist, check_state)
922
-		actionPlayer(action)
923
-		newState = check_exit(aState, rA, timer, action)
924
-	
925
-	check_state = 'fak_idle4'
926
-	if aState == check_state:
927
-		action = getattr(actionsFSMlist, check_state)
928
-		actionPlayer(action)
929
-		newState = check_exit(aState, rA, timer, action)
930
-
931
-	check_state = 'fak_idle5'
932
-	if aState == check_state:
933
-		action = getattr(actionsFSMlist, check_state)
934
-		actionPlayer(action)
935
-		newState = check_exit(aState, rA, timer, action)
936
-
937
-	check_state = 'fak_idle5'
938
-	if aState == check_state:
939
-		action = getattr(actionsFSMlist, check_state)
940
-		actionPlayer(action)
941
-		newState = check_exit(aState, rA, timer, action)
942
-
943
-	check_state = 'fak_idle6'
944
-	if aState == check_state:
945
-		action = getattr(actionsFSMlist, check_state)
946
-		actionPlayer(action)
947
-		newState = check_exit(aState, rA, timer, action)		
948
-	
949
-	check_state = 'fak_jump'
950
-	if aState == check_state:
951
-		action = getattr(actionsFSMlist, check_state)
952
-		actionPlayer(action)
953
-		if own['stateTimer'] > getattr(action, 'fef'):
954
-			newState = check_exit(aState, rA, timer, action)
955
-	
956
-	check_state = 'fak_walk_air'
957
-	if aState == check_state:
958
-		action = getattr(actionsFSMlist, check_state)
959
-		actionPlayer(action)
960
-		if aState != rA:
961
-			newState = getattr(action, 'exits')[0]
962
-	
963
-	check_state = 'fak_walk_air_out' 			
964
-	if aState == check_state:
965
-		action = getattr(actionsFSMlist, check_state)
966
-		actionPlayer(action)
967
-		#print(own['stateTimer'], getattr(action, 'fef'))
968
-		if own['stateTimer'] > getattr(action, 'fef'):	
969
-			newState = getattr(action, 'force_exit')
970
-
971 525
 	check_state = 'fak_sit'
972 526
 	if aState == check_state:
973 527
 		action = getattr(actionsFSMlist, check_state)
@@ -997,103 +551,13 @@ def main(cont):
997 551
 		action = getattr(actionsFSMlist, check_state)
998 552
 		newState = check_exit(aState, rA, timer, actionsFSMlist.fak_walkFast)
999 553
 
1000
-		if own['l_aState'] == 'fak_walk':
1001
-			frame = get_frame(actionsFSMlist.fak_walk)
1002
-			actionPlayer(action)
1003
-			set_frame(actionsFSMlist.fak_walkFast, frame)
1004
-
1005
-		else:
1006
-			actionPlayer(action)
1007
-		#print(frame)
1008
-
1009
-	check_state = 'fak_onboard'
1010
-	if aState == check_state:
1011
-		action = getattr(actionsFSMlist, check_state)
1012
-		actionPlayer(action)
1013
-		print('checking onbaord state')
1014
-		#if own['stateTimer'] > 10:
1015
-			#newState = check_exit(aState, rA, timer, actionsFSMlist.fak_onboard)
1016
-		if own['stateTimer'] > getattr(action, 'fef'):	
1017
-			newState = getattr(action, 'force_exit')			
1018
-
1019
-	check_state = 'fak_offboard'
1020
-	if aState == check_state:
1021
-		action = getattr(actionsFSMlist, check_state)
1022
-		actionPlayer(action)
1023
-		if own['stateTimer'] > 20:
1024
-			newState = check_exit(aState, rA, timer, actionsFSMlist.fak_offboard)			
1025
-
1026
-	check_state = 'fak_roll'
1027
-	if aState == check_state:
1028
-		action = getattr(actionsFSMlist, check_state)
1029
-		actionPlayer(action)
1030
-		newState = check_exit(aState, rA, timer, action)
1031
-
1032
-	check_state = 'fak_turnLeft'
1033
-	if aState == check_state:
1034
-		action = getattr(actionsFSMlist, check_state)
1035
-		actionPlayer(action)
1036
-		newState = check_exit(aState, rA, timer, action)
1037
-	
1038
-	check_state = 'fak_turnRight'
1039
-	if aState == check_state:
1040
-		action = getattr(actionsFSMlist, check_state)
1041
-		actionPlayer(action)
1042
-		newState = check_exit(aState, rA, timer, action)
1043
-
1044
-	check_state = 'fak_manual_left'
1045
-	if aState == check_state:
1046
-		action = getattr(actionsFSMlist, check_state)
1047
-		actionPlayer(action)
1048
-		newState = check_exit(aState, rA, timer, action)
1049
-	
1050
-	check_state = 'fak_manual_right'
1051
-	if aState == check_state:
1052
-		action = getattr(actionsFSMlist, check_state)
1053
-		actionPlayer(action)
1054
-		newState = check_exit(aState, rA, timer, action)	
1055
-
1056
-	check_state = 'fak_nmanual_left'
1057
-	if aState == check_state:
1058
-		action = getattr(actionsFSMlist, check_state)
1059
-		actionPlayer(action)
1060
-		newState = check_exit(aState, rA, timer, action)
1061
-	
1062
-	check_state = 'fak_nmanual_right'
1063
-	if aState == check_state:
1064
-		action = getattr(actionsFSMlist, check_state)
1065
-		actionPlayer(action)
1066
-		newState = check_exit(aState, rA, timer, action)			
1067
-
1068
-	check_state = 'fak_opos'
1069
-	if aState == check_state:
1070
-		action = getattr(actionsFSMlist, check_state)
1071
-		actionPlayer(action)
1072
-		newState = check_exit(aState, rA, timer, action)		
1073
-	
1074
-	check_state = 'fak_nopos'
1075
-	if aState == check_state:
1076
-		action = getattr(actionsFSMlist, check_state)
1077
-		actionPlayer(action)
1078
-		newState = check_exit(aState, rA, timer, action)		
1079
-
1080
-	check_state = 'fak_pump'
1081
-	if aState == check_state:
1082
-		action = getattr(actionsFSMlist, check_state)
1083
-		actionPlayer(action)
1084
-		newState = check_exit(aState, rA, timer, action)
1085
-
1086
-	check_state = 'fak_pump_left'
1087
-	if aState == check_state:
1088
-		action = getattr(actionsFSMlist, check_state)
1089
-		actionPlayer(action)
1090
-		newState = check_exit(aState, rA, timer, action)				
554
+		if own['l_aState'] == 'fak_walk':
555
+			frame = get_frame(actionsFSMlist.fak_walk)
556
+			actionPlayer(action)
557
+			set_frame(actionsFSMlist.fak_walkFast, frame)
1091 558
 
1092
-	check_state = 'fak_pump_right'
1093
-	if aState == check_state:
1094
-		action = getattr(actionsFSMlist, check_state)
1095
-		actionPlayer(action)
1096
-		newState = check_exit(aState, rA, timer, action)				
559
+		else:
560
+			actionPlayer(action)
1097 561
 
1098 562
 
1099 563
 	check_state = 'fak_push'
@@ -1134,308 +598,6 @@ def main(cont):
1134 598
 			actionPlayer(action)
1135 599
 		newState = check_exit(aState, rA, timer, actionsFSMlist.fak_fs_powerslide)				
1136 600
 
1137
-	check_state = 'fak_brfoot'
1138
-	if aState == check_state:
1139
-		action = getattr(actionsFSMlist, check_state)
1140
-		actionPlayer(action)
1141
-		if own['stateTimer'] > getattr(action, 'fef'):	
1142
-			newState = getattr(action, 'force_exit')	
1143
-	
1144
-	check_state = 'fak_frfoot'
1145
-	if aState == check_state:
1146
-		action = getattr(actionsFSMlist, check_state)
1147
-		actionPlayer(action)
1148
-		if own['stateTimer'] > getattr(action, 'fef'):	
1149
-			newState = getattr(action, 'force_exit')	
1150
-
1151
-	check_state = 'fak_blfoot'
1152
-	if aState == check_state:
1153
-		action = getattr(actionsFSMlist, check_state)
1154
-		actionPlayer(action)
1155
-		if own['stateTimer'] > getattr(action, 'fef'):	
1156
-			newState = getattr(action, 'force_exit')	
1157
-	
1158
-	check_state = 'fak_flfoot'
1159
-	if aState == check_state:
1160
-		action = getattr(actionsFSMlist, check_state)
1161
-		actionPlayer(action)
1162
-		if own['stateTimer'] > getattr(action, 'fef'):	
1163
-			newState = getattr(action, 'force_exit')				
1164
-
1165
-
1166
-
1167
-	check_state = 'fak_manual'
1168
-	if aState == check_state:
1169
-		action = getattr(actionsFSMlist, check_state)
1170
-		actionPlayer(action)
1171
-		newState = check_exit(aState, rA, timer, action)
1172
-
1173
-	check_state = 'fak_nmanual'
1174
-	if aState == check_state:
1175
-		action = getattr(actionsFSMlist, check_state)
1176
-		actionPlayer(action)
1177
-		newState = check_exit(aState, rA, timer, action)
1178
-
1179
-	check_state = 'fak_land'
1180
-	if aState == check_state:
1181
-		action = getattr(actionsFSMlist, check_state)
1182
-		actionPlayer(action)
1183
-		if own['stateTimer'] > getattr(action, 'fef'):	
1184
-			newState = getattr(action, 'force_exit')
1185
-
1186
-	check_state = 'fak_landL'
1187
-	if aState == check_state:
1188
-		action = getattr(actionsFSMlist, check_state)
1189
-		actionPlayer(action)
1190
-		if own['stateTimer'] > getattr(action, 'fef'):	
1191
-			newState = getattr(action, 'force_exit')
1192
-
1193
-	check_state = 'fak_landLb'
1194
-	if aState == check_state:
1195
-		action = getattr(actionsFSMlist, check_state)
1196
-		actionPlayer(action)
1197
-		if own['stateTimer'] > getattr(action, 'fef'):	
1198
-			newState = getattr(action, 'force_exit')
1199
-
1200
-	check_state = 'fak_landR'
1201
-	if aState == check_state:
1202
-		action = getattr(actionsFSMlist, check_state)
1203
-		actionPlayer(action)
1204
-		if own['stateTimer'] > getattr(action, 'fef'):	
1205
-			newState = getattr(action, 'force_exit')
1206
-
1207
-	check_state = 'fak_landRb'
1208
-	if aState == check_state:
1209
-		action = getattr(actionsFSMlist, check_state)
1210
-		actionPlayer(action)
1211
-		if own['stateTimer'] > getattr(action, 'fef'):	
1212
-			newState = getattr(action, 'force_exit')												
1213
-
1214
-	check_state = 'fak_air'
1215
-	if aState == check_state:
1216
-		action = getattr(actionsFSMlist, check_state)
1217
-		actionPlayer(action)
1218
-		newState = check_exit(aState, rA, timer, action)
1219
-
1220
-	check_state = 'fak_air_nb'
1221
-	if aState == check_state:
1222
-		action = getattr(actionsFSMlist, check_state)
1223
-		actionPlayer(action)
1224
-		newState = check_exit(aState, rA, timer, action)
1225
-
1226
-
1227
-	check_state = 'fak_air_nose'
1228
-	if aState == check_state:
1229
-		action = getattr(actionsFSMlist, check_state)
1230
-		actionPlayer(action)
1231
-		newState = check_exit(aState, rA, timer, action)
1232
-
1233
-	check_state = 'fak_air_tail'
1234
-	if aState == check_state:
1235
-		action = getattr(actionsFSMlist, check_state)
1236
-		actionPlayer(action)
1237
-		newState = check_exit(aState, rA, timer, action)				
1238
-
1239
-	check_state = 'fak_ollie'
1240
-	if aState == check_state:
1241
-		action = getattr(actionsFSMlist, check_state)
1242
-		actionPlayer(action)
1243
-		if own['stateTimer'] > getattr(action, 'fef'):	
1244
-			newState = getattr(action, 'force_exit')												
1245
-
1246
-	check_state = 'fak_kickflip'
1247
-	if aState == check_state:
1248
-		action = getattr(actionsFSMlist, check_state)
1249
-		actionPlayer(action)
1250
-		if own['stateTimer'] > getattr(action, 'fef'):	
1251
-			newState = getattr(action, 'force_exit')												
1252
-
1253
-	check_state = 'fak_heelflip'
1254
-	if aState == check_state:
1255
-		action = getattr(actionsFSMlist, check_state)
1256
-		actionPlayer(action)
1257
-		if own['stateTimer'] > getattr(action, 'fef'):	
1258
-			newState = getattr(action, 'force_exit')
1259
-
1260
-	check_state = 'fak_shuvit'
1261
-	if aState == check_state:
1262
-		action = getattr(actionsFSMlist, check_state)
1263
-		actionPlayer(action)
1264
-		if own['stateTimer'] > getattr(action, 'fef'):	
1265
-			newState = getattr(action, 'force_exit')												
1266
-
1267
-	check_state = 'fak_shuvit360'
1268
-	if aState == check_state:
1269
-		action = getattr(actionsFSMlist, check_state)
1270
-		actionPlayer(action)
1271
-		if own['stateTimer'] > getattr(action, 'fef'):	
1272
-			newState = getattr(action, 'force_exit')												
1273
-
1274
-	check_state = 'fak_fsshuvit'
1275
-	if aState == check_state:
1276
-		action = getattr(actionsFSMlist, check_state)
1277
-		actionPlayer(action)
1278
-		if own['stateTimer'] > getattr(action, 'fef'):	
1279
-			newState = getattr(action, 'force_exit')												
1280
-
1281
-	check_state = 'fak_fsshuvit360'
1282
-	if aState == check_state:
1283
-		action = getattr(actionsFSMlist, check_state)
1284
-		actionPlayer(action)
1285
-		if own['stateTimer'] > getattr(action, 'fef'):	
1286
-			newState = getattr(action, 'force_exit')												
1287
-#-nollie
1288
-	check_state = 'fak_nollie'
1289
-	if aState == check_state:
1290
-		action = getattr(actionsFSMlist, check_state)
1291
-		actionPlayer(action)
1292
-		if own['stateTimer'] > getattr(action, 'fef'):	
1293
-			newState = getattr(action, 'force_exit')												
1294
-
1295
-	check_state = 'fak_nollie_kickflip'
1296
-	if aState == check_state:
1297
-		action = getattr(actionsFSMlist, check_state)
1298
-		actionPlayer(action)
1299
-		if own['stateTimer'] > getattr(action, 'fef'):	
1300
-			newState = getattr(action, 'force_exit')												
1301
-
1302
-	check_state = 'fak_nollie_heelflip'
1303
-	if aState == check_state:
1304
-		action = getattr(actionsFSMlist, check_state)
1305
-		actionPlayer(action)
1306
-		if own['stateTimer'] > getattr(action, 'fef'):	
1307
-			newState = getattr(action, 'force_exit')												
1308
-
1309
-	check_state = 'fak_nollie_shuvit'
1310
-	if aState == check_state:
1311
-		action = getattr(actionsFSMlist, check_state)
1312
-		actionPlayer(action)
1313
-		if own['stateTimer'] > getattr(action, 'fef'):	
1314
-			newState = getattr(action, 'force_exit')												
1315
-
1316
-	check_state = 'fak_nollie_fsshuvit'
1317
-	if aState == check_state:
1318
-		action = getattr(actionsFSMlist, check_state)
1319
-		actionPlayer(action)
1320
-		if own['stateTimer'] > getattr(action, 'fef'):	
1321
-			newState = getattr(action, 'force_exit')												
1322
-
1323
-	check_state = 'fak_nollie_shuvit360'
1324
-	if aState == check_state:
1325
-		action = getattr(actionsFSMlist, check_state)
1326
-		actionPlayer(action)
1327
-		if own['stateTimer'] > getattr(action, 'fef'):	
1328
-			newState = getattr(action, 'force_exit')												
1329
-
1330
-	check_state = 'fak_nollie_fsshuvit_360'
1331
-	if aState == check_state:
1332
-		action = getattr(actionsFSMlist, check_state)
1333
-		actionPlayer(action)
1334
-		if own['stateTimer'] > getattr(action, 'fef'):	
1335
-			newState = getattr(action, 'force_exit')												
1336
-
1337
-	check_state = 'fak_hardflip'
1338
-	if aState == check_state:
1339
-		action = getattr(actionsFSMlist, check_state)
1340
-		actionPlayer(action)
1341
-		if own['stateTimer'] > getattr(action, 'fef'):	
1342
-			newState = getattr(action, 'force_exit')
1343
-
1344
-	check_state = 'fak_inward_heelflip'
1345
-	if aState == check_state:
1346
-		action = getattr(actionsFSMlist, check_state)
1347
-		actionPlayer(action)
1348
-		if own['stateTimer'] > getattr(action, 'fef'):	
1349
-			newState = getattr(action, 'force_exit')	
1350
-
1351
-	check_state = 'fak_varial_kickflip'
1352
-	if aState == check_state:
1353
-		action = getattr(actionsFSMlist, check_state)
1354
-		actionPlayer(action)
1355
-		if own['stateTimer'] > getattr(action, 'fef'):	
1356
-			newState = getattr(action, 'force_exit')	
1357
-
1358
-	check_state = 'fak_varial_heelflip'
1359
-	if aState == check_state:
1360
-		action = getattr(actionsFSMlist, check_state)
1361
-		actionPlayer(action)
1362
-		if own['stateTimer'] > getattr(action, 'fef'):	
1363
-			newState = getattr(action, 'force_exit')	
1364
-
1365
-
1366
-#-----------
1367
-#grinds-----
1368
-#-----------
1369
-
1370
-
1371
-
1372
-
1373
-
1374
-	check_state = 'fak_5050'
1375
-	if aState == check_state:
1376
-		action = getattr(actionsFSMlist, check_state)
1377
-		actionPlayer(action)
1378
-		newState = check_exit(aState, rA, timer, action)
1379
-
1380
-	check_state = 'fak_bsboard'
1381
-	if aState == check_state:
1382
-		action = getattr(actionsFSMlist, check_state)
1383
-		actionPlayer(action)
1384
-		newState = check_exit(aState, rA, timer, action)
1385
-
1386
-	check_state = 'fak_fsboard'
1387
-	if aState == check_state:
1388
-		action = getattr(actionsFSMlist, check_state)
1389
-		actionPlayer(action)
1390
-		newState = check_exit(aState, rA, timer, action)
1391
-
1392
-	check_state = 'fak_tailg'
1393
-	if aState == check_state:
1394
-		action = getattr(actionsFSMlist, check_state)
1395
-		actionPlayer(action)
1396
-		newState = check_exit(aState, rA, timer, action)
1397
-
1398
-	check_state = 'fak_tailgr'
1399
-	if aState == check_state:
1400
-		action = getattr(actionsFSMlist, check_state)
1401
-		actionPlayer(action)
1402
-		newState = check_exit(aState, rA, timer, action)
1403
-
1404
-	check_state = 'fak_tailgl'
1405
-	if aState == check_state:
1406
-		action = getattr(actionsFSMlist, check_state)
1407
-		actionPlayer(action)
1408
-		newState = check_exit(aState, rA, timer, action)
1409
-
1410
-	check_state = 'fak_noseg'
1411
-	if aState == check_state:
1412
-		action = getattr(actionsFSMlist, check_state)
1413
-		actionPlayer(action)
1414
-		newState = check_exit(aState, rA, timer, action)
1415
-
1416
-	check_state = 'fak_nosegr'
1417
-	if aState == check_state:
1418
-		action = getattr(actionsFSMlist, check_state)
1419
-		actionPlayer(action)
1420
-		newState = check_exit(aState, rA, timer, action)
1421
-
1422
-	check_state = 'fak_nosegl'
1423
-	if aState == check_state:
1424
-		action = getattr(actionsFSMlist, check_state)
1425
-		actionPlayer(action)
1426
-		newState = check_exit(aState, rA, timer, action)
1427
-
1428
-	check_state = 'fak_tailslide'
1429
-	if aState == check_state:
1430
-		action = getattr(actionsFSMlist, check_state)
1431
-		actionPlayer(action)
1432
-		newState = check_exit(aState, rA, timer, action)
1433
-
1434
-	check_state = 'fak_noseslide'
1435
-	if aState == check_state:
1436
-		action = getattr(actionsFSMlist, check_state)
1437
-		actionPlayer(action)
1438
-		newState = check_exit(aState, rA, timer, action)
1439 601
 
1440 602
 
1441 603
 
@@ -1505,16 +667,6 @@ def main(cont):
1505 667
 			actionPlayer(action)		
1506 668
 		newState = check_exit(aState, rA, timer, action)
1507 669
 
1508
-
1509
-
1510
-
1511
-
1512
-
1513
-
1514
-
1515
-
1516
-
1517
-
1518 670
 	check_state = 'fak_ollie_north'
1519 671
 	if aState == check_state:
1520 672
 		action = getattr(actionsFSMlist, check_state)
@@ -1577,66 +729,15 @@ def main(cont):
1577 729
 
1578 730
 
1579 731
 
1580
-
1581
-
1582
-
1583
-
1584
-
1585
-
1586
-
1587
-
1588
-
1589
-
1590
-
1591
-
1592
-
1593
-
1594
-
1595
-
1596
-
1597
-
1598
-
1599
-
1600
-
1601
-
1602
-
1603
-
1604
-
1605
-
1606
-
1607
-
1608
-
1609
-
1610
-
1611
-
1612 732
 	#-----------------------
1613
-	#own['aState'] = aState
1614 733
 	if newState != '':
1615 734
 		own['aState'] = newState 
1616
-	#print(own['l_aState'], '----l_aState', own['aState'])
1617 735
 	own['l_aState'] = og_state
1618 736
 	own['l_actionState'] = og_state
1619
-	#own['l_aState'] = newState
1620
-	#print(own['l_aState'], '----l_aState', own['aState'], 'rA', rA)
1621 737
 	state_timer(own)
1622
-
1623
-	#print(own['rotz'])
1624 738
 	skater = dict['p1']
1625 739
 	
1626 740
 	if own['requestAction'] == 'reg_roll' and own['rotz'] < .985:
1627 741
 		frame = int(own['rotz'] * 70) 
1628
-		print(frame)
1629
-		#skater.stopAction(5)	
1630
-		#skater.playAction('reg_roll_tilt', frame,frame, layer=5, play_mode=1, speed=1, blendin=5)
1631 742
 	else:
1632 743
 		skater.stopAction(5)	
1633
-		#pass
1634
-
1635
-
1636
-	# skater = dict['p1']
1637
-	# skater.update()
1638
-	# #skater.stopAction(1)
1639
-	# bone = skater.channels['root']
1640
-	# v = mathutils.Vector([bone.location[0], bone.location[1], -.2])
1641
-	# #bone.location = v
1642
-	# skater.update()

+ 36
- 36
scripts/actionsFSMlist.py View File

@@ -844,7 +844,7 @@ reg_ollie = a_class(
844 844
 	#intro, length
845 845
 	None, 0,
846 846
 	#exits
847
-	['reg_offboard'],
847
+	['reg_offboard', 'reg_air'],
848 848
 	#force exit, frame
849 849
 	'reg_air', 36,
850 850
 	#opposite
@@ -861,7 +861,7 @@ reg_heelflip = a_class(
861 861
 	#intro, length
862 862
 	None, 0,
863 863
 	#exits
864
-	['reg_offboard'],
864
+	['reg_offboard', 'reg_air'],
865 865
 	#force exit, frame
866 866
 	'reg_air', 38,
867 867
 	#opposite
@@ -878,7 +878,7 @@ reg_kickflip = a_class(
878 878
 	#intro, length
879 879
 	None, 0,
880 880
 	#exits
881
-	['reg_offboard'],
881
+	['reg_offboard', 'reg_air'],
882 882
 	#force exit, frame
883 883
 	'reg_air', 38,
884 884
 	#opposite
@@ -894,7 +894,7 @@ reg_shuvit = a_class(
894 894
 	#intro, length
895 895
 	None, 0,
896 896
 	#exits
897
-	['reg_offboard'],
897
+	['reg_offboard', 'reg_air'],
898 898
 	#force exit, frame
899 899
 	'reg_air', 38,
900 900
 	#opposite
@@ -910,7 +910,7 @@ reg_shuvit360 = a_class(
910 910
 	#intro, length
911 911
 	None, 0,
912 912
 	#exits
913
-	['reg_offboard'],
913
+	['reg_offboard', 'reg_air'],
914 914
 	#force exit, frame
915 915
 	'reg_air', 38,
916 916
 	#opposite
@@ -926,7 +926,7 @@ reg_fsshuvit = a_class(
926 926
 	#intro, length
927 927
 	None, 0,
928 928
 	#exits
929
-	['reg_offboard'],
929
+	['reg_offboard', 'reg_air'],
930 930
 	#force exit, frame
931 931
 	'reg_air', 38,
932 932
 	#opposite
@@ -942,7 +942,7 @@ reg_fsshuvit360 = a_class(
942 942
 	#intro, length
943 943
 	None, 0,
944 944
 	#exits
945
-	['reg_offboard'],
945
+	['reg_offboard', 'reg_air'],
946 946
 	#force exit, frame
947 947
 	'reg_air', 38,
948 948
 	#opposite
@@ -958,7 +958,7 @@ reg_hardflip = a_class(
958 958
 	#intro, length
959 959
 	None, 0,
960 960
 	#exits
961
-	['reg_offboard'],
961
+	['reg_offboard', 'reg_air'],
962 962
 	#force exit, frame
963 963
 	'reg_air', 38,
964 964
 	#opposite
@@ -974,7 +974,7 @@ reg_inward_heelflip = a_class(
974 974
 	#intro, length
975 975
 	None, 0,
976 976
 	#exits
977
-	['reg_offboard'],
977
+	['reg_offboard', 'reg_air'],
978 978
 	#force exit, frame
979 979
 	'reg_air', 38,
980 980
 	#opposite
@@ -990,7 +990,7 @@ reg_varial_kickflip = a_class(
990 990
 	#intro, length
991 991
 	None, 0,
992 992
 	#exits
993
-	['reg_offboard'],
993
+	['reg_offboard', 'reg_air'],
994 994
 	#force exit, frame
995 995
 	'reg_air', 38,
996 996
 	#opposite
@@ -1006,7 +1006,7 @@ reg_varial_heelflip = a_class(
1006 1006
 	#intro, length
1007 1007
 	None, 0,
1008 1008
 	#exits
1009
-	['reg_offboard'],
1009
+	['reg_offboard', 'reg_air'],
1010 1010
 	#force exit, frame
1011 1011
 	'reg_air', 38,
1012 1012
 	#opposite
@@ -1030,7 +1030,7 @@ reg_nollie = a_class(
1030 1030
 	#intro, length
1031 1031
 	None, 0,
1032 1032
 	#exits
1033
-	['reg_offboard'],
1033
+	['reg_offboard', 'reg_air'],
1034 1034
 	#force exit, frame
1035 1035
 	'reg_air', 30,
1036 1036
 	#opposite
@@ -1046,7 +1046,7 @@ reg_nollie_kickflip = a_class(
1046 1046
 	#intro, length
1047 1047
 	None, 0,
1048 1048
 	#exits
1049
-	['reg_offboard'],
1049
+	['reg_offboard', 'reg_air'],
1050 1050
 	#force exit, frame
1051 1051
 	'reg_air', 30,
1052 1052
 	#opposite
@@ -1062,7 +1062,7 @@ reg_nollie_heelflip = a_class(
1062 1062
 	#intro, length
1063 1063
 	None, 0,
1064 1064
 	#exits
1065
-	['reg_offboard'],
1065
+	['reg_offboard', 'reg_air'],
1066 1066
 	#force exit, frame
1067 1067
 	'reg_air', 30,
1068 1068
 	#opposite
@@ -1078,7 +1078,7 @@ reg_nollie_shuvit = a_class(
1078 1078
 	#intro, length
1079 1079
 	None, 0,
1080 1080
 	#exits
1081
-	['reg_offboard'],
1081
+	['reg_offboard', 'reg_air'],
1082 1082
 	#force exit, frame
1083 1083
 	'reg_air', 30,
1084 1084
 	#opposite
@@ -1094,7 +1094,7 @@ reg_nollie_fsshuvit = a_class(
1094 1094
 	#intro, length
1095 1095
 	None, 0,
1096 1096
 	#exits
1097
-	['reg_offboard'],
1097
+	['reg_offboard', 'reg_air'],
1098 1098
 	#force exit, frame
1099 1099
 	'reg_air', 30,
1100 1100
 	#opposite
@@ -1110,7 +1110,7 @@ reg_nollie_shuvit360 = a_class(
1110 1110
 	#intro, length
1111 1111
 	None, 0,
1112 1112
 	#exits
1113
-	['reg_offboard'],
1113
+	['reg_offboard', 'reg_air'],
1114 1114
 	#force exit, frame
1115 1115
 	'reg_air', 30,
1116 1116
 	#opposite
@@ -1126,7 +1126,7 @@ reg_nollie_fsshuvit_360 = a_class(
1126 1126
 	#intro, length
1127 1127
 	None, 0,
1128 1128
 	#exits
1129
-	['reg_offboard'],
1129
+	['reg_offboard', 'reg_air'],
1130 1130
 	#force exit, frame
1131 1131
 	'reg_air', 30,
1132 1132
 	#opposite
@@ -2817,7 +2817,7 @@ fak_ollie = a_class(
2817 2817
 	#intro, length
2818 2818
 	None, 0,
2819 2819
 	#exits
2820
-	['fak_offboard'],
2820
+	['fak_offboard', 'fak_air'],
2821 2821
 	#force exit, frame
2822 2822
 	'fak_air', 30,
2823 2823
 	#opposite
@@ -2834,7 +2834,7 @@ fak_heelflip = a_class(
2834 2834
 	#intro, length
2835 2835
 	None, 0,
2836 2836
 	#exits
2837
-	['fak_offboard'],
2837
+	['fak_offboard', 'fak_air'],
2838 2838
 	#force exit, frame
2839 2839
 	'fak_air_nb', 38,
2840 2840
 	#opposite
@@ -2851,7 +2851,7 @@ fak_kickflip = a_class(
2851 2851
 	#intro, length
2852 2852
 	None, 0,
2853 2853
 	#exits
2854
-	['fak_offboard'],
2854
+	['fak_offboard', 'fak_air'],
2855 2855
 	#force exit, frame
2856 2856
 	'fak_air_nb', 38,
2857 2857
 	#opposite
@@ -2867,7 +2867,7 @@ fak_shuvit = a_class(
2867 2867
 	#intro, length
2868 2868
 	None, 0,
2869 2869
 	#exits
2870
-	['fak_offboard'],
2870
+	['fak_offboard', 'fak_air'],
2871 2871
 	#force exit, frame
2872 2872
 	'fak_air', 38,
2873 2873
 	#opposite
@@ -2883,7 +2883,7 @@ fak_shuvit360 = a_class(
2883 2883
 	#intro, length
2884 2884
 	None, 0,
2885 2885
 	#exits
2886
-	['fak_offboard'],
2886
+	['fak_offboard', 'fak_air'],
2887 2887
 	#force exit, frame
2888 2888
 	'fak_air', 38,
2889 2889
 	#opposite
@@ -2899,7 +2899,7 @@ fak_fsshuvit = a_class(
2899 2899
 	#intro, length
2900 2900
 	None, 0,
2901 2901
 	#exits
2902
-	['fak_offboard'],
2902
+	['fak_offboard', 'fak_air'],
2903 2903
 	#force exit, frame
2904 2904
 	'fak_air', 38,
2905 2905
 	#opposite
@@ -2915,7 +2915,7 @@ fak_fsshuvit360 = a_class(
2915 2915
 	#intro, length
2916 2916
 	None, 0,
2917 2917
 	#exits
2918
-	['fak_offboard'],
2918
+	['fak_offboard', 'fak_air'],
2919 2919
 	#force exit, frame
2920 2920
 	'fak_air', 38,
2921 2921
 	#opposite
@@ -2931,7 +2931,7 @@ fak_hardflip = a_class(
2931 2931
 	#intro, length
2932 2932
 	None, 0,
2933 2933
 	#exits
2934
-	['fak_offboard'],
2934
+	['fak_offboard', 'fak_air'],
2935 2935
 	#force exit, frame
2936 2936
 	'fak_air_nb', 38,
2937 2937
 	#opposite
@@ -2947,7 +2947,7 @@ fak_inward_heelflip = a_class(
2947 2947
 	#intro, length
2948 2948
 	None, 0,
2949 2949
 	#exits
2950
-	['fak_offboard'],
2950
+	['fak_offboard', 'fak_air_nb'],
2951 2951
 	#force exit, frame
2952 2952
 	'fak_air_nb', 38,
2953 2953
 	#opposite
@@ -2964,7 +2964,7 @@ fak_varial_kickflip = a_class(
2964 2964
 	#intro, length
2965 2965
 	None, 0,
2966 2966
 	#exits
2967
-	['fak_offboard'],
2967
+	['fak_offboard', 'fak_air_nb'],
2968 2968
 	#force exit, frame
2969 2969
 	'fak_air_nb', 38,
2970 2970
 	#opposite
@@ -2980,7 +2980,7 @@ fak_varial_heelflip = a_class(
2980 2980
 	#intro, length
2981 2981
 	None, 0,
2982 2982
 	#exits
2983
-	['fak_offboard'],
2983
+	['fak_offboard', 'fak_air_nb'],
2984 2984
 	#force exit, frame
2985 2985
 	'fak_air_nb', 38,
2986 2986
 	#opposite
@@ -3002,7 +3002,7 @@ fak_nollie = a_class(
3002 3002
 	#intro, length
3003 3003
 	None, 0,
3004 3004
 	#exits
3005
-	['fak_offboard'],
3005
+	['fak_offboard', 'fak_air'],
3006 3006
 	#force exit, frame
3007 3007
 	'fak_air', 30,
3008 3008
 	#opposite
@@ -3018,7 +3018,7 @@ fak_nollie_kickflip = a_class(
3018 3018
 	#intro, length
3019 3019
 	None, 0,
3020 3020
 	#exits
3021
-	['fak_offboard'],
3021
+	['fak_offboard', 'fak_air'],
3022 3022
 	#force exit, frame
3023 3023
 	'fak_air', 30,
3024 3024
 	#opposite
@@ -3034,7 +3034,7 @@ fak_nollie_heelflip = a_class(
3034 3034
 	#intro, length
3035 3035
 	None, 0,
3036 3036
 	#exits
3037
-	['fak_offboard'],
3037
+	['fak_offboard', 'fak_air'],
3038 3038
 	#force exit, frame
3039 3039
 	'fak_air', 30,
3040 3040
 	#opposite
@@ -3050,7 +3050,7 @@ fak_nollie_shuvit = a_class(
3050 3050
 	#intro, length
3051 3051
 	None, 0,
3052 3052
 	#exits
3053
-	['fak_offboard'],
3053
+	['fak_offboard', 'fak_air'],
3054 3054
 	#force exit, frame
3055 3055
 	'fak_air', 30,
3056 3056
 	#opposite
@@ -3066,7 +3066,7 @@ fak_nollie_fsshuvit = a_class(
3066 3066
 	#intro, length
3067 3067
 	None, 0,
3068 3068
 	#exits
3069
-	['fak_offboard'],
3069
+	['fak_offboard', 'fak_air'],
3070 3070
 	#force exit, frame
3071 3071
 	'fak_air', 30,
3072 3072
 	#opposite
@@ -3082,7 +3082,7 @@ fak_nollie_shuvit360 = a_class(
3082 3082
 	#intro, length
3083 3083
 	None, 0,
3084 3084
 	#exits
3085
-	['fak_offboard'],
3085
+	['fak_offboard', 'fak_air'],
3086 3086
 	#force exit, frame
3087 3087
 	'fak_air', 30,
3088 3088
 	#opposite
@@ -3098,7 +3098,7 @@ fak_nollie_fsshuvit_360 = a_class(
3098 3098
 	#intro, length
3099 3099
 	None, 0,
3100 3100
 	#exits
3101
-	['fak_offboard'],
3101
+	['fak_offboard', 'fak_air'],
3102 3102
 	#force exit, frame
3103 3103
 	'fak_air', 30,
3104 3104
 	#opposite

+ 15
- 0
scripts/boneRecord.py View File

@@ -104,5 +104,20 @@ def Playback(valueIndex):
104 104
             #print(x.rotation_mode, pl[valueIndex],  'mode', valueIndex, x.name)
105 105
         except:
106 106
             print('index out of range')
107
+    if armature.isPlayingAction(0):
108
+        armature.stopAction(0)
109
+    if armature.isPlayingAction(1):
110
+        armature.stopAction(1)        
111
+    if armature.isPlayingAction(2):
112
+        armature.stopAction(2)
113
+    if armature.isPlayingAction(3):
114
+        armature.stopAction(3)
115
+    if armature.isPlayingAction(4):
116
+        armature.stopAction(4)
117
+    if armature.isPlayingAction(5):
118
+        armature.stopAction(5)
119
+    if armature.isPlayingAction(6):
120
+        armature.stopAction(6)
121
+
107 122
     armature.update()        
108 123
     deck.update()        

+ 2
- 1
scripts/controller2.py View File

@@ -204,7 +204,8 @@ def main():
204 204
         balance = 0
205 205
     #print(balance)
206 206
     #if ground_since > 0 and ground_since < 5 and jump_timer < 30:
207
-    if ground_since > -1 and ground_since < 60:
207
+    min_speed = .8
208
+    if ground_since > -1 and ground_since < 60 and (abs(linVelocity.x) > min_speed or abs(linVelocity.y) > min_speed):
208 209
         #print(balance, 'balance')
209 210
         sens = 2
210 211
         sens2 = .8

+ 4
- 0
scripts/ragdoll.py View File

@@ -143,6 +143,10 @@ def main():
143 143
             cont.actuators['Camera'].damping = .000001
144 144
             cont.activate(cont.actuators['Camera']) 
145 145
             #print(own['rd_set_vel'], 'vel setter')
146
+            if own['stance']:
147
+                own['requestAction'] = 'reg_walk'
148
+            else:    
149
+                own['requestAction'] = 'fak_walk'
146 150
             if own['rd_set_vel'] == True:
147 151
                 print(own['rd_incer'], 'rdincer', own['rd_vel'])
148 152
                 

Loading…
Cancel
Save