shuvit 3 years ago
parent
commit
fccc438afd

+ 1
- 1
assets/user2.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:3f61eb94898eac143be19fcc213d8eb9c1249a7a6b1e0bd24c6f14afb81e7768
2
+oid sha256:3b20adceeff2ea98125202f60bca109e3a4ff9b4ae238b7d955226560725fa48
3 3
 size 36970420

+ 0
- 3
assets/user2pit.blend View File

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

+ 40
- 40
config.ini View File

@@ -49,41 +49,41 @@ walk_focal_length = 14
49 49
 #character settings
50 50
 ###################
51 51
 
52
-character = ralph
52
+character = annie
53 53
 
54
-shirt_logo = 4
54
+shirt_logo = 2
55 55
 
56
-shirt_color_r = 0.23
57
-shirt_color_g = 0.03
58
-shirt_color_b = 0.05
56
+shirt_color_r = 0.44
57
+shirt_color_g = 0.44
58
+shirt_color_b = 0.44
59 59
 
60
-shoe_color_r = 0.71
61
-shoe_color_g = 0.71
62
-shoe_color_b = 0.71
60
+shoe_color_r = 0.08
61
+shoe_color_g = 0.03
62
+shoe_color_b = 0
63 63
 #-----------------
64 64
 
65 65
 #deck settings
66 66
 ##############
67
-deck_index = 6
68
-deck_color_r = 0.1
69
-deck_color_g = 0
70
-deck_color_b = 0
71
-trucks_r = 0.29
72
-trucks_g = 0.28
73
-trucks_b = 0.31
74
-
75
-wheel1_r = 0
76
-wheel1_g = 0.1
77
-wheel1_b = 0
78
-wheel2_r = 0
79
-wheel2_g = 0.1
80
-wheel2_b = 0
81
-wheel3_r = 0
82
-wheel3_g = 0.1
83
-wheel3_b = 0
84
-wheel4_r = 0
85
-wheel4_g = 0.1
86
-wheel4_b = 0
67
+deck_index = 5
68
+deck_color_r = 0.8
69
+deck_color_g = 0.8
70
+deck_color_b = 0.8
71
+trucks_r = 0
72
+trucks_g = 0
73
+trucks_b = 0
74
+
75
+wheel1_r = 0.21
76
+wheel1_g = 0.21
77
+wheel1_b = 0.21
78
+wheel2_r = 0.21
79
+wheel2_g = 0.21
80
+wheel2_b = 0.21
81
+wheel3_r = 0.21
82
+wheel3_g = 0.21
83
+wheel3_b = 0.21
84
+wheel4_r = 0.21
85
+wheel4_g = 0.21
86
+wheel4_b = 0.21
87 87
 #-------------------
88 88
 
89 89
 #2d filter settings
@@ -91,22 +91,22 @@ wheel4_b = 0
91 91
 
92 92
 #brightness / contrast
93 93
 bc = 1
94
-BC_BRIGHTNESS = 0.95
95
-BC_CONTRAST = 1.06
94
+BC_BRIGHTNESS = 1.18
95
+BC_CONTRAST = 1.32
96 96
 
97 97
 #HDR
98 98
 hdr = 1
99
-avgL = 0.77
100
-HDRamount = 0.03
99
+avgL = 0.79
100
+HDRamount = 0.02
101 101
 
102 102
 #Ambient Occlusion
103
-ao = 0
103
+ao = 1
104 104
 onlyAO = 0
105
-aowidth = 23.0
106
-aoradius = 96.0
105
+aowidth = 1.0
106
+aoradius = 1.2
107 107
 
108 108
 #Depth of Field
109
-dof_on = 1
109
+dof_on = 0
110 110
 
111 111
 #Bloom
112 112
 bloom_on = 0
@@ -118,16 +118,16 @@ FXAA_SPAN_MAX = 8.0
118 118
 
119 119
 #sun settings
120 120
 #############
121
-sun_strength = 2.05
122
-ambient_strength = 0.61
123
-sun_rot_x = -0.05
121
+sun_strength = 1.45
122
+ambient_strength = 0.52
123
+sun_rot_x = 0.05
124 124
 sun_rot_y = 0.05
125 125
 shadow_on = 0
126 126
 #------------
127 127
 
128 128
 #physics
129 129
 ########
130
-JUMPHEIGHT = 880#840#800
130
+JUMPHEIGHT = 940#880#840#800
131 131
 MAX_VEL = 6.7
132 132
 SPEEDUP = 0.055
133 133
 SPEEDPUMP = 0.14#.09

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


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


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


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


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


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


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


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


+ 701
- 6
scripts/actionPlayer.py View File

@@ -25,12 +25,12 @@ def actionPlayer(ac):
25 25
 		print('zeroing blend')
26 26
 	skater.playAction(name, start,end, layer=layer, play_mode=mode, speed=speed, blendin=blendin)
27 27
 	deck.playAction(dname, dstart,dend, layer=layer, play_mode=mode, speed=speed, blendin=blendin)
28
-	print('playing', name, get_frame(ac))
28
+	#print('playing', name, get_frame(ac))
29 29
 
30 30
 def get_frame(ac):
31 31
 	skater = dict['p1']
32 32
 	layer = getattr(ac, 'layer')
33
-	print('getting frame', skater.getActionFrame(layer))
33
+	#print('getting frame', skater.getActionFrame(layer))
34 34
 	return skater.getActionFrame(layer)
35 35
 
36 36
 def set_frame(ac, frame):
@@ -45,8 +45,16 @@ def check_exit(aState, rA, timer, ac):
45 45
 	exits = getattr(ac, 'exits')
46 46
 	force = getattr(ac, 'force_exit')
47 47
 	fe = getattr(ac, 'fef')
48
+	
49
+	print('?????????????rA, aState', rA, aState)
48 50
 	if rA in exits:
49 51
 		return rA
52
+	#
53
+
54
+	elif ('fak' in rA and 'reg' in aState) or ('reg' in rA and 'fak' in aState):
55
+		print('change stance')
56
+		if getattr(ac, 'opposite') != None:
57
+			return getattr(ac, 'opposite')
50 58
 	else:
51 59
 		return aState
52 60
 
@@ -63,16 +71,17 @@ def state_timer(own):
63 71
 def check_land(rA, aState, own):
64 72
 
65 73
 	#check if manualling
66
-	if rA in actionsFSMlist.reg_manuallist or rA in actionsFSMlist.reg_grindlist:
74
+	if rA in actionsFSMlist.reg_manuallist or rA in actionsFSMlist.reg_grindlist or rA in actionsFSMlist.fak_grindlist:
67 75
 		aState = rA
68 76
 		own['stateTimer'] = 0
69 77
 		own['aState'] = rA
70 78
 	#otherwise, force land, offboard or fliptrick
71
-	elif 'land' in rA or 'onboard' in rA or 'offboard' in rA or rA in actionsFSMlist.reg_fliplist:
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:
72 80
 		print('landing________________________', rA)
73 81
 		aState = rA
74 82
 		own['stateTimer'] = 0
75 83
 		own['aState'] = rA
84
+	print(own['stance'], '-----stance', rA)
76 85
 	return aState	
77 86
 
78 87
 def main(cont):
@@ -93,7 +102,7 @@ def main(cont):
93 102
 	aState = check_land(rA, aState, own)
94 103
 	newState = aState
95 104
 	og_state = own['aState']
96
-	print(aState, 'cur aState')
105
+	#print(aState, 'cur aState')
97 106
 
98 107
 	if own['l_aState'] in actionsFSMlist.reg_fliplist:
99 108
 		zero_blend = True
@@ -376,6 +385,13 @@ def main(cont):
376 385
 		actionPlayer(action)
377 386
 		newState = check_exit(aState, rA, timer, action)
378 387
 
388
+	check_state = 'reg_air_nb'
389
+	if aState == check_state:
390
+		action = getattr(actionsFSMlist, check_state)
391
+		actionPlayer(action)
392
+		newState = check_exit(aState, rA, timer, action)
393
+
394
+
379 395
 	check_state = 'reg_air_nose'
380 396
 	if aState == check_state:
381 397
 		action = getattr(actionsFSMlist, check_state)
@@ -705,12 +721,691 @@ def main(cont):
705 721
 
706 722
 
707 723
 
724
+
725
+
726
+
727
+
728
+
729
+
730
+
731
+
732
+
733
+
734
+
735
+
736
+
737
+
738
+
739
+
740
+
741
+
742
+
743
+
744
+
745
+
746
+
747
+
748
+
749
+
750
+
751
+
752
+
753
+
754
+
755
+
756
+
757
+
758
+
759
+	check_state = 'fak_idle'
760
+	if aState == check_state:
761
+		action = getattr(actionsFSMlist, check_state)
762
+		actionPlayer(action)
763
+		newState = check_exit(aState, rA, timer, action)
764
+
765
+	check_state = 'fak_idle2'	
766
+	if aState == check_state:
767
+		action = getattr(actionsFSMlist, check_state)
768
+		actionPlayer(action)
769
+		newState = check_exit(aState, rA, timer, action)
770
+
771
+	check_state = 'fak_idle3'
772
+	if aState == check_state:
773
+		action = getattr(actionsFSMlist, check_state)
774
+		actionPlayer(action)
775
+		newState = check_exit(aState, rA, timer, action)
776
+	
777
+	check_state = 'fak_idle4'
778
+	if aState == check_state:
779
+		action = getattr(actionsFSMlist, check_state)
780
+		actionPlayer(action)
781
+		newState = check_exit(aState, rA, timer, action)
782
+
783
+	check_state = 'fak_idle5'
784
+	if aState == check_state:
785
+		action = getattr(actionsFSMlist, check_state)
786
+		actionPlayer(action)
787
+		newState = check_exit(aState, rA, timer, action)
788
+	
789
+	check_state = 'fak_jump'
790
+	if aState == check_state:
791
+		action = getattr(actionsFSMlist, check_state)
792
+		actionPlayer(action)
793
+		if own['stateTimer'] > getattr(action, 'fef'):
794
+			newState = check_exit(aState, rA, timer, action)
795
+	
796
+	check_state = 'fak_walk_air'
797
+	if aState == check_state:
798
+		action = getattr(actionsFSMlist, check_state)
799
+		actionPlayer(action)
800
+		if aState != rA:
801
+			newState = getattr(action, 'exits')[0]
802
+	
803
+	check_state = 'fak_walk_air_out' 			
804
+	if aState == check_state:
805
+		action = getattr(actionsFSMlist, check_state)
806
+		actionPlayer(action)
807
+		print(own['stateTimer'], getattr(action, 'fef'))
808
+		if own['stateTimer'] > getattr(action, 'fef'):	
809
+			newState = getattr(action, 'force_exit')
810
+
811
+	check_state = 'fak_sit'
812
+	if aState == check_state:
813
+		action = getattr(actionsFSMlist, check_state)
814
+		#if own['stateTimer'] < 19:
815
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
816
+			actionPlayer(getattr(actionsFSMlist, 'intro'))
817
+		else:
818
+			actionPlayer(action)
819
+		newState = check_exit(aState, rA, timer, actionsFSMlist.fak_sit)
820
+
821
+	#-----------------------
822
+	check_state = 'fak_walk'
823
+	if aState == check_state:
824
+		action = getattr(actionsFSMlist, check_state)
825
+		if own['l_aState'] == 'fak_walkFast':
826
+			frame = get_frame(actionsFSMlist.fak_walkFast)
827
+			actionPlayer(action)
828
+			set_frame(actionsFSMlist.fak_walk, frame)
829
+		else:	
830
+			frame = actionPlayer(action)
831
+		
832
+		newState = check_exit(aState, rA, timer, action)
833
+
834
+	#-----------------------
835
+	check_state = 'fak_walkFast'
836
+	if aState == check_state:
837
+		action = getattr(actionsFSMlist, check_state)
838
+		newState = check_exit(aState, rA, timer, actionsFSMlist.fak_walkFast)
839
+
840
+		if own['l_aState'] == 'fak_walk':
841
+			frame = get_frame(actionsFSMlist.fak_walk)
842
+			actionPlayer(action)
843
+			set_frame(actionsFSMlist.fak_walkFast, frame)
844
+
845
+		else:
846
+			actionPlayer(action)
847
+		#print(frame)
848
+
849
+	check_state = 'fak_onboard'
850
+	if aState == check_state:
851
+		action = getattr(actionsFSMlist, check_state)
852
+		actionPlayer(action)
853
+		print('checking onbaord state')
854
+		#if own['stateTimer'] > 10:
855
+			#newState = check_exit(aState, rA, timer, actionsFSMlist.fak_onboard)
856
+		if own['stateTimer'] > getattr(action, 'fef'):	
857
+			newState = getattr(action, 'force_exit')			
858
+
859
+	check_state = 'fak_offboard'
860
+	if aState == check_state:
861
+		action = getattr(actionsFSMlist, check_state)
862
+		actionPlayer(action)
863
+		if own['stateTimer'] > 20:
864
+			newState = check_exit(aState, rA, timer, actionsFSMlist.fak_offboard)			
865
+
866
+	check_state = 'fak_roll'
867
+	if aState == check_state:
868
+		action = getattr(actionsFSMlist, check_state)
869
+		actionPlayer(action)
870
+		newState = check_exit(aState, rA, timer, action)
871
+
872
+	check_state = 'fak_turnLeft'
873
+	if aState == check_state:
874
+		action = getattr(actionsFSMlist, check_state)
875
+		actionPlayer(action)
876
+		newState = check_exit(aState, rA, timer, action)
877
+	
878
+	check_state = 'fak_turnRight'
879
+	if aState == check_state:
880
+		action = getattr(actionsFSMlist, check_state)
881
+		actionPlayer(action)
882
+		newState = check_exit(aState, rA, timer, action)
883
+
884
+	check_state = 'fak_opos'
885
+	if aState == check_state:
886
+		action = getattr(actionsFSMlist, check_state)
887
+		actionPlayer(action)
888
+		newState = check_exit(aState, rA, timer, action)		
889
+	
890
+	check_state = 'fak_nopos'
891
+	if aState == check_state:
892
+		action = getattr(actionsFSMlist, check_state)
893
+		actionPlayer(action)
894
+		newState = check_exit(aState, rA, timer, action)		
895
+
896
+	check_state = 'fak_pump'
897
+	if aState == check_state:
898
+		action = getattr(actionsFSMlist, check_state)
899
+		actionPlayer(action)
900
+		newState = check_exit(aState, rA, timer, action)
901
+
902
+	check_state = 'fak_pump_left'
903
+	if aState == check_state:
904
+		action = getattr(actionsFSMlist, check_state)
905
+		actionPlayer(action)
906
+		newState = check_exit(aState, rA, timer, action)				
907
+
908
+	check_state = 'fak_pump_right'
909
+	if aState == check_state:
910
+		action = getattr(actionsFSMlist, check_state)
911
+		actionPlayer(action)
912
+		newState = check_exit(aState, rA, timer, action)				
913
+
914
+
915
+	check_state = 'fak_push'
916
+	if aState == check_state:
917
+		action = getattr(actionsFSMlist, check_state)
918
+		actionPlayer(action)
919
+		if own['stateTimer'] > 70:
920
+			newState = 'fak_roll'
921
+
922
+	check_state = 'fak_push_goof'
923
+	if aState == check_state:
924
+		action = getattr(actionsFSMlist, check_state)
925
+		actionPlayer(action)
926
+		if own['stateTimer'] > 70:
927
+			newState = 'fak_roll'			
928
+	
929
+	check_state = 'fak_powerslide'
930
+	if aState == check_state:
931
+		action = getattr(actionsFSMlist, check_state)
932
+		# if own['stateTimer'] < 20:
933
+		# 	actionPlayer(actionsFSMlist.fak_powerslide_in)
934
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
935
+			intro = getattr(action, 'intro')
936
+			actionPlayer(getattr(actionsFSMlist, intro))	
937
+		else:
938
+			actionPlayer(action)
939
+		newState = check_exit(aState, rA, timer, actionsFSMlist.fak_powerslide)
940
+
941
+	check_state = 'fak_fs_powerslide'
942
+	if aState == check_state:
943
+		action = getattr(actionsFSMlist, check_state)
944
+		# if own['stateTimer'] < 20:
945
+		# 	actionPlayer(actionsFSMlist.fak_fs_powerslide_in)
946
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
947
+			intro = getattr(action, 'intro')
948
+			actionPlayer(getattr(actionsFSMlist, intro))	
949
+		else:
950
+			actionPlayer(action)
951
+		newState = check_exit(aState, rA, timer, actionsFSMlist.fak_fs_powerslide)				
952
+
953
+	check_state = 'fak_brfoot'
954
+	if aState == check_state:
955
+		action = getattr(actionsFSMlist, check_state)
956
+		actionPlayer(action)
957
+		if own['stateTimer'] > getattr(action, 'fef'):	
958
+			newState = getattr(action, 'force_exit')	
959
+	
960
+	check_state = 'fak_frfoot'
961
+	if aState == check_state:
962
+		action = getattr(actionsFSMlist, check_state)
963
+		actionPlayer(action)
964
+		if own['stateTimer'] > getattr(action, 'fef'):	
965
+			newState = getattr(action, 'force_exit')	
966
+
967
+	check_state = 'fak_blfoot'
968
+	if aState == check_state:
969
+		action = getattr(actionsFSMlist, check_state)
970
+		actionPlayer(action)
971
+		if own['stateTimer'] > getattr(action, 'fef'):	
972
+			newState = getattr(action, 'force_exit')	
973
+	
974
+	check_state = 'fak_flfoot'
975
+	if aState == check_state:
976
+		action = getattr(actionsFSMlist, check_state)
977
+		actionPlayer(action)
978
+		if own['stateTimer'] > getattr(action, 'fef'):	
979
+			newState = getattr(action, 'force_exit')				
980
+
981
+
982
+
983
+	check_state = 'fak_manual'
984
+	if aState == check_state:
985
+		action = getattr(actionsFSMlist, check_state)
986
+		actionPlayer(action)
987
+		newState = check_exit(aState, rA, timer, action)
988
+
989
+	check_state = 'fak_nmanual'
990
+	if aState == check_state:
991
+		action = getattr(actionsFSMlist, check_state)
992
+		actionPlayer(action)
993
+		newState = check_exit(aState, rA, timer, action)
994
+
995
+	check_state = 'fak_land'
996
+	if aState == check_state:
997
+		action = getattr(actionsFSMlist, check_state)
998
+		actionPlayer(action)
999
+		if own['stateTimer'] > getattr(action, 'fef'):	
1000
+			newState = getattr(action, 'force_exit')
1001
+
1002
+	check_state = 'fak_landL'
1003
+	if aState == check_state:
1004
+		action = getattr(actionsFSMlist, check_state)
1005
+		actionPlayer(action)
1006
+		if own['stateTimer'] > getattr(action, 'fef'):	
1007
+			newState = getattr(action, 'force_exit')
1008
+
1009
+	check_state = 'fak_landLb'
1010
+	if aState == check_state:
1011
+		action = getattr(actionsFSMlist, check_state)
1012
+		actionPlayer(action)
1013
+		if own['stateTimer'] > getattr(action, 'fef'):	
1014
+			newState = getattr(action, 'force_exit')
1015
+
1016
+	check_state = 'fak_landR'
1017
+	if aState == check_state:
1018
+		action = getattr(actionsFSMlist, check_state)
1019
+		actionPlayer(action)
1020
+		if own['stateTimer'] > getattr(action, 'fef'):	
1021
+			newState = getattr(action, 'force_exit')
1022
+
1023
+	check_state = 'fak_landRb'
1024
+	if aState == check_state:
1025
+		action = getattr(actionsFSMlist, check_state)
1026
+		actionPlayer(action)
1027
+		if own['stateTimer'] > getattr(action, 'fef'):	
1028
+			newState = getattr(action, 'force_exit')												
1029
+
1030
+	check_state = 'fak_air'
1031
+	if aState == check_state:
1032
+		action = getattr(actionsFSMlist, check_state)
1033
+		actionPlayer(action)
1034
+		newState = check_exit(aState, rA, timer, action)
1035
+
1036
+	check_state = 'fak_air_nb'
1037
+	if aState == check_state:
1038
+		action = getattr(actionsFSMlist, check_state)
1039
+		actionPlayer(action)
1040
+		newState = check_exit(aState, rA, timer, action)
1041
+
1042
+
1043
+	check_state = 'fak_air_nose'
1044
+	if aState == check_state:
1045
+		action = getattr(actionsFSMlist, check_state)
1046
+		actionPlayer(action)
1047
+		newState = check_exit(aState, rA, timer, action)
1048
+
1049
+	check_state = 'fak_air_tail'
1050
+	if aState == check_state:
1051
+		action = getattr(actionsFSMlist, check_state)
1052
+		actionPlayer(action)
1053
+		newState = check_exit(aState, rA, timer, action)				
1054
+
1055
+	check_state = 'fak_ollie'
1056
+	if aState == check_state:
1057
+		action = getattr(actionsFSMlist, check_state)
1058
+		actionPlayer(action)
1059
+		if own['stateTimer'] > getattr(action, 'fef'):	
1060
+			newState = getattr(action, 'force_exit')												
1061
+
1062
+	check_state = 'fak_kickflip'
1063
+	if aState == check_state:
1064
+		action = getattr(actionsFSMlist, check_state)
1065
+		actionPlayer(action)
1066
+		if own['stateTimer'] > getattr(action, 'fef'):	
1067
+			newState = getattr(action, 'force_exit')												
1068
+
1069
+	check_state = 'fak_heelflip'
1070
+	if aState == check_state:
1071
+		action = getattr(actionsFSMlist, check_state)
1072
+		actionPlayer(action)
1073
+		if own['stateTimer'] > getattr(action, 'fef'):	
1074
+			newState = getattr(action, 'force_exit')
1075
+
1076
+	check_state = 'fak_shuvit'
1077
+	if aState == check_state:
1078
+		action = getattr(actionsFSMlist, check_state)
1079
+		actionPlayer(action)
1080
+		if own['stateTimer'] > getattr(action, 'fef'):	
1081
+			newState = getattr(action, 'force_exit')												
1082
+
1083
+	check_state = 'fak_shuvit360'
1084
+	if aState == check_state:
1085
+		action = getattr(actionsFSMlist, check_state)
1086
+		actionPlayer(action)
1087
+		if own['stateTimer'] > getattr(action, 'fef'):	
1088
+			newState = getattr(action, 'force_exit')												
1089
+
1090
+	check_state = 'fak_fsshuvit'
1091
+	if aState == check_state:
1092
+		action = getattr(actionsFSMlist, check_state)
1093
+		actionPlayer(action)
1094
+		if own['stateTimer'] > getattr(action, 'fef'):	
1095
+			newState = getattr(action, 'force_exit')												
1096
+
1097
+	check_state = 'fak_fsshuvit360'
1098
+	if aState == check_state:
1099
+		action = getattr(actionsFSMlist, check_state)
1100
+		actionPlayer(action)
1101
+		if own['stateTimer'] > getattr(action, 'fef'):	
1102
+			newState = getattr(action, 'force_exit')												
1103
+#-nollie
1104
+	check_state = 'fak_nollie'
1105
+	if aState == check_state:
1106
+		action = getattr(actionsFSMlist, check_state)
1107
+		actionPlayer(action)
1108
+		if own['stateTimer'] > getattr(action, 'fef'):	
1109
+			newState = getattr(action, 'force_exit')												
1110
+
1111
+	check_state = 'fak_nollie_kickflip'
1112
+	if aState == check_state:
1113
+		action = getattr(actionsFSMlist, check_state)
1114
+		actionPlayer(action)
1115
+		if own['stateTimer'] > getattr(action, 'fef'):	
1116
+			newState = getattr(action, 'force_exit')												
1117
+
1118
+	check_state = 'fak_nollie_heelflip'
1119
+	if aState == check_state:
1120
+		action = getattr(actionsFSMlist, check_state)
1121
+		actionPlayer(action)
1122
+		if own['stateTimer'] > getattr(action, 'fef'):	
1123
+			newState = getattr(action, 'force_exit')												
1124
+
1125
+	check_state = 'fak_nollie_shuvit'
1126
+	if aState == check_state:
1127
+		action = getattr(actionsFSMlist, check_state)
1128
+		actionPlayer(action)
1129
+		if own['stateTimer'] > getattr(action, 'fef'):	
1130
+			newState = getattr(action, 'force_exit')												
1131
+
1132
+	check_state = 'fak_nollie_fsshuvit'
1133
+	if aState == check_state:
1134
+		action = getattr(actionsFSMlist, check_state)
1135
+		actionPlayer(action)
1136
+		if own['stateTimer'] > getattr(action, 'fef'):	
1137
+			newState = getattr(action, 'force_exit')												
1138
+
1139
+	check_state = 'fak_nollie_shuvit360'
1140
+	if aState == check_state:
1141
+		action = getattr(actionsFSMlist, check_state)
1142
+		actionPlayer(action)
1143
+		if own['stateTimer'] > getattr(action, 'fef'):	
1144
+			newState = getattr(action, 'force_exit')												
1145
+
1146
+	check_state = 'fak_nollie_fsshuvit_360'
1147
+	if aState == check_state:
1148
+		action = getattr(actionsFSMlist, check_state)
1149
+		actionPlayer(action)
1150
+		if own['stateTimer'] > getattr(action, 'fef'):	
1151
+			newState = getattr(action, 'force_exit')												
1152
+
1153
+
1154
+
1155
+
1156
+#-----------
1157
+#grinds-----
1158
+#-----------
1159
+
1160
+
1161
+
1162
+
1163
+
1164
+	check_state = 'fak_5050'
1165
+	if aState == check_state:
1166
+		action = getattr(actionsFSMlist, check_state)
1167
+		actionPlayer(action)
1168
+		newState = check_exit(aState, rA, timer, action)
1169
+
1170
+	check_state = 'fak_bsboard'
1171
+	if aState == check_state:
1172
+		action = getattr(actionsFSMlist, check_state)
1173
+		actionPlayer(action)
1174
+		newState = check_exit(aState, rA, timer, action)
1175
+
1176
+	check_state = 'fak_fsboard'
1177
+	if aState == check_state:
1178
+		action = getattr(actionsFSMlist, check_state)
1179
+		actionPlayer(action)
1180
+		newState = check_exit(aState, rA, timer, action)
1181
+
1182
+	check_state = 'fak_tailg'
1183
+	if aState == check_state:
1184
+		action = getattr(actionsFSMlist, check_state)
1185
+		actionPlayer(action)
1186
+		newState = check_exit(aState, rA, timer, action)
1187
+
1188
+	check_state = 'fak_tailgr'
1189
+	if aState == check_state:
1190
+		action = getattr(actionsFSMlist, check_state)
1191
+		actionPlayer(action)
1192
+		newState = check_exit(aState, rA, timer, action)
1193
+
1194
+	check_state = 'fak_tailgl'
1195
+	if aState == check_state:
1196
+		action = getattr(actionsFSMlist, check_state)
1197
+		actionPlayer(action)
1198
+		newState = check_exit(aState, rA, timer, action)
1199
+
1200
+	check_state = 'fak_noseg'
1201
+	if aState == check_state:
1202
+		action = getattr(actionsFSMlist, check_state)
1203
+		actionPlayer(action)
1204
+		newState = check_exit(aState, rA, timer, action)
1205
+
1206
+	check_state = 'fak_nosegr'
1207
+	if aState == check_state:
1208
+		action = getattr(actionsFSMlist, check_state)
1209
+		actionPlayer(action)
1210
+		newState = check_exit(aState, rA, timer, action)
1211
+
1212
+	check_state = 'fak_nosegl'
1213
+	if aState == check_state:
1214
+		action = getattr(actionsFSMlist, check_state)
1215
+		actionPlayer(action)
1216
+		newState = check_exit(aState, rA, timer, action)
1217
+
1218
+	check_state = 'fak_tailslide'
1219
+	if aState == check_state:
1220
+		action = getattr(actionsFSMlist, check_state)
1221
+		actionPlayer(action)
1222
+		newState = check_exit(aState, rA, timer, action)
1223
+
1224
+	check_state = 'fak_noseslide'
1225
+	if aState == check_state:
1226
+		action = getattr(actionsFSMlist, check_state)
1227
+		actionPlayer(action)
1228
+		newState = check_exit(aState, rA, timer, action)
1229
+
1230
+
1231
+
1232
+#-----------
1233
+#grabs------
1234
+#-----------
1235
+
1236
+
1237
+
1238
+	check_state = 'fak_frontside_grab'
1239
+	if aState == check_state:
1240
+		action = getattr(actionsFSMlist, check_state)
1241
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
1242
+			intro = getattr(action, 'intro')
1243
+			actionPlayer(getattr(actionsFSMlist, intro))	
1244
+		else:
1245
+			actionPlayer(action)		
1246
+		newState = check_exit(aState, rA, timer, action)
1247
+
1248
+	check_state = 'fak_backside_grab'
1249
+	if aState == check_state:
1250
+		action = getattr(actionsFSMlist, check_state)
1251
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
1252
+			intro = getattr(action, 'intro')
1253
+			actionPlayer(getattr(actionsFSMlist, intro))	
1254
+		else:
1255
+			actionPlayer(action)		
1256
+		newState = check_exit(aState, rA, timer, action)		
1257
+		
1258
+	check_state = 'fak_frontside_nose_grab'
1259
+	if aState == check_state:
1260
+		action = getattr(actionsFSMlist, check_state)
1261
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
1262
+			intro = getattr(action, 'intro')
1263
+			actionPlayer(getattr(actionsFSMlist, intro))	
1264
+		else:
1265
+			actionPlayer(action)		
1266
+		newState = check_exit(aState, rA, timer, action)
1267
+	
1268
+	check_state = 'fak_backside_nose_grab'
1269
+	if aState == check_state:
1270
+		action = getattr(actionsFSMlist, check_state)
1271
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
1272
+			intro = getattr(action, 'intro')
1273
+			actionPlayer(getattr(actionsFSMlist, intro))	
1274
+		else:
1275
+			actionPlayer(action)		
1276
+		newState = check_exit(aState, rA, timer, action)
1277
+	
1278
+	check_state = 'fak_frontside_tail_grab'
1279
+	if aState == check_state:
1280
+		action = getattr(actionsFSMlist, check_state)
1281
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
1282
+			intro = getattr(action, 'intro')
1283
+			actionPlayer(getattr(actionsFSMlist, intro))	
1284
+		else:
1285
+			actionPlayer(action)		
1286
+		newState = check_exit(aState, rA, timer, action)
1287
+
1288
+	check_state = 'fak_backside_tail_grab'
1289
+	if aState == check_state:
1290
+		action = getattr(actionsFSMlist, check_state)
1291
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
1292
+			intro = getattr(action, 'intro')
1293
+			actionPlayer(getattr(actionsFSMlist, intro))	
1294
+		else:
1295
+			actionPlayer(action)		
1296
+		newState = check_exit(aState, rA, timer, action)
1297
+
1298
+
1299
+
1300
+
1301
+
1302
+
1303
+
1304
+
1305
+
1306
+
1307
+
1308
+	check_state = 'fak_ollie_north'
1309
+	if aState == check_state:
1310
+		action = getattr(actionsFSMlist, check_state)
1311
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
1312
+			intro = getattr(action, 'intro')
1313
+			actionPlayer(getattr(actionsFSMlist, intro))	
1314
+		else:
1315
+			actionPlayer(action)		
1316
+		newState = check_exit(aState, rA, timer, action)		
1317
+
1318
+	check_state = 'fak_ollie_south'
1319
+	if aState == check_state:
1320
+		action = getattr(actionsFSMlist, check_state)
1321
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
1322
+			intro = getattr(action, 'intro')
1323
+			actionPlayer(getattr(actionsFSMlist, intro))	
1324
+		else:
1325
+			actionPlayer(action)		
1326
+		newState = check_exit(aState, rA, timer, action)
1327
+
1328
+	check_state = 'fak_judo'
1329
+	if aState == check_state:
1330
+		action = getattr(actionsFSMlist, check_state)
1331
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
1332
+			intro = getattr(action, 'intro')
1333
+			actionPlayer(getattr(actionsFSMlist, intro))	
1334
+		else:
1335
+			actionPlayer(action)		
1336
+		newState = check_exit(aState, rA, timer, action)
1337
+
1338
+	check_state = 'fak_frigid'
1339
+	if aState == check_state:
1340
+		action = getattr(actionsFSMlist, check_state)
1341
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
1342
+			intro = getattr(action, 'intro')
1343
+			actionPlayer(getattr(actionsFSMlist, intro))	
1344
+		else:
1345
+			actionPlayer(action)		
1346
+		newState = check_exit(aState, rA, timer, action)
1347
+
1348
+	check_state = 'fak_fsonefoot'
1349
+	if aState == check_state:
1350
+		action = getattr(actionsFSMlist, check_state)
1351
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
1352
+			intro = getattr(action, 'intro')
1353
+			actionPlayer(getattr(actionsFSMlist, intro))	
1354
+		else:
1355
+			actionPlayer(action)		
1356
+		newState = check_exit(aState, rA, timer, action)
1357
+
1358
+	check_state = 'fak_onefoot'
1359
+	if aState == check_state:
1360
+		action = getattr(actionsFSMlist, check_state)
1361
+		if own['stateTimer'] < getattr(action, 'intro_frames'):	
1362
+			intro = getattr(action, 'intro')
1363
+			actionPlayer(getattr(actionsFSMlist, intro))	
1364
+		else:
1365
+			actionPlayer(action)		
1366
+		newState = check_exit(aState, rA, timer, action)
1367
+
1368
+
1369
+
1370
+
1371
+
1372
+
1373
+
1374
+
1375
+
1376
+
1377
+
1378
+
1379
+
1380
+
1381
+
1382
+
1383
+
1384
+
1385
+
1386
+
1387
+
1388
+
1389
+
1390
+
1391
+
1392
+
1393
+
1394
+
1395
+
1396
+
1397
+
1398
+
1399
+
1400
+
1401
+
708 1402
 	#-----------------------
709 1403
 	#own['aState'] = aState
710 1404
 	if newState != '':
711 1405
 		own['aState'] = newState 
712 1406
 	#print(own['l_aState'], '----l_aState', own['aState'])
713 1407
 	own['l_aState'] = og_state
1408
+	own['l_actionState'] = og_state
714 1409
 	#own['l_aState'] = newState
715
-	print(own['l_aState'], '----l_aState', own['aState'], 'rA', rA)
1410
+	#print(own['l_aState'], '----l_aState', own['aState'], 'rA', rA)
716 1411
 	state_timer(own)

+ 2741
- 2609
scripts/actionsFSMlist.py
File diff suppressed because it is too large
View File


+ 1
- 1
scripts/controller2.py View File

@@ -4549,7 +4549,7 @@ def main():
4549 4549
             #print('localRay')
4550 4550
         if localHitDist > .31 and localHitDist < 2:
4551 4551
             own.alignAxisToVect(localRay[2], 2, .05)
4552
-            print('new align')
4552
+            #print('new align')
4553 4553
     #else:
4554 4554
         #print('no localRay')
4555 4555
         else:

+ 4
- 4
scripts/menuV3.py View File

@@ -731,18 +731,18 @@ def endpoint(funct, motion, dict, cont):
731 731
     if funct == 'ao width':
732 732
         b = cam['aowidth']
733 733
         if motion == 'inc':
734
-            b += 1
734
+            b += .2
735 735
         else:
736
-            b -= 1    
736
+            b -= .2    
737 737
         cam['aowidth'] = round(b,2)        
738 738
         dict['aowidth'] = round(b,2)        
739 739
 
740 740
     if funct == 'ao radius':
741 741
         b = cam['aoradius']
742 742
         if motion == 'inc':
743
-            b += 1
743
+            b += .2
744 744
         else:
745
-            b -= 1    
745
+            b -= .2   
746 746
         cam['aoradius'] = round(b,2)        
747 747
         dict['aoradius'] = round(b,2)  
748 748
     if funct == 'ao only':

+ 2
- 2
shuvit.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:9a38a3c66688c3eacb95254792badf529b3590acaad52269bd3353d2c9dbdd36
3
-size 146559260
2
+oid sha256:ff5923aa8f167494468bdf96893432527540c35518ac61c31dbb184d50827304
3
+size 146086736

Loading…
Cancel
Save