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

Merge branch 'pulls/1195352/7'

Browse Source
This commit is contained in:
Nut.andor
2025-02-15 16:34:58 +01:00
parent 6578236775 ec346e9c98
commit aa43382296
16 changed files with 348 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -238,7 +238,12 @@ public class ActorCondition extends JSONElement {
if (this.icon_id != null) {
String spritesheetId = this.icon_id.split(":")[0];
if (getProject().getSpritesheet(spritesheetId) == null) {
System.out.println("Actor Condition");
System.out.println(this.id);
System.out.println("failed to load spritesheet:");
System.out.println(spritesheetId);
System.out.println("while creating backlink for icon_id:");
System.out.println(this.icon_id);
}
getProject().getSpritesheet(spritesheetId).addBacklink(this);
}

11
src/com/gpl/rpg/atcontentstudio/model/gamedata/JSONElement.java
View File

@@ -39,14 +39,15 @@ public abstract class JSONElement extends GameDataElement {
Map jsonObj = (Map)obj;
String id = (String) jsonObj.get("id");
try {
if (id != null && id.equals(this.id )) {
this.parse(jsonObj);
this.state = State.parsed;
break;
}
if (id != null && id.equals(this.id )) {
this.parse(jsonObj);
this.state = State.parsed;
break;
}
}
catch(Exception e){
System.out.println("Error in ID: " + id);
System.out.println(e.getMessage());
}
}
} catch (FileNotFoundException e) {