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

Armbrust aus dem Code genommen. 

Abbruch, wenn ein Item aus dem Datenfile nicht in den XML-Resourcen ist.
This commit is contained in:
Enno Rehling 2005-10-03 21:15:47 +00:00
parent 5dfc2f08b6
commit 17958f9683
10 changed files with 73 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/items/weapons.c
View File

@ -57,7 +57,6 @@ enum {
WP_EOGSWORD,
WP_CATAPULT,
WP_LONGBOW,
WP_CROSSBOW,
WP_SPEAR,
WP_LANCE,
WP_RUSTY_HALBERD,
@ -67,7 +66,6 @@ enum {
enum {
RL_CATAPULT,
RL_CROSSBOW,
RL_MAX,
RL_NONE
};
@ -110,8 +108,6 @@ static weapondata weapontable[WP_MAX + 1] =
{0.00, "3d10+5", "3d10+5", I_CATAPULT, SK_CATAPULT, 0, 0, true, false, { RL_CATAPULT, 5 }, BASH },
/* Langbogen */
{0.00, "1d11+1", "1d11+1", I_LONGBOW, SK_LONGBOW, 0, 0, true, false, { RL_NONE, 0 }, PIERCE },
/* Armbrust */
{0.00, "3d3+5", "3d3+5", I_CROSSBOW, SK_CROSSBOW, 0, 0, true, false, { RL_CROSSBOW, 2 }, PIERCE | ARMORPIERCING },
/* Speer */
{0.00, "1d10+0", "1d12+2", I_SPEAR, SK_SPEAR, 0, 0, false, false, { RL_NONE, 0}, PIERCE },
/* Lanze */

4
src/common/kernel/item.c
View File

@ -897,10 +897,6 @@ static t_item itemdata[MAXITEMS] = {
{"Speer", "Speere", "Speer", "Speere"},
IS_PRODUCT, SK_WEAPONSMITH, 2, {0, 1, 0, 0, 0, 0}, 100, 0, 0, NULL
},
{ /* I_CROSSBOW */
{"Armbrust", "Armbrüste", "Armbrust", "Armbrüste"},
IS_PRODUCT, SK_WEAPONSMITH, 3, {0, 1, 0, 0, 0, 0}, 100, 0, 0, NULL
},
{ /* I_LONGBOW */
{"Bogen", "Bögen", "Bogen", "Bögen"},
IS_PRODUCT, SK_WEAPONSMITH, 2, {0, 1, 0, 0, 0, 0}, 100, 0, 0, NULL

2
src/common/kernel/item.h
View File

@ -283,7 +283,6 @@ enum {
I_WAGON,
I_CATAPULT,
I_SPEAR,
I_CROSSBOW,
I_LONGBOW,
I_CHAIN_MAIL, /* 10 */
I_PLATE_ARMOR,
@ -348,7 +347,6 @@ enum {
R_WAGON,
R_CATAPULT,
R_SPEAR,
R_CROSSBOW,
R_LONGBOW,
R_CHAIN_MAIL,
R_PLATE_ARMOR,

1
src/common/settings-eressea.h
View File

@ -26,7 +26,6 @@
#define GUARD_DISABLES_PRODUCTION 1
#define RESOURCE_QUANTITY 0.5
#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */
#define CHANGED_CROSSBOWS 1
#define COMBAT_TURNS 5
#define PEASANTS_DO_NOT_STARVE 0
#define NEW_MIGRATION 1

1
src/common/settings-tutorial.h
View File

@ -26,7 +26,6 @@
#define GUARD_DISABLES_PRODUCTION 1
#define RESOURCE_QUANTITY 0.5
#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */
#define CHANGED_CROSSBOWS 1
#define COMBAT_TURNS 5
#define PEASANTS_DO_NOT_STARVE 0
#define NEW_MIGRATION 1

1
src/common/settings-vinyambar-3.h
View File

@ -26,7 +26,6 @@
#define GUARD_DISABLES_PRODUCTION 1
#define RESOURCE_QUANTITY 0.5
#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */
#define CHANGED_CROSSBOWS 1
#define NEWATSROI 0
#define COMBAT_TURNS 5
#define PEASANTS_DO_NOT_STARVE 0

1
src/common/settings-wdw.h
View File

@ -26,7 +26,6 @@
#define GUARD_DISABLES_PRODUCTION 1
#define RESOURCE_QUANTITY 0.5
#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */
#define CHANGED_CROSSBOWS 1
#define COMBAT_TURNS 5
#define PEASANTS_DO_NOT_STARVE 0
#define NEW_MIGRATION 1

15
src/res/eressea/items.xml
View File

@ -75,4 +75,19 @@
</item>
</resource>
<!-- christmas items: start -->
<resource name="almond">
<item weight="0"/>
</resource>
<resource name="apple">
<item weight="0"/>
</resource>
<resource name="nut">
<item weight="0"/>
</resource>
<resource name="cookie">
<item weight="0"/>
</resource>
<!-- christmas items: end -->
</resources>

31
src/res/resources.xml
View File

@ -18,22 +18,6 @@
<item notlost="yes" weight="0"/>
</resource>
<resource name="almond">
<item weight="0"/>
</resource>
<resource name="apple">
<item weight="0"/>
</resource>
<resource name="nut">
<item weight="0"/>
</resource>
<resource name="cookie">
<item weight="0"/>
</resource>
<resource name="snowball">
<!-- xmas gimmik -->
<item notlost="yes" weight="0">
@ -148,12 +132,25 @@
</item>
</resource>
<resource name="crossbow">
<item weight="100">
<construction skill="sk_weaponsmithing" minskill="3" reqsize="1">
<requirement type="log" quantity="1"/>
</construction>
<weapon armorpiercing="true" pierce="true" missile="true" skill="sk_crossbow" offmod="0" defmod="0" reload="2">
<damage type="rider" value="3d3+5"/>
<damage type="footman" value="3d3+5"/>
<modifier type="missile_target" value="2"/>
</weapon>
</item>
</resource>
<resource name="mallorncrossbow">
<item weight="100">
<construction skill="sk_weaponsmithing" minskill="5" reqsize="1">
<requirement type="mallorn" quantity="1"/>
</construction>
<weapon pierce="true" missile="true" skill="sk_crossbow" offmod="0" defmod="0" reload="2" magres="0.15">
<weapon armorpiercing="true" pierce="true" missile="true" skill="sk_crossbow" offmod="0" defmod="0" reload="2" magres="0.15">
<damage type="rider" value="3d3+5"/>
<damage type="footman" value="3d3+5"/>
<modifier type="missile_target" value="2"/>

14
src/res/vinyambar/wdw-resources.xml
View File

@ -6,6 +6,7 @@
<function name="use" value="usemagicboost"></function>
</item>
</resource>
<resource name="opal" appearance="gem">
<item weight="0"></item>
</resource>
@ -30,8 +31,17 @@
<resource name="emerald" appearance="gem">
<item weight="0"></item>
</resource>
<resource name="papyrus">
<item weight="1">
</item>
<item weight="1"/>
</resource>
<resource name="apple">
<item weight="0"/>
</resource>
<resource name="nut">
<item weight="0"/>
</resource>
</resources>