Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

if parsing a missing card then log any property errors to console (if running in dev/debug mode) instead of raising a RuntimeException.

master
Lodici 2014-05-11 20:11:06 +01:00
parent 2cdf35c7d9
commit b7a78ece95
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/magic/MagicUtility.java
View File

@ -33,6 +33,10 @@ final public class MagicUtility {
return Boolean.getBoolean("devMode");
}
public static boolean isDebugMode() {
return Boolean.getBoolean("debug");
}
/**
* add "-DselfMode=true" VM argument for AI vs AI mode.
*/

32
src/magic/data/CardDefinitions.java
View File

@ -1,6 +1,7 @@
package magic.data;
import magic.MagicMain;
import magic.MagicUtility;
import magic.model.MagicCardDefinition;
import magic.model.MagicChangeCardDefinition;
import magic.model.MagicColor;
@ -105,12 +106,24 @@ public class CardDefinitions {
}
}
private static MagicCardDefinition prop2carddef(final Properties content) {
final MagicCardDefinition cardDefinition=new MagicCardDefinition();
private static MagicCardDefinition prop2carddef(final File scriptFile, final boolean isMissing) {
final Properties content = FileIO.toProp(scriptFile);
final MagicCardDefinition cardDefinition = new MagicCardDefinition();
cardDefinition.setIsMissing(isMissing);
//run through the list of properties
for (final String key : content.stringPropertyNames()) {
setProperty(cardDefinition, key, content.getProperty(key));
try {
setProperty(cardDefinition, key, content.getProperty(key));
} catch (Exception e) {
if (isMissing) {
if (MagicUtility.isDevMode() || MagicUtility.isDebugMode()) {
System.err.println(scriptFile.getName() + " [" + key + "] : " + e.getMessage());
}
} else {
throw new RuntimeException(e);
}
}
}
return cardDefinition;
@ -137,7 +150,7 @@ public class CardDefinitions {
private static void loadCardDefinition(final File file) {
try {
final MagicCardDefinition cdef = prop2carddef(FileIO.toProp(file));
final MagicCardDefinition cdef = prop2carddef(file, false);
cdef.validate();
addDefinition(cdef);
} catch (final Throwable cause) {
@ -336,13 +349,8 @@ public class CardDefinitions {
if (scriptFiles != null) {
for (final File file : scriptFiles) {
MagicCardDefinition cdef = null;
try {
cdef = prop2carddef(FileIO.toProp(file));
cdef.setIsMissing(true);
missingScripts.put(cdef.getName(), cdef);
} catch (Exception e) {
System.out.println(file.getName() + " : " + e.getMessage());
}
cdef = prop2carddef(file, true);
missingScripts.put(cdef.getName(), cdef);
}
}
// }