studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strafing work
All checks were successful
studiorailgun/Renderer/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
austin 2024-08-14 12:58:44 -04:00
parent 9750091a49
commit b36168bb14
5 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/Models/creatures/person2/person2_1.glb
View File

Binary file not shown.

24
src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java
View File

@ -563,10 +563,10 @@ public class ClientGroundMovementTree implements BehaviorTree {
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = Animation.ANIMATION_WALK_RIGHT;
break; break;
case FORWARD_LEFT: case FORWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = animationStartUp;
break; break;
case FORWARD_RIGHT: case FORWARD_RIGHT:
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = animationStartUp;
break; break;
case BACKWARD_LEFT: case BACKWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = Animation.ANIMATION_WALK_LEFT;
@ -591,10 +591,10 @@ public class ClientGroundMovementTree implements BehaviorTree {
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = Animation.ANIMATION_WALK_RIGHT;
break; break;
case FORWARD_LEFT: case FORWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = animationMain;
break; break;
case FORWARD_RIGHT: case FORWARD_RIGHT:
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = animationMain;
break; break;
case BACKWARD_LEFT: case BACKWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = Animation.ANIMATION_WALK_LEFT;
@ -619,10 +619,10 @@ public class ClientGroundMovementTree implements BehaviorTree {
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = Animation.ANIMATION_WALK_RIGHT;
break; break;
case FORWARD_LEFT: case FORWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = animationSlowDown;
break; break;
case FORWARD_RIGHT: case FORWARD_RIGHT:
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = animationSlowDown;
break; break;
case BACKWARD_LEFT: case BACKWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = Animation.ANIMATION_WALK_LEFT;
@ -654,10 +654,10 @@ public class ClientGroundMovementTree implements BehaviorTree {
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = Animation.ANIMATION_WALK_RIGHT;
break; break;
case FORWARD_LEFT: case FORWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = animationStartUp;
break; break;
case FORWARD_RIGHT: case FORWARD_RIGHT:
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = animationStartUp;
break; break;
case BACKWARD_LEFT: case BACKWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = Animation.ANIMATION_WALK_LEFT;
@ -682,10 +682,10 @@ public class ClientGroundMovementTree implements BehaviorTree {
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = Animation.ANIMATION_WALK_RIGHT;
break; break;
case FORWARD_LEFT: case FORWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = animationMain;
break; break;
case FORWARD_RIGHT: case FORWARD_RIGHT:
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = animationMain;
break; break;
case BACKWARD_LEFT: case BACKWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = Animation.ANIMATION_WALK_LEFT;
@ -710,10 +710,10 @@ public class ClientGroundMovementTree implements BehaviorTree {
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = Animation.ANIMATION_WALK_RIGHT;
break; break;
case FORWARD_LEFT: case FORWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = animationSlowDown;
break; break;
case FORWARD_RIGHT: case FORWARD_RIGHT:
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = animationSlowDown;
break; break;
case BACKWARD_LEFT: case BACKWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = Animation.ANIMATION_WALK_LEFT;

24
src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java
View File

@ -551,10 +551,10 @@ public class ServerGroundMovementTree implements BehaviorTree {
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = Animation.ANIMATION_WALK_RIGHT;
break; break;
case FORWARD_LEFT: case FORWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = animationStartUp;
break; break;
case FORWARD_RIGHT: case FORWARD_RIGHT:
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = animationStartUp;
break; break;
case BACKWARD_LEFT: case BACKWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = Animation.ANIMATION_WALK_LEFT;
@ -579,10 +579,10 @@ public class ServerGroundMovementTree implements BehaviorTree {
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = Animation.ANIMATION_WALK_RIGHT;
break; break;
case FORWARD_LEFT: case FORWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = animationMain;
break; break;
case FORWARD_RIGHT: case FORWARD_RIGHT:
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = animationMain;
break; break;
case BACKWARD_LEFT: case BACKWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = Animation.ANIMATION_WALK_LEFT;
@ -607,10 +607,10 @@ public class ServerGroundMovementTree implements BehaviorTree {
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = Animation.ANIMATION_WALK_RIGHT;
break; break;
case FORWARD_LEFT: case FORWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = animationMain;
break; break;
case FORWARD_RIGHT: case FORWARD_RIGHT:
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = animationMain;
break; break;
case BACKWARD_LEFT: case BACKWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = Animation.ANIMATION_WALK_LEFT;
@ -642,10 +642,10 @@ public class ServerGroundMovementTree implements BehaviorTree {
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = Animation.ANIMATION_WALK_RIGHT;
break; break;
case FORWARD_LEFT: case FORWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = animationMain;
break; break;
case FORWARD_RIGHT: case FORWARD_RIGHT:
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = animationMain;
break; break;
case BACKWARD_LEFT: case BACKWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = Animation.ANIMATION_WALK_LEFT;
@ -670,10 +670,10 @@ public class ServerGroundMovementTree implements BehaviorTree {
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = Animation.ANIMATION_WALK_RIGHT;
break; break;
case FORWARD_LEFT: case FORWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = animationMain;
break; break;
case FORWARD_RIGHT: case FORWARD_RIGHT:
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = animationMain;
break; break;
case BACKWARD_LEFT: case BACKWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = Animation.ANIMATION_WALK_LEFT;
@ -698,10 +698,10 @@ public class ServerGroundMovementTree implements BehaviorTree {
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = Animation.ANIMATION_WALK_RIGHT;
break; break;
case FORWARD_LEFT: case FORWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = animationMain;
break; break;
case FORWARD_RIGHT: case FORWARD_RIGHT:
rVal = Animation.ANIMATION_WALK_RIGHT; rVal = animationMain;
break; break;
case BACKWARD_LEFT: case BACKWARD_LEFT:
rVal = Animation.ANIMATION_WALK_LEFT; rVal = Animation.ANIMATION_WALK_LEFT;

25
src/main/java/electrosphere/game/data/item/type/WeaponData.java
View File

@ -11,13 +11,22 @@ public class WeaponData {
//the class of weapon (ie sword, bow, etc) //the class of weapon (ie sword, bow, etc)
String weaponClass; String weaponClass;
//the hitboxes associated with the weapon //the hitboxes associated with the weapon
List<HitboxData> hitboxes; List<HitboxData> hitboxes;
//the damage the weapon does //the damage the weapon does
int damage; int damage;
//the model for the projectile //the model for the projectile
String projectileModel; String projectileModel;
//The movespeed penalty applied when this weapon is used to perform an action
double weaponActionMovePenalty;
//The base move penalty applied when having the weapon equipped in the first place
double weaponBaseMovePenalty;
/** /**
* Gets the weapon class * Gets the weapon class
* @return the weapon class * @return the weapon class
@ -50,4 +59,20 @@ public class WeaponData {
return damage; return damage;
} }
/**
* Gets the movement penalty (a percentage) applied when an action is performed with this weapon
* @return The movement penalty percentage (ie 0.7 means you should be 70% as fast)
*/
public double getWeaponActionMovePenalty(){
return weaponActionMovePenalty;
}
/**
* Gets the movement penalty (a percentage) applied when this weapon is equipped
* @return The movementy penalty percentage (ie a 0.7 means you should be 70% as fast)
*/
public double getWeaponBaseMovePenalty(){
return weaponBaseMovePenalty;
}
} }

4
src/main/java/electrosphere/renderer/anim/Animation.java
View File

@ -29,8 +29,8 @@ public class Animation {
public static final String ANIMATION_SPRINT_STARTUP = "RunStart"; public static final String ANIMATION_SPRINT_STARTUP = "RunStart";
public static final String ANIMATION_SPRINT = "Run"; public static final String ANIMATION_SPRINT = "Run";
public static final String ANIMATION_SPRINT_WINDDOWN = "RunStart"; public static final String ANIMATION_SPRINT_WINDDOWN = "RunStart";
public static final String ANIMATION_WALK_RIGHT = "JogRight"; public static final String ANIMATION_WALK_RIGHT = "WalkStrafeRight";
public static final String ANIMATION_WALK_LEFT = "JogLeft"; public static final String ANIMATION_WALK_LEFT = "WalkStrafeLeft";