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

Ready to rumble!

Browse source
This commit is contained in:
Enno Rehling 2009-07-01 16:03:49 +00:00
parent 23b1d33f77
commit 2d2563f521
13 changed files with 106 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/kernel/battle.c
View file

@ -1213,7 +1213,7 @@ terminate(troop dt, troop at, int type, const char *damage, boolean missile)
while (chance(kritchance)) {
if (bdebug) {
fprintf(bdebug, "%s/%d lands a critical hit", unitid(au), at.index);
fprintf(bdebug, "%s/%d lands a critical hit\n", unitid(au), at.index);
}
da += dice_rand(damage);
}
@ -2193,7 +2193,7 @@ attack(battle *b, troop ta, const att *a, int numattack)
if (reload && wp && wp->type->reload && !getreload(ta)) {
int i = setreload(ta);
if (bdebug) {
fprintf(bdebug, " reloading %d turns\n", i);
fprintf(bdebug, "%s/%d reloading %d turns\n", unitid(au), ta.index, i);
}
}
}

9
src/res/armor/chainmail-2.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<resource name="chainmail">
<item weight="200" score="90">
<construction skill="armorer" minskill="3" reqsize="1">
<requirement type="iron" quantity="3"/>
</construction>
<armor ac="2" penalty="0.10" projectile="0.0" magres="0.0"/>
</item>
</resource>

9
src/res/armor/laenmail-2.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<resource name="laenmail">
<item weight="100" score="1000">
<construction skill="armorer" minskill="9" reqsize="1">
<requirement type="laen" quantity="3"/>
</construction>
<armor ac="3" penalty="0.0" projectile="0.10" magres="0.3" laen="yes" />
</item>
</resource>

9
src/res/armor/laenshield-2.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<resource name="laenshield">
<item weight="0" score="1000">
<construction skill="armorer" minskill="7" reqsize="1">
<requirement type="laen" quantity="1"/>
</construction>
<armor ac="1" penalty="-0.10" magres="0.3" laen="yes" shield="yes" />
</item>
</resource>

10
src/res/armor/plate-2.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0"?>
<resource name="plate">
<item weight="400" score="150">
<function name="canuse" value="lua_canuse_item"/>
<construction skill="armorer" minskill="4" reqsize="1">
<requirement type="iron" quantity="5"/>
</construction>
<armor ac="3" penalty="0.15" projectile="0.10" magres="0.0"/>
</item>
</resource>

9
src/res/armor/rustychainmail-2.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<resource name="rustychainmail">
<item weight="200" score="30">
<construction skill="armorer" minskill="3" reqsize="1">
<requirement type="iron" quantity="3"/>
</construction>
<armor ac="1" penalty="0.20" magres="0.0"/>
</item>
</resource>

9
src/res/armor/rustyshield-2.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<resource name="rustyshield">
<item weight="100" score="10">
<construction skill="armorer" minskill="2" reqsize="1">
<requirement type="iron" quantity="1"/>
</construction>
<armor ac="0" penalty="-0.05" magres="0.0" shield="yes"/>
</item>
</resource>

9
src/res/armor/shield-2.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<resource name="shield">
<item weight="100" score="30">
<construction skill="armorer" minskill="2" reqsize="1">
<requirement type="iron" quantity="1"/>
</construction>
<armor ac="0" penalty="-0.10" magres="0.0" shield="yes"/>
</item>
</resource>

4
src/res/armor/towershield.xml
View file

@ -6,8 +6,8 @@
<modifier function="mod_dwarves_only"/>
<requirement type="iron" quantity="2"/>
</construction>
<armor ac="2" projectile="0.30" penalty="-0.10" magres="0.0" shield="yes">
<modifier type="canuse" function="mod_elves_only"/>
<armor ac="0" penalty="-0.15" projectile="0.25" magres="0.0" shield="yes">
<modifier type="canuse" function="mod_dwarves_only"/>
</armor>
</item>
</resource>

14
src/res/e3a/armor.xml
View file

@ -1,11 +1,11 @@
<?xml version="1.0"?>
<resources xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="../armor/plate.xml"/>
<xi:include href="../armor/chainmail.xml"/>
<xi:include href="../armor/laenmail.xml"/>
<xi:include href="../armor/laenshield.xml"/>
<xi:include href="../armor/rustychainmail.xml"/>
<xi:include href="../armor/rustyshield.xml"/>
<xi:include href="../armor/shield.xml"/>
<xi:include href="../armor/plate-2.xml"/>
<xi:include href="../armor/chainmail-2.xml"/>
<xi:include href="../armor/laenmail-2.xml"/>
<xi:include href="../armor/laenshield-2.xml"/>
<xi:include href="../armor/rustychainmail-2.xml"/>
<xi:include href="../armor/rustyshield-2.xml"/>
<xi:include href="../armor/shield-2.xml"/>
<xi:include href="../armor/towershield.xml"/>
</resources>

4
src/res/e3a/items.xml
View file

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<resources>
<resource name="rpg_item_1"><item weight="10"/></resource>
<resource name="rpg_item_2"><item weight="1"/></resource>
<resource name="rpg_item_3"><item weight="100"/></resource>
<resource name="ointment" appearance="vial">
<!-- Wundsalbe -->
<item weight="0" score="60">

28
src/res/e3a/ships.xml
View file

@ -17,7 +17,7 @@
</construction>
</ship>
<ship name="raft" range="1" storm="1.00" damage="1.00" cabins="5" cargo="50000" cptskill="1" minskill="1" sumskill="7" opensea="no">
<ship name="raft" range="1" storm="1.00" damage="1.00" cabins="5" cargo="50000" cptskill="1" minskill="1" sumskill="5" opensea="no">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<coast terrain="swamp"/>
@ -44,7 +44,7 @@
</construction>
</ship>
<ship name="barge" range="4" storm="1.00" damage="1.00" cabins="10" cargo="5000" cptskill="2" minskill="1" sumskill="5" opensea="no">
<ship name="barge" range="3" storm="1.00" damage="1.00" cabins="10" cargo="5000" cptskill="2" minskill="1" sumskill="5" opensea="no">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<coast terrain="swamp"/>
@ -62,7 +62,7 @@
</ship>
<ship name="royalbarge" range="6" storm="0.25" damage="1.00" cabins="10" cargo="5000" cptskill="6" minskill="1" sumskill="10" opensea="no">
<ship name="royalbarge" range="5" storm="0.25" damage="1.00" cabins="10" cargo="5000" cptskill="5" minskill="1" sumskill="10" opensea="no">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<coast terrain="swamp"/>
@ -80,7 +80,7 @@
</construction>
</ship>
<ship name="catamaran" range="8" storm="0.25" damage="1.00" cabins="20" cargo="10000" cptskill="8" minskill="1" sumskill="20" opensea="yes">
<ship name="catamaran" range="7" storm="0.25" damage="1.00" cabins="20" cargo="10000" cptskill="7" minskill="1" sumskill="20" opensea="yes">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<construction skill="shipcraft" minskill="8" maxsize="30" reqsize="1">
@ -90,7 +90,7 @@
</ship>
<ship name="cog" range="5" storm="0.50" damage="1.00" cabins="50" cargo="200000" cptskill="4" minskill="1" sumskill="20" opensea="yes">
<ship name="cog" range="4" storm="0.50" damage="1.00" cabins="50" cargo="200000" cptskill="4" minskill="1" sumskill="20" opensea="yes">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<construction skill="shipcraft" minskill="4" maxsize="100" reqsize="1">
@ -98,7 +98,7 @@
</construction>
</ship>
<ship name="caravel" range="5" storm="0.50" damage="1.00" cabins="150" cargo="600000" cptskill="6" minskill="1" sumskill="30" opensea="yes">
<ship name="caravel" range="4" storm="0.50" damage="1.00" cabins="150" cargo="600000" cptskill="6" minskill="1" sumskill="30" opensea="yes">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<construction skill="shipcraft" minskill="6" maxsize="300" reqsize="1">
@ -107,8 +107,7 @@
</ship>
<ship name="frigate" range="5" storm="1.00" damage="1.00" cabins="110" cargo="100000" cptskill="5" minskill="1" sumskill="40" opensea="yes">
<modifier type="attack" value="+2"/>
<ship name="frigate" range="4" storm="1.00" damage="1.00" cabins="110" cargo="100000" cptskill="5" minskill="1" sumskill="40" opensea="yes">
<modifier type="defense" value="+2"/>
<coast terrain="ocean"/>
<coast terrain="plain"/>
@ -118,8 +117,7 @@
</construction>
</ship>
<ship name="galleon" range="5" storm="1.00" damage="1.00" cabins="310" cargo="300000" cptskill="7" minskill="1" sumskill="60" opensea="yes">
<modifier type="attack" value="+2"/>
<ship name="galleon" range="4" storm="1.00" damage="1.00" cabins="310" cargo="300000" cptskill="7" minskill="1" sumskill="60" opensea="yes">
<modifier type="defense" value="+2"/>
<coast terrain="ocean"/>
<coast terrain="plain"/>
@ -130,8 +128,9 @@
</ship>
<ship name="dragonship" range="7" storm="1.00" damage="1.00" cabins="110" cargo="50000" cptskill="5" minskill="1" sumskill="60" opensea="yes">
<modifier type="tactics" value="2.00"/>
<ship name="dragonship" range="6" storm="1.00" damage="1.00" cabins="110" cargo="50000" cptskill="5" minskill="1" sumskill="60" opensea="yes">
<modifier type="attack" value="+1"/>
<modifier type="tactics" factor="2.00"/>
<coast terrain="ocean"/>
<coast terrain="plain"/>
<construction skill="shipcraft" minskill="5" maxsize="100" reqsize="1">
@ -140,8 +139,9 @@
</construction>
</ship>
<ship name="trireme" range="7" storm="1.00" damage="1.00" cabins="310" cargo="150000" cptskill="7" minskill="1" sumskill="90" opensea="yes">
<modifier type="tactics" value="2.00"/>
<ship name="trireme" range="6" storm="1.00" damage="1.00" cabins="310" cargo="150000" cptskill="7" minskill="1" sumskill="90" opensea="yes">
<modifier type="attack" value="+1"/>
<modifier type="tactics" factor="2.00"/>
<coast terrain="ocean"/>
<coast terrain="plain"/>
<construction skill="shipcraft" minskill="7" maxsize="300" reqsize="1">

13
src/res/e3a/strings.xml
View file

@ -12,6 +12,19 @@
<text locale="en">the third age</text>
</string>
<string name="rpg_item_1">
<text locale="de">Pandoras Urkunde für Halbling ehrenhalber, weiblich</text>
<text locale="en">Pandora's Certificate</text>
</string>
<string name="rpg_item_2">
<text locale="de">Heilige Nußhälfte</text>
<text locale="en">piece of a holy nut</text>
</string>
<string name="rpg_item_3">
<text locale="de">Flaschengeist Zhardamon</text>
<text locale="en">bottle demon Zhardamon</text>
</string>
<string name="rep_crossbow">
<text locale="de">Repetierarmbrust</text>
<text locale="en">repeating crossbow</text>