From 6665199d12de934a214674c3bbf1c7da11ecf6c6 Mon Sep 17 00:00:00 2001
From: fp_sviat <meteorrrit99@mail.ru>
Date: Sun, 29 Mar 2026 23:14:42 +0300
Subject: [PATCH] Added the function of drawing rectangular hitboxes, as well
 as the ability to erase and save the result. Drawing in any direction.

---
 res/objecttypes.xml            |  8 ++++----
 src/model/HitboxRectangle.java | 14 +++++++++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/res/objecttypes.xml b/res/objecttypes.xml
index 5320b9e..2c13548 100644
--- a/res/objecttypes.xml
+++ b/res/objecttypes.xml
@@ -2,13 +2,13 @@
 <objecttypes>
     <objecttype color="#a0a0a4" name="misato">
         <property default="Solid" name="class" type="string"/>
-        <property default="9 3 214 11 220 190 15 185 " name="drawbox" type="string"/>
+        <property default="2 5 209 4 226 194 14 189 " name="drawbox" type="string"/>
         <property default="Circle 4 6 24" name="hitbox" type="string"/>
     </objecttype>
     <objecttype color="#a0a0a4" name="starlight">
         <property default="Solid" name="class" type="string"/>
-        <property default="11 1 196 0 181 141 26 131 " name="drawbox" type="string"/>
-        <property default="Rectangle 0 0 76 119" name="hitbox" type="string"/>
+        <property default="0 4 196 0 197 119 34 140 " name="drawbox" type="string"/>
+        <property default="Rectangle -10 -3 61 55" name="hitbox" type="string"/>
     </objecttype>
     <objecttype color="#a0a0a4" name="tavern">
         <property default="Solid" name="class" type="string"/>
@@ -23,6 +23,6 @@
     <objecttype color="000000" name="newtest">
         <property default="solid" name="class" type="string"/>
         <property default="252 116 505 120 500 247 235 237 " name="drawbox" type="string"/>
-        <property default="Rectangle 80 -607 27 49" name="hitbox" type="string"/>
+        <property default="Rectangle -185 -822 189 99" name="hitbox" type="string"/>
     </objecttype>
 </objecttypes>
diff --git a/src/model/HitboxRectangle.java b/src/model/HitboxRectangle.java
index bacd798..3e0f58a 100644
--- a/src/model/HitboxRectangle.java
+++ b/src/model/HitboxRectangle.java
@@ -88,7 +88,7 @@ public class HitboxRectangle extends Hitbox {
 	}
 	@Override
 	public String listPointsToString() {
-		System.out.println("Данные");
+		System.out.println("Парсинг данных");
 		parseCartesianListPointsToWidthHeight();
 		calculationReferencePoint();
 		return "Rectangle "+(int)referencePoint.x+" "+(int)referencePoint.y+" "+(int)widthHitbox+" "+(int)heightHitbox;
@@ -98,9 +98,17 @@ public class HitboxRectangle extends Hitbox {
 		widthHitbox = Math.abs(listPointsCartesian.get(0).x-listPointsCartesian.get(1).x);
 		heightHitbox = Math.abs(listPointsCartesian.get(1).y-listPointsCartesian.get(2).y);
 	}
+	
 	@Override
 	public void calculationReferencePoint() {
-		referencePoint.x = listPointsIso.get(1).x-owner.getImage().getWidth()/2;
-		referencePoint.y = listPointsIso.get(1).y-owner.getImage().getHeight();
+		Point bottomPoint = new Point(0,0);
+		for(Point currentPoint: listPointsIso) {
+			if(bottomPoint.y<currentPoint.y) {
+				bottomPoint.x=currentPoint.x;
+				bottomPoint.y=currentPoint.y;
+			}
+		}
+		referencePoint.x = bottomPoint.x-owner.getImage().getWidth()/2;
+		referencePoint.y = bottomPoint.y-owner.getImage().getHeight();
 	}
 }