archives/citylimitsj
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

file-format: move timing information into <cityTime> child element

Browse source
This commit is contained in:
Jason Long 2013-07-29 20:20:06 -04:00
parent 98a2b4b007
commit 4a0cfc2bcc
1 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/micropolisj/engine/Micropolis.java
View file

@ -1956,6 +1956,14 @@ public class Micropolis
firePercent = Double.parseDouble(in.getAttributeValue(null, "firePercent")) / 100.0; firePercent = Double.parseDouble(in.getAttributeValue(null, "firePercent")) / 100.0;
roadPercent = Double.parseDouble(in.getAttributeValue(null, "roadPercent")) / 100.0; roadPercent = Double.parseDouble(in.getAttributeValue(null, "roadPercent")) / 100.0;
XML_Helper.skipToEndElement(in); XML_Helper.skipToEndElement(in);
if (cityTax < 0 || cityTax > 20) { cityTax = 7; }
if (policePercent < 0.0) { policePercent = 0.0; }
if (policePercent > 1.0) { policePercent = 1.0; }
if (firePercent < 0.0) { firePercent = 0.0; }
if (firePercent > 1.0) { firePercent = 1.0; }
if (roadPercent < 0.0) { roadPercent = 0.0; }
if (roadPercent > 1.0) { roadPercent = 1.0; }
} }
static String nvl(String x, String d) static String nvl(String x, String d)
@ -1963,10 +1971,22 @@ public class Micropolis
return x != null ? x : d; return x != null ? x : d;
} }
void loadCityTime_v2(XMLStreamReader in)
throws XMLStreamException
{
cityTime = Integer.parseInt(in.getAttributeValue(null, "time"));
fcycle = Integer.parseInt(in.getAttributeValue(null, "fcycle"));
acycle = Integer.parseInt(in.getAttributeValue(null, "acycle"));
XML_Helper.skipToEndElement(in);
if (cityTime < 0) {
cityTime = 0;
}
}
void loadMisc_v2(XMLStreamReader in) void loadMisc_v2(XMLStreamReader in)
throws XMLStreamException throws XMLStreamException
{ {
cityTime = Integer.parseInt(in.getAttributeValue(null, "cityTime"));
crimeRamp = Integer.parseInt(in.getAttributeValue(null, "crimeRamp")); crimeRamp = Integer.parseInt(in.getAttributeValue(null, "crimeRamp"));
polluteRamp = Integer.parseInt(in.getAttributeValue(null, "polluteRamp")); polluteRamp = Integer.parseInt(in.getAttributeValue(null, "polluteRamp"));
landValueAverage = Integer.parseInt(in.getAttributeValue(null, "landValueAverage")); landValueAverage = Integer.parseInt(in.getAttributeValue(null, "landValueAverage"));
@ -1980,8 +2000,6 @@ public class Micropolis
simSpeed = Speed.valueOf(in.getAttributeValue(null, "simSpeed")); simSpeed = Speed.valueOf(in.getAttributeValue(null, "simSpeed"));
XML_Helper.skipToEndElement(in); XML_Helper.skipToEndElement(in);
if (cityTime < 0) { cityTime = 0; }
if (cityTax < 0 || cityTax > 20) { cityTax = 7; }
if (gameLevel < 0 || gameLevel > 2) { gameLevel = 0; } if (gameLevel < 0 || gameLevel > 2) { gameLevel = 0; }
resCap = false; resCap = false;
@ -2069,8 +2087,13 @@ public class Micropolis
out.writeAttribute("indValve", Integer.toString(indValve)); out.writeAttribute("indValve", Integer.toString(indValve));
out.writeEndElement(); out.writeEndElement();
out.writeStartElement("cityTime");
out.writeAttribute("time", Integer.toString(cityTime));
out.writeAttribute("fcycle", Integer.toString(fcycle));
out.writeAttribute("acycle", Integer.toString(acycle));
out.writeEndElement();
out.writeStartElement("misc"); out.writeStartElement("misc");
out.writeAttribute("cityTime", Integer.toString(cityTime));
out.writeAttribute("crimeRamp", Integer.toString(crimeRamp)); out.writeAttribute("crimeRamp", Integer.toString(crimeRamp));
out.writeAttribute("polluteRamp", Integer.toString(polluteRamp)); out.writeAttribute("polluteRamp", Integer.toString(polluteRamp));
out.writeAttribute("landValueAverage", Integer.toString(landValueAverage)); out.writeAttribute("landValueAverage", Integer.toString(landValueAverage));
@ -2288,6 +2311,9 @@ public class Micropolis
indValve = Integer.parseInt(in.getAttributeValue(null, "indValve")); indValve = Integer.parseInt(in.getAttributeValue(null, "indValve"));
XML_Helper.skipToEndElement(in); XML_Helper.skipToEndElement(in);
} }
else if (tagName.equals("cityTime")) {
loadCityTime_v2(in);
}
else if (tagName.equals("misc")) { else if (tagName.equals("misc")) {
loadMisc_v2(in); loadMisc_v2(in);
} }