From 383cd4f2137421f26fd95883ae89d7e9f894b9d9 Mon Sep 17 00:00:00 2001 From: Azra Victor Date: Thu, 24 Jun 2021 13:16:28 +0200 Subject: [PATCH] Corrected stand B Values and hitboxes --- src/gameplay/Characters/Blue/BlueNormals.java | 72 ++++++++++++++++--- 1 file changed, 61 insertions(+), 11 deletions(-) diff --git a/src/gameplay/Characters/Blue/BlueNormals.java b/src/gameplay/Characters/Blue/BlueNormals.java index 96083e1..bdd73d0 100644 --- a/src/gameplay/Characters/Blue/BlueNormals.java +++ b/src/gameplay/Characters/Blue/BlueNormals.java @@ -1242,13 +1242,13 @@ public class BlueNormals { return new Attack(isSpecial,rS,cmd,parts); } - private static Frame StandBFrame1() { + protected static Frame StandBFrame1() { //movement data double moveX = 3.0; double moveY = 0.0; //cancelData - boolean normalC = true; + boolean normalC = false; boolean specialC = false; boolean jumpC = false; boolean moveC = false; @@ -1260,8 +1260,24 @@ 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); + /* + Individual hitboxes creation + */ + Passive_HitBox phb1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(220*1.25f,-300*1.25f,100*1.25f,150*1.25f); + Passive_HitBox phb3 = new Passive_HitBox(200*1.25f,-400*1.25f,150*1.25f,150*1.25f); + Passive_HitBox phb4 = new Passive_HitBox(280*1.25f,-150*1.25f,50*1.25f,50*1.25f); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(150*1.25f,-500*1.25f,220*1.25f,70*1.25f); + Push_HitBox bStandPB1 = new Push_HitBox(200*1.25f,-150*1.25f,160*1.25f,400*1.25f); + + /* + adding hitboxes to lists + */ + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + pthb.add(pthb1); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); @@ -1270,13 +1286,13 @@ public class BlueNormals { return f; } - private static Frame StandBFrame2() { + protected static Frame StandBFrame2() { //movement data double moveX = 0.0; double moveY = 0.0; //cancelData - boolean normalC = true; + boolean normalC = false; boolean specialC = false; boolean jumpC = false; boolean moveC = false; @@ -1289,7 +1305,25 @@ 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); + /* + Individual hitboxes creation + */ + Passive_HitBox phb1 = new Passive_HitBox(130*1.25f,-200*1.25f,150*1.25f,150*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(150*1.25f,-300*1.25f,100*1.25f,150*1.25f); + Passive_HitBox phb3 = new Passive_HitBox(160*1.25f,-400*1.25f,150*1.25f,150*1.25f); + Passive_HitBox phb4 = new Passive_HitBox(220*1.25f,-150*1.25f,50*1.25f,50*1.25f); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(120*1.25f,-500*1.25f,220*1.25f,70*1.25f); + Push_HitBox bStandPB1 = new Push_HitBox(160*1.25f,-150*1.25f,160*1.25f,400*1.25f); + Active_HitBox ahb1= new Active_HitBox(350,-350,150,220); + /* + adding hitboxes to lists + */ + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + pthb.add(pthb1); + ahb.add(ahb1); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); @@ -1298,13 +1332,13 @@ public class BlueNormals { return f; } - private static Frame StandBFrame3() { + protected static Frame StandBFrame3() { //movement data double moveX = 0.0; double moveY = 0.0; //cancelData - boolean normalC = true; + boolean normalC = false; boolean specialC = false; boolean jumpC = false; boolean moveC = false; @@ -1316,8 +1350,24 @@ 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); + /* + Individual hitboxes creation + */ + Passive_HitBox phb1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(220*1.25f,-300*1.25f,100*1.25f,150*1.25f); + Passive_HitBox phb3 = new Passive_HitBox(200*1.25f,-400*1.25f,150*1.25f,150*1.25f); + Passive_HitBox phb4 = new Passive_HitBox(280*1.25f,-150*1.25f,50*1.25f,50*1.25f); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(150*1.25f,-500*1.25f,220*1.25f,70*1.25f); + Push_HitBox bStandPB1 = new Push_HitBox(200*1.25f,-150*1.25f,160*1.25f,400*1.25f); + + /* + adding hitboxes to lists + */ + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + pthb.add(pthb1); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC);