Browse Source

vert changes

shuvit 1 year ago
parent
commit
d59681b727

+ 3
- 0
assets/foliage.blend View File

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

+ 2
- 2
assets/materials/textures/Concrete_D_N.png View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:820ea0cf5ebcfb3fe9d79036e808b6374d42c1594ddd07d6e4a45b926da3bc70
3
-size 2717080
2
+oid sha256:a9ffe8a3e6051e860211c6e36424a82448f0608c02961798c7880e0f223dba73
3
+size 2657266

+ 1
- 1
assets/nav_points
File diff suppressed because it is too large
View File


+ 3
- 0
assets/textures/Concrete_D_A.png View File

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

+ 3
- 0
assets/textures/Concrete_D_N.png View File

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

+ 3
- 0
assets/user10_working.blend View File

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

+ 2
- 2
assets/user2.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:f02a9b5898c2cbe7ad94586182ea85f5340884de323edbae4598d3ea01240914
3
-size 14145256
2
+oid sha256:72706c55ca565b8d11198bab3c08ba1e42c24e6ba7a57696d8fb15b57549d0f0
3
+size 19062000

+ 1
- 1
assets/walker_nav_points
File diff suppressed because it is too large
View File


+ 3
- 0
characters/ken-bak.blend View File

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

+ 2
- 2
characters/ken.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:afa9ad9f23ee9b2abae29b8f4ca93f61c96c97ae9cad707e50e245138256d226
3
-size 2897620
2
+oid sha256:983c5a1732d46eaf3089c7158a7f86a47a1bda5413406a8f994f9937d606fbbd
3
+size 2876436

+ 10
- 10
config.ini View File

@@ -54,13 +54,13 @@ character = ken
54 54
 
55 55
 shirt_logo = 2
56 56
 
57
-shirt_color_r = 0.05
58
-shirt_color_g = 0
59
-shirt_color_b = 0.0
57
+shirt_color_r = 0.83
58
+shirt_color_g = 0.9
59
+shirt_color_b = 0.88
60 60
 
61
-shoe_color_r = 0.55
62
-shoe_color_g = 0.18
63
-shoe_color_b = 0
61
+shoe_color_r = 0.0
62
+shoe_color_g = 0.35
63
+shoe_color_b = 0.57
64 64
 #-----------------
65 65
 
66 66
 #deck settings
@@ -92,8 +92,8 @@ wheel4_b = 0.21
92 92
 
93 93
 #brightness / contrast
94 94
 bc = 1
95
-BC_BRIGHTNESS = 0.99
96
-BC_CONTRAST = 1.06
95
+BC_BRIGHTNESS = 1.1
96
+BC_CONTRAST = 1.09
97 97
 
98 98
 #HDR
99 99
 hdr = 1
@@ -119,8 +119,8 @@ FXAA_SPAN_MAX = 8.0
119 119
 
120 120
 #sun settings
121 121
 #############
122
-sun_strength = 1.85
123
-ambient_strength = 0.66
122
+sun_strength = 2.05
123
+ambient_strength = 0.78
124 124
 sun_rot_x = -0.05
125 125
 sun_rot_y = -0.05
126 126
 shadow_on = 0

+ 2
- 2
scripts/actionsFSMlist.py View File

@@ -3357,7 +3357,7 @@ fak_nollie_shuvit360 = a_class(
3357 3357
 	#deck action name, start, end frames  
3358 3358
 	'b_reg_360shuvit', 1, 40,
3359 3359
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3360
-	3, 1, 0, 10,
3360
+	fliplay, 1, 0, 10,
3361 3361
 	#intro, length
3362 3362
 	None, 0,
3363 3363
 	#exits
@@ -3373,7 +3373,7 @@ fak_nollie_fsshuvit_360 = a_class(
3373 3373
 	#deck action name, start, end frames  
3374 3374
 	'b_fak_360shuvit', 1, 40,
3375 3375
 	#layer, speed, mode (0 = play, 1 = loop), blendin
3376
-	3, 1, 0, 10,
3376
+	fliplay, 1, 0, 10,
3377 3377
 	#intro, length
3378 3378
 	None, 0,
3379 3379
 	#exits

+ 1
- 1
scripts/camera.py View File

@@ -361,12 +361,12 @@ def main(cont):
361 361
         cars.Execute(cont)
362 362
         own['CamFSM'].Execute()
363 363
         walkers.Execute(cont)
364
-
365 364
     else:
366 365
         pass
367 366
 
368 367
     own['life'] += 1
369 368
 
369
+
370 370
     # mo = scene.objects['Suzanne']
371 371
     # print(mo.culled)
372 372
 

+ 4455
- 0
scripts/controller2 - Copy.py
File diff suppressed because it is too large
View File


+ 58
- 39
scripts/controller2.py View File

@@ -1281,7 +1281,7 @@ def main():
1281 1281
                 jump()
1282 1282
         elif (STANCE == True) or ((grindHit == True or wallride != None) and STANCE == True):
1283 1283
             own["wallride_off"] = 1
1284
-            own['requestAction'] = 'fak_shuvit'
1284
+            own['requestAction'] = 'fak_fsshuvit'
1285 1285
             if onGround:
1286 1286
                 jump()
1287 1287
         if not onGround and STANCE == False:
@@ -1370,7 +1370,7 @@ def main():
1370 1370
                 jump()
1371 1371
         elif (STANCE == True) or ((grindHit == True or wallride != None) and STANCE == True):
1372 1372
             own["wallride_off"] = 1
1373
-            own['requestAction'] = 'fak_fsshuvit'
1373
+            own['requestAction'] = 'fak_shuvit'
1374 1374
             if onGround:
1375 1375
                 jump()
1376 1376
         if not onGround and STANCE == False:
@@ -3051,6 +3051,16 @@ def main():
3051 3051
         nollie_inward_heelflip()
3052 3052
         sr.reset()
3053 3053
 
3054
+    #360 shuvit
3055
+    if sr.q3 > 0 and sr.q4 > 0 and sr.q5 > 0 and sr.q6 > 0 and sr.q7 > 0 and sr.q7 <= sr.q6 <= sr.q5 <= sr.q4 <= sr.q3:
3056
+        fsshuvit360()
3057
+        sr.reset()
3058
+
3059
+    #360 fs shuvit
3060
+    if sr.q3 > 0 and sr.q4 > 0 and sr.q5 > 0 and sr.q6 > 0 and sr.q7 > 0 and sr.q7 >= sr.q6 >= sr.q5 >= sr.q4 >= sr.q3:
3061
+        shuvit360()
3062
+        sr.reset()
3063
+
3054 3064
     #nollie 360 shuvit
3055 3065
     if sr.q7 > 0 and sr.q8 > 0 and sr.q1 > 0 and sr.q2 > 0 and sr.q3 > 0 and sr.q7 <= sr.q8 <= sr.q1 <= sr.q2 <= sr.q3:
3056 3066
         nollie_shuvit360()
@@ -3087,16 +3097,6 @@ def main():
3087 3097
         nollie_varial_heelflip()
3088 3098
         sr.reset()
3089 3099
 
3090
-    #360 shuvit
3091
-    if sr.q3 > 0 and sr.q4 > 0 and sr.q5 > 0 and sr.q6 > 0 and sr.q7 > 0 and sr.q7 <= sr.q6 <= sr.q5 <= sr.q4 <= sr.q3:
3092
-        shuvit360()
3093
-        sr.reset()
3094
-
3095
-    #360 fs shuvit
3096
-    if sr.q3 > 0 and sr.q4 > 0 and sr.q5 > 0 and sr.q6 > 0 and sr.q7 > 0 and sr.q7 <= sr.q6 <= sr.q5 <= sr.q4 <= sr.q3:
3097
-        fsshuvit360()
3098
-        sr.reset()
3099
-
3100 3100
     #ollie
3101 3101
     if sr.q5 > 0 and sr.q1 > 0 and sr.q5 < sr.q1:
3102 3102
         aollie()
@@ -3129,6 +3129,7 @@ def main():
3129 3129
 
3130 3130
     #shuvit
3131 3131
     if sr.q7 > 0 and sr.q5 > 0 and sr.q6 > 0 and sr.q5 <= sr.q6 <= sr.q7:
3132
+        print(sr.q3, sr.q4, sr.q5, sr.q6, sr.q7)
3132 3133
         shuvit()
3133 3134
         sr.reset()
3134 3135
 
@@ -4301,37 +4302,25 @@ def main():
4301 4302
     aligned = False
4302 4303
     #if localRay[0] or grindRay[0]:
4303 4304
     if localRay[0]:
4304
-
4305
-        #if grindRay[0] and not localRay[0]:
4306
-            #localRay = grindRay
4307 4305
         if 'transition' in localRay[0]:
4308 4306
             own['transition'] = True
4309 4307
             own['last_transition_frame'] = own['framenum']
4310
-            #print('transition')
4311 4308
         localHitDist = (own.worldPosition - localRay[1]).length
4312
-        #print('gh', localHitDist)
4313 4309
         if localHitDist < .4:
4314 4310
             if own['jump_timer'] < 30:
4315 4311
                 own.localLinearVelocity.z *= .9
4316 4312
 
4317
-        #if localHitDist < .287:
4318 4313
         if localHitDist < .295:
4319 4314
             if own['jump_timer'] < 30:
4320 4315
                 own.localLinearVelocity.z = 0
4321 4316
             own.applyMovement((0, 0, (.295 - (localHitDist))), True)
4322
-            #own.applyMovement((0, 0, (.32 - (localHitDist))), True)
4323
-            #own.applyMovement((0, 0, (.5 - localHitDist)), True)
4324
-            #print('moving new ray a')
4325
-            #if localRay[2] != [0, 0, -1] and grindHit == 0:
4317
+            
4326 4318
             if localRay[2] != [0, 0, -1]:    
4327
-                #own.alignAxisToVect(localRay[2], 2, .25)
4328 4319
                 own.alignAxisToVect(localRay[2], 2, .5)
4329 4320
                 aligned = True
4330
-            #print('localRay')
4331 4321
            
4332 4322
         if localHitDist > .31 and localHitDist < 2:
4333 4323
             own.alignAxisToVect(localRay[2], 2, .05)
4334
-            #print('new align')
4335 4324
     #else:
4336 4325
         #print('no localRay')
4337 4326
         else:
@@ -4373,7 +4362,7 @@ def main():
4373 4362
         if localRay_v[0] and own['LAST_GRIND'] == False and rBump == 0 and lBump == 0 and ((own['framenum'] - own['last_transition_frame'] < 10) or (own['framenum'] - own['last_vert_frame'] < 10)):
4374 4363
             own['vert'] = 1
4375 4364
             print('vert hit')
4376
-
4365
+            ud_sens = .04      
4377 4366
             if 'spine' in localRay_v[0] and lUD < -.04:
4378 4367
                 print('spine hit!!!!!', lUD)
4379 4368
                 
@@ -4382,27 +4371,57 @@ def main():
4382 4371
                     own.applyRotation([0,.15,0], True)
4383 4372
                 else:    
4384 4373
                     own.applyRotation([0,-.15,0], True)
4385
-                own.linearVelocity.x *= .97    
4386
-            elif lUD > -.04: 
4374
+                own.linearVelocity.x *= .97  
4375
+            
4376
+            elif lUD > -ud_sens: 
4387 4377
                 own['last_vert_frame'] = own['framenum']
4388 4378
                 localHitDist = Vector.copy(Start - localRay_v[1]).length
4389 4379
                 own.linearVelocity.x *= .98
4390 4380
                 own.linearVelocity.z = .1
4381
+
4382
+
4383
+
4391 4384
                 #if localHitDist < .8 and (dict['lUD'] < .04 or dict['lUD'] > -.04):
4392 4385
                 #if localHitDist < .8:    
4393
-                if localHitDist < 1.5:        
4394
-                    #own.applyMovement((0,0,((.4 - (localHitDist) * .1))), True)
4395
-                    #own.applyMovement((0, 0, (.3 - localHitDist)), True)
4396
-                    #if localHitDist < 1.0:
4397
-                    own.applyForce((0, 0, (.4 - localHitDist) *1000), True)
4398
-
4399
-                    print('moving vert ray')
4400
-                    if localRay_v[2] != [0, 0, -1] and grindHit == 0:
4401
-                    #if localRay_v[2] != [0,0,-1]:
4402
-                        #own.alignAxisToVect(localRay_v[2], 2, .4)
4403
-                        own.alignAxisToVect(localRay_v[2], 2, .05)
4386
+
4387
+
4388
+
4389
+
4390
+
4391
+
4392
+
4393
+                # if localHitDist < 1.5:        
4394
+                #     #own.applyMovement((0,0,((.4 - (localHitDist) * .1))), True)
4395
+                #     #own.applyMovement((0, 0, (.3 - localHitDist)), True)
4396
+                #     #if localHitDist < 1.0:
4397
+                #     own.applyForce((0, 0, (.4 - localHitDist) *1000), True)
4398
+
4399
+                #     print('moving vert ray')
4400
+                #     if localRay_v[2] != [0, 0, -1] and grindHit == 0:
4401
+                #     #if localRay_v[2] != [0,0,-1]:
4402
+                #         #own.alignAxisToVect(localRay_v[2], 2, .4)
4403
+                #         own.alignAxisToVect(localRay_v[2], 2, .05)
4404
+                #         aligned = True
4405
+
4406
+
4407
+
4408
+                #f localHitDist < .295:
4409
+                if localHitDist < .4:    
4410
+                    if own['jump_timer'] < 30:
4411
+                        own.localLinearVelocity.z = 0
4412
+                    own.applyMovement((0, 0, (.295 - (localHitDist))), True)
4413
+                    #own.applyMovement((0, 0, (.35 - (localHitDist))), True)
4414
+                    if localRay_v[2] != [0, 0, -1]:    
4415
+                        own.alignAxisToVect(localRay_v[2], 2, .5)
4404 4416
                         aligned = True
4417
+
4418
+            #elif lUD >= -ud_sens:
4419
+                
4420
+
4421
+
4422
+
4405 4423
             else:
4424
+                own.alignAxisToVect([0,0,1], 2, .1)
4406 4425
                 print('doing nothing')            
4407 4426
         #print(own['lGobj'], 'lGobj')                         
4408 4427
 

+ 12
- 10
scripts/sound_man.py View File

@@ -164,7 +164,7 @@ class sounds(sound_manager):
164 164
 		handle_buffered.distance_reference = .1
165 165
 
166 166
 
167
-	def loop_play(self, obj, listener, v, p):
167
+	def loop_play(self, obj, listener, v = 0.0, p = 0.0):
168 168
 		
169 169
 		scene = bge.logic.getCurrentScene()
170 170
 
@@ -180,15 +180,17 @@ class sounds(sound_manager):
180 180
 		
181 181
 		if self.pingpong:
182 182
 			self.factory_buffered.pingpong()
183
-		
184
-		self.handle_buffered.volume = v
185
-		self.handle_buffered.pitch = p
186
-		self.handle_buffered.relative = False
187
-		self.handle_buffered.location = listener.worldPosition
188
-		self.handle_buffered.velocity = listener.getLinearVelocity()
189
-		self.handle_buffered.distance_maximum = 50
190
-		self.handle_buffered.distance_reference = .1	
191
-		
183
+		try:
184
+			self.handle_buffered.volume = v
185
+			self.handle_buffered.pitch = p
186
+			self.handle_buffered.relative = False
187
+			self.handle_buffered.location = listener.worldPosition
188
+			self.handle_buffered.velocity = listener.getLinearVelocity()
189
+			self.handle_buffered.distance_maximum = 50
190
+			self.handle_buffered.distance_reference = .1	
191
+			
192
+		except:
193
+			pass	
192 194
 
193 195
 
194 196
 def main(cont):

+ 2
- 2
shuvit.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:aae918842646245a6cf326a51b48815c50f8564def933a7b70f4f6dab073ba8a
3
-size 118803352
2
+oid sha256:e72556574622eb6505f8efaca9e42a1f2f722a16f51198ba1c9fdcbaa1a7764c
3
+size 117183140

Loading…
Cancel
Save