Merge branch 'main' of https://github.com/LittleWhole/Threnody

LittleWhole · May 30, 2022 · c71555f · c71555f
2 parents b98a842 + 8d0e1a3
commit c71555f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/combat/artes/Arte.java b/src/combat/artes/Arte.java
@@ -160,7 +160,7 @@ public void animation(Unit target, Graphics g) {
     public void animationOwner(Graphics g) {
         if (!finished()) {
             this.aniFrame = aniSheet.getSprite(spritesheetX, spritesheetY);
-            g.drawImage(aniFrame, -owner.getPosition().getX() - (owner.getWidth()/2), owner.getY() + owner.getHeight()*3.5f);
+            g.drawImage(aniFrame, -owner.getPosition().getX() - (owner.getWidth()/2), owner.getY() + owner.getHeight()*4.3f);
         }
     }
 

diff --git a/src/entities/units/player/Player.java b/src/entities/units/player/Player.java
@@ -224,11 +224,12 @@ protected void drawSprite(Graphics g) { // Draw the entity sprite
     public void battleRender(Graphics g, float plrX, float plrY)  {
         g.drawImage(sprite, -plrX - position.getX(), -plrY/2 - position.getY());
         g.setColor(new Color(255, 0,0,0.5f));
-        hitBox.setX(plrX - position.getX() + width/2);
-        hitBox.setY((-plrY/2)  + this.getHeight()*1.6f);
-        ImageManager.getImage("health").drawCentered(hitBox.getX() + hitBox.getWidth() / 2, hitBox.getY() - this.getHeight() - 30);
+
+        hitBox.setX(-plrX - position.getX() + width/3);
+        hitBox.setY((-plrY/2) - position.getY() + height/4);
+        ImageManager.getImage("health").drawCentered(hitBox.getX() + hitBox.getWidth() / 3.5f, hitBox.getY() - this.getHeight() / 2 + 15);
         g.setColor(Color.white);
-        DrawUtilities.drawStringCentered(g, String.valueOf(health), hitBox.getX() + hitBox.getWidth() / 2, hitBox.getY() - this.getHeight() - 30);
+        DrawUtilities.drawStringCentered(g, String.valueOf(health), hitBox.getX() + hitBox.getWidth() / 3.5f, hitBox.getY() - this.getHeight() / 2 + 15);
     }
 
     public void addToDeck(Arte<Player> a)   {