OMGeeky/ATCS
1
0
Fork 0
mirror of https://github.com/OMGeeky/ATCS.git synced 2026-01-19 09:51:19 +01:00
Code Issues Packages Projects Releases 15 Wiki Activity

Create new TMX maps in your project, and edit them with Tiled from ATCS

Browse Source 
!! Also, "created" elements show the "unsaved" asterisk in their
description until they're saved to disk. 
Added a button to the spritesheet editor to open image in an external
tool too. This may or may not remain in the app.
This commit is contained in:
Zukero
2017-02-28 18:43:47 +01:00
parent 41462137d6
commit 061a0fa11b
14 changed files with 369 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/gpl/rpg/atcontentstudio/model/Project.java
View File

@@ -850,6 +850,34 @@ public class Project implements ProjectTreeNode, Serializable {
}
}
/**
*
* @param node. Before calling this method, make sure that no other map with the same id exist in either created or altered.
*/
public void createElement(TMXMap node) {
node.writable = true;
if (getMap(node.id) != null) {
GameDataElement existingNode = getMap(node.id);
for (GameDataElement backlink : existingNode.getBacklinks()) {
backlink.elementChanged(existingNode, node);
}
existingNode.getBacklinks().clear();
node.writable = true;
node.tmxFile = new File(alteredContent.baseFolder, node.tmxFile.getName());
node.parent = alteredContent.gameMaps;
alteredContent.gameMaps.addMap(node);
node.link();
node.state = GameDataElement.State.created;
} else {
node.tmxFile = new File(createdContent.baseFolder, node.tmxFile.getName());
node.parent = createdContent.gameMaps;
createdContent.gameMaps.addMap(node);
node.link();
node.state = GameDataElement.State.created;
}
fireElementAdded(node, getNodeIndex(node));
}
public void moveToCreated(JSONElement target) {
target.childrenRemoved(new ArrayList<ProjectTreeNode>());

2
src/com/gpl/rpg/atcontentstudio/model/gamedata/ActorCondition.java
View File

@@ -86,7 +86,7 @@ public class ActorCondition extends JSONElement {
@Override
public String getDesc() {
return (this.state == State.modified ? "*" : "")+display_name+" ("+id+")";
return ((this.state == State.modified || this.state == State.created) ? "*" : "")+display_name+" ("+id+")";
}
@SuppressWarnings("rawtypes")

3
src/com/gpl/rpg/atcontentstudio/model/gamedata/Dialogue.java
View File

@@ -18,6 +18,7 @@ import com.gpl.rpg.atcontentstudio.Notification;
import com.gpl.rpg.atcontentstudio.model.GameDataElement;
import com.gpl.rpg.atcontentstudio.model.GameSource;
import com.gpl.rpg.atcontentstudio.model.Project;
import com.gpl.rpg.atcontentstudio.model.GameDataElement.State;
import com.gpl.rpg.atcontentstudio.model.gamedata.Requirement.RequirementType;
import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
@@ -91,7 +92,7 @@ public class Dialogue extends JSONElement {
@Override
public String getDesc() {
return (this.state == State.modified ? "*" : "")+id;
return ((this.state == State.modified || this.state == State.created) ? "*" : "")+id;
}
public static String getStaticDesc() {

3
src/com/gpl/rpg/atcontentstudio/model/gamedata/Droplist.java
View File

@@ -17,6 +17,7 @@ import com.gpl.rpg.atcontentstudio.Notification;
import com.gpl.rpg.atcontentstudio.model.GameDataElement;
import com.gpl.rpg.atcontentstudio.model.GameSource;
import com.gpl.rpg.atcontentstudio.model.Project;
import com.gpl.rpg.atcontentstudio.model.GameDataElement.State;
import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
@@ -46,7 +47,7 @@ public class Droplist extends JSONElement {
@Override
public String getDesc() {
return (this.state == State.modified ? "*" : "")+id;
return ((this.state == State.modified || this.state == State.created) ? "*" : "")+id;
}
public static String getStaticDesc() {

3
src/com/gpl/rpg/atcontentstudio/model/gamedata/Item.java
View File

@@ -17,6 +17,7 @@ import com.gpl.rpg.atcontentstudio.Notification;
import com.gpl.rpg.atcontentstudio.model.GameDataElement;
import com.gpl.rpg.atcontentstudio.model.GameSource;
import com.gpl.rpg.atcontentstudio.model.Project;
import com.gpl.rpg.atcontentstudio.model.GameDataElement.State;
public class Item extends JSONElement {
@@ -101,7 +102,7 @@ public class Item extends JSONElement {
@Override
public String getDesc() {
return (this.state == State.modified ? "*" : "")+name+" ("+id+")";
return ((this.state == State.modified || this.state == State.created) ? "*" : "")+name+" ("+id+")";
}
public static String getStaticDesc() {

3
src/com/gpl/rpg/atcontentstudio/model/gamedata/ItemCategory.java
View File

@@ -17,6 +17,7 @@ import org.json.simple.parser.ParseException;
import com.gpl.rpg.atcontentstudio.Notification;
import com.gpl.rpg.atcontentstudio.model.GameDataElement;
import com.gpl.rpg.atcontentstudio.model.GameSource;
import com.gpl.rpg.atcontentstudio.model.GameDataElement.State;
public class ItemCategory extends JSONElement {
@@ -99,7 +100,7 @@ public class ItemCategory extends JSONElement {
@Override
public String getDesc() {
return (this.state == State.modified ? "*" : "")+name+" ("+id+")";
return ((this.state == State.modified || this.state == State.created) ? "*" : "")+name+" ("+id+")";
}
public static String getStaticDesc() {

3
src/com/gpl/rpg/atcontentstudio/model/gamedata/NPC.java
View File

@@ -17,6 +17,7 @@ import com.gpl.rpg.atcontentstudio.Notification;
import com.gpl.rpg.atcontentstudio.model.GameDataElement;
import com.gpl.rpg.atcontentstudio.model.GameSource;
import com.gpl.rpg.atcontentstudio.model.Project;
import com.gpl.rpg.atcontentstudio.model.GameDataElement.State;
public class NPC extends JSONElement {
@@ -95,7 +96,7 @@ public class NPC extends JSONElement {
@Override
public String getDesc() {
return (this.state == State.modified ? "*" : "")+name+" ("+id+")";
return ((this.state == State.modified || this.state == State.created) ? "*" : "")+name+" ("+id+")";
}
public static String getStaticDesc() {

3
src/com/gpl/rpg/atcontentstudio/model/gamedata/Quest.java
View File

@@ -16,6 +16,7 @@ import org.json.simple.parser.ParseException;
import com.gpl.rpg.atcontentstudio.Notification;
import com.gpl.rpg.atcontentstudio.model.GameDataElement;
import com.gpl.rpg.atcontentstudio.model.GameSource;
import com.gpl.rpg.atcontentstudio.model.GameDataElement.State;
import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
public class Quest extends JSONElement {
@@ -48,7 +49,7 @@ public class Quest extends JSONElement {
@Override
public String getDesc() {
return (this.state == State.modified ? "*" : "")+name+" ("+id+")";
return ((this.state == State.modified || this.state == State.created) ? "*" : "")+name+" ("+id+")";
}
public static String getStaticDesc() {

8
src/com/gpl/rpg/atcontentstudio/model/maps/TMXMap.java
View File

@@ -197,7 +197,7 @@ public class TMXMap extends GameDataElement {
}
@Override
public String getDesc() {
return (this.state == State.modified ? "*" : "")+id;
return ((this.state == State.modified || this.state == State.created) ? "*" : "")+id;
}
@Override
@@ -309,8 +309,10 @@ public class TMXMap extends GameDataElement {
parse();
}
if (this.state == GameDataElement.State.parsed || this.state == GameDataElement.State.created) {
for (MapObjectGroup group : groups) {
group.link();
if (groups != null) {
for (MapObjectGroup group : groups) {
group.link();
}
}
}
}