Changeset a10d422 in lost-perception

Timestamp:

Jun 4, 2020, 4:15:10 PM (4 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

master

Children:

57674f3

Parents:

5d846bb

Message:

Create a working makefile target for MapEditor

Files:

• .gitignore (modified) (1 diff)
• main/Creature.java (modified) (2 diffs)
• main/Enemy.java (modified) (1 diff)
• main/Item.java (modified) (1 diff)
• main/MapEditor.java (modified) (5 diffs)
• main/MapObject.java (modified) (2 diffs)
• makefile (modified) (1 diff)

.gitignore

@@ -1 +1 @@
 .DS_Store
 *.class
+LostPerception.jar
+MapEditor.jar
 err.txt
-LostPerception.jar
+errMapEditor.txt

main/Creature.java

@@ -13 +13 @@
 import java.awt.geom.Point2D;
 
-public class Creature extends MapObject
-{
+public class Creature extends MapObject {
     String name;
     private Model model;
@@ -77 +76 @@
         this.dead = false;
         this.id = Creature.lastId;
-        ++Creature.lastId;
+        Creature.lastId++;
     }
     

main/Enemy.java

@@ -8 +8 @@
 import java.awt.Point;
 
-public class Enemy extends Creature
-{
+public class Enemy extends Creature {
     int xpReward;
     Point patrolTarget;

main/Item.java

@@ -9 +9 @@
 import utils.DynamicImage;
 
-public class Item extends MapObject
-{
+public class Item extends MapObject {
     private String name;
     private DynamicImage img;

main/MapEditor.java

@@ -40 +40 @@
 import java.awt.event.KeyListener;
 
-public class MapEditor implements KeyListener, MouseListener
-{
+public class MapEditor implements KeyListener, MouseListener {
     public static final int RES_X = 1024;
     public static final int RES_Y = 768;
@@ -96 +95 @@
     boolean highLevelPlacement;
     Point playerLoc;
-    Point start;
     
     public MapEditor(final GraphicsDevice device) {
         this.started = false;
-        this.start = null;
         try {
             GraphicsConfiguration gc = device.getDefaultConfiguration();
-            gc = device.getDefaultConfiguration();
             (MapEditor.frmMain = new Frame(gc)).setUndecorated(true);
             MapEditor.frmMain.setIgnoreRepaint(true);
@@ -117 +113 @@
             this.mapBuffer = gc.createCompatibleImage(800, 600);
             this.mapG = this.mapBuffer.getGraphics();
-            Utils.init(gc, false);
+            Utils.init(gc, RUNNING_FROM_JAR);
             this.state = State.Main;
             this.auxState = AuxState.None;
@@ -152 +148 @@
                 }
             }
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
             return;
-        }
-        finally {
+        } finally {
             device.setFullScreenWindow(null);
         }
@@ -1104 +1098 @@
             final GraphicsDevice device = env.getDefaultScreenDevice();
             new MapEditor(device);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }

main/MapObject.java

@@ -5 +5 @@
 import java.awt.Point;
 
-public class MapObject implements Comparable<MapObject>
-{
+public class MapObject implements Comparable<MapObject> {
     public Point loc;
     public int z;
@@ -15 +14 @@
         this.loc = new Point(x, y);
         this.z = z;
-        final Bound bound = null;
-        this.selectionBound = bound;
-        this.bound = bound;
+        this.bound = null;
+        this.selectionBound = null;
     }
     

makefile

@@ -1 @@
-ASTAR_DEPS = astar/AStarMap.class astar/AStarNode.class astar/AStarSearch.class astar/BinaryHeap.class astar/QuadTree.class
+# Use something like "LostPerception: MAP_FILE_DEPS = maps/*.txt" to specify var for a specific target
+
+#ASTAR_DEPS = astar/AStarMap.class astar/AStarNode.class astar/AStarSearch.class astar/BinaryHeap.class astar/QuadTree.class
+#COLLISION_DEPS = collision/Bound.class
+#GAMEGUI_DEPS = gamegui/Align.class gamegui/Animation.class gamegui/Button.class gamegui/Label.class gamegui/Listable.class gamegui/Member.class gamegui/ScrollBar.class gamegui/ScrollList.class gamegui/Textbox.class gamegui/Window.class
+#UTILS_DEPS = utils/DynamicImage.class utils/Utils.class utils/WrappedString.class
+
+#MAIN_DEPS = main/Action.class main/Armor.class main/Creature.class main/Dialog.class main/Direction.class main/Effect.class main/Enemy.class main/Item.class main/Location.class main/LostHavenRPG.class main/Map.class main/MapImage.class main/MapObject.class main/MapType.class main/Model.class main/NPC.class main/Player.class main/StatType.class main/Tile.class main/Weapon.class
+
+#GAMEGUI_INNER_DEPS = gamegui/Button\$$1.class gamegui/Label\$$1.class
+#MAIN_INNER_DEPS = main/Armor\$$ArmorType.class main/Effect\$$MoveSpeed.class main/Effect\$$Hitpoints.class main/Effect\$$Manapoints.class main/Effect\$$Damage.class main/Effect\$$AttackSpeed.class main/LostHavenRPG\$$1.class main/LostHavenRPG\$$AuxState.class main/LostHavenRPG\$$GameState.class main/Model\$$1.class
+#UTILS_INNER_DEPS = utils/Utils\$$1.class
+
+#INNER_DEPS = $(GAMEGUI_INNER_DEPS) $(MAIN_INNER_DEPS) $(UTILS_INNER_DEPS)
+
+#DIALOG_FILE_DEPS = dialog/*.txt
+#IMAGE_FILE_DEPS = images/*/*.png images/creatures/*/*/*.png images/*/*.ttf
+#MAP_FILE_DEPS = maps/*.txt
+
+#CLASS_DEPS = $(MAIN_DEPS) $(ASTAR_DEPS) $(GAMEGUI_DEPS) $(COLLISION_DEPS) $(UTILS_DEPS)
+#FILE_DEPS = $(DIALOG_FILE_DEPS) $(IMAGE_FILE_DEPS) $(MAP_FILE_DEPS)
+
+#LostPerception: $(CLASS_DEPS) $(FILE_DEPS)
+#       jar cfe $@.jar main.LostHavenRPG $^ $(INNER_DEPS)
+
+ASTAR_DEPS = astar/AStarMap.class astar/AStarNode.class astar/QuadTree.class
 COLLISION_DEPS = collision/Bound.class
-GAMEGUI_DEPS = gamegui/Align.class gamegui/Animation.class gamegui/Button.class gamegui/Label.class gamegui/Listable.class gamegui/Member.class gamegui/ScrollBar.class gamegui/ScrollList.class gamegui/Textbox.class gamegui/Window.class
-UTILS_DEPS = utils/DynamicImage.class utils/Utils.class utils/WrappedString.class
+GAMEGUI_DEPS = gamegui/Align.class gamegui/Animation.class gamegui/Button.class gamegui/Label.class gamegui/Member.class gamegui/ScrollBar.class gamegui/Textbox.class gamegui/Window.class
+UTILS_DEPS = utils/DynamicImage.class utils/Utils.class
 
-MAIN_DEPS = main/Action.class main/Armor.class main/Creature.class main/Dialog.class main/Direction.class main/Effect.class main/Enemy.class main/Item.class main/Location.class main/LostHavenRPG.class main/Map.class main/MapImage.class main/MapObject.class main/MapType.class main/Model.class main/NPC.class main/Player.class main/StatType.class main/Tile.class main/Weapon.class
+MAIN_DEPS = main/Action.class main/Creature.class main/Direction.class main/Enemy.class main/Item.class main/Location.class main/Map.class main/MapEditor.class main/MapImage.class main/MapObject.class main/MapType.class main/Model.class main/Player.class main/StatType.class main/Tile.class 
 
 GAMEGUI_INNER_DEPS = gamegui/Button\$$1.class gamegui/Label\$$1.class
-MAIN_INNER_DEPS = main/Armor\$$ArmorType.class main/Effect\$$MoveSpeed.class main/Effect\$$Hitpoints.class main/Effect\$$Manapoints.class main/Effect\$$Damage.class main/Effect\$$AttackSpeed.class main/LostHavenRPG\$$1.class main/LostHavenRPG\$$AuxState.class main/LostHavenRPG\$$GameState.class main/Model\$$1.class
+MAIN_INNER_DEPS = main/MapEditor\$$1.class main/MapEditor\$$AuxState.class  main/MapEditor\$$GroundType.class main/MapEditor\$$State.class main/Model\$$1.class
 UTILS_INNER_DEPS = utils/Utils\$$1.class
 
 INNER_DEPS = $(GAMEGUI_INNER_DEPS) $(MAIN_INNER_DEPS) $(UTILS_INNER_DEPS)
 
-DIALOG_FILE_DEPS = dialog/*.txt
-IMAGE_FILE_DEPS = images/*/*.png images/creatures/*/*/*.png images/*/*.ttf
-MAP_FILE_DEPS = maps/*.txt
+IMAGE_FILE_DEPS = images/*/*.png images/creatures/*/*/*.png
 
 CLASS_DEPS = $(MAIN_DEPS) $(ASTAR_DEPS) $(GAMEGUI_DEPS) $(COLLISION_DEPS) $(UTILS_DEPS)
-FILE_DEPS = $(DIALOG_FILE_DEPS) $(IMAGE_FILE_DEPS) $(MAP_FILE_DEPS)
+FILE_DEPS = $(IMAGE_FILE_DEPS)
 
-LostPerception: $(CLASS_DEPS) $(FILE_DEPS)
-        jar cfe $@.jar main.LostHavenRPG $^ $(INNER_DEPS)
+MapEditor: $(CLASS_DEPS) $(FILE_DEPS)
+        jar cfe $@.jar main.MapEditor $^ $(INNER_DEPS)