shuvit 4 years ago
parent
commit
8680ffd724

+ 2
- 2
assets/car1.blend View File

1
 version https://git-lfs.github.com/spec/v1
1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:a326d236c07858ff79280694f672e4be2a81fcc691a89fc484b8ef374d1e22e5
3
-size 2005876
2
+oid sha256:57473cb1714b3f7cf24f842abce77b72c6f99ded3c48e2971bc90e6b365a74ba
3
+size 2005548

+ 3
- 0
assets/mini_b.blend View File

1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:e1ff0591377ef662b4a9b21d6503029647c9ea8e87392514d9fd625cb18de3a1
3
+size 118444584

+ 2
- 2
assets/user2.blend View File

1
 version https://git-lfs.github.com/spec/v1
1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:36e896c7434f0434e52d8877a421d8b182b09747234e7faeefa044859aebbcbb
3
-size 14099728
2
+oid sha256:f02a9b5898c2cbe7ad94586182ea85f5340884de323edbae4598d3ea01240914
3
+size 14145256

+ 2
- 2
assets/user8_working.blend View File

1
 version https://git-lfs.github.com/spec/v1
1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:22cab52f25fc85cbe22681fae7dc7123ee0f8a9d947f5fdd3737c93d1d81ecf3
3
-size 10652112
2
+oid sha256:14732c73d8974577fe36299bbeb082f9ee6434d39c473427bd7cfbe7945662e9
3
+size 10694688

+ 5
- 5
config.ini View File

54
 
54
 
55
 shirt_logo = 2
55
 shirt_logo = 2
56
 
56
 
57
-shirt_color_r = 0.03
58
-shirt_color_g = 0.16
57
+shirt_color_r = 0.05
58
+shirt_color_g = 0
59
 shirt_color_b = 0.0
59
 shirt_color_b = 0.0
60
 
60
 
61
 shoe_color_r = 0.55
61
 shoe_color_r = 0.55
93
 #brightness / contrast
93
 #brightness / contrast
94
 bc = 1
94
 bc = 1
95
 BC_BRIGHTNESS = 0.99
95
 BC_BRIGHTNESS = 0.99
96
-BC_CONTRAST = 1.04
96
+BC_CONTRAST = 1.06
97
 
97
 
98
 #HDR
98
 #HDR
99
 hdr = 1
99
 hdr = 1
107
 aoradius = 2.4
107
 aoradius = 2.4
108
 
108
 
109
 #Depth of Field
109
 #Depth of Field
110
-dof_on = 0
110
+dof_on = 1
111
 
111
 
112
 #Bloom
112
 #Bloom
113
-bloom_on = 0
113
+bloom_on = 1
114
 
114
 
115
 #FXAA
115
 #FXAA
116
 fxaa = 1
116
 fxaa = 1

+ 4
- 6
scripts/actionPlayer.py View File

148
 'reg_offboard',
148
 'reg_offboard',
149
 'fak_onboard', 
149
 'fak_onboard', 
150
 'fak_offboard',
150
 'fak_offboard',
151
-'reg_dropin']
151
+'reg_dropin',
152
+'fak_dropin', 
153
+'reg_stop']
152
 
154
 
153
 state_b = ['reg_jump',
155
 state_b = ['reg_jump',
154
 'reg_walk_air',
156
 'reg_walk_air',
304
 		else:
306
 		else:
305
 			actionPlayer(action)
307
 			actionPlayer(action)
306
 		newState = check_exit(aState, rA, timer, action)
308
 		newState = check_exit(aState, rA, timer, action)
307
-		if aState == 'reg_onboard':
308
-			print('onboarding..')
309
-
310
-		if aState == 'reg_back_invert':
311
-			print('fffffffffffffffffffffffffffffffff')		
309
+			
312
 
310
 
313
 	elif aState in state_b:
311
 	elif aState in state_b:
314
 		action = getattr(actionsFSMlist, aState)
312
 		action = getattr(actionsFSMlist, aState)

+ 27
- 12
scripts/actionsFSMlist.py View File

317
 	#intro, length
317
 	#intro, length
318
 	None, 0,
318
 	None, 0,
319
 	#exits
319
 	#exits
320
-	['reg_idle', 'reg_offboard', 'reg_turnLeft', 'reg_turnRight', 'reg_opos', 'reg_nopos', 'reg_pump', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right'],
320
+	['reg_idle', 'reg_offboard', 'reg_turnLeft', 'reg_turnRight', 'reg_opos', 'reg_nopos', 'reg_pump', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right', 'reg_stop'],
321
 	#force exit, frame
321
 	#force exit, frame
322
 	None, 0,
322
 	None, 0,
323
 	#opposite
323
 	#opposite
333
 	#intro, length
333
 	#intro, length
334
 	None, 0,
334
 	None, 0,
335
 	#exits
335
 	#exits
336
-	['reg_roll', 'reg_opos', 'reg_nopos', 'reg_pump', 'reg_pump_left', 'reg_pump_right', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right', 'fak_turnRight'],
336
+	['reg_roll', 'reg_opos', 'reg_nopos', 'reg_pump', 'reg_pump_left', 'reg_pump_right', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right', 'fak_turnRight', 'reg_stop'],
337
 	#force exit, frame
337
 	#force exit, frame
338
 	None, 0,
338
 	None, 0,
339
 	#opposite
339
 	#opposite
349
 	#intro, length
349
 	#intro, length
350
 	None, 0,
350
 	None, 0,
351
 	#exits
351
 	#exits
352
-	['reg_roll', 'reg_opos', 'reg_nopos', 'reg_pump','reg_pump_left', 'reg_pump_right',  'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right', 'fak_turnLeft'],
352
+	['reg_roll', 'reg_opos', 'reg_nopos', 'reg_pump','reg_pump_left', 'reg_pump_right',  'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right', 'fak_turnLeft', 'reg_stop'],
353
 	#force exit, frame
353
 	#force exit, frame
354
 	None, 0,
354
 	None, 0,
355
 	#opposite
355
 	#opposite
365
 	#intro, length
365
 	#intro, length
366
 	None, 0,
366
 	None, 0,
367
 	#exits
367
 	#exits
368
-	['reg_roll', 'reg_opos', 'reg_nopos', 'reg_pump', 'reg_pump_left', 'reg_pump_right', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right'],
368
+	['reg_roll', 'reg_opos', 'reg_nopos', 'reg_pump', 'reg_pump_left', 'reg_pump_right', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right', 'reg_stop'],
369
 	#force exit, frame
369
 	#force exit, frame
370
 	None, 0,
370
 	None, 0,
371
 	#opposite
371
 	#opposite
381
 	#intro, length
381
 	#intro, length
382
 	None, 0,
382
 	None, 0,
383
 	#exits
383
 	#exits
384
-	['reg_roll', 'reg_opos', 'reg_nopos', 'reg_pump','reg_pump_left', 'reg_pump_right',  'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right'],
384
+	['reg_roll', 'reg_opos', 'reg_nopos', 'reg_pump','reg_pump_left', 'reg_pump_right',  'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right', 'reg_stop'],
385
 	#force exit, frame
385
 	#force exit, frame
386
 	None, 0,
386
 	None, 0,
387
 	#opposite
387
 	#opposite
414
 	#intro, length
414
 	#intro, length
415
 	'reg_opos_in', 80,
415
 	'reg_opos_in', 80,
416
 	#exits
416
 	#exits
417
-	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_pump', 'reg_pump_left', 'reg_pump_right', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right'],
417
+	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_pump', 'reg_pump_left', 'reg_pump_right', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right', 'reg_stop'],
418
 	#force exit, frame
418
 	#force exit, frame
419
 	None, 0,
419
 	None, 0,
420
 	#opposite
420
 	#opposite
430
 	#intro, length
430
 	#intro, length
431
 	None, 0,
431
 	None, 0,
432
 	#exits
432
 	#exits
433
-	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_pump', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail'],
433
+	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_pump', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_stop'],
434
 	#force exit, frame
434
 	#force exit, frame
435
 	None, 0,
435
 	None, 0,
436
 	#opposite
436
 	#opposite
446
 	#intro, length
446
 	#intro, length
447
 	None, 0,
447
 	None, 0,
448
 	#exits
448
 	#exits
449
-	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_pump_left', 'reg_pump_right', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'frontside_grab', 'backside_grab', 'frontside_nose_grab', 'backside_nose_grab', 'frontside_tail_grab', 'backside_tail_grab', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right'],
449
+	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_pump_left', 'reg_pump_right', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'frontside_grab', 'backside_grab', 'frontside_nose_grab', 'backside_nose_grab', 'frontside_tail_grab', 'backside_tail_grab', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right', 'reg_stop'],
450
 	#force exit, frame
450
 	#force exit, frame
451
 	None, 0,
451
 	None, 0,
452
 	#opposite
452
 	#opposite
462
 	#intro, length
462
 	#intro, length
463
 	None, 0,
463
 	None, 0,
464
 	#exits
464
 	#exits
465
-	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_opos', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_pump', 'reg_pump_right', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'backside_grab', 'frontside_nose_grab', 'backside_nose_grab', 'frontside_tail_grab', 'backside_tail_grab', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right'],
465
+	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_opos', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_pump', 'reg_pump_right', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'backside_grab', 'frontside_nose_grab', 'backside_nose_grab', 'frontside_tail_grab', 'backside_tail_grab', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right', 'reg_stop'],
466
 	#force exit, frame
466
 	#force exit, frame
467
 	None, 0,
467
 	None, 0,
468
 	#opposite
468
 	#opposite
479
 	#intro, length
479
 	#intro, length
480
 	None, 0,
480
 	None, 0,
481
 	#exits
481
 	#exits
482
-	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_opos', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_pump', 'reg_pump_left', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'backside_grab', 'frontside_nose_grab', 'backside_nose_grab', 'frontside_tail_grab', 'backside_tail_grab', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right'],
482
+	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_opos', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_pump', 'reg_pump_left', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'backside_grab', 'frontside_nose_grab', 'backside_nose_grab', 'frontside_tail_grab', 'backside_tail_grab', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right', 'reg_stop'],
483
 	#force exit, frame
483
 	#force exit, frame
484
 	None, 0,
484
 	None, 0,
485
 	#opposite
485
 	#opposite
495
 	#intro, length
495
 	#intro, length
496
 	None, 0,
496
 	None, 0,
497
 	#exits
497
 	#exits
498
-	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right'],
498
+	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_stop'],
499
 	#force exit, frame
499
 	#force exit, frame
500
 	None, 0,
500
 	None, 0,
501
 	#opposite
501
 	#opposite
511
 	#intro, length
511
 	#intro, length
512
 	None, 0,
512
 	None, 0,
513
 	#exits
513
 	#exits
514
-	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right'],
514
+	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_stop'],
515
 	#force exit, frame
515
 	#force exit, frame
516
 	None, 0,
516
 	None, 0,
517
 	#opposite
517
 	#opposite
518
 	None)
518
 	None)
519
 
519
 
520
+reg_stop = a_class(
521
+	#player armature action name, start, end frames
522
+	'reg_stop', 1, 30,
523
+	#deck action name, start, end frames  
524
+	'b_reg', 1, 1,
525
+	#layer, speed, mode (0 = play, 1 = loop), blendin
526
+	1, .5, 1, 20,
527
+	#intro, length
528
+	None, 0,
529
+	#exits
530
+	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right'],
531
+	#force exit, frame
532
+	None, 0,
533
+	#opposite
534
+	None)
520
 
535
 
521
 reg_powerslide_in = a_class(
536
 reg_powerslide_in = a_class(
522
 	#player armature action name, start, end frames
537
 	#player armature action name, start, end frames

+ 1
- 0
scripts/cars.py View File

76
 		self.active = False
76
 		self.active = False
77
 		self.target = None
77
 		self.target = None
78
 		self.lane_point = self.obj.worldPosition
78
 		self.lane_point = self.obj.worldPosition
79
+		self.point = self.obj.worldPosition
79
 		self.last_lane_point = self.obj.worldPosition
80
 		self.last_lane_point = self.obj.worldPosition
80
 		self.path = None
81
 		self.path = None
81
 		self.path_index = 0
82
 		self.path_index = 0

+ 2
- 1
scripts/controller2.py View File

916
         if can_stop == 1:
916
         if can_stop == 1:
917
             if onGround and STANCE == False:
917
             if onGround and STANCE == False:
918
                 own['requestAction'] = 'reg_stop'
918
                 own['requestAction'] = 'reg_stop'
919
+                print('reg_stop')
919
             elif onGround and STANCE == True:
920
             elif onGround and STANCE == True:
920
                 own['requestAction'] = 'fak_stop'
921
                 own['requestAction'] = 'fak_stop'
921
             yvel = linVelocity.x * .985
922
             yvel = linVelocity.x * .985
4039
 
4040
 
4040
     def wallride_sound():
4041
     def wallride_sound():
4041
         sact = own.actuators["wallSound"]
4042
         sact = own.actuators["wallSound"]
4042
-        print('wr as', own['aState'])
4043
+        #print('wr as', own['aState'])
4043
         #if own["wallride"] != None and (own['actionState'] == 'reg_wall_r' or own['actionState'] == 'reg_wall_l' or own['actionState'] == 'fak_wall_r' or own['actionState'] == 'fak_wall_l'):
4044
         #if own["wallride"] != None and (own['actionState'] == 'reg_wall_r' or own['actionState'] == 'reg_wall_l' or own['actionState'] == 'fak_wall_r' or own['actionState'] == 'fak_wall_l'):
4044
         if  own['aState'] in ['reg_wall_r', 'reg_wall_l', 'fak_wall_r', 'fak_wall_l'] and not skater.isPlayingAction(3):
4045
         if  own['aState'] in ['reg_wall_r', 'reg_wall_l', 'fak_wall_r', 'fak_wall_l'] and not skater.isPlayingAction(3):
4045
             sact.volume = .2
4046
             sact.volume = .2

+ 1
- 0
scripts/walkers.py View File

76
 		self.active = False
76
 		self.active = False
77
 		self.target = start_empty
77
 		self.target = start_empty
78
 		self.lane_point = self.obj.worldPosition
78
 		self.lane_point = self.obj.worldPosition
79
+		self.point = self.obj.worldPosition
79
 		self.last_lane_point = self.obj.worldPosition
80
 		self.last_lane_point = self.obj.worldPosition
80
 		self.path = None
81
 		self.path = None
81
 		self.path_index = 0
82
 		self.path_index = 0

+ 2
- 2
shuvit.blend View File

1
 version https://git-lfs.github.com/spec/v1
1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:9744d08d4ce1108ee8bb65ca47811342c8fa6edf0ce146c9d23df2802fbaab60
3
-size 117226000
2
+oid sha256:aae918842646245a6cf326a51b48815c50f8564def933a7b70f4f6dab073ba8a
3
+size 118803352

Loading…
Cancel
Save