Browse Source

grind ins

shuvit 4 years ago
parent
commit
cb5993fd7d

+ 2
- 2
assets/bld_kits/test1.blend View File

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

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

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

+ 2
- 2
assets/bld_kits/wall_a_window_dif.png View File

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

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

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

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

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

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

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

+ 2
- 2
assets/stores.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:3e769c3c4e72ff96dfb011b6a661fa1c48bcfd9345a8a0cb56b69f7be320f329
3
-size 14520344
2
+oid sha256:a2b543b1056b479098718aeab1c0c359db587421558d8abd5f5b58ccb27e1afe
3
+size 14603012

+ 2
- 2
assets/user2.blend View File

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

+ 2
- 2
assets/user7_working.blend View File

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

+ 2
- 2
characters/jose.blend View File

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

+ 4
- 4
config.ini View File

@@ -92,13 +92,13 @@ wheel4_b = 0.21
92 92
 
93 93
 #brightness / contrast
94 94
 bc = 1
95
-BC_BRIGHTNESS = 1.11
95
+BC_BRIGHTNESS = 0.92
96 96
 BC_CONTRAST = 1.13
97 97
 
98 98
 #HDR
99 99
 hdr = 1
100
-avgL = 0.81
101
-HDRamount = 0.25
100
+avgL = 0.95
101
+HDRamount = 0.05
102 102
 
103 103
 #Ambient Occlusion
104 104
 ao = 1
@@ -120,7 +120,7 @@ FXAA_SPAN_MAX = 8.0
120 120
 #sun settings
121 121
 #############
122 122
 sun_strength = 1.85
123
-ambient_strength = 0.37
123
+ambient_strength = 0.66
124 124
 sun_rot_x = -0.05
125 125
 sun_rot_y = -0.05
126 126
 shadow_on = 0

+ 4
- 3
scripts/actionPlayer.py View File

@@ -144,7 +144,8 @@ state_a = ['reg_idle',
144 144
 'reg_onboard', 
145 145
 'reg_offboard',
146 146
 'fak_onboard', 
147
-'fak_offboard']
147
+'fak_offboard',
148
+'reg_dropin']
148 149
 
149 150
 state_b = ['reg_jump',
150 151
 'reg_walk_air',
@@ -206,7 +207,7 @@ def actionPlayer(ac):
206 207
 	# 	print('zeroing blend')
207 208
 	skater.playAction(name, start,end, layer=layer, play_mode=mode, speed=speed, blendin=blendin)
208 209
 	deck.playAction(dname, dstart,dend, layer=layer, play_mode=mode, speed=speed, blendin=blendin)
209
-	print('playing', name, get_frame(ac))
210
+	#print('playing', name, get_frame(ac))
210 211
 	#if skater.isPlayingAction(3):
211 212
 		#print(skater.getActionFrame(3))
212 213
 
@@ -469,7 +470,7 @@ def main(cont):
469 470
 
470 471
 
471 472
 	#-----------------------
472
-	#print(own['aState'], newState, rA)
473
+	print(own['aState'], newState, rA)
473 474
 	#print()
474 475
 	if newState != '':
475 476
 		own['aState'] = newState 

+ 417
- 78
scripts/actionsFSMlist.py View File

@@ -13,7 +13,9 @@ reg_grindlist = ['reg_5050', 'reg_fsboard', 'reg_tailg', 'reg_tailgr', 'reg_tail
13 13
 
14 14
 fak_grindlist = ['fak_5050', 'fak_fsboard', 'fak_tailg', 'fak_tailgr', 'fak_tailgl', 'fak_noseg', 'fak_nosegr', 'fak_nosegl', 'fak_noseslide', 'fak_tailslide', 'fak_bsboard']
15 15
 
16
-walk_exits = ['reg_walk', 'reg_walkFast', 'reg_idle', 'reg_jump', 'reg_onboard', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_idle6', 'reg_idle7', 'reg_walk_air', 'reg_walk_air_out', 'reg_sit', 'reg_air', 'fak_walk', 'fak_walkFast', 'fak_idle', 'fak_jump', 'fak_onboard', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle6', 'fak_idle7', 'fak_walk_air', 'fak_walk_air_out', 'fak_sit', 'fak_air']
16
+walk_exits = ['reg_walk', 'reg_walkFast', 'reg_idle', 'reg_jump', 'reg_onboard', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_idle6', 'reg_idle7', 'reg_walk_air', 'reg_walk_air_out', 'reg_sit', 'reg_dropin', 'reg_air', 'fak_walk', 'fak_walkFast', 'fak_idle', 'fak_jump', 'fak_onboard', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle6', 'fak_idle7', 'fak_walk_air', 'fak_walk_air_out', 'fak_sit', 'fak_air']
17
+
18
+lands = ['fak_roll', 'fak_turnRight', 'fak_turnLeft', 'fak_push', 'fak_push_goof', 'fak_pump', 'fak_nopos', 'fak_opos', 'fak_offboard', 'fak_manual_left', 'fak_manual_right', 'fak_manual', 'fak_nmanual', 'fak_nmanual_left', 'fak_nmanual_right'] + ['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_push', 'reg_push_goof', 'reg_pump', 'reg_nopos', 'reg_opos', 'reg_offboard', 'reg_manual_left', 'reg_manual_right', 'reg_manual', 'reg_nmanual', 'reg_nmanual_left', 'reg_nmanual_right']
17 19
 
18 20
 class a_class:
19 21
 	def __init__(self, name, start, end, dname, dstart, dend, layer, speed, mode, blendin, intro, intro_frames, exits, fe, fef, opposite):
@@ -702,11 +704,11 @@ reg_land = a_class(
702 704
 	#deck action name, start, end frames  
703 705
 	'b_reg', 1, 40,
704 706
 	#layer, speed, mode (0 = play, 1 = loop), blendin
705
-	1, 1, 1, 10,
707
+	1, 1, 0, 10,
706 708
 	#intro, length
707 709
 	None, 0,
708 710
 	#exits
709
-	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_push', 'reg_push_goof', 'reg_pump', 'reg_nopos', 'reg_opos', 'reg_offboard', 'reg_manual_left', 'reg_manual_right', 'reg_manual', 'reg_nmanual', 'reg_nmanual_left', 'reg_nmanual_right'],
711
+	lands,
710 712
 	#force exit, frame
711 713
 	'reg_roll', 20,
712 714
 	#opposite
@@ -718,11 +720,11 @@ reg_landL = a_class(
718 720
 	#deck action name, start, end frames  
719 721
 	'b_reg', 1, 40,
720 722
 	#layer, speed, mode (0 = play, 1 = loop), blendin
721
-	1, 1, 1, 10,
723
+	1, 1, 0, 10,
722 724
 	#intro, length
723 725
 	None, 0,
724 726
 	#exits
725
-	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_push', 'reg_push_goof', 'reg_pump', 'reg_nopos', 'reg_opos', 'reg_offboard', 'reg_manual_left', 'reg_manual_right', 'reg_manual', 'reg_nmanual', 'reg_nmanual_left', 'reg_nmanual_right'],
727
+	lands,
726 728
 	#force exit, frame
727 729
 	'reg_roll', 20,
728 730
 	#opposite
@@ -734,11 +736,11 @@ reg_landR = a_class(
734 736
 	#deck action name, start, end frames  
735 737
 	'b_reg', 1, 40,
736 738
 	#layer, speed, mode (0 = play, 1 = loop), blendin
737
-	1, 1, 1, 10,
739
+	1, 1, 0, 10,
738 740
 	#intro, length
739 741
 	None, 0,
740 742
 	#exits
741
-	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_push', 'reg_push_goof', 'reg_pump', 'reg_nopos', 'reg_opos', 'reg_offboard', 'reg_manual_left', 'reg_manual_right', 'reg_manual', 'reg_nmanual', 'reg_nmanual_left', 'reg_nmanual_right'],
743
+	lands,
742 744
 	#force exit, frame
743 745
 	'reg_roll', 20,
744 746
 	#opposite
@@ -750,11 +752,11 @@ reg_landLb = a_class(
750 752
 	#deck action name, start, end frames  
751 753
 	'b_reg', 1, 40,
752 754
 	#layer, speed, mode (0 = play, 1 = loop), blendin
753
-	1, 1, 1, 10,
755
+	1, 1, 0, 10,
754 756
 	#intro, length
755 757
 	None, 0,
756 758
 	#exits
757
-	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_push', 'reg_push_goof', 'reg_pump', 'reg_nopos', 'reg_opos', 'reg_offboard', 'reg_manual_left', 'reg_manual_right', 'reg_manual', 'reg_nmanual', 'reg_nmanual_left', 'reg_nmanual_right'],
759
+	lands,
758 760
 	#force exit, frame
759 761
 	'reg_roll', 20,
760 762
 	#opposite
@@ -766,11 +768,11 @@ reg_landRb = a_class(
766 768
 	#deck action name, start, end frames  
767 769
 	'b_reg', 1, 40,
768 770
 	#layer, speed, mode (0 = play, 1 = loop), blendin
769
-	1, 1, 1, 10,
771
+	1, 1, 0, 10,
770 772
 	#intro, length
771 773
 	None, 0,
772 774
 	#exits
773
-	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_push', 'reg_push_goof', 'reg_pump', 'reg_nopos', 'reg_opos', 'reg_offboard', 'reg_manual_left', 'reg_manual_right', 'reg_manual', 'reg_nmanual', 'reg_nmanual_left', 'reg_nmanual_right'],
775
+	lands,
774 776
 	#force exit, frame
775 777
 	'reg_roll', 20,
776 778
 	#opposite
@@ -1720,38 +1722,54 @@ reg_5050 = a_class(
1720 1722
 	#opposite
1721 1723
 	'fak_5050')
1722 1724
 
1723
-reg_bsboard = a_class(
1725
+reg_bsboard_in = a_class(
1724 1726
 	#player armature action name, start, end frames
1725
-	'reg_BS_Board2', 1, 30,
1727
+	'reg_BS_Board2', 1, 40,
1726 1728
 	#deck action name, start, end frames  
1727
-	'b_reg', 1, 1,
1729
+	'b_reg', 1, 40,
1728 1730
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1729
-	1, .5, 1, 15,
1731
+	1, 1, 0, 10,
1730 1732
 	#intro, length
1731 1733
 	None, 0,
1732 1734
 	#exits
1733
-	['reg_air', 'reg_roll'] + reg_fliplist,
1735
+	['reg_bsboard'],
1734 1736
 	#force exit, frame
1735
-	None, 0,
1737
+	'reg_bsboard', 39,
1736 1738
 	#opposite
1737
-	None)
1739
+	'fak_bsboard')
1738 1740
 
1739
-reg_fsboard = a_class(
1741
+reg_bsboard = a_class(
1740 1742
 	#player armature action name, start, end frames
1741
-	'reg_FS_Board2', 1, 30,
1743
+	'reg_BS_Board2', 41, 80,
1742 1744
 	#deck action name, start, end frames  
1743 1745
 	'b_reg', 1, 1,
1744 1746
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1745 1747
 	1, .5, 1, 15,
1746 1748
 	#intro, length
1747
-	None, 0,
1749
+	'reg_bsboard_in', 40,
1748 1750
 	#exits
1749
-	['reg_air', 'reg_roll'],
1751
+	['reg_air', 'reg_roll'] + reg_fliplist,
1750 1752
 	#force exit, frame
1751 1753
 	None, 0,
1752 1754
 	#opposite
1753 1755
 	None)
1754 1756
 
1757
+# reg_fsboard = a_class(
1758
+# 	#player armature action name, start, end frames
1759
+# 	'reg_FS_Board2', 1, 30,
1760
+# 	#deck action name, start, end frames  
1761
+# 	'b_reg', 1, 1,
1762
+# 	#layer, speed, mode (0 = play, 1 = loop), blendin
1763
+# 	1, .5, 1, 15,
1764
+# 	#intro, length
1765
+# 	None, 0,
1766
+# 	#exits
1767
+# 	['reg_air', 'reg_roll'],
1768
+# 	#force exit, frame
1769
+# 	None, 0,
1770
+# 	#opposite
1771
+# 	None)
1772
+
1755 1773
 reg_noseg_in = a_class(
1756 1774
 	#player armature action name, start, end frames
1757 1775
 	'reg_noseg.002', 1, 40,
@@ -1784,15 +1802,32 @@ reg_noseg = a_class(
1784 1802
 	#opposite
1785 1803
 	None)
1786 1804
 
1805
+reg_nosegr_in = a_class(
1806
+	#player armature action name, start, end frames
1807
+	'reg_nosegR', 1, 40,
1808
+	#deck action name, start, end frames  
1809
+	'b_reg_nosegR', 1, 40,
1810
+	#layer, speed, mode (0 = play, 1 = loop), blendin
1811
+	1, 1, 0, 10,
1812
+	#intro, length
1813
+	None, 0,
1814
+	#exits
1815
+	['reg_nosegr'],
1816
+	#force exit, frame
1817
+	'reg_nosegr', 39,
1818
+	#opposite
1819
+	'fak_nosegl')
1820
+
1821
+
1787 1822
 reg_nosegr = a_class(
1788 1823
 	#player armature action name, start, end frames
1789
-	'reg_nosegR', 30, 1,
1824
+	'reg_nosegR', 41, 80,
1790 1825
 	#deck action name, start, end frames  
1791
-	'b_reg_nosegR', 1, 1,
1826
+	'b_reg_nosegR', 41, 80,
1792 1827
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1793 1828
 	1, .5, 1, 15,
1794 1829
 	#intro, length
1795
-	None, 0,
1830
+	'reg_nosegr_in', 40,
1796 1831
 	#exits
1797 1832
 	['reg_air', 'reg_roll'],
1798 1833
 	#force exit, frame
@@ -1800,15 +1835,31 @@ reg_nosegr = a_class(
1800 1835
 	#opposite
1801 1836
 	None)
1802 1837
 
1838
+reg_nosegl_in = a_class(
1839
+	#player armature action name, start, end frames
1840
+	'reg_nosegL', 1, 40,
1841
+	#deck action name, start, end frames  
1842
+	'b_reg_nosegL', 1, 40,
1843
+	#layer, speed, mode (0 = play, 1 = loop), blendin
1844
+	1, 1, 0, 10,
1845
+	#intro, length
1846
+	None, 0,
1847
+	#exits
1848
+	['reg_nosegl'],
1849
+	#force exit, frame
1850
+	'reg_nosegl', 39,
1851
+	#opposite
1852
+	'fak_nosegr')
1853
+
1803 1854
 reg_nosegl = a_class(
1804 1855
 	#player armature action name, start, end frames
1805
-	'reg_nosegL', 30, 1,
1856
+	'reg_nosegL', 41, 80,
1806 1857
 	#deck action name, start, end frames  
1807
-	'b_reg_nosegL', 1, 1,
1858
+	'b_reg_nosegL', 41, 80,
1808 1859
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1809 1860
 	1, .5, 1, 15,
1810 1861
 	#intro, length
1811
-	None, 0,
1862
+	'reg_nosegl_in', 40,
1812 1863
 	#exits
1813 1864
 	['reg_air', 'reg_roll'],
1814 1865
 	#force exit, frame
@@ -1848,15 +1899,31 @@ reg_tailg = a_class(
1848 1899
 	#opposite
1849 1900
 	None)
1850 1901
 
1902
+reg_tailgr_in = a_class(
1903
+	#player armature action name, start, end frames
1904
+	'reg_tailgR', 1, 40,
1905
+	#deck action name, start, end frames  
1906
+	'b_reg_tailgR', 1, 40,
1907
+	#layer, speed, mode (0 = play, 1 = loop), blendin
1908
+	1, 1, 0, 10,
1909
+	#intro, length
1910
+	None, 0,
1911
+	#exits
1912
+	['reg_tailgr'],
1913
+	#force exit, frame
1914
+	'reg_tailgr', 39,
1915
+	#opposite
1916
+	'fak_nosegl')
1917
+
1851 1918
 reg_tailgr = a_class(
1852 1919
 	#player armature action name, start, end frames
1853
-	'reg_tailgR', 30, 1,
1920
+	'reg_tailgR', 41, 80,
1854 1921
 	#deck action name, start, end frames  
1855
-	'b_reg_tailgR', 1, 1,
1922
+	'b_reg_tailgR', 41, 80,
1856 1923
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1857 1924
 	1, .5, 1, 15,
1858 1925
 	#intro, length
1859
-	None, 0,
1926
+	'reg_tailgr_in', 40,
1860 1927
 	#exits
1861 1928
 	['reg_air', 'reg_roll'],
1862 1929
 	#force exit, frame
@@ -1864,15 +1931,32 @@ reg_tailgr = a_class(
1864 1931
 	#opposite
1865 1932
 	None)
1866 1933
 
1934
+
1935
+reg_tailgl_in = a_class(
1936
+	#player armature action name, start, end frames
1937
+	'reg_tailgL', 1, 40,
1938
+	#deck action name, start, end frames  
1939
+	'b_reg_tailgL', 1, 40,
1940
+	#layer, speed, mode (0 = play, 1 = loop), blendin
1941
+	1, 1, 0, 10,
1942
+	#intro, length
1943
+	None, 0,
1944
+	#exits
1945
+	['reg_tailgl'],
1946
+	#force exit, frame
1947
+	'reg_tailgl', 39,
1948
+	#opposite
1949
+	'fak_nosegl')
1950
+
1867 1951
 reg_tailgl = a_class(
1868 1952
 	#player armature action name, start, end frames
1869
-	'reg_tailgL', 30, 1,
1953
+	'reg_tailgL', 41, 80,
1870 1954
 	#deck action name, start, end frames  
1871
-	'b_reg_tailgL', 1, 1,
1955
+	'b_reg_tailgL', 41, 80,
1872 1956
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1873 1957
 	1, .5, 1, 15,
1874 1958
 	#intro, length
1875
-	None, 0,
1959
+	'reg_tailgl_in', 40,
1876 1960
 	#exits
1877 1961
 	['reg_air', 'reg_roll'],
1878 1962
 	#force exit, frame
@@ -1880,15 +1964,31 @@ reg_tailgl = a_class(
1880 1964
 	#opposite
1881 1965
 	None)
1882 1966
 
1967
+reg_tailslide_in = a_class(
1968
+	#player armature action name, start, end frames
1969
+	'fak_noses', 1, 40,
1970
+	#deck action name, start, end frames  
1971
+	'b_fak_noses', 1, 40,
1972
+	#layer, speed, mode (0 = play, 1 = loop), blendin
1973
+	1, 1, 0, 10,
1974
+	#intro, length
1975
+	None, 0,
1976
+	#exits
1977
+	['reg_tailslide'],
1978
+	#force exit, frame
1979
+	'reg_tailslide', 39,
1980
+	#opposite
1981
+	'fak_noseslide')
1982
+
1883 1983
 reg_tailslide = a_class(
1884 1984
 	#player armature action name, start, end frames
1885
-	'fak_noses', 30, 1,
1985
+	'fak_noses', 41, 80,
1886 1986
 	#deck action name, start, end frames  
1887 1987
 	'b_fak_noses', 1, 30,
1888 1988
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1889 1989
 	1, .5, 1, 15,
1890 1990
 	#intro, length
1891
-	None, 0,
1991
+	'reg_tailslide_in', 40,
1892 1992
 	#exits
1893 1993
 	['reg_air', 'reg_roll'],
1894 1994
 	#force exit, frame
@@ -1896,15 +1996,31 @@ reg_tailslide = a_class(
1896 1996
 	#opposite
1897 1997
 	None)
1898 1998
 
1999
+reg_noseslide_in = a_class(
2000
+	#player armature action name, start, end frames
2001
+	'fak_tails', 1, 40,
2002
+	#deck action name, start, end frames  
2003
+	'b_fak_tails', 1, 40,
2004
+	#layer, speed, mode (0 = play, 1 = loop), blendin
2005
+	1, 1, 0, 10,
2006
+	#intro, length
2007
+	None, 0,
2008
+	#exits
2009
+	['reg_noseslide'],
2010
+	#force exit, frame
2011
+	'reg_noseslide', 39,
2012
+	#opposite
2013
+	'fak_tailslide')
2014
+
1899 2015
 reg_noseslide = a_class(
1900 2016
 	#player armature action name, start, end frames
1901
-	'fak_tails', 30,           1,
2017
+	'fak_tails', 41, 80,
1902 2018
 	#deck action name, start, end frames  
1903 2019
 	'b_fak_tails', 1, 1,
1904 2020
 	#layer, speed, mode (0 = play, 1 = loop), blendin
1905 2021
 	1, .5, 1, 15,
1906 2022
 	#intro, length
1907
-	None, 0,
2023
+	'reg_noseslide_in', 40,
1908 2024
 	#exits
1909 2025
 	['reg_air', 'reg_roll'],
1910 2026
 	#force exit, frame
@@ -2015,6 +2131,53 @@ revert4 = a_class(
2015 2131
 
2016 2132
 
2017 2133
 
2134
+reg_ollie_north_in = a_class(
2135
+	#player armature action name, start, end frames
2136
+	'reg_ollie_north', 1, 10,
2137
+	#deck action name, start, end frames  
2138
+	'b_reg', 1, 1,
2139
+	#layer, speed, mode (0 = play, 1 = loop), blendin
2140
+	1, 1, 0, 5,
2141
+	#intro, length
2142
+	None, 0,
2143
+	#exits
2144
+	['reg_ollie_north'],
2145
+	#force exit, frame
2146
+	'reg_ollie_north', 20,
2147
+	#opposite
2148
+	None)
2149
+
2150
+reg_dropin_in = a_class(
2151
+	#player armature action name, start, end frames
2152
+	'reg_dropin3', 30, 50,
2153
+	#deck action name, start, end frames  
2154
+	'b_reg_dropin', 30, 50,
2155
+	#layer, speed, mode (0 = play, 1 = loop), blendin
2156
+	1, 1, 0, 15,
2157
+	#intro, length
2158
+	None, 0,
2159
+	#exits
2160
+	['reg_air'],
2161
+	#force exit, frame
2162
+	None, 0,
2163
+	#opposite
2164
+	None)
2165
+
2166
+reg_dropin = a_class(
2167
+	#player armature action name, start, end frames
2168
+	'reg_dropin3', 50, 60,
2169
+	#deck action name, start, end frames  
2170
+	'b_reg_dropin', 50, 60,
2171
+	#layer, speed, mode (0 = play, 1 = loop), blendin
2172
+	1, 1, 0, 15,
2173
+	#intro, length
2174
+	'reg_dropin_in', 20,
2175
+	#exits
2176
+	['reg_air'],
2177
+	#force exit, frame
2178
+	None, 0,
2179
+	#opposite
2180
+	None)
2018 2181
 
2019 2182
 
2020 2183
 
@@ -2746,11 +2909,11 @@ fak_land = a_class(
2746 2909
 	#deck action name, start, end frames  
2747 2910
 	'b_reg', 1, 40,
2748 2911
 	#layer, speed, mode (0 = play, 1 = loop), blendin
2749
-	1, 1, 1, 10,
2912
+	1, 1, 0, 10,
2750 2913
 	#intro, length
2751 2914
 	None, 0,
2752 2915
 	#exits
2753
-	['fak_roll', 'fak_turnRight', 'fak_turnLeft', 'fak_push', 'fak_push_goof', 'fak_pump', 'fak_nopos', 'fak_opos', 'fak_offboard'],
2916
+	lands,
2754 2917
 	#force exit, frame
2755 2918
 	'fak_roll', 20,
2756 2919
 	#opposite
@@ -2762,11 +2925,11 @@ fak_landL = a_class(
2762 2925
 	#deck action name, start, end frames  
2763 2926
 	'b_reg', 1, 40,
2764 2927
 	#layer, speed, mode (0 = play, 1 = loop), blendin
2765
-	1, 1, 1, 10,
2928
+	1, 1, 0, 10,
2766 2929
 	#intro, length
2767 2930
 	None, 0,
2768 2931
 	#exits
2769
-	['fak_roll', 'fak_turnRight', 'fak_turnLeft', 'fak_push', 'fak_push_goof', 'fak_pump', 'fak_nopos', 'fak_opos', 'fak_offboard'],
2932
+	lands,
2770 2933
 	#force exit, frame
2771 2934
 	'fak_roll', 20,
2772 2935
 	#opposite
@@ -2778,11 +2941,11 @@ fak_landR = a_class(
2778 2941
 	#deck action name, start, end frames  
2779 2942
 	'b_reg', 1, 40,
2780 2943
 	#layer, speed, mode (0 = play, 1 = loop), blendin
2781
-	1, 1, 1, 10,
2944
+	1, 1, 0, 10,
2782 2945
 	#intro, length
2783 2946
 	None, 0,
2784 2947
 	#exits
2785
-	['fak_roll', 'fak_turnRight', 'fak_turnLeft', 'fak_push', 'fak_push_goof', 'fak_pump', 'fak_nopos', 'fak_opos', 'fak_offboard'],
2948
+	lands,
2786 2949
 	#force exit, frame
2787 2950
 	'fak_roll', 20,
2788 2951
 	#opposite
@@ -2798,7 +2961,7 @@ fak_landLb = a_class(
2798 2961
 	#intro, length
2799 2962
 	None, 0,
2800 2963
 	#exits
2801
-	['fak_roll', 'fak_turnRight', 'fak_turnLeft', 'fak_push', 'fak_push_goof', 'fak_pump', 'fak_nopos', 'fak_opos', 'fak_offboard'],
2964
+	lands,
2802 2965
 	#force exit, frame
2803 2966
 	'fak_roll', 20,
2804 2967
 	#opposite
@@ -2810,11 +2973,11 @@ fak_landRb = a_class(
2810 2973
 	#deck action name, start, end frames  
2811 2974
 	'b_reg', 1, 40,
2812 2975
 	#layer, speed, mode (0 = play, 1 = loop), blendin
2813
-	1, 1, 1, 10,
2976
+	1, 1, 0, 10,
2814 2977
 	#intro, length
2815 2978
 	None, 0,
2816 2979
 	#exits
2817
-	['fak_roll', 'fak_turnRight', 'fak_turnLeft', 'fak_push', 'fak_push_goof', 'fak_pump', 'fak_nopos', 'fak_opos', 'fak_offboard'],
2980
+	lands,
2818 2981
 	#force exit, frame
2819 2982
 	'fak_roll', 20,
2820 2983
 	#opposite
@@ -3607,16 +3770,31 @@ fak_ollie_south = a_class(
3607 3770
 
3608 3771
 
3609 3772
 
3773
+fak_5050_in = a_class(
3774
+	#player armature action name, start, end frames
3775
+	'fak_5050', 1, 40,
3776
+	#deck action name, start, end frames  
3777
+	'b_reg', 1, 40,
3778
+	#layer, speed, mode (0 = play, 1 = loop), blendin
3779
+	1, 1, 0, 10,
3780
+	#intro, length
3781
+	None, 0,
3782
+	#exits
3783
+	['fak_5050'],
3784
+	#force exit, frame
3785
+	'fak_5050', 39,
3786
+	#opposite
3787
+	'fak_5050')
3610 3788
 
3611 3789
 fak_5050 = a_class(
3612 3790
 	#player armature action name, start, end frames
3613
-	'fak_5050', 1, 30,
3791
+	'fak_5050', 41, 80,
3614 3792
 	#deck action name, start, end frames  
3615 3793
 	'b_reg', 1, 1,
3616 3794
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3617
-	1, .5, 1, 10,
3795
+	1, .5, 1, 15,
3618 3796
 	#intro, length
3619
-	None, 0,
3797
+	'fak_5050_in', 40,
3620 3798
 	#exits
3621 3799
 	['fak_air', 'fak_roll'],
3622 3800
 	#force exit, frame
@@ -3624,15 +3802,32 @@ fak_5050 = a_class(
3624 3802
 	#opposite
3625 3803
 	'reg_5050')
3626 3804
 
3805
+
3806
+fak_bsboard_in = a_class(
3807
+	#player armature action name, start, end frames
3808
+	'fak_BS_Board2', 1, 40,
3809
+	#deck action name, start, end frames  
3810
+	'b_reg', 1, 40,
3811
+	#layer, speed, mode (0 = play, 1 = loop), blendin
3812
+	1, 1, 0, 10,
3813
+	#intro, length
3814
+	None, 0,
3815
+	#exits
3816
+	['fak_bsboard'],
3817
+	#force exit, frame
3818
+	'fak_bsboard', 39,
3819
+	#opposite
3820
+	'fak_bsboard')
3821
+
3627 3822
 fak_bsboard = a_class(
3628 3823
 	#player armature action name, start, end frames
3629
-	'fak_BS_Board2', 1, 30,
3824
+	'fak_BS_Board2', 41, 80,
3630 3825
 	#deck action name, start, end frames  
3631 3826
 	'b_reg', 1, 1,
3632 3827
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3633 3828
 	1, .5, 1, 15,
3634 3829
 	#intro, length
3635
-	None, 0,
3830
+	'fak_bsboard_in', 40,
3636 3831
 	#exits
3637 3832
 	['fak_air', 'fak_roll'],
3638 3833
 	#force exit, frame
@@ -3640,15 +3835,31 @@ fak_bsboard = a_class(
3640 3835
 	#opposite
3641 3836
 	None)
3642 3837
 
3838
+fak_fsboard_in = a_class(
3839
+	#player armature action name, start, end frames
3840
+	'fak_FS_Board2', 1, 40,
3841
+	#deck action name, start, end frames  
3842
+	'b_reg', 1, 40,
3843
+	#layer, speed, mode (0 = play, 1 = loop), blendin
3844
+	1, 1, 0, 10,
3845
+	#intro, length
3846
+	None, 0,
3847
+	#exits
3848
+	['fak_fsboard'],
3849
+	#force exit, frame
3850
+	'fak_fsboard', 39,
3851
+	#opposite
3852
+	'fak_fsboard')
3853
+
3643 3854
 fak_fsboard = a_class(
3644 3855
 	#player armature action name, start, end frames
3645
-	'fak_FS_Board2', 1, 30,
3856
+	'fak_FS_Board2', 41, 80,
3646 3857
 	#deck action name, start, end frames  
3647 3858
 	'b_reg', 1, 1,
3648 3859
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3649 3860
 	1, .5, 1, 15,
3650 3861
 	#intro, length
3651
-	None, 0,
3862
+	'fak_fsboard_in', 40,
3652 3863
 	#exits
3653 3864
 	['fak_air', 'fak_roll'],
3654 3865
 	#force exit, frame
@@ -3656,15 +3867,31 @@ fak_fsboard = a_class(
3656 3867
 	#opposite
3657 3868
 	None)
3658 3869
 
3870
+fak_noseg_in = a_class(
3871
+	#player armature action name, start, end frames
3872
+	'fak_noseg', 1, 40,
3873
+	#deck action name, start, end frames  
3874
+	'b_fak_noseg', 1, 40,
3875
+	#layer, speed, mode (0 = play, 1 = loop), blendin
3876
+	1, 1, 0, 10,
3877
+	#intro, length
3878
+	None, 0,
3879
+	#exits
3880
+	['fak_noseg'],
3881
+	#force exit, frame
3882
+	'fak_noseg', 39,
3883
+	#opposite
3884
+	'fak_noseg')
3885
+
3659 3886
 fak_noseg = a_class(
3660 3887
 	#player armature action name, start, end frames
3661
-	'fak_noseg', 1, 30,
3888
+	'fak_noseg', 41, 80,
3662 3889
 	#deck action name, start, end frames  
3663
-	'b_fak_noseg', 10, 10,
3890
+	'b_fak_noseg', 41, 80,
3664 3891
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3665 3892
 	1, .5, 1, 15,
3666 3893
 	#intro, length
3667
-	None, 0,
3894
+	'fak_noseg_in', 40,
3668 3895
 	#exits
3669 3896
 	['fak_air', 'fak_roll'],
3670 3897
 	#force exit, frame
@@ -3672,15 +3899,31 @@ fak_noseg = a_class(
3672 3899
 	#opposite
3673 3900
 	None)
3674 3901
 
3902
+fak_nosegr_in = a_class(
3903
+	#player armature action name, start, end frames
3904
+	'fak_nosegR', 1, 40,
3905
+	#deck action name, start, end frames  
3906
+	'b_fak_nosegR', 1, 40,
3907
+	#layer, speed, mode (0 = play, 1 = loop), blendin
3908
+	1, 1, 0, 10,
3909
+	#intro, length
3910
+	None, 0,
3911
+	#exits
3912
+	['fak_nosegr'],
3913
+	#force exit, frame
3914
+	'fak_nosegr', 39,
3915
+	#opposite
3916
+	'fak_nosegr')
3917
+
3675 3918
 fak_nosegr = a_class(
3676 3919
 	#player armature action name, start, end frames
3677
-	'fak_nosegR', 30, 1,
3920
+	'fak_nosegR', 41, 80,
3678 3921
 	#deck action name, start, end frames  
3679
-	'b_fak_nosegR', 1, 1,
3922
+	'b_fak_nosegR', 41, 80,
3680 3923
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3681 3924
 	1, .5, 1, 15,
3682 3925
 	#intro, length
3683
-	None, 0,
3926
+	'fak_nosegr', 40,
3684 3927
 	#exits
3685 3928
 	['fak_air', 'fak_roll'],
3686 3929
 	#force exit, frame
@@ -3688,15 +3931,31 @@ fak_nosegr = a_class(
3688 3931
 	#opposite
3689 3932
 	None)
3690 3933
 
3934
+fak_nosegl_in = a_class(
3935
+	#player armature action name, start, end frames
3936
+	'fak_nosegL', 1, 40,
3937
+	#deck action name, start, end frames  
3938
+	'b_fak_nosegL', 1, 40,
3939
+	#layer, speed, mode (0 = play, 1 = loop), blendin
3940
+	1, 1, 0, 10,
3941
+	#intro, length
3942
+	None, 0,
3943
+	#exits
3944
+	['fak_nosegl'],
3945
+	#force exit, frame
3946
+	'fak_nosegl', 39,
3947
+	#opposite
3948
+	'fak_nosegl')
3949
+
3691 3950
 fak_nosegl = a_class(
3692 3951
 	#player armature action name, start, end frames
3693
-	'fak_nosegL', 30, 1,
3952
+	'fak_nosegL', 41, 80,
3694 3953
 	#deck action name, start, end frames  
3695
-	'b_fak_nosegL', 1, 1,
3954
+	'b_fak_nosegL', 41, 80,
3696 3955
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3697 3956
 	1, .5, 1, 15,
3698 3957
 	#intro, length
3699
-	None, 0,
3958
+	'fak_nosegl', 40,
3700 3959
 	#exits
3701 3960
 	['fak_air', 'fak_roll'],
3702 3961
 	#force exit, frame
@@ -3704,15 +3963,31 @@ fak_nosegl = a_class(
3704 3963
 	#opposite
3705 3964
 	None)
3706 3965
 
3966
+fak_tailg_in = a_class(
3967
+	#player armature action name, start, end frames
3968
+	'fak_tailg', 1, 40,
3969
+	#deck action name, start, end frames  
3970
+	'b_fak_tailg', 1, 40,
3971
+	#layer, speed, mode (0 = play, 1 = loop), blendin
3972
+	1, 1, 0, 10,
3973
+	#intro, length
3974
+	None, 0,
3975
+	#exits
3976
+	['fak_tailg'],
3977
+	#force exit, frame
3978
+	'fak_tailg', 39,
3979
+	#opposite
3980
+	'fak_tailg')
3981
+
3707 3982
 fak_tailg = a_class(
3708 3983
 	#player armature action name, start, end frames
3709
-	'fak_tailg', 30, 1,
3984
+	'fak_tailg', 41, 80,
3710 3985
 	#deck action name, start, end frames  
3711
-	'b_fak_tailg', 1, 1,
3986
+	'b_fak_tailg', 41, 80,
3712 3987
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3713 3988
 	1, .5, 1, 15,
3714 3989
 	#intro, length
3715
-	None, 0,
3990
+	'fak_tailg_in', 40,
3716 3991
 	#exits
3717 3992
 	['fak_air', 'fak_roll'],
3718 3993
 	#force exit, frame
@@ -3720,15 +3995,31 @@ fak_tailg = a_class(
3720 3995
 	#opposite
3721 3996
 	None)
3722 3997
 
3998
+fak_tailgr_in = a_class(
3999
+	#player armature action name, start, end frames
4000
+	'fak_tailgR', 1, 40,
4001
+	#deck action name, start, end frames  
4002
+	'b_fak_tailgR', 1, 40,
4003
+	#layer, speed, mode (0 = play, 1 = loop), blendin
4004
+	1, 1, 0, 10,
4005
+	#intro, length
4006
+	None, 0,
4007
+	#exits
4008
+	['fak_tailgr'],
4009
+	#force exit, frame
4010
+	'fak_tailgr', 39,
4011
+	#opposite
4012
+	'fak_tailgr')
4013
+
3723 4014
 fak_tailgr = a_class(
3724 4015
 	#player armature action name, start, end frames
3725
-	'fak_tailgR', 30, 1,
4016
+	'fak_tailgR', 41, 80,
3726 4017
 	#deck action name, start, end frames  
3727
-	'b_fak_tailgR', 1, 1,
4018
+	'b_fak_tailgR', 41, 80,
3728 4019
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3729 4020
 	1, .5, 1, 15,
3730 4021
 	#intro, length
3731
-	None, 0,
4022
+	'fak_tailgr_in', 40,
3732 4023
 	#exits
3733 4024
 	['fak_air', 'fak_roll'],
3734 4025
 	#force exit, frame
@@ -3736,15 +4027,31 @@ fak_tailgr = a_class(
3736 4027
 	#opposite
3737 4028
 	None)
3738 4029
 
4030
+fak_tailgl_in = a_class(
4031
+	#player armature action name, start, end frames
4032
+	'fak_tailgL', 1, 40,
4033
+	#deck action name, start, end frames  
4034
+	'b_fak_tailgL', 1, 40,
4035
+	#layer, speed, mode (0 = play, 1 = loop), blendin
4036
+	1, 1, 0, 10,
4037
+	#intro, length
4038
+	None, 0,
4039
+	#exits
4040
+	['fak_tailgl'],
4041
+	#force exit, frame
4042
+	'fak_tailgl', 39,
4043
+	#opposite
4044
+	'fak_tailgl')
4045
+
3739 4046
 fak_tailgl = a_class(
3740 4047
 	#player armature action name, start, end frames
3741
-	'fak_tailgL', 30, 1,
4048
+	'fak_tailgL', 41, 80,
3742 4049
 	#deck action name, start, end frames  
3743
-	'b_fak_tailgL', 1, 1,
4050
+	'b_fak_tailgL', 41, 80,
3744 4051
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3745 4052
 	1, .5, 1, 15,
3746 4053
 	#intro, length
3747
-	None, 0,
4054
+	'fak_tailgl_in', 40,
3748 4055
 	#exits
3749 4056
 	['fak_air', 'fak_roll'],
3750 4057
 	#force exit, frame
@@ -3752,15 +4059,31 @@ fak_tailgl = a_class(
3752 4059
 	#opposite
3753 4060
 	None)
3754 4061
 
4062
+fak_tailslide_in = a_class(
4063
+	#player armature action name, start, end frames
4064
+	'reg_noses', 1, 40,
4065
+	#deck action name, start, end frames  
4066
+	'b_reg_noses', 1, 40,
4067
+	#layer, speed, mode (0 = play, 1 = loop), blendin
4068
+	1, 1, 0, 10,
4069
+	#intro, length
4070
+	None, 0,
4071
+	#exits
4072
+	['fak_tailslide'],
4073
+	#force exit, frame
4074
+	'fak_tailslide', 39,
4075
+	#opposite
4076
+	'fak_tailslide')
4077
+
3755 4078
 fak_tailslide = a_class(
3756 4079
 	#player armature action name, start, end frames
3757
-	'reg_noses', 30, 1,
4080
+	'reg_noses', 41, 80,
3758 4081
 	#deck action name, start, end frames  
3759
-	'b_reg_noses', 1, 1,
4082
+	'b_reg_noses', 41, 80,
3760 4083
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3761 4084
 	1, .5, 1, 15,
3762 4085
 	#intro, length
3763
-	None, 0,
4086
+	'fak_tailslide_in', 40,
3764 4087
 	#exits
3765 4088
 	['fak_air', 'fak_roll'],
3766 4089
 	#force exit, frame
@@ -3768,15 +4091,31 @@ fak_tailslide = a_class(
3768 4091
 	#opposite
3769 4092
 	None)
3770 4093
 
4094
+fak_noseslide_in = a_class(
4095
+	#player armature action name, start, end frames
4096
+	'reg_tails', 1, 40,
4097
+	#deck action name, start, end frames  
4098
+	'b_reg_tails', 1, 40,
4099
+	#layer, speed, mode (0 = play, 1 = loop), blendin
4100
+	1, 1, 0, 10,
4101
+	#intro, length
4102
+	None, 0,
4103
+	#exits
4104
+	['fak_noseslide'],
4105
+	#force exit, frame
4106
+	'fak_noseslide', 39,
4107
+	#opposite
4108
+	'fak_noseslide')
4109
+
3771 4110
 fak_noseslide = a_class(
3772 4111
 	#player armature action name, start, end frames
3773
-	'reg_tails', 30,           1,
4112
+	'reg_tails', 41, 80,
3774 4113
 	#deck action name, start, end frames  
3775
-	'b_reg_tails', 1, 1,
4114
+	'b_reg_tails', 41, 80,
3776 4115
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3777 4116
 	1, .5, 1, 15,
3778 4117
 	#intro, length
3779
-	None, 0,
4118
+	'fak_noseslide_in', 40,
3780 4119
 	#exits
3781 4120
 	['fak_air', 'fak_roll'],
3782 4121
 	#force exit, frame

+ 2
- 2
scripts/camera.py View File

@@ -358,9 +358,9 @@ def main(cont):
358 358
     sound_man.main(cont)
359 359
     
360 360
     if own['life'] % 2 == 1:
361
-        cars.Execute(cont)
361
+        #cars.Execute(cont)
362 362
         own['CamFSM'].Execute()
363
-        walkers.Execute(cont)
363
+        #walkers.Execute(cont)
364 364
 
365 365
     else:
366 366
         pass

+ 13
- 5
scripts/controller2.py View File

@@ -2479,17 +2479,25 @@ def main():
2479 2479
             own["coping"] = 0
2480 2480
 
2481 2481
     def onboard():
2482
-        if own['walk'] == 1 and own['lasty'] == False and own['requestAction'] not in ['reg_dropin', 'fak_dropin']:
2482
+        #if own['walk'] == 1 and own['lasty'] == False and own['requestAction'] not in ['reg_dropin', 'fak_dropin']:
2483
+        if own['walk'] == 1 and own['lasty'] == False:    
2483 2484
             cont.deactivate(cam.actuators['replayCam'])
2484 2485
             cont.activate(cam.actuators['Camera'])
2485
-            killall()
2486
-            walklay = 40
2486
+            #killall()
2487
+            #walklay = 40
2487 2488
             ob_speed = .5
2488 2489
             if STANCE == 0:
2489
-                killall()
2490
-                if own['dropinCol'] == True:
2490
+                #killall()
2491
+                #print('dropincol', own['dropinCol'].positive)
2492
+                #if own['dropinCol'].positive == True:
2493
+                if own['dropinTimer'] > 0:    
2491 2494
                     own['requestAction'] = 'reg_dropin'
2492 2495
                     own['dropinTimer'] = 60
2496
+
2497
+                    force = (linVelocity.x -1, linVelocity.y, linVelocity.z)
2498
+                    own.setLinearVelocity(force, True)
2499
+                    
2500
+                    print('dropping in ')
2493 2501
                 else:
2494 2502
                     own['requestAction'] = 'reg_onboard'
2495 2503
                     force = (linVelocity.x -1, linVelocity.y, linVelocity.z)

+ 2
- 2
scripts/walk.py View File

@@ -491,11 +491,11 @@ def main(cont):
491 491
                 #         pass 
492 492
                 print('dropin')
493 493
                 if STANCE == 0: 
494
-                    own['requestAction'] ='reg_dropin_pos' 
494
+                    own['requestAction'] ='reg_dropin' 
495 495
                     own['dropinTimer'] = 60                                     
496 496
                         
497 497
                 if STANCE == 1: 
498
-                    own['requestAction'] ='fak_dropin_pos'  
498
+                    own['requestAction'] ='fak_dropin'  
499 499
                     own['dropinTimer'] = 60                                 
500 500
                                          
501 501
         if getonboard == 1:

+ 2
- 2
shuvit.blend View File

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

Loading…
Cancel
Save