lands and animations

assets/user2.blend

 version https://git-lfs.github.com/spec/v1
-oid sha256:2c257aae715f761b5176750760a35ab35e154f255290b83a304062d90f11534a
+oid sha256:229526f98ab6d87888ff8430e5b15e3cec23890d40b70d2b0ac3c5202dc9f82c
 size 36839716

characters/annie.ini

 
 shirt_logo = 2
 
-shirt_color_r = 0.18
-shirt_color_g = 0.05
-shirt_color_b = 0.28
+shirt_color_r = 0.44
+shirt_color_g = 0.44
+shirt_color_b = 0.44
 
-shoe_color_r = 0.53
-shoe_color_g = 0.52
-shoe_color_b = 0.49
+shoe_color_r = 0.08
+shoe_color_g = 0.03
+shoe_color_b = 0
 #-----------------
 
 #deck settings
 ##############
-deck_index = 7
-deck_color_r = 0.46
-deck_color_g = 0
-deck_color_b = 1
+deck_index = 5
+deck_color_r = 0.8
+deck_color_g = 0.8
+deck_color_b = 0.8
 trucks_r = 0
 trucks_g = 0
 trucks_b = 0
 
-wheel1_r = 0.83
-wheel1_g = 0
-wheel1_b = 0.73
-wheel2_r = 0.83
-wheel2_g = 0
-wheel2_b = 0.73
-wheel3_r = 0.83
-wheel3_g = 0
-wheel3_b = 0.73
-wheel4_r = 0.83
-wheel4_g = 0
-wheel4_b = 0.73
+wheel1_r = 0.21
+wheel1_g = 0.21
+wheel1_b = 0.21
+wheel2_r = 0.21
+wheel2_g = 0.21
+wheel2_b = 0.21
+wheel3_r = 0.21
+wheel3_g = 0.21
+wheel3_b = 0.21
+wheel4_r = 0.21
+wheel4_g = 0.21
+wheel4_b = 0.21
 #-------------------

config.ini

 #camera 
 #######
 cam_height = -0.4
-focal_length = 10
+focal_length = 26
 cam_min = 2.9
 cam_max = 5.0
 cch_targetHeight = 0.5
 
 shirt_logo = 2
 
-shirt_color_r = 0.18
-shirt_color_g = 0.05
-shirt_color_b = 0.28
+shirt_color_r = 0.44
+shirt_color_g = 0.44
+shirt_color_b = 0.44
 
-shoe_color_r = 0.53
-shoe_color_g = 0.52
-shoe_color_b = 0.49
+shoe_color_r = 0.08
+shoe_color_g = 0.03
+shoe_color_b = 0
 #-----------------
 
 #deck settings
 ##############
-deck_index = 7
-deck_color_r = 0.46
-deck_color_g = 0
-deck_color_b = 1
+deck_index = 5
+deck_color_r = 0.8
+deck_color_g = 0.8
+deck_color_b = 0.8
 trucks_r = 0
 trucks_g = 0
 trucks_b = 0
 
-wheel1_r = 0.83
-wheel1_g = 0
-wheel1_b = 0.73
-wheel2_r = 0.83
-wheel2_g = 0
-wheel2_b = 0.73
-wheel3_r = 0.83
-wheel3_g = 0
-wheel3_b = 0.73
-wheel4_r = 0.83
-wheel4_g = 0
-wheel4_b = 0.73
+wheel1_r = 0.21
+wheel1_g = 0.21
+wheel1_b = 0.21
+wheel2_r = 0.21
+wheel2_g = 0.21
+wheel2_b = 0.21
+wheel3_r = 0.21
+wheel3_g = 0.21
+wheel3_b = 0.21
+wheel4_r = 0.21
+wheel4_g = 0.21
+wheel4_b = 0.21
 #-------------------
 
 #2d filter settings
 
 #HDR
 hdr = 1
-avgL = 0.91
+avgL = 0.77
 HDRamount = 0.03
 
 #Ambient Occlusion
 
 #sun settings
 #############
-sun_strength = 1.6
-ambient_strength = 0.66
+sun_strength = 2.05
+ambient_strength = 0.61
 sun_rot_x = 0.05
 sun_rot_y = 0.05
 shadow_on = 0

scripts/co_ActionState.py

         own['requestAction'] = 'empty'              
 #================
     #stance change detection
-    if (requestAction == 'reg_roll' and l_actionState in ('fak_roll', 'fak_land', 'fak_pump_out', 'fak_nopos_out', 'fak_opos_out', 'fak_air-roll', 'fak_fs_powerslide_out', 'fak_bs_powerslide_out', 'fak_nmanual_out', 'fak_manual_out', 'fak_tailslide_out', 'fak_noseslide_out', 'fak_5050_out')) or l_actionState == 'fak_land' and (requestAction in ['reg_turnLeft', 'reg_turnRight', 'reg_turnLeft_out', 'reg_turnRight_out', 'reg_opos', 'reg_nopos', 'reg_pump', 'reg_push', 'reg_push_goof', 'fak_5050-roll']) and requestAction not in ['reg_push', 'reg_push_goof', 'fak_push', 'fak_push_goof'] or (requestAction in ('reg_turnLeft', 'reg_turnRight') and l_actionState in ('fak_turnLeft', 'fak_turnRight')):
+    if (requestAction == 'reg_roll' and l_actionState in ('fak_roll', 'fak_land', 'fak_landL', 'fak_landLb', 'fak_landR', 'fak_landRb', 'fak_pump_out', 'fak_nopos_out', 'fak_opos_out', 'fak_air-roll', 'fak_fs_powerslide_out', 'fak_bs_powerslide_out', 'fak_nmanual_out', 'fak_manual_out', 'fak_tailslide_out', 'fak_noseslide_out', 'fak_5050_out')) or l_actionState == 'fak_land' and (requestAction in ['reg_turnLeft', 'reg_turnRight', 'reg_turnLeft_out', 'reg_turnRight_out', 'reg_opos', 'reg_nopos', 'reg_pump', 'reg_push', 'reg_push_goof', 'fak_5050-roll']) and requestAction not in ['reg_push', 'reg_push_goof', 'fak_push', 'fak_push_goof'] or (requestAction in ('reg_turnLeft', 'reg_turnRight') and l_actionState in ('fak_turnLeft', 'fak_turnRight')):
         #print('fak-reg_roll')
         requestAction = 'fak-reg_roll'
         own['requestAction'] = 'fak-reg_roll' 
         requestAction = 'fak-reg_roll'                     
     
     
-    if requestAction in ['reg_push', 'reg_push_goof'] and l_actionState == 'fak_land':
+    if requestAction in ['reg_push', 'reg_push_goof', 'reg_turnRight', 'reg_turnLeft'] and l_actionState == 'fak_land':
         requestAction = 'fak-reg_roll'
-    if requestAction in ['fak_push', 'fak_push_goof'] and l_actionState in ['reg_land', 'reg_landL', 'reg_landR',  'reg_landLb', 'reg_landRb']:
+    if requestAction in ['fak_push', 'fak_push_goof', 'fak_turnRight', 'fak_turnLeft'] and l_actionState in ['reg_land', 'reg_landL', 'reg_landR',  'reg_landLb', 'reg_landRb']:
         requestAction = 'reg-fak_roll'         
     
     if requestAction == 'reg_5050' and (l_actionState == 'fak_5050' or l_actionState == 'fak_air' or l_actionState in fak_fliplist) or (l_actionState == 'fak-reg_5050' and actionTimer > 1):
             
         if l_actionState == 'fak_air_nose to nmanual' and requestAction in ['reg_land', 'fak_land'] and own['actionTimer'] > 1:
             requestAction = 'fak_air_nose to nmanual'            
-
+        
         if requestAction in ['fak_land', 'reg_land']:  
             requestAction = own['lland']
         if l_actionState == 'reg_air-roll' and requestAction == 'fak_landL':
         if l_actionState == 'fak_air-roll' and requestAction == 'reg_landRb':
             requestAction = 'fak_landRb'            
         if l_actionState == 'fak_air-roll' and requestAction == 'reg_land':
-            requestAction = 'fak_land'                
+            requestAction = 'fak_land'           
+
+
+
+       #if own['jump_stance'] == 0 and requestAction == 'fak_land'          
 #---------------------------------------------------                                                                                  
                                                                                   
                                                                                                                                                         
                 #own['actionTimer'] = 0
                 #if l_actionState == 'reg_roll':
                 if l_actionState != 'reg_5050' and l_actionState != 'fak-reg_5050':    
-                    skater.playAction('reg_air', 40,34, layer=trans_layer, play_mode=0, speed=.5)
+                    skater.playAction('reg_5050', 50,70, layer=trans_layer, play_mode=0, speed=.5)
                 else:
                     skater.playAction('reg_5050', 1,30, layer=loop_layer, play_mode=1, speed=.5)
                     deck.playAction('a_reg', 1,30, layer=loop_layer, play_mode=1, speed=.5)
     if trans_playing:
         cur_frame = skater.getActionFrame(trans_layer)  
         cur_frame = round(cur_frame, 2)     
-    print('oG: ', og_request, 'rA:', requestAction, '|aS:', own['actionState'], 'q', queueAction, own['actionTimer'], 'cf', cur_frame)
+    #print('oG: ', og_request, 'rA:', requestAction, '|aS:', own['actionState'], 'q', queueAction, own['actionTimer'], 'cf', cur_frame)
     #print('rA:', requestAction, '|aS:', own['actionState'], own['actionTimer'], 'cf', cur_frame)
     cur_frame = skater.getActionFrame(trans_layer)
     #print(cur_frame)

scripts/controller2.py

         balance = 0
     #print(balance)
     #if ground_since > 0 and ground_since < 5 and jump_timer < 30:
-    if ground_since > -1 and ground_since < 200:
+    if ground_since > -1 and ground_since < 60:
         #print(balance, 'balance')
-        sens = 1.8
-        sens2 = .2
-        sens3 = 1.2
+        sens = 2
+        sens2 = .8
+        sens3 = 1.5
         if balance > sens or balance < - sens:
             #fall
             #if ground_since > -1 and ground_since < 10:
                     own['requestAction'] = 'fak_fp_rback'
 
     def invert():
-        if grindHit == True and own['grindpos'] == 'reg_board' and gsf < 10:
-            if lBump == 1:
-                own['invert_on'] = 1
-                own.linearVelocity.x = 0
-                own.linearVelocity.y = 0
+        if grindHit == True and own['grindpos'] == 'reg_board' and gsf < 10 and lBump == 1 and rBump == 0:
+            
+            own['invert_on'] = 1
+            own.linearVelocity.x = 0
+            own.linearVelocity.y = 0
+        else:
+            if lBump == 0:
+                own['invert_on'] = 0    
         if own["coping"] == 1 and own['invert_on'] == 1:
             if own['invert_on'] == 1 and own['last_invert'] == False:
                 cont.activate(own.actuators['invertOn_sound'])
 
     invert()
     footplant()
-
+    #print(own['invert_on'], 'invert_on')
     def reset_pos():
         #reset
         if ddPad == 1:
             cont.deactivate(own.actuators['grindoutLeft'])
         if (LAST_GRIND == True and jumping == None and sincegrinding > 35 and ground_since > 20) or own['invert_on'] == True and LAST_GRIND == 1:
             outloc = 0.022
-            bsoutloc = .07
-            bsoutvel = .1
+            bsoutloc = .001#.07
+            bsoutvel = .01#.1
             outrot = .06#2 #0.012
             outrot2 = .24
             outact = own.actuators["grindoutRight"]
                     if STANCE == True:
                         if own['footplant_on'] == True:
                             own.setLinearVelocity([(outvel.x + bsoutvel), outvel.y, outvel.z], 1)
-                            cont.activate(own.actuators["grindoutRight"])
+                            #cont.activate(own.actuators["grindoutRight"])
                         if own['grind_out_type'] == None:
                             own['grind_out_type'] = 'bs fak forward'
-                        own.applyRotation((0, .15, 0), True)
+                        #own.applyRotation((0, .15, 0), True)
                     if STANCE == False:
                         if own['footplant_on'] == True:
                             own.setLinearVelocity([(outvel.x + -bsoutvel), outvel.y, outvel.z], 1)
-                            cont.activate(own.actuators["grindoutRight"])
+                            #cont.activate(own.actuators["grindoutRight"])
                         if own['grind_out_type'] == None:
                             own['grind_out_type'] = 'bs reg forward'
-                        own.applyRotation((0, -.15, 0), True)
+                        #own.applyRotation((0, -.15, 0), True)
                     own["grindoutturn"] = gotcd
                     own['invert_on'] = 0
             if lq1on or lq2on or lq3on or lq4on or lq5on or lq6on or lq7on or lq8on:
         reg_rot = 0.02#2
         reg_rot2 = .26
         reg_move2 = .13
-        bsforce = 50
+        bsforce = 1#50
         bs_dloc = .04
         outvel = own.linearVelocity
         if own["coping"] == 1:
         if localHitDist < .4:
             if own['jump_timer'] < 30:
                 own.localLinearVelocity.z *= .9
+
         #if localHitDist < .287:
-        if localHitDist < .32:
+        if localHitDist < .295:
             if own['jump_timer'] < 30:
                 own.localLinearVelocity.z = 0
-            #own.applyMovement((0, 0, (.287 - (localHitDist))), True)
-            own.applyMovement((0, 0, (.32 - (localHitDist))), True)
+            own.applyMovement((0, 0, (.295 - (localHitDist))), True)
+            #own.applyMovement((0, 0, (.32 - (localHitDist))), True)
             #own.applyMovement((0, 0, (.5 - localHitDist)), True)
             #print('moving new ray a')
             #if localRay[2] != [0, 0, -1] and grindHit == 0:
         End = Vector.copy(own.worldPosition + (own.worldOrientation.col[Axis]*Distance))
         Start = Vector.copy(own.worldPosition)
         localRay_v = own.rayCast(End, Start, 0, 'vert', 1, 0, 0, 61439)
-        if localRay_v[0] and own['LAST_GRIND'] == False and rBump == 0 and ((own['framenum'] - own['last_transition_frame'] < 10) or (own['framenum'] - own['last_vert_frame'] < 10)):
+
+        if lBump == 1 and rBump == 1:
+            own.alignAxisToVect([0.0, 0.0, 1.0], 2, .05)  
+        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)):
             own['vert'] = 1
-            print('vert hit')
+            #print('vert hit')
             own['last_vert_frame'] = own['framenum']
             localHitDist = Vector.copy(Start - localRay_v[1]).length
             own.linearVelocity.x *= .98
             print('rayb hit')
 
 
-    if not aligned:
+    if not aligned or (lBump == 1):
         own.alignAxisToVect([0.0, 0.0, 1.0], 2, .00003)
 
     if own.linearVelocity.x > 12:
 
 
 
+    if own['actionState'] in ['frontside_grab_out', 'backside_grab_out', 'frontside_nose_grab_out', 'frontside_tail_grab_out', 'backside_nose_grab_out', 'backside_tail_grab_out', 'reg_walk_air_out', 'reg_air-walk_air', 'reg_judo_out', 'reg_frigid_out', 'reg_fsonefoot_out', 'reg_onefoot_out', 'reg_airwalk_out'] and own['requestAction'] in ['fak_land', 'reg_land']:
+        own['requestAction'] = 'reg_land'
+
+    elif own['actionState'] in ['fak_backside_grab_out', 'fak_frontside_grab_out', 'fak_frontside_nose_grab_out', 'fak_frontside_tail_grab_out', 'fak_backside_nose_grab_out', 'fak_backside_tail_grab_out', 'fak_walk_air_out', 'fak_air-walk_air', 'fak_judo_out', 'fak_frigid_out', 'fak_fsonefoot_out', 'fak_onefoot_out'] and own['requestAction'] in  ['reg_land', 'fak_land']:
+        own['requestAction'] = 'fak_land'   
+
+
+
+
     if own['requestAction'] == 'reg_land':
         print('*****************ra', land_overRideL, land_overRideR, land_overRideLb, land_overRideRb)
         if land_overRideL == True:
             own['requestAction'] = 'reg_landL'
             print('requesting unbalanced land1')
+            own['lland'] = own['requestAction']
         elif land_overRideR == True:
             own['requestAction'] = 'reg_landR'
             print('requesting unbalanced land2')
-        if land_overRideLb == True:
+            own['lland'] = own['requestAction']
+        elif land_overRideLb == True:
             own['requestAction'] = 'reg_landLb'
             print('requesting unbalanced land1b')
+            own['lland'] = own['requestAction']
         elif land_overRideRb == True:
             own['requestAction'] = 'reg_landRb'
             print('requesting unbalanced land2b')
+            own['lland'] = own['requestAction']
+        else:
+            own['lland'] = own['requestAction']    
 
     if own['requestAction'] == 'fak_land':
         print('*****************ra', land_overRideL, land_overRideR, land_overRideLb, land_overRideRb)
         if land_overRideL == True:
             own['requestAction'] = 'fak_landL'
-            print('requesting unbalanced land1')
+            print('requesting unbalanced landf1')
+            own['lland'] = own['requestAction']
         elif land_overRideR == True:
             own['requestAction'] = 'fak_landR'
-            print('requesting unbalanced land2')
-        if land_overRideLb == True:
+            print('requesting unbalanced landf2')
+            own['lland'] = own['requestAction']
+        elif land_overRideLb == True:
             own['requestAction'] = 'fak_landLb'
-            print('requesting unbalanced land1b')
+            print('requesting unbalanced landf1b')
+            own['lland'] = own['requestAction']
         elif land_overRideRb == True:
             own['requestAction'] = 'fak_landRb'
-            print('requesting unbalanced land2b')
-    if own['requestAction'] in ['fak_land', 'reg_land', 'fak_landL', 'reg_landR', 'fak_landRb', 'reg_landLb']:
-        own['lland'] = own['requestAction']
+            print('requesting unbalanced landf2b')
+            own['lland'] = own['requestAction']
+        else:
+            own['lland'] = own['requestAction']    
+    # if own['requestAction'] in ['fak_land', 'reg_land', 'fak_landL', 'fak_landLb', 'reg_landR', 'reg_landRb', 'fak_landR' 'fak_landRb', 'reg_landL', 'reg_landLb']:
+        

scripts/grindV2.py

     
     if (framenum - own['last_vert_frame'] < 40) and own['vert'] == 0:
         no_grind = 1
-        print('no_grind = 1 last vert = ', (framenum - own['last_vert_frame']))
+        #print('no_grind = 1 last vert = ', (framenum - own['last_vert_frame']))
     if dict['rBump'] == 1 or (framenum - own['last_vert_frame'] > 40):
         no_grind = 0
 
 
     if grindold == 1:
         no_grind = 0
+    if dict['lBump'] and dict['rBump']:
+        no_grind = 1
+    elif dict['lBump']:
+        no_grind = 0        
 #---------###########___###########-----------
 #start new                     #######
 ##----------##############----------############
         if invert_on:
             invertpos(detectedObjects)
             own['inverting'] = True
+            print('calling invert funct')
         else:
             own['inverting'] = False
         grind_dist = .8#.6
         skipper = 0
         #print(lastobj.worldPosition)
-        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:
+        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 or dict['rBump'] == 1 or dict['lBump'] == 1):
             #print("grinding")
             grind_height_dif = (own.worldPosition[2] - nearestObject.worldPosition[2]) - .287
             #worldPos = own.worldPosition
         if own['grindOld'] == 0 and ray.triggered == 0:
             own['aligntimer'] = 0
 
-    def invertpos():
+    def invertpos(xyz):
         minDist = None
         nearestObject = None
+        print('doing invert funct')
         for obj in invertObjs:
             dist = own.getDistanceTo(obj)
             if (minDist is None or dist < minDist):

scripts/walk.py

 
         gdist = ((own.worldPosition.z - r_ground.hitPosition[2]))  
         #print(gdist)
-        if gdist < .3 and gdist > .1:
+        if gdist < .28 and gdist > .1:
             #move = 2.875 - gdist
-            move = (.3 - gdist)*.5
+            move = (.28 - gdist)*.5
             #move = (own.worldPosition.z + gdist)
             if move > 0:
                 own.worldPosition.z = own.worldPosition.z + move

shuvit.blend

 version https://git-lfs.github.com/spec/v1
-oid sha256:146e177ff6c51f8476150c3ae08c0df75f7274c9893e79a4fbab99622939c07f
-size 145082860
+oid sha256:25104724a66fbae95b6511ec52b9b86f2472fca54ff98ba8612bdda6be2b8b29
+size 142303020