From 1b669442c0bf7400fd71f72cc8945b2a2d34c772 Mon Sep 17 00:00:00 2001 From: no Date: Wed, 23 Jun 2021 22:37:48 +0200 Subject: [PATCH] Corrected sprites and addedhitboxes for blue cruch D --- .../Characters/Blue/BlueBaseFrames.java | 2 +- src/gameplay/Characters/Blue/BlueNormals.java | 54 ++++++++++++++----- 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java index 9fe1b72..9ad27b5 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.crouchBFrame2(); + Frame f = BlueNormals.crouchDFrame2(); 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 16f1964..a93a719 100644 --- a/src/gameplay/Characters/Blue/BlueNormals.java +++ b/src/gameplay/Characters/Blue/BlueNormals.java @@ -479,7 +479,7 @@ public class BlueNormals { return new Attack(isSpecial,rS,cmd,parts); } - private static Frame crouchDFrame1() { + protected static Frame crouchDFrame1() { //movement data double moveX = 0.0; double moveY = 0.0; @@ -498,16 +498,22 @@ 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 pB1 = new Push_HitBox(200,-150,160,400); + Push_HitBox pB1 = new Push_HitBox(140*1.25f,-250*1.25f,280*1.25f,300*1.25f); + Passive_HitBox phb1 = new Passive_HitBox(200*1.25f,-250*1.25f,200*1.25f,300*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(260*1.25f,-200*1.25f,80*1.25f,50*1.25f); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(150*1.25f,-500*1.25f,300*1.25f,70*1.25f); + pthb.add(pthb1); + phb.add(phb1); + phb.add(phb2); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); //set sprite data on sheet - f.setSpriteWrap((138*7),(138*5),138,138); + f.setSpriteWrap((138*5),(138*7),138,138); return f; } - private static Frame crouchDFrame2() { + protected static Frame crouchDFrame2() { //movement data double moveX = 0.0; double moveY = 0.0; @@ -526,16 +532,24 @@ 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 pB1 = new Push_HitBox(200,-150,160,400); + Push_HitBox pB1 = new Push_HitBox(120,-250*1.25f,250,300*1.25f); + Passive_HitBox phb1 = new Passive_HitBox(100,-250*1.25f,200*1.25f,300*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(260*1.25f,-550,300,100); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(150*1.25f,-500*1.25f,300*1.25f,70*1.25f); + Active_HitBox ahb1 = new Active_HitBox(300,-500,400,200); + pthb.add(pthb1); + phb.add(phb1); + phb.add(phb2); + ahb.add(ahb1); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); //set sprite data on sheet - f.setSpriteWrap((138*7),(138*6),138,138); + f.setSpriteWrap((138*6),(138*7),138,138); return f; } - private static Frame crouchDFrame3() { + protected static Frame crouchDFrame3() { //movement data double moveX = 0.0; double moveY = 0.0; @@ -554,7 +568,13 @@ 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 pB1 = new Push_HitBox(200,-150,160,400); + Push_HitBox pB1 = new Push_HitBox(140*1.25f,-250*1.25f,280*1.25f,300*1.25f); + Passive_HitBox phb1 = new Passive_HitBox(200*1.25f,-250*1.25f,200*1.25f,300*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(260*1.25f,-200*1.25f,80*1.25f,50*1.25f); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(150*1.25f,-500*1.25f,300*1.25f,70*1.25f); + pthb.add(pthb1); + phb.add(phb1); + phb.add(phb2); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); @@ -563,7 +583,7 @@ public class BlueNormals { return f; } - private static Frame crouchDFrame4() { + protected static Frame crouchDFrame4() { //movement data double moveX = 0.0; double moveY = 0.0; @@ -582,12 +602,22 @@ 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 pB1 = new Push_HitBox(200,-150,160,400); + Push_HitBox pB1 = new Push_HitBox(140*1.25f,-250*1.25f,280*1.25f,300*1.25f); + Passive_HitBox phb1 = new Passive_HitBox(100*1.25f,-250*1.25f,200*1.25f,300*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(260*1.25f,-200*1.25f,80*1.25f,50*1.25f); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(100*1.25f,-500*1.25f,300*1.25f,70*1.25f); + pB1.reverseHorizontally(); + phb1.reverseHorizontally(); + phb2.reverseHorizontally(); + pthb1.reverseHorizontally(); + pthb.add(pthb1); + phb.add(phb1); + phb.add(phb2); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); //set sprite data on sheet - f.setSpriteWrap((138*7),(138*8),138,138); + f.setSpriteWrap((138*8),(138*7),138,138); return f; } @@ -614,7 +644,7 @@ public class BlueNormals { private static attackPart blueCrouchDactive() { Frame[] f = new Frame[6]; for(int i = 0; i < f.length; i++) { - f[i] = crouchAFrame2(); + f[i] = crouchDFrame2(); } return(new attackPart(120,0,31,10,30,15,f,true,false,true)); }