mirror of
https://github.com/OMGeeky/ATCS.git
synced 2025-12-26 23:57:25 +01:00
Compare commits
2 Commits
v0.6.20
...
misc-error
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4d03c15e08 | ||
|
|
4571bea429 |
@@ -80,5 +80,5 @@ if [ "$LINUX" = true ] ; then
|
||||
tar caf "ATCS_${VERSION}.tar.gz" "common"
|
||||
echo "Created archive at ${PACKAGING_DIR}/ATCS_${VERSION}.tar.gz"
|
||||
else
|
||||
echo "Can't create zip files on windows yet. Please pack the content of the '${PACKAGING_DIR}/common/' folder yourself
|
||||
fi
|
||||
echo "Can't create zip files on windows yet. Please pack the content of the '${PACKAGING_DIR}/common/' folder yourself"
|
||||
fi
|
||||
|
||||
@@ -236,7 +236,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 backling for icon_id");
|
||||
System.out.println(this.icon_id);
|
||||
}
|
||||
getProject().getSpritesheet(spritesheetId).addBacklink(this);
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user