shuvit 5 years ago
parent
commit
cff5fe943d

+ 0
- 2
Recordings/shuvit replay.dat
File diff suppressed because it is too large
View File


+ 28
- 28
config.ini View File

@@ -20,7 +20,7 @@ music_player = 1
20 20
 
21 21
 #level
22 22
 ######
23
-level = user1
23
+level = user2
24 24
 #------------
25 25
 
26 26
 #replay recorder
@@ -48,41 +48,41 @@ walk_focal_length = 14
48 48
 #character settings
49 49
 ###################
50 50
 
51
-character = ralph
51
+character = annie
52 52
 
53
-shirt_logo = 4
53
+shirt_logo = 5
54 54
 
55
-shirt_color_r = 0.54
56
-shirt_color_g = 0.4
57
-shirt_color_b = 0.05
55
+shirt_color_r = 0
56
+shirt_color_g = 0.16
57
+shirt_color_b = 0
58 58
 
59
-shoe_color_r = 0.02
60
-shoe_color_g = 0.02
59
+shoe_color_r = 0.08
60
+shoe_color_g = 0.05
61 61
 shoe_color_b = 0.02
62 62
 #-----------------
63 63
 
64 64
 #deck settings
65 65
 ##############
66 66
 deck_index = 7
67
-deck_color_r = 1
68
-deck_color_g = 1.0
69
-deck_color_b = 1
70
-trucks_r = 0.46
71
-trucks_g = 0.03
72
-trucks_b = 0.03
73
-
74
-wheel1_r = 1
75
-wheel1_g = 0.71
76
-wheel1_b = 0.08
77
-wheel2_r = 1
78
-wheel2_g = 0.71
79
-wheel2_b = 0.08
80
-wheel3_r = 1
81
-wheel3_g = 0.71
82
-wheel3_b = 0.08
83
-wheel4_r = 1
84
-wheel4_g = 0.71
85
-wheel4_b = 0.08
67
+deck_color_r = 0.28
68
+deck_color_g = 0.1
69
+deck_color_b = 0
70
+trucks_r = 0
71
+trucks_g = 0.41
72
+trucks_b = 0
73
+
74
+wheel1_r = 0.31
75
+wheel1_g = 0.16
76
+wheel1_b = 0
77
+wheel2_r = 0.31
78
+wheel2_g = 0.16
79
+wheel2_b = 0
80
+wheel3_r = 0.31
81
+wheel3_g = 0.16
82
+wheel3_b = 0
83
+wheel4_r = 0.31
84
+wheel4_g = 0.16
85
+wheel4_b = 0
86 86
 #-------------------
87 87
 
88 88
 #2d filter settings
@@ -90,7 +90,7 @@ wheel4_b = 0.08
90 90
 
91 91
 #brightness / contrast
92 92
 bc = 1
93
-BC_BRIGHTNESS = 1.15
93
+BC_BRIGHTNESS = 1.05
94 94
 BC_CONTRAST = 1.0
95 95
 
96 96
 #HDR

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


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


+ 8
- 3
scripts/controller2.py View File

@@ -3942,6 +3942,9 @@ def main():
3942 3942
             cont.deactivate(own.actuators['grindoutRight'])
3943 3943
             cont.deactivate(own.actuators['grindoutLeft'])  
3944 3944
         if (LAST_GRIND == True and jumping == None and sincegrinding > 20 and ground_since > 20) or own['invert_on'] == True and LAST_GRIND == 1:
3945
+
3946
+        #own['grindTouch']      
3947
+
3945 3948
             outloc = 0.022
3946 3949
             bsoutloc = .07
3947 3950
             bsoutvel = .1
@@ -4379,12 +4382,12 @@ def main():
4379 4382
     if localRay[0]:
4380 4383
         localHitDist = (own.worldPosition - localRay[1]).length
4381 4384
         #print(localHitDist)
4382
-        print(localRay[2])
4385
+        #print(localRay[2])
4383 4386
         if localHitDist < .287:
4384 4387
             own.localPosition[2] += (.287 - localHitDist)
4385 4388
             if localRay[2] != [0,0,-1] and grindHit == 0:
4386 4389
                 own.alignAxisToVect(localRay[2], 2, .5)
4387
-                print('moving local')
4390
+                #print('moving local')
4388 4391
 
4389 4392
 
4390 4393
     #rend = bge.render
@@ -4396,4 +4399,6 @@ def main():
4396 4399
     if (grindDar == False and r_ground.triggered and own['grindTouch'] == False) or own['jump_timer'] > 40:
4397 4400
         own['grindType'] = ''
4398 4401
     
4399
-    dict['walk'] = 0  
4402
+    dict['walk'] = 0  
4403
+
4404
+    print(own["LAST_GRIND"])

+ 7
- 7
scripts/grindV2.py View File

@@ -540,13 +540,13 @@ def main():
540 540
         #print(lastobj.worldPosition)
541 541
         if dist < grind_dist and dropin == 0 and manual == 0 and no_grind == 0 and own['grindoutturn'] == 0 and own['manual'] == 0 and own['gt_cd2'] < 40 and invert_on == False and own['air_mover'] == False and no_grind_pull == 0 and own['last_invert'] == False and own['grindjumpturn'] == 0 and grind_jump == 0 and own['airup'] == 0:
542 542
             #print('grind')      
543
-            hitObject, hitPoint, hitNormal = own.rayCast(nearestObject.worldPosition, own.worldPosition, .0, 'grind')
544
-            if grindold == 0:     
545
-                if grindTouch.triggered:
546
-                    nearpos = nearestObject.worldPosition
547
-                    if hitNormal != None:
548
-                        stre = .45
549
-                        own.alignAxisToVect(hitNormal, 2, stre) 
543
+            # hitObject, hitPoint, hitNormal = own.rayCast(nearestObject.worldPosition, own.worldPosition, .0, 'grind')
544
+            # if grindold == 0:     
545
+            #     if grindTouch.triggered:
546
+            #         nearpos = nearestObject.worldPosition
547
+            #         if hitNormal != None:
548
+            #             stre = .45
549
+            #             own.alignAxisToVect(hitNormal, 2, stre) 
550 550
                         #print("align")                   
551 551
                     #own.worldPosition = [nearpos.x, nearpos.y, nearpos.z + .2975]
552 552
                     #print('moving world')

+ 2
- 2
shuvit.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:de4009805703b3e19a354dd042f0efc51298105b7dda97df72a1b525c76ed44c
3
-size 180305952
2
+oid sha256:89a7916e8f873d5e06151821952acee98d9265847c3e5feb48fb0791cf129373
3
+size 180306096

Loading…
Cancel
Save