option to add full frame hurtboxes

TwilCynder · Mar 28, 2024 · 87b4026 · 87b4026
1 parent 55a27bc
commit 87b4026
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 11 deletions.
diff --git a/editor/javaEditor/src/UI/Window.java b/editor/javaEditor/src/UI/Window.java
@@ -381,6 +381,14 @@ public void actionPerformed(ActionEvent e) {
 		}
 	};
 
+	Action makeDefaultHurtboxesAction = new AbstractAction("Make default hurtboxes") {
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			makeFullFrameHurtboxes();
+		}
+
+	};
+
 	Action changeSourceImageAction = new AbstractAction("Change animation source image") {
 		@Override
 		public void actionPerformed(ActionEvent e) {
@@ -1184,6 +1192,7 @@ private void initMenus(){
 		animationGamedataMenuItems.add(new JMenuItem(changeDescriptorAction));
 		animationGamedataMenuItems.add(new JMenuItem(renameSourceImageAction));
 		animationGamedataMenuItems.add(new JMenuItem(changeSourceImageAction));
+		animationGamedataMenuItems.add(new JMenuItem(makeDefaultHurtboxesAction));
 
 		championGamedataMenuItems.add(new JMenuItem(renameChampionDescriptorAction));
 
@@ -1390,6 +1399,14 @@ private boolean changeCurrentAnimSourceImage() throws WindowStateException{
 		return changeAnimSourceImage(anim);
 	}
 
+	private boolean makeFullFrameHurtboxes() {
+		EntityAnimation anim = getCurrentEntityAnimation();
+		anim.fullFramehurtboxes();
+		notifyDataModified();
+		updateVisualEditor();
+		return true;
+	}
+
 	private boolean renameChampionDescriptor(Champion champion){
 		return (new RenameChampionDescriptorForm(this, champion).showForm()) == JOptionPane.OK_OPTION;
 	}

diff --git a/editor/javaEditor/src/UI/displayers/AbstractEntityAnimationEditorBackend.java b/editor/javaEditor/src/UI/displayers/AbstractEntityAnimationEditorBackend.java
@@ -89,6 +89,15 @@ public void actionPerformed(ActionEvent e){
             item = new JMenuItem("Move origin here");
             item.addActionListener(createMoveOriginActionListener(this));
             add(item);
+
+            item = new JMenuItem("Create default hurtboxes");
+            item.addActionListener(new ActionListener(){
+                public void actionPerformed(ActionEvent e){
+                    makeDefaultHurtboxes();
+                    cancelSelection(displayer);
+                }
+            });
+            add(item);
         }
 
         @Override
@@ -204,6 +213,15 @@ private void createHurtbox(Rectangle rect){
         notifyDataModified();
     }
 
+    private void makeDefaultHurtboxes(){
+        EntityAnimationDisplayer editor = getEditor();
+        EntityAnimation anim = editor.getAnimation();
+
+        anim.fullFramehurtboxes();
+
+        notifyDataModified();
+    }
+
     private void createHitbox(Rectangle rect){
         EntityAnimationDisplayer editor = getEditor();
         Frame frame = editor.getCurrentFrame();

diff --git a/editor/javaEditor/src/UI/forms/NewAnimationForm.java b/editor/javaEditor/src/UI/forms/NewAnimationForm.java
@@ -229,6 +229,7 @@ protected boolean confirm(){
 
         try {
             currentRessourcePath.addAnimation(champion, animName, nbFrames, sourceImageFilename, descriptorFilename);
+            editor.notifyDataModified();
             editor.updateAnimations();
             currentData.printAnimations();
         } catch (RessourceException ex){    

diff --git a/editor/javaEditor/src/gamedata/EntityAnimation.java b/editor/javaEditor/src/gamedata/EntityAnimation.java
@@ -3,6 +3,7 @@
 import gamedata.EntityFrame.FrameMovementAxis;
 import gamedata.exceptions.FrameOutOfBoundsException;
 import gamedata.exceptions.GameDataException;
+import gamedata.exceptions.WhatTheHellException;
 import gamedata.parsers.AnimationParser;
 
 import java.awt.Image;
@@ -227,6 +228,20 @@ public static void moveOriginY(Frame frame, EntityFrame entity_frame, int new_y)
         shiftElements(entity_frame, diff);
     }
 
+    public void fullFramehurtboxes(){
+        for (int i = 0; i < this.getNbFrames(); i++){
+            Frame frame; EntityFrame entity_frame;
+            try {
+                frame = this.getFrame(i);
+                entity_frame = this.getEntityFrame(i);
+            } catch (FrameOutOfBoundsException e){
+                throw new WhatTheHellException("Supposedly safe array iteration went out of bounds", e);
+            }
+
+            entity_frame.fullFrameHurtbox(frame);
+        }
+    }
+
     @Override
     public AnimationType getType(){
         return AnimationType.ENTITY;

diff --git a/editor/javaEditor/src/gamedata/parsers/AnimationParser.java b/editor/javaEditor/src/gamedata/parsers/AnimationParser.java
@@ -300,17 +300,7 @@ private static void parseAnimationDescriptor(Animation anim, String descriptor_f
                         fields = StringHelper.split(line, " ");
                         if (fields.length > 1 && fields[1].equals("all")){
                             EntityAnimation eanim = estate.getAnimation();
-                            for (int i = 0; i < anim.getNbFrames(); i++){
-                                Frame frame; EntityFrame entity_frame;
-                                try {
-                                    frame = anim.getFrame(i);
-                                    entity_frame = eanim.getEntityFrame(i);
-                                } catch (FrameOutOfBoundsException e){
-                                    throw new WhatTheHellException("Supposedly safe array iteration went out of bounds", e);
-                                }
-
-                                entity_frame.fullFrameHurtbox(frame);
-                            }
+                            eanim.fullFramehurtboxes();
                         } else {
 
                             if (fields.length < 2){