6-15-19 cleaning

scripts/Settings.py

@@ -29,7 +29,7 @@ def to_dict(section, key):
 def readChar():
     mainDir = GameLogic.expandPath("//characters/")    
     fileName = mainDir + dict['character'] + ".ini"
-    print('loading character settings', fileName)
+    #print('loading character settings', fileName)
     char_config = ConfigObj(fileName, interpolation=True)
     
     
@@ -45,7 +45,7 @@ def readChar():
                 except:
                     pass
         dict[key] = value  
-        print(key, value)      
+        #print(key, value)      
     
     
     char_config.walk(to_dict2, char_config)
@@ -90,7 +90,7 @@ def setres():
     resx = int(dict["resx"])
     resy = int(dict["resy"])
     fullscreen = bge.render.getFullScreen()
-    print("fullscreen = ", fullscreen)
+    #print("fullscreen = ", fullscreen)
     if fullscreen != True:
         if dict['fullscreen_on'] == 1:
             bge.render.setFullScreen(True)
@@ -99,7 +99,7 @@ def setres():
             bge.render.setFullScreen(False) 
             
     bge.render.setWindowSize(resx, resy)         
-    print("resolution = ", resx, resy)       
+    #print("resolution = ", resx, resy)       
         
 def loadlevel():
     import GameLogic

scripts/actionsFSMlist.py

@@ -1646,9 +1646,9 @@ reg_5050_in = a_class(
 	#player armature action name, start, end frames
 	'reg_5050', 1, 20,
 	#deck action name, start, end frames  
-	'b_reg', 1, 20,
+	'b_reg', 1, 30,
 	#layer, speed, mode (0 = play, 1 = loop), blendin
-	1, .5, 0, 10,
+	1, 1, 0, 10,
 	#intro, length
 	None, 0,
 	#exits
@@ -1660,7 +1660,7 @@ reg_5050_in = a_class(
 
 reg_5050 = a_class(
 	#player armature action name, start, end frames
-	'reg_5050', 20, 50,
+	'reg_5050', 30, 60,
 	#deck action name, start, end frames  
 	'b_reg', 1, 30,
 	#layer, speed, mode (0 = play, 1 = loop), blendin

scripts/birds.py

@@ -26,19 +26,21 @@ def main(cont, scene):
                 own['bird_list'].append(x)
                 
     def do_birds(scene, own, cont):
-        num = random.randint(0,2)
-        if own['life'] % 50 == 0 and num == 1:
-            #print('add bird')
-            top = len(own['bird_list']) - 1
-            start = random.randint(0, top)
-            end = start
-            while end == start:
-                end = random.randint(0, top)
-            obj = scene.addObject('bird_cont', own['bird_list'][start], 0)                
-            obj['start'] = own['bird_list'][start]
-            obj['end'] = own['bird_list'][end]
-            obj.worldPosition = obj['start'].worldPosition
-            #print(obj['start'], obj['end'])
+        
+        if own['life'] % 50 == 0:
+            num = random.randint(0,2)
+            if num == 1:
+                #print('add bird')
+                top = len(own['bird_list']) - 1
+                start = random.randint(0, top)
+                end = start
+                while end == start:
+                    end = random.randint(0, top)
+                obj = scene.addObject('bird_cont', own['bird_list'][start], 0)                
+                obj['start'] = own['bird_list'][start]
+                obj['end'] = own['bird_list'][end]
+                obj.worldPosition = obj['start'].worldPosition
+                #print(obj['start'], obj['end'])
             
     def life(own):
         if 'life' in own:

scripts/camera.py

@@ -4,7 +4,6 @@ import mathutils
 from mathutils import *
 scene = bge.logic.getCurrentScene()
 import camFSM
-import birds
 
 def main(cont):
     #camFSM.main(cont)
@@ -44,7 +43,6 @@ def main(cont):
     cam3 = scene.objects['followcam']
     camList = scene.cameras
     freecam = camList["freecam"]
-    dict['camera'] = cam1
 
     if 'init' not in own:
         own['init'] = 1
@@ -62,6 +60,7 @@ def main(cont):
         cam.height = dict['cam_height']
         dict['cam_state'] = 'walking'
         controlcube['ragdoll_active'] = False
+        dict['camera'] = cam1
     acam = scene.active_camera
 
     def get_cam_state():
@@ -92,13 +91,16 @@ def main(cont):
 
         if down.triggered == False and LAST_GRIND == False and cam_moved == 0 and walk == 0:
             camempty['hitdown'] = False
-            if cam_height > (cam_def_height + .06) and zdist > -.2 and raised == 0:
+            if cam_height > (cam_def_height + .08) and zdist > -.2 and raised == 0:
                 cam.height = cam_height - .02
+                print('raising a')
         if cam_height < -.6 and cam_moved == 0 and LAST_GRIND == False and zdist > -.2 and raised == 0 and walk == 0:
             cam_height = .1
+            print('raising b')
         if LAST_GRIND == True and walk == 0:
             if cam.height < -.5 or zdist < -.2:
                 cam.height = cam.height + .013
+                print('raising c')
             if cam.height >= -.5 and not down.triggered:
                 pass
 
@@ -148,15 +150,15 @@ def main(cont):
         if hit[0]:
             #if hitobj != control and walk == 0 and 'vert' not in hit[0] and 'ground' in hit[0] and controlcube['ragdoll_active'] == False:
             if hitobj != control and walk == 0 and 'vert' not in hit[0] and 'ground' in hit[0]:
-                cam.damping = .0
+                cam.damping = .01
                 if cam.height < 2:
                     cam.height = cam_height + .1
                     cam.max = cam.max - .2
-                    #print('small move')
+                    print('small move', cam.height, dict['cam_height'])
                 elif cam.height >= 2 and cam.height < 4:
                     cam.height = cam_height + .05
                     cam.max = cam.max - .05
-                    #print('big move')
+                    print('big move')
 
     if dict['menu_idle_timer'] > 300:
         move_len = 2048
@@ -358,5 +360,4 @@ def main(cont):
             pass
     set_lens_dist()        
     get_cam_state()
-    camFSM.main(cont)
-    birds.main(cont, scene) 
+    camFSM.main(cont)

scripts/colors.py

@@ -52,7 +52,7 @@ def main():
     #print(dict['shirt_color'])
     scol = [dict['shirt_color_r'], dict['shirt_color_g'], dict['shirt_color_b'], 1]
     deckC = [dict['deck_color_r'], dict['deck_color_g'], dict['deck_color_b'], 1]
-    print(scol)
+    #print(scol)
     shirt.color = scol
     deck.color = deckC
     throw_deck.color = deckC
@@ -164,7 +164,7 @@ def update_shirt_tex():
         fileName2 = mainDir + 'textures//shirt//*.png'  
     shirtList = glob.glob(fileName2)
     dict['shirtList'] = shirtList  
-    print(shirtList, 'shirtList')
+    #print(shirtList, 'shirtList')
     ID = texture.materialID(shirt, 'MAshirt')
     shirt_texture = texture.Texture(shirt, ID)
     new_source2 = texture.ImageFFmpeg(shirtList[dict["shirt_logo"]])

scripts/controller2.py

@@ -4510,16 +4510,72 @@ def main():
                 own['ragdoll_out'] = 0
                 stre = 0
                 
-
             armature = scene.objects['Char4']
             for const in armature.constraints:
                 #print(const, 'const')
                 if ('rd_cl' in str(const) or 'rd_cr' in str(const)):
-                    #print(const, 'const', strength)
                     const.enforce = stre  
 
 
 
+    def land_mod():
+        if own['requestAction'] == 'reg_land':
+            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')
+                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':
+            if land_overRideL == True:
+                own['requestAction'] = 'fak_landL'
+                print('requesting unbalanced landf1')
+                own['lland'] = own['requestAction']
+            elif land_overRideR == True:
+                own['requestAction'] = 'fak_landR'
+                print('requesting unbalanced landf2')
+                own['lland'] = own['requestAction']
+            elif land_overRideLb == True:
+                own['requestAction'] = 'fak_landLb'
+                print('requesting unbalanced landf1b')
+                own['lland'] = own['requestAction']
+            elif land_overRideRb == True:
+                own['requestAction'] = 'fak_landRb'
+                print('requesting unbalanced landf2b')
+                own['lland'] = own['requestAction']
+            else:
+                own['lland'] = own['requestAction']   
+
+    def incline_action():
+        own['ground_since'] = ground_since
+        if own['rotz'] < .97:
+            if own['requestAction'] == 'reg_roll':
+                own['requestAction'] = 'reg_opos'
+            if own['requestAction'] == 'reg_turnLeft':
+                own['requestAction'] = 'reg_pump_left'
+            if own['requestAction'] == 'reg_turnRight':
+                own['requestAction'] = 'reg_pump_right'
+
+            if own['requestAction'] == 'fak_roll':
+                own['requestAction'] = 'fak_opos'
+            if own['requestAction'] == 'fak_turnLeft':
+                own['requestAction'] = 'fak_pump_left'
+            if own['requestAction'] == 'fak_turnRight':
+                own['requestAction'] = 'fak_pump_right'        
+
     jump_Timer()
     check_landing()
     nextframe()
@@ -4541,6 +4597,8 @@ def main():
     dropinRotate()
     onboard()
     grind_but_align()
+    land_mod()
+    incline_action()
     #ragdoll_out()
     linvelx = own.getLinearVelocity(True)
     own["linvelx"] = linvelx.x
@@ -4579,31 +4637,7 @@ def main():
     own['lastxBut_ground'] = xBut_ground
     own["last_sel"] = own["sel"]
     own["sel"] = bkBut
-
-    # if r_ground.triggered and own["jump_timer"] < 20:
-    #     if 1 == 1:
-    #         force2 = [0.0, 0, dict['antibounce']]
-
-    #         gdist = ((own.worldPosition.z - r_ground.hitPosition[2]))
-    #         if gdist < .2875 and gdist > .1:
-    #             move = (.2875 - gdist)*.33
-    #             if move > 0:
-    #                 own.worldPosition.z = own.worldPosition.z + move
-    #             else:
-    #                 own.worldPosition.z = own.worldPosition.z - move
-    #             own.linearVelocity.z = 0
-
-    #             friction = .998
-    #             own.linearVelocity.x *= friction
-    #     else:
-    #         gdist = ((own.worldPosition.z - r_ground.hitPosition[2]))
-    #         if gdist < .2875 and gdist > .1:
-    #             move = (.2875 - gdist)*.4
-    #             if move > 0:
-    #                 own.worldPosition.z = own.worldPosition.z + move
-    #             else:
-    #                 own.worldPosition.z = own.worldPosition.z - move
-    #             own.linearVelocity.z = 0
+    dict['walk'] = 0
 
     Axis = 2
     Distance = -10
@@ -4636,7 +4670,7 @@ def main():
             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')
+            #print('moving new ray a')
             #if localRay[2] != [0, 0, -1] and grindHit == 0:
             if localRay[2] != [0, 0, -1]:    
                 #own.alignAxisToVect(localRay[2], 2, .25)
@@ -4750,7 +4784,7 @@ def main():
     if (grindDar == False and onGround and own['grindTouch'] == False) or own['jump_timer'] > 40:
         own['grindType'] = ''
 
-    dict['walk'] = 0
+    
 
 
 
@@ -4763,64 +4797,6 @@ def main():
 
 
 
-    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')
-            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 landf1')
-            own['lland'] = own['requestAction']
-        elif land_overRideR == True:
-            own['requestAction'] = 'fak_landR'
-            print('requesting unbalanced landf2')
-            own['lland'] = own['requestAction']
-        elif land_overRideLb == True:
-            own['requestAction'] = 'fak_landLb'
-            print('requesting unbalanced landf1b')
-            own['lland'] = own['requestAction']
-        elif land_overRideRb == True:
-            own['requestAction'] = 'fak_landRb'
-            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']:
-    #print(own['requestAction'], 'controller end request')
-
-
-
-    own['ground_since'] = ground_since
-    if own['rotz'] < .97:
-        if own['requestAction'] == 'reg_roll':
-            own['requestAction'] = 'reg_opos'
-        if own['requestAction'] == 'reg_turnLeft':
-            own['requestAction'] = 'reg_pump_left'
-        if own['requestAction'] == 'reg_turnRight':
-            own['requestAction'] = 'reg_pump_right'
-
-        if own['requestAction'] == 'fak_roll':
-            own['requestAction'] = 'fak_opos'
-        if own['requestAction'] == 'fak_turnLeft':
-            own['requestAction'] = 'fak_pump_left'
-        if own['requestAction'] == 'fak_turnRight':
-            own['requestAction'] = 'fak_pump_right'
+ 
+
+

scripts/ragdoll.py

@@ -15,20 +15,12 @@ def zero_constraints(own, scene):
         
         if 'rd_cl' in str(const):
             const.enforce = 0
-            #print(const)
+            print(const)
         if 'rd_cr' in str(const):
             const.enforce = 0   
     for x in own['rd_rb'].groupMembers:
         x.suspendDynamics(True)
 
-def set_influence(own, scene, strength):
-    armature = scene.objects['Char4']
-    for const in armature.constraints:
-        #print(const, 'const')
-        if ('rd_cl' in str(const) or 'rd_cr' in str(const)):
-            #print(const, 'const', strength)
-            const.enforce = strength  
-
     
 def update_rb(physBody, scene):
     #print('updating rigid body positions')
@@ -98,10 +90,8 @@ def main():
         own['rd_set_vel'] = False
         own['rd_vel'] = None
         own['rd_incer'] = 0
-        own['rd_life'] = 0
-        zero_constraints(own, scene) 
+        zero_constraints(own, scene)    
 
-    #print(own['rd_life'], 'ragdoll incer')
     #if (sens.positive) or (dict['aBut'] == 1 and dict['bBut'] == 1) or own['fall'] == True:
     if (sens.positive) or own['fall'] == True:
         #print('option1')
@@ -110,7 +100,6 @@ def main():
             #own['fall'] = 1
             own['fall'] = True
             print('do ragdoll')
-            own['rd_life'] = 0
             incer = -1
             update_rb(own['rd_rb'], scene)   
             while incer < 20:
@@ -133,7 +122,7 @@ def main():
             cont.actuators['Camera'].height = 2.0
             #cont.actuators['Camera'].min = 14.0
             #cont.actuators['Camera'].max = 18.0
-            cont.actuators['Camera'].damping = 0.001
+            cont.actuators['Camera'].damping = .000001
             cont.activate(cont.actuators['Camera']) 
                         
             #own.suspendDynamics()
@@ -142,20 +131,16 @@ def main():
 
         if own['ragdoll_active'] == True:
             #pass
-            own['rd_life'] += 1
-            #scene.objects[armature].stopAction(2)
-            #scene.objects[armature].stopAction(7)
-            #scene.objects[armature].update()
-            #cont.actuators['Camera'].object = scene.objects['ragdoll_parent']
-            own.worldPosition = scene.objects['ragdoll_parent'].worldPosition
-            #cont.actuators['Camera'].object = own
+            scene.objects[armature].stopAction(2)
+            scene.objects[armature].stopAction(7)
+            scene.objects[armature].update()
+            cont.actuators['Camera'].object = scene.objects['ragdoll_parent']
             wp = scene.objects['camCube'].worldPosition - scene.objects['ragdoll_parent'].worldPosition
             wp = wp * .9
-            cont.actuators['Camera'].height = 1.7
+            cont.actuators['Camera'].height = 2.0
             cont.actuators['Camera'].min = 4.0
-            cont.actuators['Camera'].max = 7.0
-            #cont.actuators['Camera'].damping = .000001
-            cont.actuators['Camera'].damping = .006#.99
+            cont.actuators['Camera'].max = 8.0
+            cont.actuators['Camera'].damping = .000001
             cont.activate(cont.actuators['Camera']) 
             #print(own['rd_set_vel'], 'vel setter')
             if own['rd_set_vel'] == True:
@@ -171,7 +156,7 @@ def main():
                     #scene.objects['npc_ed_arm_phys_master'].worldLinearVelocity.x = 100
                     #scene.objects['npc_ed_arm_phys_master'].applyForce([5000,0,0], False)
                     for pB in own['rd_rb'].groupMembers:
-                        #print('setting', pB, own['rd_vel'])
+                        print('setting', pB, own['rd_vel'])
                         
                         try:
                             #pass
@@ -179,15 +164,14 @@ def main():
                             #pB.worldLinearVelocity.x = 100
                             #pB.worldLinearVelocity = own['rd_vel']
                             pB.setLinearVelocity(own['rd_vel'], False)
-                            #print('adding force to', pB, pB.worldLinearVelocity)
+                            print('adding force to', pB, pB.worldLinearVelocity)
                         except:
-                            #print('cant add force to ', pB)
-                            pass
+                            print('cant add force to ', pB)
                 else:
                     own['rd_incer'] = 0
                     own['rd_set_vel'] = False
             
-            if dict['last_yBut'] == 1 and dict['yBut'] == 0:                
+            if dict['yBut'] == 1:                
                 print('turn off ragdoll')
                 zero_constraints(own, scene)
                 scene.objects[armature].setParent(own, False, True)
@@ -195,24 +179,20 @@ def main():
                 for x in own['rd_rb'].groupMembers:
                     x.suspendDynamics(True)
                 own['ragdoll_active'] = False    
-                own['rd_life'] = 0
-                #print(scene.objects[armature].parent, 'parent')
+                print(scene.objects[armature].parent, 'parent')
                 cont.actuators['Camera'].object = scene.objects['camCube']
                 cont.activate(cont.actuators['Camera']) 
                 own.worldPosition = scene.objects['npc_ed_arm_phys_master'].worldPosition
                 own.worldPosition.z += .4
-                own['requestAction'] = 'reg_onboard'
-                own['ragdoll_out'] = 1
                 cont.activate(cont.actuators['walk']) 
-                
 
 
-            if dict['lUD'] < -.08 and own['rd_life'] > 360:
+            if dict['lUD'] < -.08:
                 physBody = own['rd_rb']
                 excludes = ['npc_ed_arm_phys_hand.R', 'npc_ed_arm_phys_hand.L', 'npc_ed_arm_phys_forearm.fk.L', 'npc_ed_arm_phys_forearm.fk.R', 'npc_ed_arm_phys_upper_arm.fk.L', 'npc_ed_arm_phys_upper_arm.fk.R']
                 #excludes = []
                 for x in physBody.groupMembers:
-                    #print(x.name)
+                    print(x.name)
                                     
                     if x.name not in excludes:
                         pass
@@ -232,23 +212,8 @@ def main():
                 scene.objects['npc_ed_arm_phys_clavicle.L'].applyForce([0,0,200], False)
                 scene.objects['npc_ed_arm_phys_clavicle.R'].applyForce([0,0,200], False)
 
-            if dict['rUD'] > .08 and own['rd_life'] > 360:
+            if dict['rUD'] > .08:
                 scene.objects['npc_ed_arm_phys_master'].applyForce([0,600,0], True)
-
-            blendamt = 20
-            if own['rd_life'] < blendamt:
-                dif = own['rd_life'] / blendamt
-            else:
-                dif = 1
-            set_influence(own, scene, dif)
-             
-            # scene.objects[armature].stopAction(1)
-            # scene.objects[armature].stopAction(2)
-            # scene.objects[armature].stopAction(3)
-            # scene.objects[armature].stopAction(4)
-            # scene.objects[armature].update()
- 
         else:
             update_rb(own['rd_rb'], scene)   
-            #pass
-        scene.objects[armature].update()    
+            #pass

scripts/scene_init.py

@@ -160,6 +160,7 @@ def main():
         own['lland'] = ''
         own['grinding'] = False
         own['ground_since'] = 100
+        own['last_transition_frame'] = 0
         
         colors.update_shirt_tex() 
         colors.update_truck_tex()