Merge remote-tracking branch 'omgeeky/spawnchance' into spawnchance

ATCS_JAR.jardesc

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="ATContentStudio/ATCS_v0.6.18.jar"/>
+    <jar path="ATContentStudio/ATCS_v0.6.19.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/ATContentStudio/ATCS_JAR.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>

packaging/ATCS_latest

@@ -1 +1 @@
-v0.6.18
+v0.6.19

packaging/Windows/ATCS_Installer.nsi

@@ -1,6 +1,6 @@
 !include MUI2.nsh
 
-!define VERSION "0.6.18"
+!define VERSION "0.6.19"
 !define TRAINER_VERSION "0.1.5"
 !define JAVA_BIN "javaw"
 
@@ -88,7 +88,7 @@ Section install
   file "C:\AT\ATCS_source\lib\AndorsTrainer_v${TRAINER_VERSION}.jar"
   file "C:\AT\ATCS_source\lib\junit-4.10.jar"
   file "C:\AT\ATCS_source\lib\json_simple-1.1.jar"
-  file "C:\AT\temp\ATCS_v0.6.18\ATCS_v${VERSION}.jar"
+  file "C:\AT\temp\ATCS_v0.6.19\ATCS_v${VERSION}.jar"
   file "C:\AT\ATCS_source\lib\rsyntaxtextarea.jar"
   file "C:\AT\ATCS_source\lib\prefuse.jar"
   file "C:\AT\ATCS_source\lib\bsh-2.0b4.jar"

src/com/gpl/rpg/atcontentstudio/ATContentStudio.java

@@ -43,7 +43,7 @@ import com.gpl.rpg.atcontentstudio.ui.WorkspaceSelector;
 public class ATContentStudio {
 
 	public static final String APP_NAME = "Andor's Trail Content Studio";
-	public static final String APP_VERSION = "v0.6.18";
+	public static final String APP_VERSION = "v0.6.19";
 	
 	public static final String CHECK_UPDATE_URL = "https://andorstrail.com/static/ATCS_latest";
 	public static final String DOWNLOAD_URL = "https://andorstrail.com/viewtopic.php?f=6&t=4806";

src/com/gpl/rpg/atcontentstudio/model/maps/SpawnArea.java

@@ -11,7 +11,7 @@ import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 public class SpawnArea extends MapObject {
 
 	public int quantity = 1;
-	public int spawnchance = 10;
+	public int respawnSpeed = 10;
 	public boolean active = true;
 	public boolean ignoreAreas = false;
 	public String spawngroup_id;
@@ -21,8 +21,8 @@ public class SpawnArea extends MapObject {
 		if (obj.getProperties().getProperty("quantity") != null) {
 			this.quantity = Integer.parseInt(obj.getProperties().getProperty("quantity"));
 		}
-		if (obj.getProperties().getProperty("spawnchance") != null) {
+		if (obj.getProperties().getProperty("respawnspeed") != null) {
-			this.spawnchance = Integer.parseInt(obj.getProperties().getProperty("spawnchance"));
+			this.respawnSpeed = Integer.parseInt(obj.getProperties().getProperty("respawnspeed"));
 		}
 		if (obj.getProperties().getProperty("active") != null) {
 			this.active = Boolean.parseBoolean(obj.getProperties().getProperty("active"));
@@ -82,8 +82,8 @@ public class SpawnArea extends MapObject {
 		if (quantity != 1) {
 			tmxObject.getProperties().setProperty("quantity", Integer.toString(quantity));
 		}
-		if (spawnchance != 10) {
+		if (respawnSpeed != 10) {
-			tmxObject.getProperties().setProperty("spawnchance", Integer.toString(spawnchance));
+			tmxObject.getProperties().setProperty("respawnspeed", Integer.toString(respawnSpeed));
 		}
 		if (!this.active) {
 			tmxObject.getProperties().setProperty("active", Boolean.toString(active));
@@ -92,5 +92,4 @@ public class SpawnArea extends MapObject {
 			tmxObject.getProperties().setProperty("ignoreAreas", Boolean.toString(ignoreAreas));
 		}
 	}
-	
 }

src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java

@@ -161,6 +161,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	@SuppressWarnings("rawtypes")
 	private JComboBox evaluateTriggerBox;
 	private JSpinner quantityField;
+	private JSpinner respawnSpeedField;
 	private JCheckBox spawnActiveForNewGame;
 	private JCheckBox spawnIgnoreAreas;
 	private JTextField spawngroupField;
@@ -629,6 +630,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			areaField = addTextField(pane, "Spawn area ID: ", ((SpawnArea)selected).name, ((TMXMap)target).writable, listener);
 			spawngroupField = addTextField(pane, "Spawn group ID: ", ((SpawnArea)selected).spawngroup_id, ((TMXMap)target).writable, listener);
 			quantityField = addIntegerField(pane, "Number of spawned NPCs: ", ((SpawnArea)selected).quantity, false, ((TMXMap)target).writable, listener);
+			respawnSpeedField = addIntegerField(pane, "Respawn-Speed of NPCs: ", ((SpawnArea)selected).respawnSpeed, false, ((TMXMap)target).writable, listener);
 			spawnActiveForNewGame = addBooleanBasedCheckBox(pane, "Active in a new game: ", ((SpawnArea)selected).active, ((TMXMap)target).writable, listener);
 			spawnIgnoreAreas = addBooleanBasedCheckBox(pane, "Monsters can walk on other game objects: ", ((SpawnArea)selected).ignoreAreas, ((TMXMap)target).writable, listener);
 			npcListModel = new SpawnGroupNpcListModel((SpawnArea) selected);
@@ -2049,6 +2051,10 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 					SpawnArea area = (SpawnArea) selectedMapObject;
 					area.quantity = (Integer) value;
 				}
+			} else if (source == respawnSpeedField) {
+				if (selectedMapObject instanceof SpawnArea area) {
+					area.respawnSpeed = (Integer) value;
+				}
 			} else if (source == spawnActiveForNewGame) {
 				if (selectedMapObject instanceof SpawnArea) {
 					SpawnArea area = (SpawnArea) selectedMapObject;

src/com/gpl/rpg/atcontentstudio/ui/sprites/SpriteChooser.java

@@ -1,20 +1,29 @@
 package com.gpl.rpg.atcontentstudio.ui.sprites;
 
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Image;
+import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import javax.swing.*;
+
+import javax.swing.ButtonGroup;
+import javax.swing.ImageIcon;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JToggleButton;
+import javax.swing.ScrollPaneConstants;
 
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.model.Project;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet.Category;
-import com.gpl.rpg.atcontentstudio.utils.SpriteUtils;
 
 
 public class SpriteChooser extends JDialog {
@@ -25,8 +34,8 @@ public class SpriteChooser extends JDialog {
 	private static final int STD_HEIGHT = 32;
 	private static final int MAX_PER_ROW = 10;
 	
-	public static Map<Project, Map<Spritesheet.Category, SpriteChooser>> cache = new LinkedHashMap<Project, Map<Spritesheet.Category, SpriteChooser>>();
+	public static Map<Project, Map<Spritesheet.Category, SpriteChooser>> cache = new LinkedHashMap<Project, Map<Spritesheet.Category,SpriteChooser>>();
-	public static Map<Project, Map<Spritesheet.Category, List<Spritesheet>>> cacheValidator = new LinkedHashMap<Project, Map<Category, List<Spritesheet>>>();
+	public static Map<Project, Map<Spritesheet.Category, List<Spritesheet>>> cacheValidator = new LinkedHashMap<Project, Map<Category,List<Spritesheet>>>();
 	
 	
 	public static SpriteChooser getChooser(Project proj, Spritesheet.Category category) {
@@ -37,13 +46,13 @@ public class SpriteChooser extends JDialog {
 			cache.get(proj).put(category, new SpriteChooser(proj, category));
 		} else {
 			List<Spritesheet> spritesheets = new ArrayList<Spritesheet>();
-			for (int i = 0; i < proj.getSpritesheetCount(); i++) {
+			for (int i=0; i<proj.getSpritesheetCount(); i++) {
 				Spritesheet sheet = proj.getSpritesheet(i);
 				if (sheet.category == category) {
 					spritesheets.add(sheet);
 				}
 			}
-			if (!spritesheets.equals(cacheValidator.get(proj).get(category))) {
+			if ( !spritesheets.equals(cacheValidator.get(proj).get(category)) ) {
 				cache.get(proj).put(category, new SpriteChooser(proj, category));
 			}
 		}
@@ -69,7 +78,7 @@ public class SpriteChooser extends JDialog {
 		setTitle("Select a sprite");
 		setModalityType(ModalityType.APPLICATION_MODAL);
 		List<Spritesheet> spritesheets = new ArrayList<Spritesheet>();
-		for (int i = 0; i < proj.getSpritesheetCount(); i++) {
+		for (int i=0; i<proj.getSpritesheetCount(); i++) {
 			Spritesheet sheet = proj.getSpritesheet(i);
 			if (sheet.category == category) {
 				spritesheets.add(sheet);
@@ -97,14 +106,11 @@ public class SpriteChooser extends JDialog {
 		Point nextFreeSlot = new Point(0, 0);
 		
 		int i;
-		BufferedImage img;
+		Image img;
 		group = new ButtonGroup();
 		for (Spritesheet sheet : spritesheets) {
-            i = -1;
+			i = 0;
-            while ((img = sheet.getImage(++i)) != null) {
+			while ((img = sheet.getImage(i)) != null) {
-                if (SpriteUtils.checkIsImageEmpty(img)) {
-                    continue;
-                }
 				IconButton button = new IconButton(img, sheet.id, i);
 				group.add(button);
 				if (sheet.spriteWidth == STD_WIDTH && sheet.spriteHeight == STD_HEIGHT) {
@@ -114,7 +120,7 @@ public class SpriteChooser extends JDialog {
 						c.gridx = 0;
 						c.gridy++;
 					}
-					nextFreeSlot.setLocation(c.gridx, c.gridy);
+					nextFreeSlot.setLocation(c.gridx,  c.gridy);
 				} else {
 					c.gridwidth = (sheet.spriteWidth / STD_WIDTH) + (sheet.spriteWidth % STD_WIDTH == 0 ? 0 : 1);
 					c.gridheight = (sheet.spriteHeight / STD_HEIGHT) + (sheet.spriteHeight % STD_HEIGHT == 0 ? 0 : 1);
@@ -151,8 +157,9 @@ public class SpriteChooser extends JDialog {
 						c.gridx = 0;
 						c.gridy++;
 					}
-					nextFreeSlot.setLocation(c.gridx, c.gridy);
+					nextFreeSlot.setLocation(c.gridx,  c.gridy);
 				}
+				i++;
 			}
 		}
 		
@@ -225,12 +232,12 @@ public class SpriteChooser extends JDialog {
 			super(new ImageIcon(img));
 			this.sheetId = sheetId;
 			this.spriteIndex = spriteIndex;
-			setToolTipText(sheetId + ":" + spriteIndex);
+			setToolTipText(sheetId+":"+spriteIndex);
 			addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent e) {
 					if (IconButton.this.isSelected()) {
-						selectedIconId = IconButton.this.sheetId + ":" + IconButton.this.spriteIndex;
+						selectedIconId = IconButton.this.sheetId+":"+IconButton.this.spriteIndex;
 						SpriteChooser.this.setVisible(false);
 						SpriteChooser.this.dispose();
 						if (listener != null) listener.iconSelected(selectedIconId);

src/com/gpl/rpg/atcontentstudio/utils/SpriteUtils.java

@@ -1,34 +0,0 @@
-package com.gpl.rpg.atcontentstudio.utils;
-
-import java.awt.image.BufferedImage;
-import java.awt.image.WritableRaster;
-
-public final class SpriteUtils {
-
-	/**
-	 * Check if the image is empty (transparent )
-	 *
-	 * @param img The image to check
-	 * @return true if the image is empty
-	 */
-	public static boolean checkIsImageEmpty(BufferedImage img) {
-		int width = img.getWidth(null);
-		int height = img.getHeight(null);
-		WritableRaster raster = img.getAlphaRaster();
-		if (raster == null) {
-			return false;
-		}
-		for (int x = 0; x < width; x++) {
-			for (int y = 0; y < height; y++) {
-				//get pixel alpha value
-				int alpha = raster.getSample(x, y, 0);
-				//if alpha is not 0 then the pixel is not transparent
-				if (alpha != 0) {
-					return false;
-				}
-			}
-		}
-		//no non-transparent pixel found
-		return true;
-	}
-}