Browse Source

removing old deck

shuvit 2 months ago
parent
commit
20c1accf64

+ 2
- 2
assets/user2.blend View File

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

+ 2
- 2
characters/annie.blend View File

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

+ 6
- 6
characters/annie.ini View File

@@ -4,13 +4,13 @@
4 4
 
5 5
 shirt_logo = 2
6 6
 
7
-shirt_color_r = 0.44
8
-shirt_color_g = 0.44
9
-shirt_color_b = 0.44
7
+shirt_color_r = 0.69
8
+shirt_color_g = 0.05
9
+shirt_color_b = 0.18
10 10
 
11
-shoe_color_r = 0.08
12
-shoe_color_g = 0.03
13
-shoe_color_b = 0
11
+shoe_color_r = 0.73
12
+shoe_color_g = 0.73
13
+shoe_color_b = 0.73
14 14
 #-----------------
15 15
 
16 16
 #deck settings

+ 6
- 6
config.ini View File

@@ -53,13 +53,13 @@ character = annie
53 53
 
54 54
 shirt_logo = 2
55 55
 
56
-shirt_color_r = 0.44
57
-shirt_color_g = 0.44
58
-shirt_color_b = 0.44
56
+shirt_color_r = 0.69
57
+shirt_color_g = 0.05
58
+shirt_color_b = 0.18
59 59
 
60
-shoe_color_r = 0.08
61
-shoe_color_g = 0.03
62
-shoe_color_b = 0
60
+shoe_color_r = 0.73
61
+shoe_color_g = 0.73
62
+shoe_color_b = 0.73
63 63
 #-----------------
64 64
 
65 65
 #deck settings

+ 2
- 2
scripts/Manager.py View File

@@ -50,8 +50,8 @@ def main():
50 50
         freecam = camList["freecam"]
51 51
         skater = scene.objects["Char4"]
52 52
         cube = scene.objects["control_cube.002"]
53
-        deck = scene.objects["deck"]
54
-        trucks = scene.objects["trucks"]
53
+        deck = scene.objects["b_deck"]
54
+        trucks = scene.objects["b_trucks"]
55 55
         replay_cam_axis = own['replay_cam_axis']
56 56
         cam = own.actuators['Camera']
57 57
         #----

+ 42
- 42
scripts/Record.py View File

@@ -16,14 +16,14 @@ path = logic.expandPath(own["filePath"])
16 16
 PAF = 0
17 17
 DAF = 0
18 18
 
19
-deck = scene.objects["deck"]
20
-trucks = scene.objects["trucks"]
19
+deck = scene.objects["b_deck"]
20
+trucks = scene.objects["b_trucks"]
21 21
 
22 22
 throw_deck_empty = scene.objects["throw_deck_empty"]
23
-wheel1 = scene.objects["rollen.000"]
24
-wheel2 = scene.objects["rollen.001"]
25
-wheel3 = scene.objects["rollen.002"]
26
-wheel4 = scene.objects["rollen.003"]
23
+wheel1 = scene.objects["wheel1"]
24
+wheel2 = scene.objects["wheel2"]
25
+wheel3 = scene.objects["wheel3"]
26
+wheel4 = scene.objects["wheel4"]
27 27
 
28 28
 try:
29 29
     throw_deck = scene.objects['throw_deck']
@@ -89,8 +89,8 @@ class getData:
89 89
         import bge
90 90
         scene = bge.logic.getCurrentScene()
91 91
         skater = scene.objects["Char4"]
92
-        deck = scene.objects["deck"]
93
-        trucks = scene.objects["trucks"]
92
+        deck = scene.objects["b_deck"]
93
+        trucks = scene.objects["b_trucks"]
94 94
         playing_layer = 0
95 95
         for x in range(7):
96 96
             l1 = skater.isPlayingAction(x)
@@ -109,31 +109,31 @@ class getData:
109 109
         writeData.addSkaterAnimF(obj, str(PAF), cut)   
110 110
         
111 111
     def saveDeckAnim(obj, cut):
112
-        import bge
113
-        scene = bge.logic.getCurrentScene()
114
-        skater = scene.objects["Char4"]
115
-        deck = scene.objects["deck"]
116
-        trucks = scene.objects["trucks"]
117
-        wheel1 = scene.objects["rollen.000"]
118
-        wheel2 = scene.objects["rollen.001"]
119
-        wheel3 = scene.objects["rollen.002"]
120
-        wheel4 = scene.objects["rollen.003"]        
121
-        playing_layer = 0
122
-        for x in range(7):
123
-            l1 = deck.isPlayingAction(x)
124
-            if l1 == True:
125
-                playing_layer = x
126
-                #print(x)
127
-        playing_action = deck.getActionName(playing_layer)
128
-        playing_action_frame = deck.getActionFrame(playing_layer)
129
-        DAF = playing_action_frame
130
-        own['DAF'] = DAF
112
+        # import bge
113
+        # scene = bge.logic.getCurrentScene()
114
+        # skater = scene.objects["Char4"]
115
+        # deck = scene.objects["b_deck"]
116
+        # trucks = scene.objects["b_trucks"]
117
+        # wheel1 = scene.objects["rollen.000"]
118
+        # wheel2 = scene.objects["rollen.001"]
119
+        # wheel3 = scene.objects["rollen.002"]
120
+        # wheel4 = scene.objects["rollen.003"]        
121
+        # playing_layer = 0
122
+        # for x in range(7):
123
+        #     l1 = deck.isPlayingAction(x)
124
+        #     if l1 == True:
125
+        #         playing_layer = x
126
+        #         #print(x)
127
+        # playing_action = deck.getActionName(playing_layer)
128
+        # playing_action_frame = deck.getActionFrame(playing_layer)
129
+        # DAF = playing_action_frame
130
+        # own['DAF'] = DAF
131 131
        #print(playing_action, playing_action_frame)        
132
-        writeData.addDeckAnim(obj, str(playing_action), cut)
132
+        writeData.addDeckAnim(obj, str(1), cut)
133 133
         
134 134
     def saveDeckAnimF(obj, cut):
135
-        DAF = own['DAF']
136
-        writeData.addDeckAnimF(obj, str(DAF), cut)
135
+        #DAF = own['DAF']
136
+        writeData.addDeckAnimF(obj, str(1), cut)
137 137
 
138 138
     def saveSrollVol(obj, cut):
139 139
         num = cube['sroll_vol']
@@ -223,8 +223,8 @@ def loadData():
223 223
     loadedSrevertsound = own["loadedSrevertsound"] 
224 224
     
225 225
     skater = scene.objects["Char4"]
226
-    deck = scene.objects["deck"]
227
-    trucks = scene.objects["trucks"]
226
+    deck = scene.objects["b_deck"]
227
+    trucks = scene.objects["b_trucks"]
228 228
     bdeck = scene.objects['deck_arm']
229 229
     num = 1
230 230
     obj = scene.objects['control_cube.002']
@@ -415,16 +415,16 @@ def loadData():
415 415
                 deck.stopAction(3)
416 416
                 deck.stopAction(9999)
417 417
                 #print(deckanim)
418
-                if deckanim != '':
419
-                    turnList = ['a_reg_right', 'a_reg_left', 'a_fak_right', 'a_fak_left']
420
-                    #print(deckanim)
421
-                    if deckanim not in turnList:
422
-                        deck.playAction(deckanim, DAF,DAF, layer=9999, play_mode=1, speed=1)
423
-                        trucks.playAction(deckanim, DAF,DAF, layer=9999, play_mode=1, speed=1)
424
-                    else:
425
-                        #print('play a_reg')  
426
-                        deck.playAction(deckanim, DAF,DAF, layer=9999, play_mode=1, speed=1)
427
-                        trucks.playAction('a_reg', DAF,DAF, layer=9999, play_mode=1, speed=1)                          
418
+                # if deckanim != '':
419
+                #     turnList = ['a_reg_right', 'a_reg_left', 'a_fak_right', 'a_fak_left']
420
+                #     #print(deckanim)
421
+                #     if deckanim not in turnList:
422
+                #         deck.playAction(deckanim, DAF,DAF, layer=9999, play_mode=1, speed=1)
423
+                #         trucks.playAction(deckanim, DAF,DAF, layer=9999, play_mode=1, speed=1)
424
+                #     else:
425
+                #         #print('play a_reg')  
426
+                #         deck.playAction(deckanim, DAF,DAF, layer=9999, play_mode=1, speed=1)
427
+                #         trucks.playAction('a_reg', DAF,DAF, layer=9999, play_mode=1, speed=1)                          
428 428
                 #print("Playing: ", deckanim, PAF)
429 429
             except:
430 430
                 print("deck something is wrong")

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


BIN
scripts/__pycache__/Record.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__/menuV3.cpython-36.pyc View File


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


+ 17
- 10
scripts/actionPlayer.py View File

@@ -22,7 +22,7 @@ def actionPlayer(ac):
22 22
 	#--------------------------------
23 23
 	if zero_blend:
24 24
 		blendin = 0
25
-		print('zeroing blend')
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 28
 	#print('playing', name, get_frame(ac))
@@ -39,27 +39,27 @@ def set_frame(ac, frame):
39 39
 	layer = getattr(ac, 'layer')
40 40
 	skater.setActionFrame(frame, layer)
41 41
 	deck.setActionFrame(frame, layer)
42
-	print('setting frame', frame)
42
+	#print('setting frame', frame)
43 43
 
44 44
 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 48
 	
49
-	print('?????????????rA, aState', rA, aState)
49
+	#print('?????????????rA, aState', rA, aState)
50 50
 	if rA in exits:
51 51
 		return rA
52 52
 	#
53 53
 
54 54
 	elif ('fak' in rA and 'reg' in aState) or ('reg' in rA and 'fak' in aState):
55
-		print('change stance')
55
+		#print('change stance')
56 56
 		if getattr(ac, 'opposite') != None:
57 57
 			return getattr(ac, 'opposite')
58 58
 	else:
59 59
 		return aState
60 60
 
61 61
 	if force != None and fe >= timer:
62
-		print('doing exit timer')
62
+		#print('doing exit timer')
63 63
 		return force
64 64
 
65 65
 def state_timer(own):
@@ -77,11 +77,11 @@ def check_land(rA, aState, own):
77 77
 		own['aState'] = rA
78 78
 	#otherwise, force land, offboard or fliptrick
79 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:
80
-		print('landing________________________', rA)
80
+		#print('landing________________________', rA)
81 81
 		aState = rA
82 82
 		own['stateTimer'] = 0
83 83
 		own['aState'] = rA
84
-	print(own['stance'], '-----stance', rA)
84
+	#print(own['stance'], '-----stance', rA)
85 85
 	return aState	
86 86
 
87 87
 def main(cont):
@@ -156,7 +156,7 @@ def main(cont):
156 156
 	if aState == check_state:
157 157
 		action = getattr(actionsFSMlist, check_state)
158 158
 		actionPlayer(action)
159
-		print(own['stateTimer'], getattr(action, 'fef'))
159
+		#print(own['stateTimer'], getattr(action, 'fef'))
160 160
 		if own['stateTimer'] > getattr(action, 'fef'):	
161 161
 			newState = getattr(action, 'force_exit')
162 162
 
@@ -500,7 +500,14 @@ def main(cont):
500 500
 		action = getattr(actionsFSMlist, check_state)
501 501
 		actionPlayer(action)
502 502
 		if own['stateTimer'] > getattr(action, 'fef'):	
503
-			newState = getattr(action, 'force_exit')												
503
+			newState = getattr(action, 'force_exit')	
504
+
505
+	check_state = 'reg_hardflip'
506
+	if aState == check_state:
507
+		action = getattr(actionsFSMlist, check_state)
508
+		actionPlayer(action)
509
+		if own['stateTimer'] > getattr(action, 'fef'):	
510
+			newState = getattr(action, 'force_exit')															
504 511
 
505 512
 
506 513
 
@@ -804,7 +811,7 @@ def main(cont):
804 811
 	if aState == check_state:
805 812
 		action = getattr(actionsFSMlist, check_state)
806 813
 		actionPlayer(action)
807
-		print(own['stateTimer'], getattr(action, 'fef'))
814
+		#print(own['stateTimer'], getattr(action, 'fef'))
808 815
 		if own['stateTimer'] > getattr(action, 'fef'):	
809 816
 			newState = getattr(action, 'force_exit')
810 817
 

+ 16
- 0
scripts/actionsFSMlist.py View File

@@ -844,6 +844,22 @@ reg_fsshuvit360 = a_class(
844 844
 	#opposite
845 845
 	None)
846 846
 
847
+reg_hardflip = a_class(
848
+	#player armature action name, start, end frames
849
+	'reg_hardflip', 1, 40,
850
+	#deck action name, start, end frames  
851
+	'b_reg_hardflip', 1, 40,
852
+	#layer, speed, mode (0 = play, 1 = loop), blendin
853
+	3, 1, 0, 10,
854
+	#intro, length
855
+	None, 0,
856
+	#exits
857
+	['reg_offboard'],
858
+	#force exit, frame
859
+	'reg_air', 38,
860
+	#opposite
861
+	None)
862
+
847 863
 
848 864
 
849 865
 

+ 2
- 3
scripts/boneRecord.py View File

@@ -47,7 +47,8 @@ def Record():
47 47
         master[str(y) + '-rot'].append(rot)
48 48
 
49 49
         master[str(y) + '-pos'].append(pos)
50
-        master[str(y) + '-rot'].append(rot)   
50
+        master[str(y) + '-rot'].append(rot) 
51
+
51 52
 
52 53
 
53 54
     for y in deck_list:
@@ -91,8 +92,6 @@ def Playback(valueIndex):
91 92
             #print(x.rotation_mode, pl[valueIndex],  'mode', valueIndex)
92 93
         except:
93 94
             print('index out of range')
94
-        
95
-
96 95
 
97 96
     for z in deck_list:
98 97
         x = deck.channels[z]

+ 2
- 2
scripts/camera.py View File

@@ -150,11 +150,11 @@ def main(cont):
150 150
                 if cam.height < 2:
151 151
                     cam.height = cam_height + .1
152 152
                     cam.max = cam.max - .2
153
-                    print('small move')
153
+                    #print('small move')
154 154
                 elif cam.height >= 2 and cam.height < 4:
155 155
                     cam.height = cam_height + .05
156 156
                     cam.max = cam.max - .05
157
-                    print('big move')
157
+                    #print('big move')
158 158
 
159 159
     if dict['menu_idle_timer'] > 300:
160 160
         move_len = 2048

+ 34
- 48
scripts/colors.py View File

@@ -8,7 +8,7 @@ def main():
8 8
     dict = bge.logic.globalDict 
9 9
     scene = bge.logic.getCurrentScene()
10 10
     shirt = scene.objects["Char4:Zshirtt1"]
11
-    deck = scene.objects["deck"]
11
+    deck = scene.objects["b_deck"]
12 12
     throw_deck = scene.objectsInactive["throw_deck"]
13 13
     throw_deck_trucks = scene.objectsInactive["throw_deck_trucks"]
14 14
     focus_deckA = scene.objectsInactive["focus_deckA"]
@@ -17,11 +17,11 @@ def main():
17 17
     focus_deckB_trucks = scene.objectsInactive["focus_deckB_trucks"]
18 18
     shoeR = scene.objects['Char4:Shoes02.R']
19 19
     shoeL = scene.objects['Char4:Shoes02.L']
20
-    trucks = scene.objects['trucks']
21
-    wheel1 = scene.objects['rollen.000']
22
-    wheel2 = scene.objects['rollen.001']
23
-    wheel3 = scene.objects['rollen.002']
24
-    wheel4 = scene.objects['rollen.003']
20
+    trucks = scene.objects['b_trucks']
21
+    wheel1 = scene.objects['wheel1']
22
+    wheel2 = scene.objects['wheel2']
23
+    wheel3 = scene.objects['wheel3']
24
+    wheel4 = scene.objects['wheel4']
25 25
     throw_deck_wheel1 = scene.objectsInactive["throw_deck_trucks_wheels"]
26 26
     throw_deck_wheel2 = scene.objectsInactive["throw_deck_trucks_wheels.001"]
27 27
     throw_deck_wheel3 = scene.objectsInactive["throw_deck_trucks_wheels.002"]
@@ -51,8 +51,8 @@ def main():
51 51
     #shirt.color = shirtC
52 52
     #print(dict['shirt_color'])
53 53
     scol = [dict['shirt_color_r'], dict['shirt_color_g'], dict['shirt_color_b'], 1]
54
-    deckC = [dict['deck_color_r'], dict['deck_color_g'], dict['deck_color_b'], 0]
55
-    #print(scol)
54
+    deckC = [dict['deck_color_r'], dict['deck_color_g'], dict['deck_color_b'], 1]
55
+    print(scol)
56 56
     shirt.color = scol
57 57
     deck.color = deckC
58 58
     throw_deck.color = deckC
@@ -62,14 +62,14 @@ def main():
62 62
     shoeR.color = shoesC
63 63
     shoeL.color = shoesC
64 64
     
65
-    trucks.color = [dict['trucks_r'], dict['trucks_g'], dict['trucks_b'], 0]
66
-    throw_deck_trucks.color = [dict['trucks_r'], dict['trucks_g'], dict['trucks_b'], 0]
65
+    trucks.color = [dict['trucks_r'], dict['trucks_g'], dict['trucks_b'], 1]
66
+    throw_deck_trucks.color = [dict['trucks_r'], dict['trucks_g'], dict['trucks_b'], 1]
67 67
     focus_deckA_trucks.color = [dict['trucks_r'], dict['trucks_g'], dict['trucks_b'], 1]
68 68
     focus_deckB_trucks.color = [dict['trucks_r'], dict['trucks_g'], dict['trucks_b'], 1]
69
-    wheel1.color = [dict['wheel1_r'], dict['wheel1_g'], dict['wheel1_b'], 0]
70
-    wheel2.color = [dict['wheel2_r'], dict['wheel2_g'], dict['wheel2_b'], 0]
71
-    wheel3.color = [dict['wheel3_r'], dict['wheel3_g'], dict['wheel3_b'], 0]
72
-    wheel4.color = [dict['wheel4_r'], dict['wheel4_g'], dict['wheel4_b'], 0]
69
+    wheel1.color = [dict['wheel1_r'], dict['wheel1_g'], dict['wheel1_b'], 1]
70
+    wheel2.color = [dict['wheel2_r'], dict['wheel2_g'], dict['wheel2_b'], 1]
71
+    wheel3.color = [dict['wheel3_r'], dict['wheel3_g'], dict['wheel3_b'], 1]
72
+    wheel4.color = [dict['wheel4_r'], dict['wheel4_g'], dict['wheel4_b'], 1]
73 73
     throw_deck_wheel1.color = [dict['wheel1_r'], dict['wheel1_g'], dict['wheel1_b'], 1]
74 74
     throw_deck_wheel2.color = [dict['wheel2_r'], dict['wheel2_g'], dict['wheel2_b'], 1]
75 75
     throw_deck_wheel3.color = [dict['wheel3_r'], dict['wheel3_g'], dict['wheel3_b'], 1]
@@ -122,22 +122,19 @@ main()
122 122
 
123 123
 
124 124
 def update_truck_tex():
125
+    #deck graphic testing
126
+    #pass
125 127
     import glob
126 128
     import platform
127
-    dict = bge.logic.globalDict 
128
-    dict['deckList'] = []
129 129
     scene = bge.logic.getCurrentScene()
130
-    deck = scene.objects["deck"]
130
+    dict = bge.logic.globalDict
131
+    deck = scene.objects["b_deck"]
131 132
     mainDir = bge.logic.expandPath("//")
132 133
     fileName = mainDir + "textures\\decks\\*.png"  
133
-    linux = False
134 134
     if platform.system() == 'Linux':
135
-        fileName = mainDir + 'textures/decks//*.png'  
136
-        linux = True
137
-    deckList = []    
135
+        fileName = mainDir + 'textures//decks//*.png'  
138 136
     deckList = glob.glob(fileName)
139
-    dict['deckList'] = sorted(deckList)  
140
-
137
+    dict['deckList'] = deckList  
141 138
     ID = texture.materialID(deck, 'MAdeck')
142 139
     deck_texture = texture.Texture(deck, ID)
143 140
     new_source = texture.ImageFFmpeg(deckList[dict["deck_index"]])
@@ -146,34 +143,28 @@ def update_truck_tex():
146 143
     bge.logic.texture.refresh(False)
147 144
     deck_name = deckList[dict['deck_index']]
148 145
     deck_name = deck_name.replace(mainDir, '')
149
-    if linux == True:
150
-        deck_name = deck_name.replace('textures/decks/', '' )
151
-        deck_name = deck_name.replace('.png', '')   
152
-        deck_name = deck_name.replace("//", "")  
153
-    else:
154
-        deck_name = deck_name.replace('textures\decks', '' )
155
-        deck_name = deck_name.replace('.png', '')   
156
-        deck_name = deck_name.replace("\\", "")      
146
+    deck_name = deck_name.replace('textures\decks', '' )
147
+    deck_name = deck_name.replace('.png', '')   
148
+    deck_name = deck_name.replace("\\", "")  
157 149
     print('deck texture updted to ', deck_name)
158 150
     dict['deck_name'] = deck_name
159 151
     
160 152
 def update_shirt_tex():
153
+    #pass
154
+    #deck graphic testing
161 155
     import glob
162 156
     import platform
163 157
     scene = bge.logic.getCurrentScene()
164
-    dict = bge.logic.globalDict 
165
-    dict['shirtList'] = []
158
+    dict = bge.logic.globalDict
159
+    #deck = scene.objects["deck"]
166 160
     shirt = scene.objects["Char4:Zshirtt1"]
167 161
     mainDir = bge.logic.expandPath("//")
168
-    fileName2 = mainDir + "textures\\shirt\\*.png" 
169
-    linux = False 
162
+    fileName2 = mainDir + "textures\\shirt\\*.png"  
170 163
     if platform.system() == 'Linux':
171
-        fileName2 = mainDir + 'textures/shirt//*.png' 
172
-        linux = True 
173
-    shirtList = []    
164
+        fileName2 = mainDir + 'textures//shirt//*.png'  
174 165
     shirtList = glob.glob(fileName2)
175
-    dict['shirtList'] = sorted(shirtList)  
176
-    
166
+    dict['shirtList'] = shirtList  
167
+    print(shirtList, 'shirtList')
177 168
     ID = texture.materialID(shirt, 'MAshirt')
178 169
     shirt_texture = texture.Texture(shirt, ID)
179 170
     new_source2 = texture.ImageFFmpeg(shirtList[dict["shirt_logo"]])
@@ -182,14 +173,9 @@ def update_shirt_tex():
182 173
     bge.logic.texture2.refresh(False)
183 174
     shirt_name = shirtList[dict['shirt_logo']]
184 175
     shirt_name = shirt_name.replace(mainDir, '')
185
-    if linux == True:
186
-        shirt_name = shirt_name.replace('textures/shirt/', '' )
187
-        shirt_name = shirt_name.replace('.png', '')   
188
-        shirt_name = shirt_name.replace("//", "")  
189
-    else:    
190
-        shirt_name = shirt_name.replace('textures\shirt', '' )
191
-        shirt_name = shirt_name.replace('.png', '')   
192
-        shirt_name = shirt_name.replace("\\", "")  
176
+    shirt_name = shirt_name.replace('textures\shirt', '' )
177
+    shirt_name = shirt_name.replace('.png', '')   
178
+    shirt_name = shirt_name.replace("\\", "")  
193 179
     print('shirt texture updted to ', shirt_name)
194 180
     dict['shirt_name'] = shirt_name    
195 181
 

+ 50
- 49
scripts/controller2.py View File

@@ -103,12 +103,12 @@ def main():
103 103
     grindRail = cont.actuators["grind_rail"]
104 104
     grindSound = own["grindSound"]
105 105
     skater = scene.objects["Char4"]
106
-    deck = scene.objects["deck"]
107
-    trucks = scene.objects["trucks"]
108
-    wheel1 = scene.objects["rollen.000"]
109
-    wheel2 = scene.objects["rollen.001"]
110
-    wheel3 = scene.objects["rollen.002"]
111
-    wheel4 = scene.objects["rollen.003"]
106
+    deck = scene.objects["b_deck"]
107
+    trucks = scene.objects["b_trucks"]
108
+    wheel1 = scene.objects["wheel1"]
109
+    wheel2 = scene.objects["wheel2"]
110
+    wheel3 = scene.objects["wheel3"]
111
+    wheel4 = scene.objects["wheel4"]
112 112
     turnsens = .04
113 113
     turnsens2 = .06 #air_turn_boost
114 114
     grindDar = own["grindDar_hit"]
@@ -251,7 +251,7 @@ def main():
251 251
         if balance > sens or balance < - sens:
252 252
             #fall
253 253
             #if ground_since > -1 and ground_since < 10:
254
-            if 'land' in own['l_actionState']:
254
+            if 'land' in own['l_actionState'] and touched == False:
255 255
                 own['fall'] = 1
256 256
                 own['last_fall_frame'] = frame
257 257
             #pass
@@ -1896,47 +1896,47 @@ def main():
1896 1896
             wheel3.stopAction(2)
1897 1897
             wheel4.stopAction(2)
1898 1898
         #regular
1899
-        if linVelocity.x > 0.05 and linVelocity.x < .5:
1900
-            wheel2.playAction("roll1.001", 1, 20, layer=2, play_mode=0, speed=.25)
1901
-            wheel3.playAction("roll2.001", 1, 20, layer=2, play_mode=0, speed=.25)
1902
-            wheel4.playAction("roll3.001", 1, 20, layer=2, play_mode=0, speed=.25)
1903
-            wheel1.playAction("roll4.001", 1, 20, layer=2, play_mode=0, speed=.25)
1904
-        if linVelocity.x > 0.5 and linVelocity.x < 1:
1905
-            wheel2.playAction("roll1.001", 1, 20, layer=2, play_mode=1, speed=1)
1906
-            wheel3.playAction("roll2.001", 1, 20, layer=2, play_mode=1, speed=1)
1907
-            wheel4.playAction("roll3.001", 1, 20, layer=2, play_mode=1, speed=1)
1908
-            wheel1.playAction("roll4.001", 1, 20, layer=2, play_mode=1, speed=1)
1909
-        if linVelocity.x > 1 and linVelocity.x < 4:
1910
-            wheel2.playAction("roll1.001", 1, 20, layer=2, play_mode=1, speed=1.5)
1911
-            wheel3.playAction("roll2.001", 1, 20, layer=2, play_mode=1, speed=1.5)
1912
-            wheel4.playAction("roll3.001", 1, 20, layer=2, play_mode=1, speed=1.5)
1913
-            wheel1.playAction("roll4.001", 1, 20, layer=2, play_mode=1, speed=1.5)
1914
-        if linVelocity.x > 4:
1915
-            wheel2.playAction("roll1.001", 1, 20, layer=2, play_mode=1, speed=2)
1916
-            wheel3.playAction("roll2.001", 1, 20, layer=2, play_mode=1, speed=2)
1917
-            wheel4.playAction("roll3.001", 1, 20, layer=2, play_mode=1, speed=2)
1918
-            wheel1.playAction("roll4.001", 1, 20, layer=2, play_mode=1, speed=2)
1919
-        #switch
1920
-        if linVelocity.x < -0.05 and linVelocity.x > -.5:
1921
-            wheel2.playAction("roll1.001", 20, 1, layer=2, play_mode=0, speed=.25)
1922
-            wheel3.playAction("roll2.001", 20, 1, layer=2, play_mode=0, speed=.25)
1923
-            wheel4.playAction("roll3.001", 20, 1, layer=2, play_mode=0, speed=.25)
1924
-            wheel1.playAction("roll4.001", 20, 1, layer=2, play_mode=0, speed=.25)
1925
-        if linVelocity.x < -0.5 and linVelocity.x > -1:
1926
-            wheel2.playAction("roll1.001", 20, 1, layer=2, play_mode=1, speed=1)
1927
-            wheel3.playAction("roll2.001", 20, 1, layer=2, play_mode=1, speed=1)
1928
-            wheel4.playAction("roll3.001", 20, 1, layer=2, play_mode=1, speed=1)
1929
-            wheel1.playAction("roll4.001", 20, 1, layer=2, play_mode=1, speed=1)
1930
-        if linVelocity.x < -1 and linVelocity > -4:
1931
-            wheel2.playAction("roll1.001", 20, 1, layer=2, play_mode=1, speed=1.5)
1932
-            wheel3.playAction("roll2.001", 20, 1, layer=2, play_mode=1, speed=1.5)
1933
-            wheel4.playAction("roll3.001", 20, 1, layer=2, play_mode=1, speed=1.5)
1934
-            wheel1.playAction("roll4.001", 20, 1, layer=2, play_mode=1, speed=1.5)
1935
-        if linVelocity.x < -4:
1936
-            wheel2.playAction("roll1.001", 20, 1, layer=2, play_mode=1, speed=2)
1937
-            wheel3.playAction("roll2.001", 20, 1, layer=2, play_mode=1, speed=2)
1938
-            wheel4.playAction("roll3.001", 20, 1, layer=2, play_mode=1, speed=2)
1939
-            wheel1.playAction("roll4.001", 20, 1, layer=2, play_mode=1, speed=2)
1899
+        # if linVelocity.x > 0.05 and linVelocity.x < .5:
1900
+        #     wheel2.playAction("roll1.001", 1, 20, layer=2, play_mode=0, speed=.25)
1901
+        #     wheel3.playAction("roll2.001", 1, 20, layer=2, play_mode=0, speed=.25)
1902
+        #     wheel4.playAction("roll3.001", 1, 20, layer=2, play_mode=0, speed=.25)
1903
+        #     wheel1.playAction("roll4.001", 1, 20, layer=2, play_mode=0, speed=.25)
1904
+        # if linVelocity.x > 0.5 and linVelocity.x < 1:
1905
+        #     wheel2.playAction("roll1.001", 1, 20, layer=2, play_mode=1, speed=1)
1906
+        #     wheel3.playAction("roll2.001", 1, 20, layer=2, play_mode=1, speed=1)
1907
+        #     wheel4.playAction("roll3.001", 1, 20, layer=2, play_mode=1, speed=1)
1908
+        #     wheel1.playAction("roll4.001", 1, 20, layer=2, play_mode=1, speed=1)
1909
+        # if linVelocity.x > 1 and linVelocity.x < 4:
1910
+        #     wheel2.playAction("roll1.001", 1, 20, layer=2, play_mode=1, speed=1.5)
1911
+        #     wheel3.playAction("roll2.001", 1, 20, layer=2, play_mode=1, speed=1.5)
1912
+        #     wheel4.playAction("roll3.001", 1, 20, layer=2, play_mode=1, speed=1.5)
1913
+        #     wheel1.playAction("roll4.001", 1, 20, layer=2, play_mode=1, speed=1.5)
1914
+        # if linVelocity.x > 4:
1915
+        #     wheel2.playAction("roll1.001", 1, 20, layer=2, play_mode=1, speed=2)
1916
+        #     wheel3.playAction("roll2.001", 1, 20, layer=2, play_mode=1, speed=2)
1917
+        #     wheel4.playAction("roll3.001", 1, 20, layer=2, play_mode=1, speed=2)
1918
+        #     wheel1.playAction("roll4.001", 1, 20, layer=2, play_mode=1, speed=2)
1919
+        # #switch
1920
+        # if linVelocity.x < -0.05 and linVelocity.x > -.5:
1921
+        #     wheel2.playAction("roll1.001", 20, 1, layer=2, play_mode=0, speed=.25)
1922
+        #     wheel3.playAction("roll2.001", 20, 1, layer=2, play_mode=0, speed=.25)
1923
+        #     wheel4.playAction("roll3.001", 20, 1, layer=2, play_mode=0, speed=.25)
1924
+        #     wheel1.playAction("roll4.001", 20, 1, layer=2, play_mode=0, speed=.25)
1925
+        # if linVelocity.x < -0.5 and linVelocity.x > -1:
1926
+        #     wheel2.playAction("roll1.001", 20, 1, layer=2, play_mode=1, speed=1)
1927
+        #     wheel3.playAction("roll2.001", 20, 1, layer=2, play_mode=1, speed=1)
1928
+        #     wheel4.playAction("roll3.001", 20, 1, layer=2, play_mode=1, speed=1)
1929
+        #     wheel1.playAction("roll4.001", 20, 1, layer=2, play_mode=1, speed=1)
1930
+        # if linVelocity.x < -1 and linVelocity > -4:
1931
+        #     wheel2.playAction("roll1.001", 20, 1, layer=2, play_mode=1, speed=1.5)
1932
+        #     wheel3.playAction("roll2.001", 20, 1, layer=2, play_mode=1, speed=1.5)
1933
+        #     wheel4.playAction("roll3.001", 20, 1, layer=2, play_mode=1, speed=1.5)
1934
+        #     wheel1.playAction("roll4.001", 20, 1, layer=2, play_mode=1, speed=1.5)
1935
+        # if linVelocity.x < -4:
1936
+        #     wheel2.playAction("roll1.001", 20, 1, layer=2, play_mode=1, speed=2)
1937
+        #     wheel3.playAction("roll2.001", 20, 1, layer=2, play_mode=1, speed=2)
1938
+        #     wheel4.playAction("roll3.001", 20, 1, layer=2, play_mode=1, speed=2)
1939
+        #     wheel1.playAction("roll4.001", 20, 1, layer=2, play_mode=1, speed=2)
1940 1940
 
1941 1941
     def turn():
1942 1942
         #rotamt = .02
@@ -3304,7 +3304,8 @@ def main():
3304 3304
             JUMPSTRENGTH = 1
3305 3305
         if JUMPSTRENGTH >= 7:
3306 3306
             JUMPSTRENGTH = .9
3307
-        aollie()
3307
+        #aollie()
3308
+        hardflip()
3308 3309
         reset_rtimers()
3309 3310
         q1oncd = 0
3310 3311
         q2oncd = 0

+ 6
- 6
scripts/menuV3.py View File

@@ -21,12 +21,12 @@ def endpoint(funct, motion, dict, cont):
21 21
     shirt = scene.objects["Char4:Zshirtt1"]  
22 22
     shoeR = scene.objects['Char4:Shoes02.R']
23 23
     shoeL = scene.objects['Char4:Shoes02.L']
24
-    deck = scene.objects["deck"]
25
-    trucks = scene.objects["trucks"]
26
-    wheel1 = scene.objects["rollen.000"]
27
-    wheel2 = scene.objects["rollen.001"]
28
-    wheel3 = scene.objects["rollen.002"]
29
-    wheel4 = scene.objects["rollen.003"]
24
+    deck = scene.objects["b_deck"]
25
+    trucks = scene.objects["b_trucks"]
26
+    wheel1 = scene.objects["wheel1"]
27
+    wheel2 = scene.objects["wheel2"]
28
+    wheel3 = scene.objects["wheel3"]
29
+    wheel4 = scene.objects["wheel4"]
30 30
     throw_deck = scene.objectsInactive["throw_deck"] 
31 31
     cam = scene.objects['Camera.003']
32 32
     cam2 = scene.objects['freecam']

+ 2
- 2
scripts/npause.py View File

@@ -14,8 +14,8 @@ def main(cont):
14 14
     dict = bge.logic.globalDict 
15 15
     
16 16
     skater = scene.objects["Char4"]
17
-    deck = scene.objects["deck"]
18
-    trucks = scene.objects["trucks"]
17
+    deck = scene.objects["b_deck"]
18
+    trucks = scene.objects["b_trucks"]
19 19
     own = scene.objects["control_cube.002"]
20 20
     
21 21
     camList = scene.cameras

+ 9
- 4
scripts/trick_text.py View File

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

+ 17
- 17
scripts/walk.py View File

@@ -61,14 +61,14 @@ def main(cont):
61 61
     dropinCol = own.sensors['dropinCol']
62 62
     cube = scene.objects['control_cube.002']
63 63
     skater = scene.objects["Char4"]
64
-    deck = scene.objects["deck"]
65
-    trucks = scene.objects["trucks"]
64
+    deck = scene.objects["b_deck"]
65
+    trucks = scene.objects["b_trucks"]
66 66
     camobj2 = scene.objects['camobj']
67 67
     throw_deck_empty = scene.objects["throw_deck_empty"]
68
-    wheel1 = scene.objects["rollen.000"]
69
-    wheel2 = scene.objects["rollen.001"]
70
-    wheel3 = scene.objects["rollen.002"]
71
-    wheel4 = scene.objects["rollen.003"]
68
+    wheel1 = scene.objects["wheel1"]
69
+    wheel2 = scene.objects["wheel2"]
70
+    wheel3 = scene.objects["wheel3"]
71
+    wheel4 = scene.objects["wheel4"]
72 72
     camobj = scene.objects["Camera.003"]
73 73
     camera = cont.actuators["Camera"]
74 74
     replayCam = cont.actuators["replayCam"]
@@ -504,18 +504,18 @@ def main(cont):
504 504
             wheel2act = wheel2.actuators["Visibility"]
505 505
             wheel3act = wheel3.actuators["Visibility"]
506 506
             wheel4act = wheel4.actuators["Visibility"]        
507
-            #deckact.visibility = True
507
+            deckact.visibility = True
508 508
             trucksact.visibility = True
509 509
             wheel1act.visibility = True
510 510
             wheel2act.visibility = True
511 511
             wheel3act.visibility = True
512 512
             wheel4act.visibility = True  
513
-            #cont.activate(deck.actuators['Visibility'])
514
-            #cont.activate(trucks.actuators['Visibility'])
515
-            #cont.activate(wheel1.actuators['Visibility'])
516
-            #cont.activate(wheel2.actuators['Visibility'])
517
-            #cont.activate(wheel3.actuators['Visibility'])
518
-            #cont.activate(wheel4.actuators['Visibility']) 
513
+            cont.activate(deck.actuators['Visibility'])
514
+            cont.activate(trucks.actuators['Visibility'])
515
+            cont.activate(wheel1.actuators['Visibility'])
516
+            cont.activate(wheel2.actuators['Visibility'])
517
+            cont.activate(wheel3.actuators['Visibility'])
518
+            cont.activate(wheel4.actuators['Visibility']) 
519 519
             own['throw_deck'] = False 
520 520
             throw_deck_empty = scene.objects["throw_deck_empty"]
521 521
             throw_deck_empty['kill_deck'] = 1 
@@ -1269,10 +1269,10 @@ def main(cont):
1269 1269
 
1270 1270
     own.alignAxisToVect([0.0,0.0,1.0], 2, .03)
1271 1271
     own.actuators["sroll"].stopSound() 
1272
-    wheel1 = scene.objects["rollen.000"]
1273
-    wheel2 = scene.objects["rollen.001"]
1274
-    wheel3 = scene.objects["rollen.002"]
1275
-    wheel4 = scene.objects["rollen.003"]
1272
+    wheel1 = scene.objects["wheel1"]
1273
+    wheel2 = scene.objects["wheel2"]
1274
+    wheel3 = scene.objects["wheel3"]
1275
+    wheel4 = scene.objects["wheel4"]
1276 1276
     wheel1.stopAction(2)
1277 1277
     wheel2.stopAction(2)
1278 1278
     wheel3.stopAction(2)

+ 2
- 2
shuvit.blend View File

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

Loading…
Cancel
Save