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

file-format: move taxRate and budget levels from <misc> to <budget>

Browse source
This commit is contained in:
Jason Long 2013-07-28 07:36:38 -04:00
parent 4ee34ba245
commit f17021066a
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1940,6 +1940,17 @@ public class Micropolis
out.writeEndElement(); out.writeEndElement();
} }
void loadBudget_v2(XMLStreamReader in)
throws XMLStreamException
{
budget.totalFunds = Integer.parseInt(in.getAttributeValue(null, "funds"));
cityTax = Integer.parseInt(in.getAttributeValue(null, "cityTax"));
policePercent = Double.parseDouble(in.getAttributeValue(null, "policePercent")) / 100.0;
firePercent = Double.parseDouble(in.getAttributeValue(null, "firePercent")) / 100.0;
roadPercent = Double.parseDouble(in.getAttributeValue(null, "roadPercent")) / 100.0;
XML_Helper.skipToEndElement(in);
}
void loadMisc_v2(XMLStreamReader in) void loadMisc_v2(XMLStreamReader in)
throws XMLStreamException throws XMLStreamException
{ {
@ -1953,11 +1964,7 @@ public class Micropolis
autoBulldoze = Boolean.parseBoolean(in.getAttributeValue(null, "autoBulldoze")); autoBulldoze = Boolean.parseBoolean(in.getAttributeValue(null, "autoBulldoze"));
autoBudget = Boolean.parseBoolean(in.getAttributeValue(null, "autoBudget")); autoBudget = Boolean.parseBoolean(in.getAttributeValue(null, "autoBudget"));
autoGo = Boolean.parseBoolean(in.getAttributeValue(null, "autoGo")); autoGo = Boolean.parseBoolean(in.getAttributeValue(null, "autoGo"));
cityTax = Integer.parseInt(in.getAttributeValue(null, "cityTax"));
simSpeed = Speed.valueOf(in.getAttributeValue(null, "simSpeed")); simSpeed = Speed.valueOf(in.getAttributeValue(null, "simSpeed"));
policePercent = Double.parseDouble(in.getAttributeValue(null, "policePercent")) / 100.0;
firePercent = Double.parseDouble(in.getAttributeValue(null, "firePercent")) / 100.0;
roadPercent = Double.parseDouble(in.getAttributeValue(null, "roadPercent")) / 100.0;
XML_Helper.skipToEndElement(in); XML_Helper.skipToEndElement(in);
resCap = false; resCap = false;
@ -2056,11 +2063,7 @@ public class Micropolis
out.writeAttribute("autoBulldoze", Boolean.toString(autoBulldoze)); out.writeAttribute("autoBulldoze", Boolean.toString(autoBulldoze));
out.writeAttribute("autoBudget", Boolean.toString(autoBudget)); out.writeAttribute("autoBudget", Boolean.toString(autoBudget));
out.writeAttribute("autoGo", Boolean.toString(autoGo)); out.writeAttribute("autoGo", Boolean.toString(autoGo));
out.writeAttribute("cityTax", Integer.toString(cityTax));
out.writeAttribute("simSpeed", simSpeed.name()); out.writeAttribute("simSpeed", simSpeed.name());
out.writeAttribute("policePercent", Double.toString(policePercent*100));
out.writeAttribute("firePercent", Double.toString(firePercent*100));
out.writeAttribute("roadPercent", Double.toString(roadPercent*100));
out.writeEndElement(); out.writeEndElement();
out.writeStartElement("evaluation"); out.writeStartElement("evaluation");
@ -2070,6 +2073,10 @@ public class Micropolis
out.writeStartElement("budget"); out.writeStartElement("budget");
out.writeAttribute("funds", Integer.toString(budget.totalFunds)); out.writeAttribute("funds", Integer.toString(budget.totalFunds));
out.writeAttribute("cityTax", Integer.toString(cityTax));
out.writeAttribute("policePercent", Double.toString(policePercent*100));
out.writeAttribute("firePercent", Double.toString(firePercent*100));
out.writeAttribute("roadPercent", Double.toString(roadPercent*100));
out.writeEndElement(); out.writeEndElement();
} }
@ -2274,8 +2281,7 @@ public class Micropolis
XML_Helper.skipToEndElement(in); XML_Helper.skipToEndElement(in);
} }
else if (tagName.equals("budget")) { else if (tagName.equals("budget")) {
budget.totalFunds = Integer.parseInt(in.getAttributeValue(null, "funds")); loadBudget_v2(in);
XML_Helper.skipToEndElement(in);
} }
else if (tagName.equals("map")) { else if (tagName.equals("map")) {
loadMap_v2(in); loadMap_v2(in);