diff --git a/assets/Data/creatures/human.json b/assets/Data/creatures/human.json index 608d29c4..7f810977 100644 --- a/assets/Data/creatures/human.json +++ b/assets/Data/creatures/human.json @@ -74,10 +74,10 @@ "movementSystems" : [ { "type" : "GROUND", - "acceleration" : 16.0, + "acceleration" : 1000.0, "maxVelocity" : 1.0, "animationStartup" : { - "name" : "Armature|WalkStart", + "name" : "Armature|Walk", "length" : 1, "loops" : false }, @@ -87,7 +87,7 @@ "loops" : false }, "animationWindDown" : { - "name" : "Armature|WalkStart", + "name" : "Armature|Walk", "length" : 1, "loops" : false }, diff --git a/assets/Models/baseman.fbx b/assets/Models/baseman.fbx index 15b50384..44c90e68 100644 Binary files a/assets/Models/baseman.fbx and b/assets/Models/baseman.fbx differ diff --git a/assets/Textures/default_texture_map.json b/assets/Textures/default_texture_map.json index 759dbf17..c7abe1cf 100644 --- a/assets/Textures/default_texture_map.json +++ b/assets/Textures/default_texture_map.json @@ -73,51 +73,51 @@ "/Textures/skin1.png", "/Textures/skin1.png" ], - "HandLeft" : [ + "Hand.L" : [ "/Textures/skin1.png", "/Textures/skin1.png" ], - "ForearmLeft" : [ + "Forearm.L" : [ "/Textures/skin1.png", "/Textures/skin1.png" ], - "BicepLeft" : [ + "Bicep.L" : [ "/Textures/skin1.png", "/Textures/skin1.png" ], - "HandRight" : [ + "Hand.R" : [ "/Textures/skin1.png", "/Textures/skin1.png" ], - "ForearmRight" : [ + "Forearm.R" : [ "/Textures/skin1.png", "/Textures/skin1.png" ], - "BicepRight" : [ + "Bicep.R" : [ "/Textures/skin1.png", "/Textures/skin1.png" ], - "FootLeft" : [ + "Foot.L" : [ "/Textures/skin1.png", "/Textures/skin1.png" ], - "FootRight" : [ + "Foot.R" : [ "/Textures/skin1.png", "/Textures/skin1.png" ], - "LowerLegLeft" : [ + "LowerLeg.L" : [ "/Textures/skin1.png", "/Textures/skin1.png" ], - "LowerLegRight" : [ + "LowerLeg.R" : [ "/Textures/skin1.png", "/Textures/skin1.png" ], - "UpperLegLeft" : [ + "UpperLeg.L" : [ "/Textures/skin1.png", "/Textures/skin1.png" ], - "UpperLegRight" : [ + "UpperLeg.R" : [ "/Textures/skin1.png", "/Textures/skin1.png" ], @@ -125,11 +125,15 @@ "/Textures/skin1.png", "/Textures/skin1.png" ], - "ShoulderLeft" : [ + "Shoulder.L" : [ "/Textures/skin1.png", "/Textures/skin1.png" ], - "ShoulderRight" : [ + "Shoulder.R" : [ + "/Textures/skin1.png", + "/Textures/skin1.png" + ], + "Neck" : [ "/Textures/skin1.png", "/Textures/skin1.png" ], @@ -137,19 +141,19 @@ "/Textures/skin1.png", "/Textures/skin1.png" ], - "EyebrowRight" : [ + "Eyebrow.R" : [ "/Textures/b1.png", "/Textures/b1.png" ], - "EyebrowLeft" : [ + "Eyebrow.L" : [ "/Textures/b1.png", "/Textures/b1.png" ], - "EyeRight" : [ + "Eye.R" : [ "/Textures/w1.png", "/Textures/w1.png" ], - "EyeLeft" : [ + "Eye.L" : [ "/Textures/w1.png", "/Textures/w1.png" ] diff --git a/src/main/java/electrosphere/entity/Entity.java b/src/main/java/electrosphere/entity/Entity.java index e7e9d4d9..f3988d08 100644 --- a/src/main/java/electrosphere/entity/Entity.java +++ b/src/main/java/electrosphere/entity/Entity.java @@ -50,8 +50,8 @@ public class Entity { } public Entity(){ - data = new HashMap(); - dataKeys = new LinkedList(); + data = new HashMap(); + dataKeys = new LinkedList(); while(Globals.entityManager.getEntityFromId(entity_id_iterator)!=null){ entity_id_iterator++; } diff --git a/src/main/java/electrosphere/entity/state/movement/GroundMovementTree.java b/src/main/java/electrosphere/entity/state/movement/GroundMovementTree.java index da598f10..837fdcd2 100644 --- a/src/main/java/electrosphere/entity/state/movement/GroundMovementTree.java +++ b/src/main/java/electrosphere/entity/state/movement/GroundMovementTree.java @@ -74,7 +74,7 @@ public class GroundMovementTree { Collidable collidable; - CopyOnWriteArrayList networkMessageQueue = new CopyOnWriteArrayList(); + CopyOnWriteArrayList networkMessageQueue = new CopyOnWriteArrayList(); long lastUpdateTime = 0; @@ -225,17 +225,6 @@ public class GroundMovementTree { entityActor.playAnimation(animationToPlay,1); entityActor.incrementAnimationTime(0.01); } - // if(sprintTree != null && sprintTree.state == SprintTreeState.SPRINTING){ - // if(!entityActor.isPlayingAnimation() || !entityActor.isPlayingAnimation(animationSprintStart)){ - // entityActor.playAnimation(animationSprintStart,1); - // entityActor.incrementAnimationTime(0.01); - // } - // } else { - // if(!entityActor.isPlayingAnimation() || !entityActor.isPlayingAnimation(animationStartUp)){ - // entityActor.playAnimation(animationStartUp,1); - // entityActor.incrementAnimationTime(0.01); - // } - // } } //check if can transition state if(velocity >= maxNaturalVelocity){ @@ -314,17 +303,6 @@ public class GroundMovementTree { entityActor.playAnimation(animationToPlay,1); entityActor.incrementAnimationTime(0.01); } - // if(sprintTree != null && sprintTree.state == SprintTreeState.SPRINTING){ - // if(!entityActor.isPlayingAnimation() || !entityActor.isPlayingAnimation(animationSprint)){ - // entityActor.playAnimation(animationSprint,1); - // entityActor.incrementAnimationTime(0.01); - // } - // } else { - // if(!entityActor.isPlayingAnimation() || !entityActor.isPlayingAnimation(animationMain)){ - // entityActor.playAnimation(animationMain,1); - // entityActor.incrementAnimationTime(0.01); - // } - // } } if(velocity != maxNaturalVelocity){ velocity = maxNaturalVelocity; @@ -401,17 +379,6 @@ public class GroundMovementTree { entityActor.playAnimation(animationToPlay,1); entityActor.incrementAnimationTime(0.01); } - // if(sprintTree != null && sprintTree.state == SprintTreeState.SPRINTING){ - // if(!entityActor.isPlayingAnimation() || !entityActor.isPlayingAnimation(animationSprintWindDown)){ - // entityActor.playAnimation(animationSprintWindDown,1); - // entityActor.incrementAnimationTime(0.01); - // } - // } else { - // if(!entityActor.isPlayingAnimation() || !entityActor.isPlayingAnimation(animationSlowDown)){ - // entityActor.playAnimation(animationSlowDown,1); - // entityActor.incrementAnimationTime(0.01); - // } - // } } //check if can transition state if(velocity <= 0){