sigonasr2/RabiClone
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add a slide buffer so it can be queued prior to landing.

Browse Source 
Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com>
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
This commit is contained in:
sigonasr2, Sig, Sigo 2022-06-09 17:52:33 +00:00 committed by GitHub
parent 72565d2b02
commit 537bc7c744
5 changed files with 55 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/RabiClone.jar
View File

Binary file not shown.

47
src/sig/RabiClone.java
View File

@ -89,35 +89,7 @@ public class RabiClone{
double updateMult = Math.min(1/60d,timePassed/1000000000d);
//System.out.println(CONTROLLERS.length);
for (int i=0;i<CONTROLLERS.length;i++) {
if (CONTROLLERS[i].getType()==Controller.Type.KEYBOARD||CONTROLLERS[i].getType()==Controller.Type.MOUSE) {
continue;
}
if (CONTROLLERS[i].poll()) {
//System.out.println(CONTROLLERS[i].getPortType()+" // "+CONTROLLERS[i].getType());
Component[] components = CONTROLLERS[i].getComponents();
for (int j=0;j<components.length;j++) {
//Component c = components[j];
//System.out.println(c.getName()+","+c.getIdentifier()+": "+c.getPollData());
}
//System.out.println("--------");
} else {
Controller[] newArr = new Controller[CONTROLLERS.length-1];
for (int j=0;j<CONTROLLERS.length;j++) {
if (j!=i) {
newArr[(j>i?j-1:j)]=CONTROLLERS[i];
}
}
CONTROLLERS=newArr;
}
/*EventQueue queue = controller_list[i].getEventQueue();
while (queue.getNextEvent(event)) {
Component c = event.getComponent();
System.out.println(c.getName()+","+c.getIdentifier()+": "+c.getPollData());
}*/
}
handleGameControllers();
KeyBind.poll();
@ -155,6 +127,23 @@ public class RabiClone{
}
}
private static void handleGameControllers() {
for (int i=0;i<CONTROLLERS.length;i++) {
if (CONTROLLERS[i].getType()==Controller.Type.KEYBOARD||CONTROLLERS[i].getType()==Controller.Type.MOUSE) {
continue;
}
if (!CONTROLLERS[i].poll()) {
Controller[] newArr = new Controller[CONTROLLERS.length-1];
for (int j=0;j<CONTROLLERS.length;j++) {
if (j!=i) {
newArr[(j>i?j-1:j)]=CONTROLLERS[i];
}
}
CONTROLLERS=newArr;
}
}
}
private static void ResetGame() {
player=null;
level_renderer=null;

4
src/sig/engine/KeyBind.java
View File

@ -111,13 +111,13 @@ public class KeyBind {
}
private static void emitReleaseEvent(Action a) {
System.out.println("Release for "+a);
//System.out.println("Release for "+a);
for (int i=0;i<RabiClone.OBJ.size();i++) {
RabiClone.OBJ.get(i).KeyReleased(a);
}
}
private static void emitPressEvent(Action a) {
System.out.println("Press for "+a);
//System.out.println("Press for "+a);
for (int i=0;i<RabiClone.OBJ.size();i++) {
RabiClone.OBJ.get(i).KeyPressed(a);
}

1
src/sig/engine/String.java
View File

@ -2,7 +2,6 @@ package sig.engine;
import java.util.regex.Pattern;
@SuppressWarnings("unused")
public class String{
private StringBuilder sb;
private Point bounds = new Point(0,1);

53
src/sig/objects/Player.java
View File

@ -12,14 +12,14 @@ import sig.map.View;
import sig.objects.actor.State;
public class Player extends AnimatedObject{
final double GRAVITY = 1300;
final double NORMAL_FRICTION = 6400;
final double NORMAL_JUMP_VELOCITY = -300;
final boolean LEFT = false;
final boolean RIGHT = true;
final int jump_fall_AnimationWaitTime = 200;
final int slide_AnimationWaitTime = 100;
final int slide_duration = 700;
final static double GRAVITY = 1300;
final static double NORMAL_FRICTION = 6400;
final static double NORMAL_JUMP_VELOCITY = -300;
final static boolean LEFT = false;
final static boolean RIGHT = true;
final static int jump_fall_AnimationWaitTime = 200;
final static int slide_AnimationWaitTime = 100;
final static int slide_duration = 700;
double y_acceleration = GRAVITY;
double y_acceleration_limit = 100;
@ -56,6 +56,9 @@ public class Player extends AnimatedObject{
long slide_time = -1;
int jumpHoldTime = 150;
final static int slideBufferTime = 200;
long slidePressed = -1;
public Player(Panel panel) {
super(Sprite.ERINA,5,panel);
setX(RabiClone.BASE_WIDTH/2-getAnimatedSpr().getWidth()/2);
@ -83,6 +86,11 @@ public class Player extends AnimatedObject{
}
break;
case IDLE:
if (System.currentTimeMillis()-slidePressed<=slideBufferTime) {
performSlide();
break;
}
jump_velocity = NORMAL_JUMP_VELOCITY;
horizontal_friction = NORMAL_FRICTION;
jump_slide_fall_StartAnimationTimer=-1;
@ -164,17 +172,14 @@ public class Player extends AnimatedObject{
break;
case IDLE:
if(a==Action.SLIDE||a==Action.FALL){
slide_time = System.currentTimeMillis();
if(facing_direction){
x_velocity=sliding_velocity;
}
else{
x_velocity=-sliding_velocity;
}
state=State.SLIDE;
performSlide();
}
break;
case FALLING:
if (a==Action.SLIDE||a==Action.FALL) {
slidePressed=System.currentTimeMillis();
//System.out.println("Queue up slide.");
}
case JUMP:
if(jumpCount>0 && spacebarReleased && (a==Action.JUMP)){
jumpCount=0;
@ -215,6 +220,18 @@ public class Player extends AnimatedObject{
}
private void performSlide() {
slide_time = System.currentTimeMillis();
if(facing_direction){
x_velocity=sliding_velocity;
}
else{
x_velocity=-sliding_velocity;
}
state=State.SLIDE;
}
private void handleCameraRoomMovement() {
int tileX = (int)(getX())/Tile.TILE_WIDTH;
int tileY = (int)(getY())/Tile.TILE_HEIGHT;
@ -340,8 +357,8 @@ public class Player extends AnimatedObject{
}
}
if (y_velocity==0) {
Tile checked_tile_bottom_right = RabiClone.CURRENT_MAP.getTile((int)(getX()+getAnimatedSpr().getWidth()/2-4)/Tile.TILE_WIDTH, (int)(getY()+getAnimatedSpr().getHeight()/2+0.5)/Tile.TILE_HEIGHT);
Tile checked_tile_bottom_left = RabiClone.CURRENT_MAP.getTile((int)(getX()-getAnimatedSpr().getWidth()/2+4)/Tile.TILE_WIDTH, (int)(getY()+getAnimatedSpr().getHeight()/2+0.5)/Tile.TILE_HEIGHT);
Tile checked_tile_bottom_right = RabiClone.CURRENT_MAP.getTile((int)(getX()+getAnimatedSpr().getWidth()/2-4)/Tile.TILE_WIDTH, (int)(getY()+getAnimatedSpr().getHeight()/2+1)/Tile.TILE_HEIGHT);
Tile checked_tile_bottom_left = RabiClone.CURRENT_MAP.getTile((int)(getX()-getAnimatedSpr().getWidth()/2+4)/Tile.TILE_WIDTH, (int)(getY()+getAnimatedSpr().getHeight()/2+1)/Tile.TILE_HEIGHT);
if (!(checked_tile_bottom_right.getCollision()==CollisionType.BLOCK||checked_tile_bottom_left.getCollision()==CollisionType.BLOCK)) {
groundCollision=false;
} else {