mirror of
https://github.com/OMGeeky/ATCS.git
synced 2025-12-26 23:57:25 +01:00
Compare commits
1 Commits
misc-error
...
sample-bui
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5d5ca15669 |
4
build-and-run.sh
Executable file
4
build-and-run.sh
Executable file
@@ -0,0 +1,4 @@
|
|||||||
|
export MAIN_CLASS=com.gpl.rpg.atcontentstudio.ATContentStudio
|
||||||
|
export CP="lib/*:src:res:hacked-libtiled:siphash-zackehh/src/main/java/:."
|
||||||
|
javac -cp $CP ./src/com/gpl/rpg/atcontentstudio/ATContentStudio.java
|
||||||
|
java -cp $CP $MAIN_CLASS
|
||||||
@@ -236,12 +236,7 @@ public class ActorCondition extends JSONElement {
|
|||||||
if (this.icon_id != null) {
|
if (this.icon_id != null) {
|
||||||
String spritesheetId = this.icon_id.split(":")[0];
|
String spritesheetId = this.icon_id.split(":")[0];
|
||||||
if (getProject().getSpritesheet(spritesheetId) == null) {
|
if (getProject().getSpritesheet(spritesheetId) == null) {
|
||||||
System.out.println("Actor Condition");
|
|
||||||
System.out.println(this.id);
|
System.out.println(this.id);
|
||||||
System.out.println("failed to load spritesheet");
|
|
||||||
System.out.println(spritesheetId);
|
|
||||||
System.out.println("while creating backling for icon_id");
|
|
||||||
System.out.println(this.icon_id);
|
|
||||||
}
|
}
|
||||||
getProject().getSpritesheet(spritesheetId).addBacklink(this);
|
getProject().getSpritesheet(spritesheetId).addBacklink(this);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,15 +39,14 @@ public abstract class JSONElement extends GameDataElement {
|
|||||||
Map jsonObj = (Map)obj;
|
Map jsonObj = (Map)obj;
|
||||||
String id = (String) jsonObj.get("id");
|
String id = (String) jsonObj.get("id");
|
||||||
try {
|
try {
|
||||||
if (id != null && id.equals(this.id )) {
|
if (id != null && id.equals(this.id )) {
|
||||||
this.parse(jsonObj);
|
this.parse(jsonObj);
|
||||||
this.state = State.parsed;
|
this.state = State.parsed;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch(Exception e){
|
catch(Exception e){
|
||||||
System.out.println("Error in ID: " + id);
|
System.out.println("Error in ID: " + id);
|
||||||
System.out.println(e.getMessage());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (FileNotFoundException e) {
|
} catch (FileNotFoundException e) {
|
||||||
|
|||||||
Reference in New Issue
Block a user