Rativel/jeu-de-combat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Input recognition modification. Hopefully finally works.

Browse Source
This commit is contained in:
Azra Victor 2021-06-16 12:27:49 +02:00 committed by no
parent 1945e7bd4a
commit fa3c5eb4a7
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gameplay/input/InputBuffer.java
View File

@ -118,7 +118,7 @@ public class InputBuffer {
else {frameToCheck = startFrameCount - backCounter;} else {frameToCheck = startFrameCount - backCounter;}
boolean search = true; boolean search = true;
while(ret && search) { while(ret && search) {
if(this.inputList[frameToCheck].containsButtonTab2(command[i])) { if(this.inputList[frameToCheck].equalsButtonTab(command[i])) {
ret = true; ret = true;
search = false; search = false;
} else { } else {

19
src/gameplay/input/Inputs.java
View File

@ -70,24 +70,25 @@ public class Inputs {
* @param bs a number of inputs. Check if those are contained in this * @param bs a number of inputs. Check if those are contained in this
* @return true if all inputs of in are also in this * @return true if all inputs of in are also in this
*/ */
public boolean containsButtonTab2(ButtonIG[] bs) { public boolean equalsButtonTab(ButtonIG[] bs) {
ButtonIG[] directions = {DOWN,FORWARD,UP,BACK}; ButtonIG[] directions = {DOWN,FORWARD,UP,BACK};
ButtonIG[] buttons = {A,B,C,D}; ButtonIG[] buttons = {A,B,C,D};
Inputs inp = new Inputs();
for(int i = 0; i < bs.length; i++) {
inp.recordOneInput(bs[1]);
}
if(!this.containsButtonTab(bs)){return false;}
for(ButtonIG d : directions) { for(ButtonIG d : directions) {
if(!this.containsInput(d) && buttonTabContainsButton(bs, d)) { return false;} if(!this.containsInput(d) && inp.containsInput(d)) { return false;}
if(this.containsInput(d) && !buttonTabContainsButton(bs, d)) { return false;} if(this.containsInput(d) && !inp.containsInput(d)) { return false;}
} }
for(ButtonIG d : buttons) { for(ButtonIG d : buttons) {
if(!this.containsInput(d) && buttonTabContainsButton(bs, d)) { return false;} if(!this.containsInput(d) && inp.containsInput(d)) { return false;}
if(this.containsInput(d) && !buttonTabContainsButton(bs, d)) { return false;} if(this.containsInput(d) && !inp.containsInput(d)) { return false;}
} }
return true; return true;
} }
private static boolean buttonTabContainsButton(ButtonIG[] bs, ButtonIG b) {
for (int i = 0; i < bs.length; i++) { if(bs[i] == b) return true; }
return false;
}
public boolean[] getInputs() { public boolean[] getInputs() {
return this.tab; return this.tab;