From 9ca70a99c5a0d4490782219c89f124c400d5b8ce Mon Sep 17 00:00:00 2001 From: no Date: Thu, 24 Jun 2021 00:15:34 +0200 Subject: [PATCH] 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);