From 1bf42701299ec6133b86a228fa8a288afd1bafa0 Mon Sep 17 00:00:00 2001 From: Azra Victor Date: Wed, 23 Jun 2021 23:23:37 +0200 Subject: [PATCH 1/9] adjusted pushbox for the knocked down frames of blue somewhat --- .../Characters/Blue/BlueBaseFrames.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java index 9ad27b5..cb15aa8 100644 --- a/src/gameplay/Characters/Blue/BlueBaseFrames.java +++ b/src/gameplay/Characters/Blue/BlueBaseFrames.java @@ -765,7 +765,7 @@ public class BlueBaseFrames { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + Push_HitBox pB1 = new Push_HitBox(300,-450,200,300); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); @@ -793,7 +793,7 @@ public class BlueBaseFrames { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + Push_HitBox pB1 = new Push_HitBox(300,-450,200,300); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); @@ -821,7 +821,7 @@ public class BlueBaseFrames { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + Push_HitBox pB1 = new Push_HitBox(300,-450,200,300); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); @@ -849,7 +849,7 @@ public class BlueBaseFrames { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + Push_HitBox pB1 = new Push_HitBox(300,-450,200,300); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); @@ -877,7 +877,7 @@ public class BlueBaseFrames { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + Push_HitBox pB1 = new Push_HitBox(300,-450,200,300); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); @@ -905,7 +905,7 @@ public class BlueBaseFrames { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + Push_HitBox pB1 = new Push_HitBox(300,-450,200,300); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); @@ -933,7 +933,7 @@ public class BlueBaseFrames { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + Push_HitBox pB1 = new Push_HitBox(300,-450,200,300); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); @@ -961,7 +961,7 @@ public class BlueBaseFrames { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + Push_HitBox pB1 = new Push_HitBox(300,-450,200,300); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); @@ -1022,7 +1022,7 @@ public class BlueBaseFrames { String path = "textures/Sprite_sans_grille_9comp.png"; String pathToBG = "textures/arena1.png"; - Frame f = BlueNormals.crouchDFrame2(); + Frame f = KnockedDown8(); ObjectGl blue = new ObjectGl(0f, 138f, 138f, 5f, path, null); From 02bb004cb125644dcd66caf4fc28c36a301f3169 Mon Sep 17 00:00:00 2001 From: no Date: Wed, 23 Jun 2021 23:39:56 +0200 Subject: [PATCH 2/9] added hitboxes for blue jump A --- .../Characters/Blue/BlueBaseFrames.java | 2 +- src/gameplay/Characters/Blue/BlueNormals.java | 58 ++++++++++++++----- 2 files changed, 45 insertions(+), 15 deletions(-) diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java index cb15aa8..fabf565 100644 --- a/src/gameplay/Characters/Blue/BlueBaseFrames.java +++ b/src/gameplay/Characters/Blue/BlueBaseFrames.java @@ -1022,7 +1022,7 @@ public class BlueBaseFrames { String path = "textures/Sprite_sans_grille_9comp.png"; String pathToBG = "textures/arena1.png"; - Frame f = KnockedDown8(); + Frame f = BlueNormals.JumpAFrame2(); ObjectGl blue = new ObjectGl(0f, 138f, 138f, 5f, path, null); diff --git a/src/gameplay/Characters/Blue/BlueNormals.java b/src/gameplay/Characters/Blue/BlueNormals.java index a93a719..76cbd39 100644 --- a/src/gameplay/Characters/Blue/BlueNormals.java +++ b/src/gameplay/Characters/Blue/BlueNormals.java @@ -1648,7 +1648,7 @@ public class BlueNormals { return new Attack(isSpecial,rS,cmd,parts); } - private static Frame JumpAFrame1() { + protected static Frame JumpAFrame1() { //movement data double moveX = 0.0; double moveY = 0.0; @@ -1667,16 +1667,26 @@ public class BlueNormals { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox pB1 = new Push_HitBox(200*1.25f,-20*1.25f,160*1.25f,400*1.25f); + Passive_HitBox phb1 = new Passive_HitBox(180*1.25f,-100*1.25f,170*1.25f,200*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(210*1.25f,-350*1.25f,90*1.25f,80*1.25f); + Passive_HitBox phb3 = new Passive_HitBox(230*1.25f,-200*1.25f,140*1.25f,160*1.25f); + Passive_HitBox phb4 = new Passive_HitBox(230*1.25f,-50*1.25f,70*1.25f,50*1.25f); + Passive_HitBox phb5 = new Passive_HitBox(280*1.25f,-20*1.25f,70*1.25f,100*1.25f); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + phb.add(phb5); - Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); //set sprite data on sheet f.setSpriteWrap((138*12),(138*3),138,138); return f; } - private static Frame JumpAFrame2() { + protected static Frame JumpAFrame2() { //movement data double moveX = 0.0; double moveY = 0.0; @@ -1694,17 +1704,28 @@ public class BlueNormals { ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); - //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox pB1 = new Push_HitBox(200*1.25f,-150,160*1.25f,350); + Passive_HitBox phb1 = new Passive_HitBox(180*1.25f,-100*1.25f,170*1.25f,200*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(210*1.25f,-350*1.25f,90*1.25f,80*1.25f); + Passive_HitBox phb3 = new Passive_HitBox(230*1.25f,-200*1.25f,140*1.25f,160*1.25f); + Passive_HitBox phb5 = new Passive_HitBox(280*1.25f,-280,200,80); + Active_HitBox ahb1 = new Active_HitBox(420,-250,120,120); + Active_HitBox ahb2 = new Active_HitBox(520,-330,120,120); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb5); + ahb.add(ahb1); + ahb.add(ahb2); - Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); //set sprite data on sheet f.setSpriteWrap((138*13),(138*3),138,138); return f; } - private static Frame JumpAFrame3() { + protected static Frame JumpAFrame3() { //movement data double moveX = 0.0; double moveY = 0.0; @@ -1722,10 +1743,19 @@ public class BlueNormals { ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); - //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox pB1 = new Push_HitBox(200*1.25f,-20*1.25f,160*1.25f,400*1.25f); + Passive_HitBox phb1 = new Passive_HitBox(180*1.25f,-150*1.25f,170*1.25f,200*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(210*1.25f,-400*1.25f,90*1.25f,80*1.25f); + Passive_HitBox phb3 = new Passive_HitBox(230*1.25f,-250*1.25f,140*1.25f,160*1.25f); + Passive_HitBox phb4 = new Passive_HitBox(230*1.25f,-100*1.25f,70*1.25f,50*1.25f); + Passive_HitBox phb5 = new Passive_HitBox(280*1.25f,-70*1.25f,70*1.25f,100*1.25f); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + phb.add(phb5); - Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); //set sprite data on sheet f.setSpriteWrap((138*14),(138*3),138,138); @@ -1764,7 +1794,7 @@ public class BlueNormals { return new Attack(isSpecial,rS,cmd,parts); } - private static Frame JumpCFrame1() { + protected static Frame JumpCFrame1() { //movement data double moveX = 0.0; double moveY = 0.0; @@ -1792,7 +1822,7 @@ public class BlueNormals { return f; } - private static Frame JumpCFrame2() { + protected static Frame JumpCFrame2() { //movement data double moveX = 0.0; double moveY = 0.0; @@ -1820,7 +1850,7 @@ public class BlueNormals { return f; } - private static Frame JumpCFrame3() { + protected static Frame JumpCFrame3() { //movement data double moveX = 0.0; double moveY = 0.0; From 0b4b7e8ece9a23e98013f62ee721d62c7ecf3be9 Mon Sep 17 00:00:00 2001 From: no Date: Wed, 23 Jun 2021 23:47:32 +0200 Subject: [PATCH 3/9] added hitboxes for blue jump C --- .../Characters/Blue/BlueBaseFrames.java | 2 +- src/gameplay/Characters/Blue/BlueNormals.java | 44 ++++++++++++++++--- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java index fabf565..b805d04 100644 --- a/src/gameplay/Characters/Blue/BlueBaseFrames.java +++ b/src/gameplay/Characters/Blue/BlueBaseFrames.java @@ -1022,7 +1022,7 @@ public class BlueBaseFrames { String path = "textures/Sprite_sans_grille_9comp.png"; String pathToBG = "textures/arena1.png"; - Frame f = BlueNormals.JumpAFrame2(); + Frame f = BlueNormals.JumpCFrame2(); ObjectGl blue = new ObjectGl(0f, 138f, 138f, 5f, path, null); diff --git a/src/gameplay/Characters/Blue/BlueNormals.java b/src/gameplay/Characters/Blue/BlueNormals.java index 76cbd39..e32628a 100644 --- a/src/gameplay/Characters/Blue/BlueNormals.java +++ b/src/gameplay/Characters/Blue/BlueNormals.java @@ -1813,9 +1813,19 @@ public class BlueNormals { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox pB1 = new Push_HitBox(200*1.25f,-20*1.25f,160*1.25f,400*1.25f); + Passive_HitBox phb1 = new Passive_HitBox(180*1.25f,-100*1.25f,170*1.25f,200*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(210*1.25f,-350*1.25f,90*1.25f,80*1.25f); + Passive_HitBox phb3 = new Passive_HitBox(230*1.25f,-200*1.25f,140*1.25f,160*1.25f); + Passive_HitBox phb4 = new Passive_HitBox(230*1.25f,-50*1.25f,70*1.25f,50*1.25f); + Passive_HitBox phb5 = new Passive_HitBox(280*1.25f,-20*1.25f,70*1.25f,100*1.25f); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + phb.add(phb5); - Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); //set sprite data on sheet f.setSpriteWrap((138*12),(138*3),138,138); @@ -1841,9 +1851,21 @@ public class BlueNormals { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox pB1 = new Push_HitBox(200*1.25f,-150,160*1.25f,350); + Passive_HitBox phb1 = new Passive_HitBox(180*1.25f,-100*1.25f,170*1.25f,200*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(210*1.25f,-350*1.25f,90*1.25f,80*1.25f); + Passive_HitBox phb3 = new Passive_HitBox(230*1.25f,-200*1.25f,140*1.25f,160*1.25f); + Passive_HitBox phb5 = new Passive_HitBox(280*1.25f,-280,200,80); + Active_HitBox ahb1 = new Active_HitBox(420,-250,120,120); + Active_HitBox ahb2 = new Active_HitBox(520,-330,120,120); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb5); + ahb.add(ahb1); + ahb.add(ahb2); - Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); //set sprite data on sheet f.setSpriteWrap((138*13),(138*3),138,138); @@ -1869,9 +1891,19 @@ public class BlueNormals { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox pB1 = new Push_HitBox(200*1.25f,-20*1.25f,160*1.25f,400*1.25f); + Passive_HitBox phb1 = new Passive_HitBox(180*1.25f,-150*1.25f,170*1.25f,200*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(210*1.25f,-400*1.25f,90*1.25f,80*1.25f); + Passive_HitBox phb3 = new Passive_HitBox(230*1.25f,-250*1.25f,140*1.25f,160*1.25f); + Passive_HitBox phb4 = new Passive_HitBox(230*1.25f,-100*1.25f,70*1.25f,50*1.25f); + Passive_HitBox phb5 = new Passive_HitBox(280*1.25f,-70*1.25f,70*1.25f,100*1.25f); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + phb.add(phb5); - Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); //set sprite data on sheet f.setSpriteWrap((138*14),(138*3),138,138); From 00ff2fb63db6e30bead5eb9edfc3902de79f48f4 Mon Sep 17 00:00:00 2001 From: Azra Victor Date: Thu, 24 Jun 2021 00:02:58 +0200 Subject: [PATCH 4/9] added hitboxes for blue jump B --- .../Characters/Blue/BlueBaseFrames.java | 2 +- src/gameplay/Characters/Blue/BlueNormals.java | 52 +++++++++++++++---- 2 files changed, 44 insertions(+), 10 deletions(-) diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java index b805d04..a6ea900 100644 --- a/src/gameplay/Characters/Blue/BlueBaseFrames.java +++ b/src/gameplay/Characters/Blue/BlueBaseFrames.java @@ -1022,7 +1022,7 @@ public class BlueBaseFrames { String path = "textures/Sprite_sans_grille_9comp.png"; String pathToBG = "textures/arena1.png"; - Frame f = BlueNormals.JumpCFrame2(); + Frame f = BlueNormals.JumpBFrame2(); ObjectGl blue = new ObjectGl(0f, 138f, 138f, 5f, path, null); diff --git a/src/gameplay/Characters/Blue/BlueNormals.java b/src/gameplay/Characters/Blue/BlueNormals.java index e32628a..b73844f 100644 --- a/src/gameplay/Characters/Blue/BlueNormals.java +++ b/src/gameplay/Characters/Blue/BlueNormals.java @@ -1942,7 +1942,7 @@ public class BlueNormals { return new Attack(isSpecial,rS,cmd,parts); } - private static Frame JumpBFrame1() { + protected static Frame JumpBFrame1() { //movement data double moveX = 0.0; double moveY = 0.0; @@ -1961,16 +1961,26 @@ public class BlueNormals { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox pB1 = new Push_HitBox(200*1.25f,-20*1.25f,160*1.25f,400*1.25f); + Passive_HitBox phb1 = new Passive_HitBox(180*1.25f,-100*1.25f,170*1.25f,200*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(210*1.25f,-350*1.25f,90*1.25f,80*1.25f); + Passive_HitBox phb3 = new Passive_HitBox(230*1.25f,-200*1.25f,140*1.25f,160*1.25f); + Passive_HitBox phb4 = new Passive_HitBox(230*1.25f,-50*1.25f,70*1.25f,50*1.25f); + Passive_HitBox phb5 = new Passive_HitBox(280*1.25f,-20*1.25f,70*1.25f,100*1.25f); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + phb.add(phb5); - Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); //set sprite data on sheet f.setSpriteWrap((138*14),138,138,138); return f; } - private static Frame JumpBFrame2() { + protected static Frame JumpBFrame2() { //movement data double moveX = 0.0; double moveY = 0.0; @@ -1989,16 +1999,30 @@ public class BlueNormals { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox pB1 = new Push_HitBox(200*1.25f,-20*1.25f,160*1.25f,400*1.25f); + Passive_HitBox phb1 = new Passive_HitBox(180*1.25f,-100*1.25f,170*1.25f,200*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(210*1.25f,-350*1.25f,90*1.25f,80*1.25f); + Passive_HitBox phb3 = new Passive_HitBox(230*1.25f,-200*1.25f,140*1.25f,160*1.25f); + Passive_HitBox phb4 = new Passive_HitBox(230*1.25f,-50*1.25f,70*1.25f,50*1.25f); + Passive_HitBox phb5 = new Passive_HitBox(280*1.25f,-250,230,100); + Active_HitBox ahb1 = new Active_HitBox(360,-240,200,120); + Active_HitBox ahb2 = new Active_HitBox(530,-200,120,120); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + phb.add(phb5); + ahb.add(ahb1); + ahb.add(ahb2); - Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); //set sprite data on sheet f.setSpriteWrap((138*13),138,138,138); return f; } - private static Frame JumpBFrame3() { + protected static Frame JumpBFrame3() { //movement data double moveX = 0.0; double moveY = 0.0; @@ -2017,9 +2041,19 @@ public class BlueNormals { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox pB1 = new Push_HitBox(200*1.25f,-20*1.25f,160*1.25f,400*1.25f); + Passive_HitBox phb1 = new Passive_HitBox(180*1.25f,-100*1.25f,170*1.25f,200*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(210*1.25f,-350*1.25f,90*1.25f,80*1.25f); + Passive_HitBox phb3 = new Passive_HitBox(230*1.25f,-200*1.25f,140*1.25f,160*1.25f); + Passive_HitBox phb4 = new Passive_HitBox(230*1.25f,-50*1.25f,70*1.25f,50*1.25f); + Passive_HitBox phb5 = new Passive_HitBox(280*1.25f,-20*1.25f,70*1.25f,100*1.25f); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + phb.add(phb5); - Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); //set sprite data on sheet f.setSpriteWrap((138*14),138,138,138); From 9ca70a99c5a0d4490782219c89f124c400d5b8ce Mon Sep 17 00:00:00 2001 From: no Date: Thu, 24 Jun 2021 00:15:34 +0200 Subject: [PATCH 5/9] added hitboxes for blue jump D --- .../Characters/Blue/BlueBaseFrames.java | 2 +- src/gameplay/Characters/Blue/BlueNormals.java | 25 ++++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java index a6ea900..7ccca36 100644 --- a/src/gameplay/Characters/Blue/BlueBaseFrames.java +++ b/src/gameplay/Characters/Blue/BlueBaseFrames.java @@ -1022,7 +1022,7 @@ public class BlueBaseFrames { String path = "textures/Sprite_sans_grille_9comp.png"; String pathToBG = "textures/arena1.png"; - Frame f = BlueNormals.JumpBFrame2(); + Frame f = BlueNormals.JumpDFrame2(); ObjectGl blue = new ObjectGl(0f, 138f, 138f, 5f, path, null); diff --git a/src/gameplay/Characters/Blue/BlueNormals.java b/src/gameplay/Characters/Blue/BlueNormals.java index b73844f..96083e1 100644 --- a/src/gameplay/Characters/Blue/BlueNormals.java +++ b/src/gameplay/Characters/Blue/BlueNormals.java @@ -2092,7 +2092,7 @@ public class BlueNormals { return new Attack(isSpecial,rS,cmd,parts); } - private static Frame JumpDFrame1() { + protected static Frame JumpDFrame1() { //movement data double moveX = 0.0; double moveY = 0.0; @@ -2111,7 +2111,10 @@ public class BlueNormals { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox bStandPB1 = new Push_HitBox(250,-50,150,400); + Passive_HitBox phb1 = new Passive_HitBox(240,-50,170,430); + + phb.add(phb1); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); @@ -2120,7 +2123,7 @@ public class BlueNormals { return f; } - private static Frame JumpDFrame2() { + protected static Frame JumpDFrame2() { //movement data double moveX = 0.0; double moveY = 0.0; @@ -2139,7 +2142,14 @@ public class BlueNormals { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox bStandPB1 = new Push_HitBox(250,-50,150,400); + Passive_HitBox phb1 = new Passive_HitBox(240,-50,170,430); + Passive_HitBox phb2 = new Passive_HitBox(330,-240,220,100); + + Active_HitBox ahb1 = new Active_HitBox(330,-230,280,150); + phb.add(phb1); + phb.add(phb2); + ahb.add(ahb1); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); @@ -2148,7 +2158,7 @@ public class BlueNormals { return f; } - private static Frame JumpDFrame3() { + protected static Frame JumpDFrame3() { //movement data double moveX = 0.0; double moveY = 0.0; @@ -2167,7 +2177,10 @@ public class BlueNormals { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox bStandPB1 = new Push_HitBox(250,-50,150,400); + Passive_HitBox phb1 = new Passive_HitBox(240,-50,170,430); + + phb.add(phb1); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); From e74903508d797f2a360577406ae1eef84310069f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o?= Date: Thu, 24 Jun 2021 00:22:54 +0200 Subject: [PATCH 6/9] old version of clone method in nextframebuffer --- src/gameplay/frames/nextFrameBuffer.java | 29 +++++++++++++----------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/gameplay/frames/nextFrameBuffer.java b/src/gameplay/frames/nextFrameBuffer.java index 6d6cb3f..cd935fe 100644 --- a/src/gameplay/frames/nextFrameBuffer.java +++ b/src/gameplay/frames/nextFrameBuffer.java @@ -24,20 +24,23 @@ public class nextFrameBuffer { } public void clone(nextFrameBuffer f) { + this.current = f.current; + this.next = f.next; - try{ - Frame cf = new Frame(); - cf.clone(f.current); - this.current = cf; } - catch (NullPointerException n) { - this.current = null; - this.next = null; - } - nextFrameBuffer nfb = new nextFrameBuffer(); - try { - nfb.clone(f.next); - } catch (NullPointerException n) {} - this.next = nfb; + +// try{ +// Frame cf = new Frame(); +// cf.clone(f.current); +// this.current = cf; } +// catch (NullPointerException n) { +// this.current = null; +// this.next = null; +// } +// nextFrameBuffer nfb = new nextFrameBuffer(); +// try { +// nfb.clone(f.next); +// } catch (NullPointerException n) {} +// this.next = nfb; } From 20788b59c7db406f4f598d8b33b26b63398e74e0 Mon Sep 17 00:00:00 2001 From: Azra Victor Date: Thu, 24 Jun 2021 00:19:22 +0200 Subject: [PATCH 7/9] corrected guarding check. Guard should now be working correctly. --- src/gameplay/match/match.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gameplay/match/match.java b/src/gameplay/match/match.java index 12c9c61..0a8f596 100644 --- a/src/gameplay/match/match.java +++ b/src/gameplay/match/match.java @@ -651,7 +651,7 @@ public class match { */ private static void getHit(Character c, attackPart aP, Inputs inputs) { boolean getsHit = (c.getStatus() == Status.JUMPING) || (c.getStatus() == Status.HITINAIR) || (c.getStatus() == Status.FALLING) - || inputs.containsInput(ButtonIG.BACK) + || !inputs.containsInput(ButtonIG.BACK) || (aP.isLow() && !inputs.containsInput(ButtonIG.DOWN)) || (aP.isOverHead() && inputs.containsInput(ButtonIG.DOWN)); Frame[] nextFrames; From e2ac89a375a8773393709f55ceaf7ade92d9d5b1 Mon Sep 17 00:00:00 2001 From: Antoine Date: Thu, 24 Jun 2021 01:27:41 +0200 Subject: [PATCH 8/9] refactor endRound --- src/gameplay/match/match.java | 59 +++++++++++++---------------------- 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/src/gameplay/match/match.java b/src/gameplay/match/match.java index 0a8f596..8910355 100644 --- a/src/gameplay/match/match.java +++ b/src/gameplay/match/match.java @@ -28,6 +28,7 @@ import gameplay.input.ButtonIG; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; +import java.sql.SQLOutput; import java.util.ArrayList; import java.util.List; @@ -129,45 +130,27 @@ public class match { /** * Ends the round. * Used for playing animations and such. - * TODO : Implement this once we know what to do. - * @throws InterruptedException */ - private static void endRound() throws InterruptedException { - - if(roundP1) { - //texte de victoire - System.out.println("P1 won the round"); - roundWon = new UIElementText("Player1 won the round", 5f, 0.25f, 0.5f, 100f, engine); - roundWon.setBackground(new Vector3f(0f,0f,0f)); - engine.add_uiElement(roundWon); - engine.update(); - engine.render(); - Thread.sleep(1000); - engine.remove_uiElement(roundWon); - - //replacement des sprites - objP1.translate(new Vector3f(-p1.getPosX(), -p1.getPosY())); - objP2.translate(new Vector3f(-p2.getPosX(), -p2.getPosY())); - objP1.getShadow().translate(new Vector3f(0f,-p1.getPosY(),0)); - objP2.getShadow().translate(new Vector3f(0f,-p2.getPosY(),0)); - } - else { - //texte de victoire - System.out.println("P2 won the round"); - roundWon = new UIElementText("Player2 won the round", 5f, 0.25f, 0.5f, 100f, engine); - roundWon.setBackground(new Vector3f(0f,0f,0f)); - engine.add_uiElement(roundWon); - engine.update(); - engine.render(); - Thread.sleep(1000); - engine.remove_uiElement(roundWon); - - //replacement des sprites - objP1.translate(new Vector3f(-p1.getPosX(), -p1.getPosY())); - objP2.translate(new Vector3f(-p2.getPosX(), -p2.getPosY())); - objP1.getShadow().translate(new Vector3f(0f,-p1.getPosY(),0)); - objP2.getShadow().translate(new Vector3f(0f,-p2.getPosY(),0)); - } + private static void endRound() { + String victoryTxt = roundP1 ? "Player1 won the round" : "Player2 won the round"; + + System.out.println(victoryTxt); + roundWon = new UIElementText(victoryTxt, 5f, 0.25f, 0.5f, 100f, engine); + engine.add_uiElement(roundWon); + + engine.update(); + engine.render(); + + glfwWaitEventsTimeout(1); + + engine.remove_uiElement(roundWon); + + //replacement des sprites + objP1.translate(new Vector3f(-p1.getPosX(), -p1.getPosY())); + objP2.translate(new Vector3f(-p2.getPosX(), -p2.getPosY())); + objP1.getShadow().translate(new Vector3f(0f,-p1.getPosY(),0)); + objP2.getShadow().translate(new Vector3f(0f,-p2.getPosY(),0)); + } /** From 8cc35dda85723fede8a5a6c938d424861f1120df Mon Sep 17 00:00:00 2001 From: Antoine Date: Thu, 24 Jun 2021 01:37:07 +0200 Subject: [PATCH 9/9] WavyText between round --- src/gameplay/match/match.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gameplay/match/match.java b/src/gameplay/match/match.java index 8910355..819ca17 100644 --- a/src/gameplay/match/match.java +++ b/src/gameplay/match/match.java @@ -135,13 +135,15 @@ public class match { String victoryTxt = roundP1 ? "Player1 won the round" : "Player2 won the round"; System.out.println(victoryTxt); - roundWon = new UIElementText(victoryTxt, 5f, 0.25f, 0.5f, 100f, engine); + roundWon = new UIElementText(victoryTxt, 5f, 0.25f, 0.5f, 200f, engine); + roundWon.setShader("shaders/StylishShaders/WavyTextVert.glsl", "shaders/StylishShaders/TextFrag.glsl", true, true); engine.add_uiElement(roundWon); - engine.update(); - engine.render(); - - glfwWaitEventsTimeout(1); + timeStamp1 = System.currentTimeMillis(); + while(System.currentTimeMillis() - timeStamp1 < 2500){ + engine.update(); + engine.render(); + } engine.remove_uiElement(roundWon);