Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

familiars do not need the default value in XML (bad XML).

This commit is contained in:
Enno Rehling 2018-05-10 20:02:53 +02:00
parent 8c7b890f3e
commit b0012eeae0
15 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
res/e3a/races.xml
View File

@ -40,7 +40,7 @@
<skill name="magic" modifier="-99"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="dolphin" default="yes"/>
<familiar race="dolphin"/>
<familiar race="giantturtle"/>
</race>
@ -67,7 +67,7 @@
<skill name="unarmed" modifier="-99"/>
<skill name="weaponsmithing" modifier="2"/>
<attack type="1" damage="1d5"/>
<familiar race="wolf" default="yes"/>
<familiar race="wolf"/>
<familiar race="ghost"/>
</race>
@ -95,7 +95,7 @@
<skill name="magic" modifier="-99"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="eagle" default="yes"/>
<familiar race="eagle"/>
<familiar race="imp"/>
</race>
@ -116,7 +116,7 @@
<skill name="weaponsmithing" modifier="1"/>
<attack type="1" damage="1d5"/>
<attack type="5"/>
<familiar race="imp" default="yes"/>
<familiar race="imp"/>
<familiar race="ghost"/>
</race>
@ -138,7 +138,7 @@
<skill name="training" modifier="2"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="nymph" default="yes"/>
<familiar race="nymph"/>
<familiar race="unicorn"/>
</race>
@ -160,7 +160,7 @@
<skill name="training" modifier="-1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5+3"/>
<familiar race="tunnelworm" default="yes"/>
<familiar race="tunnelworm"/>
<familiar race="rat"/>
</race>
@ -186,7 +186,7 @@
<skill name="weaponsmithing" modifier="2"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="lynx" default="yes"/>
<familiar race="lynx"/>
<familiar race="songdragon"/>
</race>

24
res/eressea/races.xml
View File

@ -20,7 +20,7 @@
<skill name="sailing" modifier="1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="wolf" default="yes"/>
<familiar race="wolf"/>
<familiar race="dreamcat"/>
<familiar race="owl"/>
<familiar race="owl"/>
@ -749,7 +749,7 @@
<skill name="roadwork" modifier="-1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="giantturtle" default="yes"/>
<familiar race="giantturtle"/>
<familiar race="dolphin"/>
<familiar race="giantturtle"/>
<familiar race="dolphin"/>
@ -774,7 +774,7 @@
<skill name="taxation" modifier="1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="lynx" default="yes"/>
<familiar race="lynx"/>
<familiar race="dreamcat"/>
<familiar race="lynx"/>
<familiar race="songdragon"/>
@ -806,7 +806,7 @@
<skill name="taxation" modifier="-1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="owl" default="yes"/>
<familiar race="owl"/>
<familiar race="rat"/>
<familiar race="eagle"/>
<familiar race="songdragon"/>
@ -834,7 +834,7 @@
<skill name="perception" modifier="1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="ghost" default="yes"/>
<familiar race="ghost"/>
<familiar race="rat"/>
<familiar race="owl"/>
<familiar race="rat"/>
@ -864,7 +864,7 @@
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<attack type="5"/>
<familiar race="imp" default="yes"/>
<familiar race="imp"/>
<familiar race="imp"/>
<familiar race="ghost"/>
<familiar race="rat"/>
@ -894,7 +894,7 @@
<skill name="taxation" modifier="1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5+3"/>
<familiar race="tunnelworm" default="yes"/>
<familiar race="tunnelworm"/>
<familiar race="rat"/>
<familiar race="rat"/>
<familiar race="eagle"/>
@ -918,7 +918,7 @@
<skill name="cartmaking" modifier="-1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="rat" default="yes"/>
<familiar race="rat"/>
<familiar race="songdragon"/>
<familiar race="imp"/>
<familiar race="rat"/>
@ -1109,7 +1109,7 @@
<skill name="taxation" modifier="1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="goblin" default="yes"/>
<familiar race="goblin"/>
<familiar race="ghost"/>
<familiar race="imp"/>
<familiar race="rat"/>
@ -1135,7 +1135,7 @@
<skill name="perception" modifier="1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="lynx" default="yes"/>
<familiar race="lynx"/>
<familiar race="fairy"/>
<familiar race="owl"/>
<familiar race="nymph"/>
@ -1166,7 +1166,7 @@
<skill name="taxation" modifier="1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="tunnelworm" default="yes"/>
<familiar race="tunnelworm"/>
<familiar race="eagle"/>
<familiar race="owl"/>
<familiar race="lynx"/>
@ -1196,7 +1196,7 @@
<skill name="taxation" modifier="1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="goblin" default="yes"/>
<familiar race="goblin"/>
<familiar race="ghost"/>
<familiar race="imp"/>
<familiar race="rat"/>

2
res/races/aquarian.xml
View File

@ -10,7 +10,7 @@
<skill name="roadwork" modifier="-1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="giantturtle" default="yes"/>
<familiar race="giantturtle"/>
<familiar race="dolphin"/>
<familiar race="giantturtle"/>
<familiar race="dolphin"/>

2
res/races/cat.xml
View File

@ -17,7 +17,7 @@
<skill name="taxation" modifier="1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="lynx" default="yes"/>
<familiar race="lynx"/>
<familiar race="dreamcat"/>
<familiar race="lynx"/>
<familiar race="songdragon"/>

2
res/races/demon.xml
View File

@ -27,7 +27,7 @@ recruitethereal="yes" equipment="yes" healing="1.5">
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<attack type="5"/>
<familiar race="imp" default="yes"/>
<familiar race="imp"/>
<familiar race="imp"/>
<familiar race="ghost"/>
<familiar race="rat"/>

2
res/races/dwarf.xml
View File

@ -23,7 +23,7 @@
<skill name="taxation" modifier="1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="tunnelworm" default="yes"/>
<familiar race="tunnelworm"/>
<familiar race="eagle"/>
<familiar race="owl"/>
<familiar race="lynx"/>

2
res/races/elf.xml
View File

@ -18,7 +18,7 @@
<skill name="perception" modifier="1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="lynx" default="yes"/>
<familiar race="lynx"/>
<familiar race="fairy"/>
<familiar race="owl"/>
<familiar race="nymph"/>

2
res/races/goblin-3.xml
View File

@ -21,7 +21,7 @@ getitem="yes" equipment="yes" healing="2.0">
<skill name="unarmed" modifier="-99"/>
<skill name="weaponsmithing" modifier="-1"/>
<attack type="1" damage="1d5"/>
<familiar race="rat" default="yes"/>
<familiar race="rat"/>
<familiar race="imp"/>
</race>
</races>

2
res/races/goblin.xml
View File

@ -21,7 +21,7 @@ healing="2.0">
<skill name="cartmaking" modifier="-1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="rat" default="yes"/>
<familiar race="rat"/>
<familiar race="songdragon"/>
<familiar race="imp"/>
<familiar race="rat"/>

2
res/races/halfling.xml
View File

@ -24,7 +24,7 @@
<skill name="taxation" modifier="-1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="owl" default="yes"/>
<familiar race="owl"/>
<familiar race="rat"/>
<familiar race="eagle"/>
<familiar race="songdragon"/>

2
res/races/human.xml
View File

@ -7,7 +7,7 @@
<skill name="sailing" modifier="1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="wolf" default="yes"/>
<familiar race="wolf"/>
<familiar race="dreamcat"/>
<familiar race="owl"/>
<familiar race="owl"/>

2
res/races/insect.xml
View File

@ -20,7 +20,7 @@
<skill name="perception" modifier="1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="ghost" default="yes"/>
<familiar race="ghost"/>
<familiar race="rat"/>
<familiar race="owl"/>
<familiar race="rat"/>

2
res/races/orc.xml
View File

@ -22,7 +22,7 @@
<skill name="taxation" modifier="1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="goblin" default="yes"/>
<familiar race="goblin"/>
<familiar race="ghost"/>
<familiar race="imp"/>
<familiar race="rat"/>

2
res/races/troll.xml
View File

@ -27,7 +27,7 @@ healing="1.5">
<skill name="taxation" modifier="1"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5+3"/>
<familiar race="tunnelworm" default="yes"/>
<familiar race="tunnelworm"/>
<familiar race="rat"/>
<familiar race="rat"/>
<familiar race="eagle"/>

8
src/xmlreader.c
View File

@ -1464,13 +1464,7 @@ static int parse_races(xmlDocPtr doc)
assert(propValue != NULL);
frc = rc_get_or_create((const char *)propValue);
frc->flags |= RCF_FAMILIAR;
if (xml_bvalue(node, "default", false)) {
rc->familiars[k] = rc->familiars[0];
rc->familiars[0] = frc;
}
else {
rc->familiars[k] = frc;
}
rc->familiars[k] = frc;
xmlFree(propValue);
}
else {