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

Fixed caching issue with spritesheet chooser. Improved actor condition

Browse Source 
management for items.
This commit is contained in:
Zukero
2017-04-03 17:53:44 +02:00
parent bbee5bef25
commit 300b7bbbdd
9 changed files with 232 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -665,6 +665,26 @@ public class Project implements ProjectTreeNode, Serializable {
return sheet;
}
public int getSpritesheetCount() {
return createdContent.gameSprites.spritesheets.size() + baseContent.gameSprites.spritesheets.size();
}
public Spritesheet getSpritesheet(int index) {
if (index < createdContent.gameSprites.spritesheets.size()) {
return createdContent.gameSprites.spritesheets.get(index);
} else if (index < getQuestCount()){
return getSpritesheet(baseContent.gameSprites.spritesheets.get(index - createdContent.gameSprites.spritesheets.size()).id);
}
return null;
}
public int getSpritesheetIndex(Spritesheet spritesheet) {
if (spritesheet.getDataType() == GameSource.Type.created) {
return createdContent.gameSprites.spritesheets.indexOf(spritesheet);
} else {
return createdContent.gameSprites.spritesheets.size() + baseContent.gameSprites.spritesheets.indexOf(baseContent.gameSprites.getSpritesheet(spritesheet.id));
}
}
public TMXMap getMap(String id) {
TMXMap map = createdContent.gameMaps.getMap(id);

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

@@ -110,7 +110,7 @@ public class WorkspaceSettings {
return;
}
json.put(VERSION_KEY, ATContentStudio.APP_VERSION);
json.put(VERSION_KEY, SETTINGS_VERSION);
StringWriter writer = new JsonPrettyWriter();
try {
JSONObject.writeJSONString(json, writer);

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

@@ -20,6 +20,8 @@ import com.gpl.rpg.atcontentstudio.model.GameSource;
public class ActorCondition extends JSONElement {
private static final long serialVersionUID = -3969824899972048507L;
public static final Integer CLEAR_AC_MAGNITUDE = -99;
// Available from init state
//public String id; inherited.