forked from github/server
replace all of the E2 terrains with JSON data (no more XML!)
This commit is contained in:
Enno Rehling
parent
7c4d18ec2d
commit
b4971dd651
|
|
@ -20,7 +20,6 @@
|
||||||
<xi:include href="config://core/ships.xml"/>
|
<xi:include href="config://core/ships.xml"/>
|
||||||
<xi:include href="config://core/common/buildings.xml"/>
|
<xi:include href="config://core/common/buildings.xml"/>
|
||||||
<xi:include href="config://game/familiars.xml"/>
|
<xi:include href="config://game/familiars.xml"/>
|
||||||
<xi:include href="config://core/terrains.xml"/>
|
|
||||||
<xi:include href="config://game/artrewards.xml"/>
|
<xi:include href="config://game/artrewards.xml"/>
|
||||||
<xi:include href="config://game/buildings.xml"/>
|
<xi:include href="config://game/buildings.xml"/>
|
||||||
<xi:include href="config://core/calendar.xml"/>
|
<xi:include href="config://core/calendar.xml"/>
|
||||||
|
|
|
||||||
|
|
@ -166,6 +166,110 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"iceberg": {
|
||||||
|
"size": 100,
|
||||||
|
"herbs": [ "h18", "h19", "h20" ],
|
||||||
|
"flags": [ "arctic", "land", "walk", "sail", "fly" ],
|
||||||
|
"production": {
|
||||||
|
"iron": {
|
||||||
|
"chance": 0.9,
|
||||||
|
"base": "3",
|
||||||
|
"div": "50",
|
||||||
|
"level": "1"
|
||||||
|
},
|
||||||
|
"stone": {
|
||||||
|
"chance": 0.9,
|
||||||
|
"base": "2",
|
||||||
|
"div": "100",
|
||||||
|
"level": "1"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"iceberg_sleep": {
|
||||||
|
"size": 100,
|
||||||
|
"herbs": [ "h18", "h19", "h20" ],
|
||||||
|
"flags": [ "arctic", "land", "walk", "sail", "fly" ],
|
||||||
|
"production": {
|
||||||
|
"iron": {
|
||||||
|
"chance": 0.9,
|
||||||
|
"base": "3",
|
||||||
|
"div": "50",
|
||||||
|
"level": "1"
|
||||||
|
},
|
||||||
|
"stone": {
|
||||||
|
"chance": 0.9,
|
||||||
|
"base": "2",
|
||||||
|
"div": "100",
|
||||||
|
"level": "1"
|
||||||
|
},
|
||||||
|
"laen": {
|
||||||
|
"chance": 0.05,
|
||||||
|
"base": "4",
|
||||||
|
"div": "100",
|
||||||
|
"level": "1"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"firewall": {
|
||||||
|
"size": 100,
|
||||||
|
"road": 250,
|
||||||
|
"flags": [ "forbidden" ]
|
||||||
|
},
|
||||||
|
"fog": {
|
||||||
|
"flags": [ "walk", "fly" ]
|
||||||
|
},
|
||||||
|
"thickfog": {
|
||||||
|
"flags": [ "forbidden" ]
|
||||||
|
},
|
||||||
|
"volcano": {
|
||||||
|
"size": 500,
|
||||||
|
"road": 250,
|
||||||
|
"seed": 1,
|
||||||
|
"production": {
|
||||||
|
"iron": {
|
||||||
|
"chance": 0.5,
|
||||||
|
"level": 1,
|
||||||
|
"base": 50,
|
||||||
|
"div": 50
|
||||||
|
},
|
||||||
|
"stone": {
|
||||||
|
"chance": 0.5,
|
||||||
|
"level": 1,
|
||||||
|
"base": 100,
|
||||||
|
"div": 100
|
||||||
|
},
|
||||||
|
"laen": {
|
||||||
|
"chance": 0.075,
|
||||||
|
"level": 1,
|
||||||
|
"base": 4,
|
||||||
|
"div": 100
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"activevolcano": {
|
||||||
|
"size": 500,
|
||||||
|
"road": 250,
|
||||||
|
"production": {
|
||||||
|
"iron": {
|
||||||
|
"chance": 0.5,
|
||||||
|
"level": 1,
|
||||||
|
"base": 50,
|
||||||
|
"div": 50
|
||||||
|
},
|
||||||
|
"stone": {
|
||||||
|
"chance": 0.5,
|
||||||
|
"level": 1,
|
||||||
|
"base": 100,
|
||||||
|
"div": 100
|
||||||
|
},
|
||||||
|
"laen": {
|
||||||
|
"chance": 0.075,
|
||||||
|
"level": 1,
|
||||||
|
"base": 4,
|
||||||
|
"div": 100
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"hell": {
|
"hell": {
|
||||||
"flags": [ "land", "walk" ]
|
"flags": [ "land", "walk" ]
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
|
||||||
<terrains>
|
|
||||||
<!-- defaults: walk="yes" sail="yes" fly="yes" swim="no" forest="no" sea="no" land="yes" forbidden="no" arctic="no" cavalry="no" -->
|
|
||||||
<terrain name="iceberg_sleep" size="100" road="250" arctic="yes">
|
|
||||||
<herb name="h18" />
|
|
||||||
<herb name="h19" />
|
|
||||||
<herb name="h20" />
|
|
||||||
<resource name="iron" chance="0.9" level="1" base="3" div="50" />
|
|
||||||
<resource name="stone" chance="0.9" level="1" base="2" div="100" />
|
|
||||||
<resource name="laen" chance="0.05" level="1" base="4" div="100" />
|
|
||||||
</terrain>
|
|
||||||
<terrain name="iceberg" size="100" arctic="yes">
|
|
||||||
<herb name="h18" />
|
|
||||||
<herb name="h19" />
|
|
||||||
<herb name="h20" />
|
|
||||||
<resource name="iron" chance="0.9" level="1" base="3" div="50" />
|
|
||||||
<resource name="stone" chance="0.9" level="1" base="2" div="100" />
|
|
||||||
</terrain>
|
|
||||||
<terrain name="firewall" size="100" road="250" land="no" walk="no" sail="no" fly="no" forbidden="yes" />
|
|
||||||
<terrain name="fog" sail="no" land="no" size="0" />
|
|
||||||
<terrain name="thickfog" forbidden="yes" sail="no" walk="no" fly="no" land="no" size="0" />
|
|
||||||
<terrain name="volcano" size="500" road="250" seed="1">
|
|
||||||
<resource name="iron" chance="0.5" level="1" base="50" div="50" />
|
|
||||||
<resource name="stone" chance="0.5" level="1" base="100" div="100" />
|
|
||||||
<resource name="laen" chance="0.075" level="1" base="4" div="100" />
|
|
||||||
</terrain>
|
|
||||||
<terrain name="activevolcano" size="500" road="250">
|
|
||||||
<resource name="iron" chance="0.5" level="1" base="50" div="50" />
|
|
||||||
<resource name="stone" chance="0.5" level="1" base="100" div="100" />
|
|
||||||
<resource name="laen" chance="0.075" level="1" base="4" div="100" />
|
|
||||||
</terrain>
|
|
||||||
</terrains>
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
<?xml version="1.0" ?>
|
|
||||||
<terrains>
|
|
||||||
<!-- used by the experimental dungeon -->
|
|
||||||
<terrain name="hell" fly="no" sail="no" size="0" land="no"/>
|
|
||||||
|
|
||||||
<!-- used for the museum only -->
|
|
||||||
<terrain name="hall1" fly="no" size="0" />
|
|
||||||
<terrain name="corridor1" fly="no" size="0" />
|
|
||||||
<terrain name="wall1" sail="no" walk="no" fly="no" forbidden="yes" size="0" />
|
|
||||||
</terrains>
|
|
||||||
|
|
@ -1151,7 +1151,7 @@ void terraform_region(region * r, const terrain_type * terrain)
|
||||||
|
|
||||||
/** ENNO:
|
/** ENNO:
|
||||||
* ich denke, das das hier nicht sein sollte.
|
* ich denke, das das hier nicht sein sollte.
|
||||||
* statt dessen sollte ein attribut an der region sein, das das erledigt,
|
* statt dessen sollte ein attribut an der region sein, dass das erledigt,
|
||||||
* egal ob durch den spell oder anderes angelegt.
|
* egal ob durch den spell oder anderes angelegt.
|
||||||
**/
|
**/
|
||||||
#include "curse.h"
|
#include "curse.h"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue