Added some more frames for Blue.

Updated Action constructors.
This commit is contained in:
no
2021-06-10 10:06:44 +02:00
parent 10b3b60598
commit f56c84ef8e
7 changed files with 238 additions and 26 deletions

View File

@ -10,24 +10,31 @@ public class Attack implements Action {
/**
* Defines if the attack is a special one (E.G. a fireball) or a normal one (a punch)
*/
private static boolean isSpecial;
private boolean isSpecial;
private Status requiredStatus;
private static Status requiredStatus;
/**
* The suite of Inputs to have the move come out.
* For example, a classic fireball would be something like
* {{DOWN},{DOWN,RIGHT},{RIGHT},{A}}
*/
private static ButtonIG[][] command;
private ButtonIG[][] command;
/**
* The different sections of the attack
*/
private attackPart[] parts;
public Attack(boolean isSpecial, Status requiredStatus, ButtonIG[][] command, attackPart[] parts) {
this.isSpecial = isSpecial;
this.requiredStatus = requiredStatus;
this.command = command;
this.parts = parts;
}
@Override
public ArrayList<Frame> getFrame() {
ArrayList<Frame> res = new ArrayList<Frame>();
@ -47,21 +54,21 @@ public class Attack implements Action {
return res;
}
public static boolean isIsSpecial() {
return isSpecial;
public boolean isIsSpecial() {
return this.isSpecial;
}
public static void setIsSpecial(boolean isSpecial) {
Attack.isSpecial = isSpecial;
public void setIsSpecial(boolean isSpecial) {
this.isSpecial = isSpecial;
}
@Override
public ButtonIG[][] getCommand() {
return command;
return this.command;
}
public static void setCommand(ButtonIG[][] command) {
Attack.command = command;
public void setCommand(ButtonIG[][] command) {
this.command = command;
}
public attackPart[] getParts() {
@ -72,13 +79,15 @@ public class Attack implements Action {
this.parts = parts;
}
public static Status getRequiredStatus() {
return requiredStatus;
public Status getRequiredStatus() {
return this.requiredStatus;
}
public static void setRequiredStatus(Status requiredStatus) {
Attack.requiredStatus = requiredStatus;
public void setRequiredStatus(Status requiredStatus) {
this.requiredStatus = requiredStatus;
}
public boolean isSpecial() {return this.isSpecial();}
}

View File

@ -11,11 +11,11 @@ public class Dash implements Action {
* For example, a Front Dash would be something like
* {{FORWARD},{FORWARD}}
*/
private static ButtonIG[][] command;
private ButtonIG[][] command;
private Frame[] frames;
@Override
public ArrayList<Frame> getFrame() {
ArrayList<Frame> res = new ArrayList<Frame>();
@ -27,7 +27,11 @@ public class Dash implements Action {
@Override
public ButtonIG[][] getCommand() {
return command;
return this.command;
}
public Dash(ButtonIG[][] command, Frame[] frames) {
this.command = command;
this.frames = frames;
}
}

View File

@ -12,7 +12,7 @@ public class Jump implements Action {
* For example, a Front Jump would be something like
* {{UP,RIGHT}}
*/
private static ButtonIG[][] command;
private ButtonIG[][] command;
private Frame[] frames;
@ -27,7 +27,11 @@ public class Jump implements Action {
@Override
public ButtonIG[][] getCommand() {
return command;
return this.command;
}
public Jump(ButtonIG[][] command, Frame[] frames) {
this.command = command;
this.frames = frames;
}
}

View File

@ -10,7 +10,7 @@ public class Throw implements Action {
/**
* Defines if the throw is a special one (E.G. a Moonsault Press ) or a normal one
*/
private static boolean isSpecial;
private boolean isSpecial;
/**
* The suite of Inputs to have the move come out.
@ -52,7 +52,14 @@ public class Throw implements Action {
@Override
public ButtonIG[][] getCommand() {
return command;
return this.command;
}
public Throw(boolean isSpecial, ThrowPart[] parts) {
this.isSpecial = isSpecial;
this.parts = parts;
}
public Throw() {
}
}