diff --git a/assets/Data/creatures.json b/assets/Data/creatures.json index 569c30f8..3d085854 100644 --- a/assets/Data/creatures.json +++ b/assets/Data/creatures.json @@ -105,6 +105,20 @@ "name" : "Armature|WalkStart", "length" : 1, "loops" : false + }, + "sprintSystem" : { + "maxVelocity" : 5.8, + "staminaMax" : 500, + "animationStartUp" : { + "name" : "SprintStart", + "length" : 1, + "loops" : false + }, + "animationMain" : { + "name" : "Sprint", + "length" : 1, + "loops" : false + } } } ], diff --git a/assets/Data/items.json b/assets/Data/items.json index 9fa9fe0e..7f48f51d 100644 --- a/assets/Data/items.json +++ b/assets/Data/items.json @@ -42,9 +42,9 @@ "type" : "CUBE", "dimension1" : 0.1, "dimension2" : 0.1, - "dimension3" : 0.1, + "dimension3" : 0.35, "offsetX" : 0, - "offsetY" : 0.1, + "offsetY" : 0.05, "offsetZ" : 0 } } diff --git a/assets/Models/person1animpass2.fbx b/assets/Models/person1animpass2.fbx index 319e508d..59d0a3d6 100644 Binary files a/assets/Models/person1animpass2.fbx and b/assets/Models/person1animpass2.fbx differ diff --git a/src/main/java/electrosphere/controls/ControlHandler.java b/src/main/java/electrosphere/controls/ControlHandler.java index 097214a3..89dab308 100644 --- a/src/main/java/electrosphere/controls/ControlHandler.java +++ b/src/main/java/electrosphere/controls/ControlHandler.java @@ -372,14 +372,15 @@ public class ControlHandler { if(controls.get(INPUT_CODE_SPRINT).isIsKey() && glfwGetKey(Globals.window, controls.get(INPUT_CODE_SPRINT).getKeyValue()) == GLFW_PRESS){ if(controls.get(INPUT_CODE_SPRINT).isState() == false){ if(sprintTree != null){ - System.out.println("Sprint code"); sprintTree.start(); } } controls.get(INPUT_CODE_SPRINT).setState(true); } else { if(controls.get(INPUT_CODE_SPRINT).isState() == true){ - sprintTree.stop(); + if(sprintTree != null){ + sprintTree.stop(); + } } controls.get(INPUT_CODE_SPRINT).setState(false); } diff --git a/src/main/java/electrosphere/net/server/ServerConnectionHandler.java b/src/main/java/electrosphere/net/server/ServerConnectionHandler.java index 99c654bf..4aa56d50 100644 --- a/src/main/java/electrosphere/net/server/ServerConnectionHandler.java +++ b/src/main/java/electrosphere/net/server/ServerConnectionHandler.java @@ -97,7 +97,7 @@ public class ServerConnectionHandler implements Runnable { Player newPlayerObject = new Player(this); Globals.playerManager.addPlayer(newPlayerObject); //spawn player in world - Entity newPlayerCharacter = CreatureUtils.spawnBasicCreature("Goblin"); + Entity newPlayerCharacter = CreatureUtils.spawnBasicCreature("Human"); playerCharacterID = newPlayerCharacter.getId(); CollisionObjUtils.positionCharacter(newPlayerCharacter, new Vector3f(Globals.spawnPoint.x,Globals.spawnPoint.y,Globals.spawnPoint.z)); //attach player object to player character