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

goblin update completed

Browse source 
some indentations
This commit is contained in:
Enno Rehling 2009-08-02 22:12:56 +00:00
parent 1b6a6d9bd1
commit a377f8b5f1
6 changed files with 32 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/common/kernel/move.c
View file

@ -260,22 +260,22 @@ get_transporters(const item * itm, int * p_animals, int *p_acap, int * p_vehicle
static int
ridingcapacity(unit * u)
{
int vehicles = 0, vcap = 0;
int vehicles = 0, vcap = 0;
int animals = 0, acap = 0;
get_transporters(u->items, &animals, &acap, &vehicles, &vcap);
/* Man trägt sein eigenes Gewicht plus seine Kapazität! Die Menschen
* tragen nichts (siehe walkingcapacity). Ein Wagen zählt nur, wenn er
* von zwei Pferden gezogen wird */
** tragen nichts (siehe walkingcapacity). Ein Wagen zählt nur, wenn er
** von zwei Pferden gezogen wird */
animals = MIN(animals, effskill(u, SK_RIDING) * u->number * 2);
if (fval(u->race, RCF_HORSE)) animals += u->number;
if (fval(u->race, RCF_HORSE)) animals += u->number;
/* maximal diese Pferde können zum Ziehen benutzt werden */
vehicles = MIN(animals / HORSESNEEDED, vehicles);
/* maximal diese Pferde können zum Ziehen benutzt werden */
vehicles = MIN(animals / HORSESNEEDED, vehicles);
return vehicles * vcap + animals * acap;
return vehicles * vcap + animals * acap;
}
int

6
src/res/e3a-update.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0"?>
<eressea xmlns:xi="http://www.w3.org/2001/XInclude">
<races>
<xi:include href="races/goblin-e3a.xml"/>
</races>
</eressea>

22
src/res/e3a/races.xml
View file

@ -3,27 +3,7 @@
<!-- begin main races -->
<race name="goblin" magres="-0.05" maxaura="1.0" regaura="1.0" recruitcost="60" maintenance="6" weight="600" capacity="440" speed="1.0" hp="16" damage="1d5" unarmedattack="-2" unarmeddefense="0" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
<ai splitsize="10000" moverandom="yes" learn="yes"/>
<function name="itemdrop" value="defaultdrops"/>
<param name="hunger.damage" value="1d8+7"/>
<param name="other_race" value="demon"/>
<param name="other_cost" value="500"/>
<param name="recruit_multi" value="0.5"/>
<skill name="building" modifier="1"/>
<skill name="cartmaking" modifier="-1"/>
<skill name="catapult" modifier="1"/>
<skill name="magic" modifier="-99"/>
<skill name="mining" modifier="1"/>
<skill name="roadwork" modifier="-2"/>
<skill name="sailing" modifier="-2"/>
<skill name="shipcraft" modifier="-2"/>
<skill name="tactics" modifier="-2"/>
<skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/>
<familiar race="rat" default="yes"/>
<familiar race="imp"/>
</race>
<xi:include href="races/goblin-3.xml"/>
<race name="uruk" studyspeed="-5" magres="-0.05" maxaura="1.0" regaura="1.0" recruitcost="100" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
<ai splitsize="10000" moverandom="yes" learn="yes"/>

22
src/res/races/goblin-3.xml Normal file
View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<race name="goblin" magres="-0.05" maxaura="1.0" regaura="1.0" recruitcost="60" maintenance="6" weight="600" capacity="440" speed="1.0" hp="16" damage="1d5" unarmedattack="-2" unarmeddefense="0" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
<ai splitsize="10000" moverandom="yes" learn="yes"/>
<function name="itemdrop" value="defaultdrops"/>
<param name="hunger.damage" value="1d8+7"/>
<param name="other_race" value="demon"/>
<param name="other_cost" value="500"/>
<param name="recruit_multi" value="0.5"/>
<skill name="cartmaking" modifier="-1"/>
<skill name="catapult" modifier="1"/>
<skill name="magic" modifier="-99"/>
<skill name="mining" modifier="1"/>
<skill name="roadwork" modifier="-2"/>
<skill name="sailing" modifier="-2"/>
<skill name="shipcraft" modifier="-2"/>
<skill name="tactics" modifier="-2"/>
<skill name="unarmed" modifier="-99"/>
<skill name="weaponsmithing" modifier="-1"/>
<attack type="1" damage="1d5"/>
<familiar race="rat" default="yes"/>
<familiar race="imp"/>
</race>

2
src/res/races/goblin-e3a.xml
View file

@ -6,6 +6,7 @@
<param name="other_race" value="demon"/>
<param name="other_cost" value="500"/>
<param name="recruit_multi" value="0.5"/>
<skill name="building" modifier="1"/>
<skill name="cartmaking" modifier="-1"/>
<skill name="catapult" modifier="1"/>
<skill name="magic" modifier="-99"/>
@ -15,7 +16,6 @@
<skill name="shipcraft" modifier="-2"/>
<skill name="tactics" modifier="-2"/>
<skill name="unarmed" modifier="-99"/>
<skill name="weaponsmithing" modifier="-1"/>
<attack type="1" damage="1d5"/>
<familiar race="rat" default="yes"/>
<familiar race="imp"/>

2
src/scripts/run-e3a.lua
View file

@ -197,7 +197,7 @@ function process(orders)
-- use newfactions file to place out new players
-- autoseed(basepath .. "/newfactions", false)
read_xml(resourcepath.."/e3a-update.xml")
-- read_xml(resourcepath.."/e3a-update.xml")
write_files(locales)
write_statistics()