From f7a3af368bc3db7da7a492e5677e1f3c3dceda49 Mon Sep 17 00:00:00 2001 From: Azra Victor Date: Sun, 20 Jun 2021 15:47:55 +0200 Subject: [PATCH] adjusted already made hitboxes so they would fit a size 5 sprite instead of size 4 --- .../Characters/Blue/BlueBaseFrames.java | 252 +++++++++--------- src/gameplay/Characters/Blue/BlueNormals.java | 37 ++- src/gameplay/match/match.java | 2 +- 3 files changed, 155 insertions(+), 136 deletions(-) diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java index e53f943..3e33bd9 100644 --- a/src/gameplay/Characters/Blue/BlueBaseFrames.java +++ b/src/gameplay/Characters/Blue/BlueBaseFrames.java @@ -44,12 +44,12 @@ public class BlueBaseFrames { } */ private static Frame generateStandFrame1(){ - Passive_HitBox bStandPHB1 = new Passive_HitBox(200,-200,150,150); - Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,75,150); - Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); - Passive_HitBox bStandPHB4 = new Passive_HitBox(250,-150,50,50); - Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(200,-500,200,70); - Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); + Passive_HitBox bStandPHB1 = new Passive_HitBox(250,-250,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220*1.25f,-300*1.25f,75*1.25f,150*1.25f); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200*1.25f,-400*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB4 = new Passive_HitBox(250*1.25f,-150*1.25f,50*1.25f,50*1.25f); + Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(200*1.25f,-500*1.25f,200*1.25f,70*1.25f); + Push_HitBox bStandPB1 = new Push_HitBox(200*1.25f,-150*1.25f,160*1.25f,400*1.25f); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); phb.add(bStandPHB1); @@ -64,12 +64,12 @@ public class BlueBaseFrames { } private static Frame generateStandFrame2(){ - Passive_HitBox bStandPHB1 = new Passive_HitBox(200,-200,150,150); - Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,75,150); - Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); - Passive_HitBox bStandPHB4 = new Passive_HitBox(250,-150,50,50); - Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(200,-500,200,70); - Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); + Passive_HitBox bStandPHB1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220*1.25f,-300*1.25f,75*1.25f,150*1.25f); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200*1.25f,-400*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB4 = new Passive_HitBox(250*1.25f,-150*1.25f,50*1.25f,50*1.25f); + Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(200*1.25f,-500*1.25f,200*1.25f,70*1.25f); + Push_HitBox bStandPB1 = new Push_HitBox(200*1.25f,-150*1.25f,160*1.25f,400*1.25f); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); phb.add(bStandPHB1); @@ -113,10 +113,10 @@ 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 pB = new Push_HitBox(140,-250,280,300); - Passive_HitBox phb1 = new Passive_HitBox(200,-250,200,300); - Passive_HitBox phb2 = new Passive_HitBox(260,-200,80,50); - Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(150,-500,300,70); + Push_HitBox pB = 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); @@ -151,12 +151,12 @@ 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,-20,160,400); - Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); - Passive_HitBox phb2 = new Passive_HitBox(210,-350,90,80); - Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); - Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); - Passive_HitBox phb5 = new Passive_HitBox(280,-20,70,100); + 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); @@ -189,12 +189,12 @@ 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,-20,160,400); - Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); - Passive_HitBox phb2 = new Passive_HitBox(210,-350,90,80); - Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); - Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); - Passive_HitBox phb5 = new Passive_HitBox(280,-20,70,100); + 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); @@ -238,12 +238,12 @@ 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,-20,160,400); - Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); - Passive_HitBox phb2 = new Passive_HitBox(210,-350,150,80); - Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); - Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); - Passive_HitBox phb5 = new Passive_HitBox(210,-430,70,70); + 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,150*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(210*1.25f,-430*1.25f,70*1.25f,70*1.25f); phb.add(phb1); phb.add(phb2); phb.add(phb3); @@ -276,12 +276,12 @@ 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,-20,160,400); - Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); - Passive_HitBox phb2 = new Passive_HitBox(210,-350,90,80); - Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); - Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); - Passive_HitBox phb5 = new Passive_HitBox(280,-20,70,100); + 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); @@ -314,12 +314,12 @@ 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,-20,160,400); - Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); - Passive_HitBox phb2 = new Passive_HitBox(210,-350,90,80); - Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); - Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); - Passive_HitBox phb5 = new Passive_HitBox(280,-20,70,100); + 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); @@ -352,12 +352,12 @@ 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,-20,160,400); - Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); - Passive_HitBox phb2 = new Passive_HitBox(210,-350,150,80); - Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); - Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); - Passive_HitBox phb5 = new Passive_HitBox(210,-430,70,70); + 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,150*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(210*1.25f,-430*1.25f,70*1.25f,70*1.25f); phb.add(phb1); phb.add(phb2); phb.add(phb3); @@ -407,12 +407,12 @@ 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,-20,160,400); - Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); - Passive_HitBox phb2 = new Passive_HitBox(210,-350,150,80); - Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); - Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); - Passive_HitBox phb5 = new Passive_HitBox(210,-430,70,70); + 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,150*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(210*1.25f,-430*1.25f,70*1.25f,70*1.25f); phb.add(phb1); phb.add(phb2); phb.add(phb3); @@ -445,12 +445,12 @@ 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,-20,160,400); - Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); - Passive_HitBox phb2 = new Passive_HitBox(210,-350,90,80); - Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); - Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); - Passive_HitBox phb5 = new Passive_HitBox(280,-20,70,100); + 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); @@ -483,12 +483,12 @@ 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,-20,160,400); - Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); - Passive_HitBox phb2 = new Passive_HitBox(210,-350,90,80); - Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); - Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); - Passive_HitBox phb5 = new Passive_HitBox(280,-20,70,100); + 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); @@ -521,12 +521,12 @@ 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,-20,160,400); - Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); - Passive_HitBox phb2 = new Passive_HitBox(210,-350,150,80); - Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); - Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); - Passive_HitBox phb5 = new Passive_HitBox(210,-430,70,70); + 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,150*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(210*1.25f,-430*1.25f,70*1.25f,70*1.25f); phb.add(phb1); phb.add(phb2); phb.add(phb3); @@ -559,12 +559,12 @@ public class BlueBaseFrames { private static Frame walkForwardFrame1(){ - Passive_HitBox bStandPHB1 = new Passive_HitBox(200,-200,150,150); - Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,100,150); - Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); - Passive_HitBox bStandPHB4 = new Passive_HitBox(280,-150,50,50); - Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(150,-500,220,70); - Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); + Passive_HitBox bStandPHB1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220*1.25f,-300*1.25f,100*1.25f,150*1.25f); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200*1.25f,-400*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB4 = new Passive_HitBox(280*1.25f,-150*1.25f,50*1.25f,50*1.25f); + Passive_throw_HitBox bStandPTHB1 = 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); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); phb.add(bStandPHB1); @@ -579,12 +579,12 @@ public class BlueBaseFrames { } private static Frame walkForwardFrame2(){ - Passive_HitBox bStandPHB1 = new Passive_HitBox(200,-200,150,150); - Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,100,150); - Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); - Passive_HitBox bStandPHB4 = new Passive_HitBox(280,-150,50,50); - Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(150,-500,220,70); - Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); + Passive_HitBox bStandPHB1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220*1.25f,-300*1.25f,100*1.25f,150*1.25f); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200*1.25f,-400*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB4 = new Passive_HitBox(280*1.25f,-150*1.25f,50*1.25f,50*1.25f); + Passive_throw_HitBox bStandPTHB1 = 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); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); phb.add(bStandPHB1); @@ -599,12 +599,12 @@ public class BlueBaseFrames { } private static Frame walkForwardFrame3(){ - Passive_HitBox bStandPHB1 = new Passive_HitBox(200,-200,150,150); - Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,100,150); - Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); - Passive_HitBox bStandPHB4 = new Passive_HitBox(280,-150,50,50); - Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(150,-500,220,70); - Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); + Passive_HitBox bStandPHB1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220*1.25f,-300*1.25f,100*1.25f,150*1.25f); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200*1.25f,-400*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB4 = new Passive_HitBox(280*1.25f,-150*1.25f,50*1.25f,50*1.25f); + Passive_throw_HitBox bStandPTHB1 = 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); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); phb.add(bStandPHB1); @@ -619,12 +619,12 @@ public class BlueBaseFrames { } private static Frame walkForwardFrame4(){ - Passive_HitBox bStandPHB1 = new Passive_HitBox(200,-200,150,150); - Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,100,150); - Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); - Passive_HitBox bStandPHB4 = new Passive_HitBox(280,-150,50,50); - Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(150,-500,220,70); - Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); + Passive_HitBox bStandPHB1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220*1.25f,-300*1.25f,100*1.25f,150*1.25f); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200*1.25f,-400*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB4 = new Passive_HitBox(280*1.25f,-150*1.25f,50*1.25f,50*1.25f); + Passive_throw_HitBox bStandPTHB1 = 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); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); phb.add(bStandPHB1); @@ -658,12 +658,12 @@ public class BlueBaseFrames { private static Frame walkBackFrame4(){ - Passive_HitBox bStandPHB1 = new Passive_HitBox(200,-200,150,150); - Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,100,150); - Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); - Passive_HitBox bStandPHB4 = new Passive_HitBox(280,-150,50,50); - Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(150,-500,220,70); - Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); + Passive_HitBox bStandPHB1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220*1.25f,-300*1.25f,100*1.25f,150*1.25f); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200*1.25f,-400*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB4 = new Passive_HitBox(280*1.25f,-150*1.25f,50*1.25f,50*1.25f); + Passive_throw_HitBox bStandPTHB1 = 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); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); phb.add(bStandPHB1); @@ -678,12 +678,12 @@ public class BlueBaseFrames { } private static Frame walkBackFrame3(){ - Passive_HitBox bStandPHB1 = new Passive_HitBox(200,-200,150,150); - Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,100,150); - Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); - Passive_HitBox bStandPHB4 = new Passive_HitBox(280,-150,50,50); - Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(150,-500,220,70); - Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); + Passive_HitBox bStandPHB1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220*1.25f,-300*1.25f,100*1.25f,150*1.25f); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200*1.25f,-400*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB4 = new Passive_HitBox(280*1.25f,-150*1.25f,50*1.25f,50*1.25f); + Passive_throw_HitBox bStandPTHB1 = 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); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); phb.add(bStandPHB1); @@ -698,12 +698,12 @@ public class BlueBaseFrames { } private static Frame walkBackFrame2(){ - Passive_HitBox bStandPHB1 = new Passive_HitBox(200,-200,150,150); - Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,100,150); - Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); - Passive_HitBox bStandPHB4 = new Passive_HitBox(280,-150,50,50); - Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(150,-500,220,70); - Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); + Passive_HitBox bStandPHB1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220*1.25f,-300*1.25f,100*1.25f,150*1.25f); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200*1.25f,-400*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB4 = new Passive_HitBox(280*1.25f,-150*1.25f,50*1.25f,50*1.25f); + Passive_throw_HitBox bStandPTHB1 = 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); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); phb.add(bStandPHB1); @@ -718,12 +718,12 @@ public class BlueBaseFrames { } private static Frame walkBackFrame1(){ - Passive_HitBox bStandPHB1 = new Passive_HitBox(200,-200,150,150); - Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,100,150); - Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); - Passive_HitBox bStandPHB4 = new Passive_HitBox(280,-150,50,50); - Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(150,-500,220,70); - Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); + Passive_HitBox bStandPHB1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220*1.25f,-300*1.25f,100*1.25f,150*1.25f); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200*1.25f,-400*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB4 = new Passive_HitBox(280*1.25f,-150*1.25f,50*1.25f,50*1.25f); + Passive_throw_HitBox bStandPTHB1 = 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); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); phb.add(bStandPHB1); @@ -761,10 +761,10 @@ public class BlueBaseFrames { String path = "textures/Sprite_sans_grille_9comp.png"; String pathToBG = "textures/arena1.png"; - Frame f = walkForwardFrame4(); + Frame f = BlueNormals.blueCrouchJab().getFrame().get(0); - ObjectGl blue = new ObjectGl(0f, 138f, 138f, 4f, path, null); + ObjectGl blue = new ObjectGl(0f, 138f, 138f, 5f, path, null); blue.setTextureWrap(f.getSprite()[0], f.getSprite()[1], f.getSprite()[2], f.getSprite()[3]); int posX = -750; diff --git a/src/gameplay/Characters/Blue/BlueNormals.java b/src/gameplay/Characters/Blue/BlueNormals.java index 7b030e6..2d33602 100644 --- a/src/gameplay/Characters/Blue/BlueNormals.java +++ b/src/gameplay/Characters/Blue/BlueNormals.java @@ -18,17 +18,36 @@ import static gameplay.input.ButtonIG.*; public class BlueNormals { private static Frame crouchAFrame1(){ - Passive_HitBox bStandPHB1 = new Passive_HitBox(70,70,150,500); - Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(70,400,150,100); - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); - phb.add(bStandPHB1); - pthb.add(bStandPTHB1); - Frame blueStandframe1 = new Frame(0.0,0.0,phb,new ArrayList(),pthb,new ArrayList(), - bStandPB1,false,false,false,false,false); - blueStandframe1.setSpriteWrap(0,(138*2),138,138); - return blueStandframe1; + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB = 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(moveX,moveY,phb,ahb,pthb,athb,pB,normalC,specialC,jumpC,moveC,dashC); + + f.setSpriteWrap(0,138*2,138,138); + return f; } private static Frame crouchAFrame2(){ diff --git a/src/gameplay/match/match.java b/src/gameplay/match/match.java index de9feb6..c31527f 100644 --- a/src/gameplay/match/match.java +++ b/src/gameplay/match/match.java @@ -162,7 +162,7 @@ public class match { p1 = CharacterBlue.generateCharBlue(); p2 = CharacterBlue.generateCharBlue(); - objP1 = new Sprite(14f, 4f, path, null); + objP1 = new Sprite(14f, 5f, path, null); objP2 = new Sprite(15f, 5f, path, new Vector3f(1.0f,0.0f,1.0f)); engine.add_objectGl(objP1); engine.add_objectGl(objP2);