undo more CRLF screwups.

This commit is contained in:
Enno Rehling 2010-08-08 01:06:34 -07:00
parent 72d186787b
commit 44804c2074
29 changed files with 920 additions and 920 deletions

View file

@ -1,17 +1,17 @@
[eressea] [eressea]
base = . base = .
load = setup.lua load = setup.lua
report = reports report = reports
verbose = 0 verbose = 0
lomem = 0 lomem = 0
debug = 0 debug = 0
memcheck = 0 memcheck = 0
locales = de,en locales = de,en
[config] [config]
game = example game = example
source_dir = ../.. source_dir = ../..
maxnmrs = 10 maxnmrs = 10
[editor] [editor]
color = 1 color = 1

View file

@ -1,15 +1,15 @@
local srcpath = config.source_dir local srcpath = config.source_dir
local respath = srcpath .. '/example/res' local respath = srcpath .. '/example/res'
local paths = { local paths = {
'example/scripts/?.lua', 'example/scripts/?.lua',
'server/scripts/?.lua', 'server/scripts/?.lua',
'external/lunit/?.lua' 'external/lunit/?.lua'
} }
for idx, path in pairs(paths) do for idx, path in pairs(paths) do
package.path = srcpath .. '/' .. path .. ';' .. package.path package.path = srcpath .. '/' .. path .. ';' .. package.path
end end
read_xml(respath..'/config-example.xml', respath..'/catalog-example.xml') read_xml(respath..'/config-example.xml', respath..'/catalog-example.xml')
require "init" require "init"

View file

@ -1,13 +1,13 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<resources xmlns:xi="http://www.w3.org/2001/XInclude"> <resources xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- this file contains a lot of armor --> <!-- this file contains a lot of armor -->
<xi:include href="eressea:///core/armor/plate.xml"/> <xi:include href="eressea:///core/armor/plate.xml"/>
<xi:include href="eressea:///core/armor/chainmail.xml"/> <xi:include href="eressea:///core/armor/chainmail.xml"/>
<xi:include href="eressea:///core/armor/laenmail.xml"/> <xi:include href="eressea:///core/armor/laenmail.xml"/>
<xi:include href="eressea:///core/armor/laenshield.xml"/> <xi:include href="eressea:///core/armor/laenshield.xml"/>
<xi:include href="eressea:///core/armor/rustychainmail.xml"/> <xi:include href="eressea:///core/armor/rustychainmail.xml"/>
<xi:include href="eressea:///core/armor/rustyshield.xml"/> <xi:include href="eressea:///core/armor/rustyshield.xml"/>
<xi:include href="eressea:///core/armor/shield.xml"/> <xi:include href="eressea:///core/armor/shield.xml"/>
</resources> </resources>

View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<buildings xmlns:xi="http://www.w3.org/2001/XInclude"> <buildings xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="buildings/castle.xml"/> <xi:include href="buildings/castle.xml"/>
</buildings> </buildings>

View file

@ -1,26 +1,26 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<building name="castle" capacity="1"> <building name="castle" capacity="1">
<function name="name" value="castle_name"/> <function name="name" value="castle_name"/>
<function name="protection" value="eressea_building_protection"/> <function name="protection" value="eressea_building_protection"/>
<construction skill="building" minskill="1" maxsize="2" reqsize="1"> <construction skill="building" minskill="1" maxsize="2" reqsize="1">
<requirement type="stone" quantity="1"/> <requirement type="stone" quantity="1"/>
</construction> </construction>
<construction skill="building" minskill="1" maxsize="8" reqsize="1"> <construction skill="building" minskill="1" maxsize="8" reqsize="1">
<requirement type="stone" quantity="1"/> <requirement type="stone" quantity="1"/>
</construction> </construction>
<construction skill="building" minskill="2" maxsize="40" reqsize="1"> <construction skill="building" minskill="2" maxsize="40" reqsize="1">
<requirement type="stone" quantity="1"/> <requirement type="stone" quantity="1"/>
</construction> </construction>
<construction skill="building" minskill="3" maxsize="200" reqsize="1"> <construction skill="building" minskill="3" maxsize="200" reqsize="1">
<requirement type="stone" quantity="1"/> <requirement type="stone" quantity="1"/>
</construction> </construction>
<construction skill="building" minskill="4" maxsize="1000" reqsize="1"> <construction skill="building" minskill="4" maxsize="1000" reqsize="1">
<requirement type="stone" quantity="1"/> <requirement type="stone" quantity="1"/>
</construction> </construction>
<construction skill="building" minskill="5" maxsize="5000" reqsize="1"> <construction skill="building" minskill="5" maxsize="5000" reqsize="1">
<requirement type="stone" quantity="1"/> <requirement type="stone" quantity="1"/>
</construction> </construction>
<construction skill="building" minskill="6" reqsize="1"> <construction skill="building" minskill="6" reqsize="1">
<requirement type="stone" quantity="1"/> <requirement type="stone" quantity="1"/>
</construction> </construction>
</building> </building>

View file

@ -1,10 +1,10 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE catalog <!DOCTYPE catalog
PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN" PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"
"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<rewriteURI <rewriteURI
uriStartString="eressea:///core/" uriStartString="eressea:///core/"
rewritePrefix="../../server/res/" /> rewritePrefix="../../server/res/" />
</catalog> </catalog>

View file

@ -1,3 +1,3 @@
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<items> <items>
</items> </items>

View file

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<races xmlns:xi="http://www.w3.org/2001/XInclude"> <races xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="races/aquarian.xml"/> <xi:include href="races/aquarian.xml"/>
<xi:include href="races/cat.xml"/> <xi:include href="races/cat.xml"/>
<xi:include href="races/demon.xml"/> <xi:include href="races/demon.xml"/>
<xi:include href="races/dwarf.xml"/> <xi:include href="races/dwarf.xml"/>
<xi:include href="races/elf.xml"/> <xi:include href="races/elf.xml"/>
<xi:include href="races/goblin.xml"/> <xi:include href="races/goblin.xml"/>
<xi:include href="races/halfling.xml"/> <xi:include href="races/halfling.xml"/>
<xi:include href="races/human.xml"/> <xi:include href="races/human.xml"/>
<xi:include href="races/insect.xml"/> <xi:include href="races/insect.xml"/>
<xi:include href="races/orc.xml"/> <xi:include href="races/orc.xml"/>
<xi:include href="races/troll.xml"/> <xi:include href="races/troll.xml"/>
</races> </races>

View file

@ -1,20 +1,20 @@
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<race name="aquarian" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" shipspeed="yes" playerrace="yes" coastal="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes"> <race name="aquarian" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" shipspeed="yes" playerrace="yes" coastal="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
<ai splitsize="10000" moverandom="yes" learn="yes"/> <ai splitsize="10000" moverandom="yes" learn="yes"/>
<function name="itemdrop" value="defaultdrops"/> <function name="itemdrop" value="defaultdrops"/>
<skill name="mining" modifier="-2"/> <skill name="mining" modifier="-2"/>
<skill name="building" modifier="-1"/> <skill name="building" modifier="-1"/>
<skill name="trade" modifier="2"/> <skill name="trade" modifier="2"/>
<skill name="armorer" modifier="-1"/> <skill name="armorer" modifier="-1"/>
<skill name="shipcraft" modifier="3"/> <skill name="shipcraft" modifier="3"/>
<skill name="sailing" modifier="3"/> <skill name="sailing" modifier="3"/>
<skill name="roadwork" modifier="-1"/> <skill name="roadwork" modifier="-1"/>
<skill name="unarmed" modifier="-99"/> <skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/> <attack type="1" damage="1d5"/>
<familiar race="giantturtle" default="yes"/> <familiar race="giantturtle" default="yes"/>
<familiar race="dolphin"/> <familiar race="dolphin"/>
<familiar race="giantturtle"/> <familiar race="giantturtle"/>
<familiar race="dolphin"/> <familiar race="dolphin"/>
<familiar race="dolphin"/> <familiar race="dolphin"/>
<familiar race="kraken"/> <familiar race="kraken"/>
</race> </race>

View file

@ -1,27 +1,27 @@
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<race name="cat" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="90" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" defensemodifier="1" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes"> <race name="cat" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="90" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" defensemodifier="1" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
<ai splitsize="10000" moverandom="yes" learn="yes"/> <ai splitsize="10000" moverandom="yes" learn="yes"/>
<function name="itemdrop" value="defaultdrops"/> <function name="itemdrop" value="defaultdrops"/>
<skill name="alchemy" modifier="-1"/> <skill name="alchemy" modifier="-1"/>
<skill name="mining" modifier="-2"/> <skill name="mining" modifier="-2"/>
<skill name="building" modifier="-1"/> <skill name="building" modifier="-1"/>
<skill name="catapult" modifier="-1"/> <skill name="catapult" modifier="-1"/>
<skill name="herbalism" modifier="1"/> <skill name="herbalism" modifier="1"/>
<skill name="armorer" modifier="-1"/> <skill name="armorer" modifier="-1"/>
<skill name="shipcraft" modifier="-1"/> <skill name="shipcraft" modifier="-1"/>
<skill name="sailing" modifier="-2"/> <skill name="sailing" modifier="-2"/>
<skill name="espionage" modifier="2"/> <skill name="espionage" modifier="2"/>
<skill name="quarrying" modifier="-1"/> <skill name="quarrying" modifier="-1"/>
<skill name="roadwork" modifier="-1"/> <skill name="roadwork" modifier="-1"/>
<skill name="stealth" modifier="1"/> <skill name="stealth" modifier="1"/>
<skill name="perception" modifier="2"/> <skill name="perception" modifier="2"/>
<skill name="taxation" modifier="1"/> <skill name="taxation" modifier="1"/>
<skill name="unarmed" modifier="-99"/> <skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/> <attack type="1" damage="1d5"/>
<familiar race="lynx" default="yes"/> <familiar race="lynx" default="yes"/>
<familiar race="dreamcat"/> <familiar race="dreamcat"/>
<familiar race="lynx"/> <familiar race="lynx"/>
<familiar race="songdragon"/> <familiar race="songdragon"/>
<familiar race="tiger"/> <familiar race="tiger"/>
<familiar race="hellcat"/> <familiar race="hellcat"/>
</race> </race>

View file

@ -1,33 +1,33 @@
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<race name="demon" magres="0.150000" maxaura="1.000000" regaura="1.250000" recruitcost="150" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="50" ac="2" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" shapeshift="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" recruitethereal="yes" equipment="yes"> <race name="demon" magres="0.150000" maxaura="1.000000" regaura="1.250000" recruitcost="150" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="50" ac="2" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" shapeshift="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" recruitethereal="yes" equipment="yes">
<ai splitsize="10000" moverandom="yes" learn="yes"/> <ai splitsize="10000" moverandom="yes" learn="yes"/>
<function name="initfamiliar" value="oldfamiliars"/> <function name="initfamiliar" value="oldfamiliars"/>
<function name="itemdrop" value="defaultdrops"/> <function name="itemdrop" value="defaultdrops"/>
<skill name="alchemy" modifier="2"/> <skill name="alchemy" modifier="2"/>
<skill name="trade" modifier="-3"/> <skill name="trade" modifier="-3"/>
<skill name="forestry" modifier="1"/> <skill name="forestry" modifier="1"/>
<skill name="herbalism" modifier="-3"/> <skill name="herbalism" modifier="-3"/>
<skill name="magic" modifier="1"/> <skill name="magic" modifier="1"/>
<skill name="training" modifier="-3"/> <skill name="training" modifier="-3"/>
<skill name="riding" modifier="-1"/> <skill name="riding" modifier="-1"/>
<skill name="shipcraft" modifier="-1"/> <skill name="shipcraft" modifier="-1"/>
<skill name="melee" modifier="1"/> <skill name="melee" modifier="1"/>
<skill name="sailing" modifier="-1"/> <skill name="sailing" modifier="-1"/>
<skill name="polearm" modifier="1"/> <skill name="polearm" modifier="1"/>
<skill name="tactics" modifier="-1"/> <skill name="tactics" modifier="-1"/>
<skill name="stealth" modifier="1"/> <skill name="stealth" modifier="1"/>
<skill name="entertainment" modifier="-3"/> <skill name="entertainment" modifier="-3"/>
<skill name="weaponsmithing" modifier="1"/> <skill name="weaponsmithing" modifier="1"/>
<skill name="cartmaking" modifier="-2"/> <skill name="cartmaking" modifier="-2"/>
<skill name="perception" modifier="1"/> <skill name="perception" modifier="1"/>
<skill name="taxation" modifier="1"/> <skill name="taxation" modifier="1"/>
<skill name="unarmed" modifier="-99"/> <skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/> <attack type="1" damage="1d5"/>
<attack type="5"/> <attack type="5"/>
<familiar race="imp" default="yes"/> <familiar race="imp" default="yes"/>
<familiar race="imp"/> <familiar race="imp"/>
<familiar race="ghost"/> <familiar race="ghost"/>
<familiar race="rat"/> <familiar race="rat"/>
<familiar race="wolf"/> <familiar race="wolf"/>
<familiar race="imp"/> <familiar race="imp"/>
</race> </race>

View file

@ -1,33 +1,33 @@
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<race name="dwarf" magres="0.050000" maxaura="1.000000" regaura="0.500000" recruitcost="110" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes"> <race name="dwarf" magres="0.050000" maxaura="1.000000" regaura="0.500000" recruitcost="110" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" 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"/> <ai splitsize="10000" moverandom="yes" learn="yes"/>
<function name="itemdrop" value="defaultdrops"/> <function name="itemdrop" value="defaultdrops"/>
<skill name="mining" modifier="2"/> <skill name="mining" modifier="2"/>
<skill name="bow" modifier="-1"/> <skill name="bow" modifier="-1"/>
<skill name="building" modifier="2"/> <skill name="building" modifier="2"/>
<skill name="trade" modifier="1"/> <skill name="trade" modifier="1"/>
<skill name="forestry" modifier="-1"/> <skill name="forestry" modifier="-1"/>
<skill name="catapult" modifier="2"/> <skill name="catapult" modifier="2"/>
<skill name="herbalism" modifier="-2"/> <skill name="herbalism" modifier="-2"/>
<skill name="magic" modifier="-2"/> <skill name="magic" modifier="-2"/>
<skill name="training" modifier="-2"/> <skill name="training" modifier="-2"/>
<skill name="riding" modifier="-2"/> <skill name="riding" modifier="-2"/>
<skill name="armorer" modifier="2"/> <skill name="armorer" modifier="2"/>
<skill name="shipcraft" modifier="-1"/> <skill name="shipcraft" modifier="-1"/>
<skill name="melee" modifier="1"/> <skill name="melee" modifier="1"/>
<skill name="sailing" modifier="-2"/> <skill name="sailing" modifier="-2"/>
<skill name="quarrying" modifier="2"/> <skill name="quarrying" modifier="2"/>
<skill name="roadwork" modifier="2"/> <skill name="roadwork" modifier="2"/>
<skill name="stealth" modifier="-1"/> <skill name="stealth" modifier="-1"/>
<skill name="entertainment" modifier="-1"/> <skill name="entertainment" modifier="-1"/>
<skill name="weaponsmithing" modifier="2"/> <skill name="weaponsmithing" modifier="2"/>
<skill name="taxation" modifier="1"/> <skill name="taxation" modifier="1"/>
<skill name="unarmed" modifier="-99"/> <skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/> <attack type="1" damage="1d5"/>
<familiar race="tunnelworm" default="yes"/> <familiar race="tunnelworm" default="yes"/>
<familiar race="eagle"/> <familiar race="eagle"/>
<familiar race="owl"/> <familiar race="owl"/>
<familiar race="lynx"/> <familiar race="lynx"/>
<familiar race="wolf"/> <familiar race="wolf"/>
<familiar race="rat"/> <familiar race="rat"/>
</race> </race>

View file

@ -1,29 +1,29 @@
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<race name="elf" magres="0.100000" maxaura="1.000000" regaura="1.250000" recruitcost="130" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="18" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes"> <race name="elf" magres="0.100000" maxaura="1.000000" regaura="1.250000" recruitcost="130" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="18" 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"/> <ai splitsize="10000" moverandom="yes" learn="yes"/>
<function name="itemdrop" value="defaultdrops"/> <function name="itemdrop" value="defaultdrops"/>
<skill name="alchemy" modifier="-1"/> <skill name="alchemy" modifier="-1"/>
<skill name="mining" modifier="-2"/> <skill name="mining" modifier="-2"/>
<skill name="bow" modifier="2"/> <skill name="bow" modifier="2"/>
<skill name="building" modifier="-1"/> <skill name="building" modifier="-1"/>
<skill name="catapult" modifier="-2"/> <skill name="catapult" modifier="-2"/>
<skill name="herbalism" modifier="2"/> <skill name="herbalism" modifier="2"/>
<skill name="magic" modifier="1"/> <skill name="magic" modifier="1"/>
<skill name="training" modifier="1"/> <skill name="training" modifier="1"/>
<skill name="armorer" modifier="-1"/> <skill name="armorer" modifier="-1"/>
<skill name="shipcraft" modifier="-1"/> <skill name="shipcraft" modifier="-1"/>
<skill name="sailing" modifier="-1"/> <skill name="sailing" modifier="-1"/>
<skill name="quarrying" modifier="-1"/> <skill name="quarrying" modifier="-1"/>
<skill name="roadwork" modifier="-1"/> <skill name="roadwork" modifier="-1"/>
<skill name="stealth" modifier="1"/> <skill name="stealth" modifier="1"/>
<skill name="perception" modifier="1"/> <skill name="perception" modifier="1"/>
<skill name="unarmed" modifier="-99"/> <skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/> <attack type="1" damage="1d5"/>
<familiar race="lynx" default="yes"/> <familiar race="lynx" default="yes"/>
<familiar race="fairy"/> <familiar race="fairy"/>
<familiar race="owl"/> <familiar race="owl"/>
<familiar race="nymph"/> <familiar race="nymph"/>
<familiar race="unicorn"/> <familiar race="unicorn"/>
<familiar race="imp"/> <familiar race="imp"/>
</race> </race>

View file

@ -1,27 +1,27 @@
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<race name="goblin" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="40" maintenance="10" weight="600" capacity="440" speed="1.000000" hp="16" damage="1d5" unarmedattack="-2" unarmeddefense="0" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes"> <race name="goblin" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="40" maintenance="10" weight="600" capacity="440" speed="1.000000" 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"/> <ai splitsize="10000" moverandom="yes" learn="yes"/>
<function name="initfamiliar" value="oldfamiliars"/> <function name="initfamiliar" value="oldfamiliars"/>
<function name="itemdrop" value="defaultdrops"/> <function name="itemdrop" value="defaultdrops"/>
<skill name="alchemy" modifier="1"/> <skill name="alchemy" modifier="1"/>
<skill name="mining" modifier="1"/> <skill name="mining" modifier="1"/>
<skill name="building" modifier="1"/> <skill name="building" modifier="1"/>
<skill name="trade" modifier="-1"/> <skill name="trade" modifier="-1"/>
<skill name="catapult" modifier="1"/> <skill name="catapult" modifier="1"/>
<skill name="magic" modifier="-1"/> <skill name="magic" modifier="-1"/>
<skill name="shipcraft" modifier="-2"/> <skill name="shipcraft" modifier="-2"/>
<skill name="sailing" modifier="-2"/> <skill name="sailing" modifier="-2"/>
<skill name="roadwork" modifier="-2"/> <skill name="roadwork" modifier="-2"/>
<skill name="tactics" modifier="-2"/> <skill name="tactics" modifier="-2"/>
<skill name="stealth" modifier="1"/> <skill name="stealth" modifier="1"/>
<skill name="entertainment" modifier="-1"/> <skill name="entertainment" modifier="-1"/>
<skill name="cartmaking" modifier="-1"/> <skill name="cartmaking" modifier="-1"/>
<skill name="unarmed" modifier="-99"/> <skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/> <attack type="1" damage="1d5"/>
<familiar race="rat" default="yes"/> <familiar race="rat" default="yes"/>
<familiar race="songdragon"/> <familiar race="songdragon"/>
<familiar race="imp"/> <familiar race="imp"/>
<familiar race="rat"/> <familiar race="rat"/>
<familiar race="rat"/> <familiar race="rat"/>
<familiar race="imp"/> <familiar race="imp"/>
</race> </race>

View file

@ -1,34 +1,34 @@
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<race name="halfling" magres="0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="18" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes"> <race name="halfling" magres="0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="18" 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"/> <ai splitsize="10000" moverandom="yes" learn="yes"/>
<function name="itemdrop" value="defaultdrops"/> <function name="itemdrop" value="defaultdrops"/>
<param name="hunger.damage" value="1d14+14"/> <param name="hunger.damage" value="1d14+14"/>
<skill name="crossbow" modifier="1"/> <skill name="crossbow" modifier="1"/>
<skill name="mining" modifier="1"/> <skill name="mining" modifier="1"/>
<skill name="bow" modifier="-1"/> <skill name="bow" modifier="-1"/>
<skill name="building" modifier="1"/> <skill name="building" modifier="1"/>
<skill name="trade" modifier="2"/> <skill name="trade" modifier="2"/>
<skill name="catapult" modifier="-1"/> <skill name="catapult" modifier="-1"/>
<skill name="herbalism" modifier="2"/> <skill name="herbalism" modifier="2"/>
<skill name="training" modifier="-1"/> <skill name="training" modifier="-1"/>
<skill name="riding" modifier="-1"/> <skill name="riding" modifier="-1"/>
<skill name="shipcraft" modifier="-1"/> <skill name="shipcraft" modifier="-1"/>
<skill name="melee" modifier="-1"/> <skill name="melee" modifier="-1"/>
<skill name="sailing" modifier="-2"/> <skill name="sailing" modifier="-2"/>
<skill name="polearm" modifier="-1"/> <skill name="polearm" modifier="-1"/>
<skill name="espionage" modifier="1"/> <skill name="espionage" modifier="1"/>
<skill name="roadwork" modifier="1"/> <skill name="roadwork" modifier="1"/>
<skill name="stealth" modifier="1"/> <skill name="stealth" modifier="1"/>
<skill name="entertainment" modifier="1"/> <skill name="entertainment" modifier="1"/>
<skill name="cartmaking" modifier="2"/> <skill name="cartmaking" modifier="2"/>
<skill name="perception" modifier="1"/> <skill name="perception" modifier="1"/>
<skill name="taxation" modifier="-1"/> <skill name="taxation" modifier="-1"/>
<skill name="unarmed" modifier="-99"/> <skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/> <attack type="1" damage="1d5"/>
<familiar race="owl" default="yes"/> <familiar race="owl" default="yes"/>
<familiar race="rat"/> <familiar race="rat"/>
<familiar race="eagle"/> <familiar race="eagle"/>
<familiar race="songdragon"/> <familiar race="songdragon"/>
<familiar race="eagle"/> <familiar race="eagle"/>
<familiar race="rat"/> <familiar race="rat"/>
</race> </race>

View file

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<race name="human" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="75" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes"> <race name="human" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="75" maintenance="10" weight="1000" capacity="540" speed="1.000000" 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"/> <ai splitsize="10000" moverandom="yes" learn="yes"/>
<function name="itemdrop" value="defaultdrops"/> <function name="itemdrop" value="defaultdrops"/>
<skill name="trade" modifier="1"/> <skill name="trade" modifier="1"/>
<skill name="herbalism" modifier="-1"/> <skill name="herbalism" modifier="-1"/>
<skill name="shipcraft" modifier="1"/> <skill name="shipcraft" modifier="1"/>
<skill name="sailing" modifier="1"/> <skill name="sailing" modifier="1"/>
<skill name="unarmed" modifier="-99"/> <skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/> <attack type="1" damage="1d5"/>
<familiar race="wolf" default="yes"/> <familiar race="wolf" default="yes"/>
<familiar race="dreamcat"/> <familiar race="dreamcat"/>
<familiar race="owl"/> <familiar race="owl"/>
<familiar race="owl"/> <familiar race="owl"/>
<familiar race="eagle"/> <familiar race="eagle"/>
<familiar race="imp"/> <familiar race="imp"/>
</race> </race>

View file

@ -1,30 +1,30 @@
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<race name="insect" magres="0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" ac="2" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes"> <race name="insect" magres="0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" ac="2" 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"/> <ai splitsize="10000" moverandom="yes" learn="yes"/>
<function name="itemdrop" value="defaultdrops"/> <function name="itemdrop" value="defaultdrops"/>
<skill name="crossbow" modifier="1"/> <skill name="crossbow" modifier="1"/>
<skill name="mining" modifier="1"/> <skill name="mining" modifier="1"/>
<skill name="bow" modifier="-2"/> <skill name="bow" modifier="-2"/>
<skill name="building" modifier="2"/> <skill name="building" modifier="2"/>
<skill name="trade" modifier="-1"/> <skill name="trade" modifier="-1"/>
<skill name="forestry" modifier="1"/> <skill name="forestry" modifier="1"/>
<skill name="herbalism" modifier="1"/> <skill name="herbalism" modifier="1"/>
<skill name="training" modifier="-3"/> <skill name="training" modifier="-3"/>
<skill name="riding" modifier="-3"/> <skill name="riding" modifier="-3"/>
<skill name="armorer" modifier="2"/> <skill name="armorer" modifier="2"/>
<skill name="melee" modifier="-1"/> <skill name="melee" modifier="-1"/>
<skill name="polearm" modifier="1"/> <skill name="polearm" modifier="1"/>
<skill name="roadwork" modifier="-1"/> <skill name="roadwork" modifier="-1"/>
<skill name="tactics" modifier="-1"/> <skill name="tactics" modifier="-1"/>
<skill name="stealth" modifier="-1"/> <skill name="stealth" modifier="-1"/>
<skill name="entertainment" modifier="-2"/> <skill name="entertainment" modifier="-2"/>
<skill name="perception" modifier="1"/> <skill name="perception" modifier="1"/>
<skill name="unarmed" modifier="-99"/> <skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/> <attack type="1" damage="1d5"/>
<familiar race="ghost" default="yes"/> <familiar race="ghost" default="yes"/>
<familiar race="rat"/> <familiar race="rat"/>
<familiar race="owl"/> <familiar race="owl"/>
<familiar race="rat"/> <familiar race="rat"/>
<familiar race="tunnelworm"/> <familiar race="tunnelworm"/>
<familiar race="imp"/> <familiar race="imp"/>
</race> </race>

View file

@ -1,31 +1,31 @@
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<race name="orc" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="70" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes"> <race name="orc" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="70" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" 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"/> <ai splitsize="10000" moverandom="yes" learn="yes"/>
<param name="recruit_multi" value="0.5"/> <param name="recruit_multi" value="0.5"/>
<skill name="alchemy" modifier="1"/> <skill name="alchemy" modifier="1"/>
<skill name="mining" modifier="1"/> <skill name="mining" modifier="1"/>
<skill name="building" modifier="1"/> <skill name="building" modifier="1"/>
<skill name="trade" modifier="-3"/> <skill name="trade" modifier="-3"/>
<skill name="forestry" modifier="1"/> <skill name="forestry" modifier="1"/>
<skill name="herbalism" modifier="-2"/> <skill name="herbalism" modifier="-2"/>
<skill name="magic" modifier="-1"/> <skill name="magic" modifier="-1"/>
<skill name="training" modifier="-1"/> <skill name="training" modifier="-1"/>
<skill name="armorer" modifier="1"/> <skill name="armorer" modifier="1"/>
<skill name="shipcraft" modifier="-1"/> <skill name="shipcraft" modifier="-1"/>
<skill name="sailing" modifier="-1"/> <skill name="sailing" modifier="-1"/>
<skill name="espionage" modifier="-1"/> <skill name="espionage" modifier="-1"/>
<skill name="quarrying" modifier="1"/> <skill name="quarrying" modifier="1"/>
<skill name="tactics" modifier="1"/> <skill name="tactics" modifier="1"/>
<skill name="entertainment" modifier="-2"/> <skill name="entertainment" modifier="-2"/>
<skill name="weaponsmithing" modifier="2"/> <skill name="weaponsmithing" modifier="2"/>
<skill name="cartmaking" modifier="-1"/> <skill name="cartmaking" modifier="-1"/>
<skill name="taxation" modifier="1"/> <skill name="taxation" modifier="1"/>
<skill name="unarmed" modifier="-99"/> <skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5"/> <attack type="1" damage="1d5"/>
<familiar race="goblin" default="yes"/> <familiar race="goblin" default="yes"/>
<familiar race="ghost"/> <familiar race="ghost"/>
<familiar race="imp"/> <familiar race="imp"/>
<familiar race="rat"/> <familiar race="rat"/>
<familiar race="wolf"/> <familiar race="wolf"/>
<familiar race="demon"/> <familiar race="demon"/>
</race> </race>

View file

@ -1,32 +1,32 @@
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<race name="troll" magres="0.100000" maxaura="1.000000" regaura="1.000000" recruitcost="90" maintenance="10" weight="2000" capacity="1080" speed="1.000000" hp="30" ac="1" damage="1d5+3" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes"> <race name="troll" magres="0.100000" maxaura="1.000000" regaura="1.000000" recruitcost="90" maintenance="10" weight="2000" capacity="1080" speed="1.000000" hp="30" ac="1" damage="1d5+3" 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"/> <ai splitsize="10000" moverandom="yes" learn="yes"/>
<function name="itemdrop" value="defaultdrops"/> <function name="itemdrop" value="defaultdrops"/>
<skill name="mining" modifier="2"/> <skill name="mining" modifier="2"/>
<skill name="bow" modifier="-2"/> <skill name="bow" modifier="-2"/>
<skill name="building" modifier="2"/> <skill name="building" modifier="2"/>
<skill name="catapult" modifier="2"/> <skill name="catapult" modifier="2"/>
<skill name="herbalism" modifier="-1"/> <skill name="herbalism" modifier="-1"/>
<skill name="training" modifier="-1"/> <skill name="training" modifier="-1"/>
<skill name="riding" modifier="-2"/> <skill name="riding" modifier="-2"/>
<skill name="armorer" modifier="2"/> <skill name="armorer" modifier="2"/>
<skill name="shipcraft" modifier="-1"/> <skill name="shipcraft" modifier="-1"/>
<skill name="melee" modifier="1"/> <skill name="melee" modifier="1"/>
<skill name="sailing" modifier="-1"/> <skill name="sailing" modifier="-1"/>
<skill name="espionage" modifier="-3"/> <skill name="espionage" modifier="-3"/>
<skill name="quarrying" modifier="2"/> <skill name="quarrying" modifier="2"/>
<skill name="roadwork" modifier="2"/> <skill name="roadwork" modifier="2"/>
<skill name="tactics" modifier="-1"/> <skill name="tactics" modifier="-1"/>
<skill name="stealth" modifier="-3"/> <skill name="stealth" modifier="-3"/>
<skill name="entertainment" modifier="-1"/> <skill name="entertainment" modifier="-1"/>
<skill name="perception" modifier="-1"/> <skill name="perception" modifier="-1"/>
<skill name="taxation" modifier="1"/> <skill name="taxation" modifier="1"/>
<skill name="unarmed" modifier="-99"/> <skill name="unarmed" modifier="-99"/>
<attack type="1" damage="1d5+3"/> <attack type="1" damage="1d5+3"/>
<familiar race="tunnelworm" default="yes"/> <familiar race="tunnelworm" default="yes"/>
<familiar race="rat"/> <familiar race="rat"/>
<familiar race="rat"/> <familiar race="rat"/>
<familiar race="eagle"/> <familiar race="eagle"/>
<familiar race="tunnelworm"/> <familiar race="tunnelworm"/>
<familiar race="wolf"/> <familiar race="wolf"/>
</race> </race>

View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<ships xmlns:xi="http://www.w3.org/2001/XInclude"> <ships xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="ships/boat.xml"/> <xi:include href="ships/boat.xml"/>
</ships> </ships>

View file

@ -1,18 +1,18 @@
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<ship name="boat" range="2" storm="1.00" damage="1.00" cargo="5000" cptskill="1" minskill="1" sumskill="2" opensea="yes"> <ship name="boat" range="2" storm="1.00" damage="1.00" cargo="5000" cptskill="1" minskill="1" sumskill="2" opensea="yes">
<coast terrain="ocean"/> <coast terrain="ocean"/>
<coast terrain="plain"/> <coast terrain="plain"/>
<coast terrain="swamp"/> <coast terrain="swamp"/>
<coast terrain="desert"/> <coast terrain="desert"/>
<coast terrain="highland"/> <coast terrain="highland"/>
<coast terrain="mountain"/> <coast terrain="mountain"/>
<coast terrain="glacier"/> <coast terrain="glacier"/>
<coast terrain="volcano"/> <coast terrain="volcano"/>
<coast terrain="activevolcano"/> <coast terrain="activevolcano"/>
<coast terrain="iceberg_sleep"/> <coast terrain="iceberg_sleep"/>
<coast terrain="iceberg"/> <coast terrain="iceberg"/>
<construction skill="shipcraft" minskill="1" maxsize="5" reqsize="1"> <construction skill="shipcraft" minskill="1" maxsize="5" reqsize="1">
<requirement type="log" quantity="1"/> <requirement type="log" quantity="1"/>
</construction> </construction>
</ship> </ship>

View file

@ -1,166 +1,166 @@
<?xml version="1.0" encoding="iso-8859-1" ?> <?xml version="1.0" encoding="iso-8859-1" ?>
<spells> <spells>
<!-- draig spells --> <!-- draig spells -->
<spell name="create_roi" type="draig" ship="true" rank="5" level="6" index="130"> <spell name="create_roi" type="draig" ship="true" rank="5" level="6" index="130">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="50" cost="fixed"/> <resource name="aura" amount="50" cost="fixed"/>
<resource name="money" amount="3000" cost="fixed"/> <resource name="money" amount="3000" cost="fixed"/>
<resource name="permaura" amount="1" cost="fixed"/> <resource name="permaura" amount="1" cost="fixed"/>
</spell> </spell>
<spell name="earn_silver#draig" type="draig" ship="true" variable="true" rank="5" level="1" index="159"> <spell name="earn_silver#draig" type="draig" ship="true" variable="true" rank="5" level="1" index="159">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="1" cost="level"/> <resource name="aura" amount="1" cost="level"/>
</spell> </spell>
<spell name="create_aots" type="draig" ship="true" rank="5" level="6" index="125"> <spell name="create_aots" type="draig" ship="true" rank="5" level="6" index="125">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="50" cost="fixed"/> <resource name="aura" amount="50" cost="fixed"/>
<resource name="money" amount="3000" cost="fixed"/> <resource name="money" amount="3000" cost="fixed"/>
<resource name="permaura" amount="1" cost="fixed"/> <resource name="permaura" amount="1" cost="fixed"/>
</spell> </spell>
<spell name="create_firesword" type="draig" ship="true" rank="5" level="12" index="148"> <spell name="create_firesword" type="draig" ship="true" rank="5" level="12" index="148">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="100" cost="fixed"/> <resource name="aura" amount="100" cost="fixed"/>
<resource name="p10" amount="1" cost="fixed"/> <resource name="p10" amount="1" cost="fixed"/>
<resource name="sword" amount="1" cost="fixed"/> <resource name="sword" amount="1" cost="fixed"/>
<resource name="permaura" amount="1" cost="fixed"/> <resource name="permaura" amount="1" cost="fixed"/>
</spell> </spell>
<spell name="create_trollbelt" type="draig" ship="true" rank="5" level="9" index="48"> <spell name="create_trollbelt" type="draig" ship="true" rank="5" level="9" index="48">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="20" cost="fixed"/> <resource name="aura" amount="20" cost="fixed"/>
<resource name="permaura" amount="1" cost="fixed"/> <resource name="permaura" amount="1" cost="fixed"/>
</spell> </spell>
<!-- gwyrrd spells --> <!-- gwyrrd spells -->
<spell name="create_roi" type="gwyrrd" ship="true" rank="5" level="6" index="129"> <spell name="create_roi" type="gwyrrd" ship="true" rank="5" level="6" index="129">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="50" cost="fixed"/> <resource name="aura" amount="50" cost="fixed"/>
<resource name="money" amount="3000" cost="fixed"/> <resource name="money" amount="3000" cost="fixed"/>
<resource name="permaura" amount="1" cost="fixed"/> <resource name="permaura" amount="1" cost="fixed"/>
</spell> </spell>
<spell name="earn_silver#gwyrrd" type="gwyrrd" ship="true" variable="true" rank="5" level="1" index="159"> <spell name="earn_silver#gwyrrd" type="gwyrrd" ship="true" variable="true" rank="5" level="1" index="159">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="1" cost="level"/> <resource name="aura" amount="1" cost="level"/>
</spell> </spell>
<spell name="create_aots" type="gwyrrd" ship="true" rank="5" level="6" index="124"> <spell name="create_aots" type="gwyrrd" ship="true" rank="5" level="6" index="124">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="50" cost="fixed"/> <resource name="aura" amount="50" cost="fixed"/>
<resource name="money" amount="3000" cost="fixed"/> <resource name="money" amount="3000" cost="fixed"/>
<resource name="permaura" amount="1" cost="fixed"/> <resource name="permaura" amount="1" cost="fixed"/>
</spell> </spell>
<spell name="create_magicherbbag" type="gwyrrd" ship="true" rank="5" level="5" index="165"> <spell name="create_magicherbbag" type="gwyrrd" ship="true" rank="5" level="5" index="165">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="30" cost="fixed"/> <resource name="aura" amount="30" cost="fixed"/>
<resource name="permaura" amount="1" cost="fixed"/> <resource name="permaura" amount="1" cost="fixed"/>
<resource name="p2" amount="1" cost="fixed"/> <resource name="p2" amount="1" cost="fixed"/>
</spell> </spell>
<!-- illaun spells --> <!-- illaun spells -->
<spell name="create_roi" type="illaun" ship="true" rank="5" level="6" index="131"> <spell name="create_roi" type="illaun" ship="true" rank="5" level="6" index="131">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="50" cost="fixed"/> <resource name="aura" amount="50" cost="fixed"/>
<resource name="money" amount="3000" cost="fixed"/> <resource name="money" amount="3000" cost="fixed"/>
<resource name="permaura" amount="1" cost="fixed"/> <resource name="permaura" amount="1" cost="fixed"/>
</spell> </spell>
<spell name="earn_silver#illaun" type="illaun" ship="true" variable="true" rank="5" level="1" index="159"> <spell name="earn_silver#illaun" type="illaun" ship="true" variable="true" rank="5" level="1" index="159">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="1" cost="level"/> <resource name="aura" amount="1" cost="level"/>
</spell> </spell>
<spell name="create_aots" type="illaun" ship="true" rank="5" level="6" index="126"> <spell name="create_aots" type="illaun" ship="true" rank="5" level="6" index="126">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="50" cost="fixed"/> <resource name="aura" amount="50" cost="fixed"/>
<resource name="money" amount="3000" cost="fixed"/> <resource name="money" amount="3000" cost="fixed"/>
<resource name="permaura" amount="1" cost="fixed"/> <resource name="permaura" amount="1" cost="fixed"/>
</spell> </spell>
<spell name="create_dreameye" type="illaun" ship="true" rank="5" level="14" index="149"> <spell name="create_dreameye" type="illaun" ship="true" rank="5" level="14" index="149">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="dragonhead" amount="1" cost="fixed"/> <resource name="dragonhead" amount="1" cost="fixed"/>
<resource name="permaura" amount="5" cost="fixed"/> <resource name="permaura" amount="5" cost="fixed"/>
</spell> </spell>
<spell name="create_invisibility_sphere" type="illaun" ship="true" rank="5" level="13" index="178"> <spell name="create_invisibility_sphere" type="illaun" ship="true" rank="5" level="13" index="178">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="150" cost="fixed"/> <resource name="aura" amount="150" cost="fixed"/>
<resource name="money" amount="30000" cost="fixed"/> <resource name="money" amount="30000" cost="fixed"/>
<resource name="permaura" amount="3" cost="fixed"/> <resource name="permaura" amount="3" cost="fixed"/>
</spell> </spell>
<!-- tybied spells --> <!-- tybied spells -->
<spell name="create_roi" type="tybied" ship="true" rank="5" level="6" index="133"> <spell name="create_roi" type="tybied" ship="true" rank="5" level="6" index="133">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="50" cost="fixed"/> <resource name="aura" amount="50" cost="fixed"/>
<resource name="money" amount="3000" cost="fixed"/> <resource name="money" amount="3000" cost="fixed"/>
<resource name="permaura" amount="1" cost="fixed"/> <resource name="permaura" amount="1" cost="fixed"/>
</spell> </spell>
<spell name="earn_silver#tybied" type="tybied" ship="true" variable="true" rank="5" level="1" index="159"> <spell name="earn_silver#tybied" type="tybied" ship="true" variable="true" rank="5" level="1" index="159">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="1" cost="level"/> <resource name="aura" amount="1" cost="level"/>
</spell> </spell>
<spell name="create_aots" type="tybied" ship="true" rank="5" level="6" index="128"> <spell name="create_aots" type="tybied" ship="true" rank="5" level="6" index="128">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="50" cost="fixed"/> <resource name="aura" amount="50" cost="fixed"/>
<resource name="money" amount="3000" cost="fixed"/> <resource name="money" amount="3000" cost="fixed"/>
<resource name="permaura" amount="1" cost="fixed"/> <resource name="permaura" amount="1" cost="fixed"/>
</spell> </spell>
<spell name="create_antimagic" type="tybied" ship="true" rank="5" level="7" index="38"> <spell name="create_antimagic" type="tybied" ship="true" rank="5" level="7" index="38">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="50" cost="fixed"/> <resource name="aura" amount="50" cost="fixed"/>
<resource name="money" amount="3000" cost="fixed"/> <resource name="money" amount="3000" cost="fixed"/>
</spell> </spell>
<spell name="create_rop" type="tybied" ship="true" rank="5" level="9" index="1"> <spell name="create_rop" type="tybied" ship="true" rank="5" level="9" index="1">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="100" cost="fixed"/> <resource name="aura" amount="100" cost="fixed"/>
<resource name="permaura" amount="1" cost="fixed"/> <resource name="permaura" amount="1" cost="fixed"/>
<resource name="money" amount="4000" cost="fixed"/> <resource name="money" amount="4000" cost="fixed"/>
</spell> </spell>
<spell name="create_bagofholding" type="tybied" ship="true" rank="5" level="10" index="155"> <spell name="create_bagofholding" type="tybied" ship="true" rank="5" level="10" index="155">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="30" cost="fixed"/> <resource name="aura" amount="30" cost="fixed"/>
<resource name="permaura" amount="1" cost="fixed"/> <resource name="permaura" amount="1" cost="fixed"/>
<resource name="money" amount="5000" cost="fixed"/> <resource name="money" amount="5000" cost="fixed"/>
</spell> </spell>
<!-- gray magic --> <!-- gray magic -->
<spell name="create_runesword" type="gray" ship="true" rank="5" level="6" index="135"> <spell name="create_runesword" type="gray" ship="true" rank="5" level="6" index="135">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="100" cost="fixed"/> <resource name="aura" amount="100" cost="fixed"/>
<resource name="permaura" amount="1" cost="fixed"/> <resource name="permaura" amount="1" cost="fixed"/>
<resource name="money" amount="1000" cost="fixed"/> <resource name="money" amount="1000" cost="fixed"/>
<resource name="laensword" amount="1" cost="fixed"/> <resource name="laensword" amount="1" cost="fixed"/>
</spell> </spell>
<spell name="create_chastitybelt" type="gray" ship="true" rank="5" level="7" index="134"> <spell name="create_chastitybelt" type="gray" ship="true" rank="5" level="7" index="134">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="50" cost="fixed"/> <resource name="aura" amount="50" cost="fixed"/>
<resource name="permaura" amount="1" cost="fixed"/> <resource name="permaura" amount="1" cost="fixed"/>
<resource name="money" amount="3000" cost="fixed"/> <resource name="money" amount="3000" cost="fixed"/>
</spell> </spell>
<spell name="create_focus" type="gray" ship="true" rank="5" level="9" index="2"> <spell name="create_focus" type="gray" ship="true" rank="5" level="9" index="2">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="100" cost="fixed"/> <resource name="aura" amount="100" cost="fixed"/>
<resource name="permaura" amount="1" cost="fixed"/> <resource name="permaura" amount="1" cost="fixed"/>
</spell> </spell>
<spell name="create_ror" type="gray" ship="true" rank="5" level="9" index="3"> <spell name="create_ror" type="gray" ship="true" rank="5" level="9" index="3">
<function name="cast" value="lua_castspell"/> <function name="cast" value="lua_castspell"/>
<resource name="aura" amount="100" cost="fixed"/> <resource name="aura" amount="100" cost="fixed"/>
<resource name="permaura" amount="1" cost="fixed"/> <resource name="permaura" amount="1" cost="fixed"/>
</spell> </spell>
</spells> </spells>

View file

@ -1,57 +1,57 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<terrains> <terrains>
<!-- defaults: walk="yes" sail="yes" fly="yes" shallow="yes" swim="no" forest="no" sea="no" land="yes" forbidden="no" arctic="no" cavalry="no" size="0" --> <!-- defaults: walk="yes" sail="yes" fly="yes" shallow="yes" swim="no" forest="no" sea="no" land="yes" forbidden="no" arctic="no" cavalry="no" size="0" -->
<terrain name="ocean" size="100" shallow="no" walk="no" swim="yes" land="no" sea="yes" /> <terrain name="ocean" size="100" shallow="no" walk="no" swim="yes" land="no" sea="yes" />
<terrain name="plain" size="4000" road="50" shallow="no" forest="yes" cavalry="yes" seed="3"> <terrain name="plain" size="4000" road="50" shallow="no" forest="yes" cavalry="yes" seed="3">
<resource name="iron" chance="0.1" level="2d4-1" base="5d8" div="2d20+10" /> <resource name="iron" chance="0.1" level="2d4-1" base="5d8" div="2d20+10" />
<resource name="stone" chance="0.15" level="1d4" base="5d8" div="2d30+20" /> <resource name="stone" chance="0.15" level="1d4" base="5d8" div="2d30+20" />
<resource name="laen" chance="0.01" level="1d4" base="1d4" div="2d20+50" /> <resource name="laen" chance="0.01" level="1d4" base="1d4" div="2d20+50" />
</terrain> </terrain>
<terrain name="swamp" size="1200" road="75" seed="2"> <terrain name="swamp" size="1200" road="75" seed="2">
<resource name="iron" chance="0.02" level="2d4-1" base="5d8" div="2d20+10" /> <resource name="iron" chance="0.02" level="2d4-1" base="5d8" div="2d20+10" />
<resource name="stone" chance="0.02" level="1d4" base="5d8" div="2d30+20" /> <resource name="stone" chance="0.02" level="1d4" base="5d8" div="2d30+20" />
<resource name="laen" chance="0.02" level="1d4" base="1d4" div="2d20+50" /> <resource name="laen" chance="0.02" level="1d4" base="1d4" div="2d20+50" />
</terrain> </terrain>
<terrain name="desert" size="400" road="100" cavalry="yes" seed="2"> <terrain name="desert" size="400" road="100" cavalry="yes" seed="2">
<resource name="iron" chance="0.15" level="2d4-1" base="5d8" div="2d20+10" /> <resource name="iron" chance="0.15" level="2d4-1" base="5d8" div="2d20+10" />
<resource name="stone" chance="0.25" level="1d4" base="5d8" div="2d30+20" /> <resource name="stone" chance="0.25" level="1d4" base="5d8" div="2d30+20" />
<resource name="laen" chance="0.025" level="1d4" base="1d4" div="2d20+50" /> <resource name="laen" chance="0.025" level="1d4" base="1d4" div="2d20+50" />
</terrain> </terrain>
<terrain name="highland" size="2300" road="100" cavalry="yes" seed="2"> <terrain name="highland" size="2300" road="100" cavalry="yes" seed="2">
<resource name="iron" chance="0.15" level="2d4-1" base="5d8" div="2d20+10" /> <resource name="iron" chance="0.15" level="2d4-1" base="5d8" div="2d20+10" />
<resource name="stone" chance="0.25" level="1d4" base="5d8" div="2d30+20" /> <resource name="stone" chance="0.25" level="1d4" base="5d8" div="2d30+20" />
<resource name="laen" chance="0.025" level="1d4" base="1d4" div="2d20+50" /> <resource name="laen" chance="0.025" level="1d4" base="1d4" div="2d20+50" />
</terrain> </terrain>
<terrain name="mountain" size="600" road="250" seed="2"> <terrain name="mountain" size="600" road="250" seed="2">
<resource name="iron" chance="1.0" level="1" base="50" div="50" /> <resource name="iron" chance="1.0" level="1" base="50" div="50" />
<resource name="stone" chance="1.0" level="1" base="100" div="100" /> <resource name="stone" chance="1.0" level="1" base="100" div="100" />
<resource name="laen" chance="0.05" level="1" base="4" div="100" /> <resource name="laen" chance="0.05" level="1" base="4" div="100" />
</terrain> </terrain>
<terrain name="glacier" size="150" road="250" arctic="yes" seed="2"> <terrain name="glacier" size="150" road="250" arctic="yes" seed="2">
<resource name="iron" chance="1.0" level="1" base="3" div="50" /> <resource name="iron" chance="1.0" level="1" base="3" div="50" />
<resource name="stone" chance="1.0" level="1" base="2" div="100" /> <resource name="stone" chance="1.0" level="1" base="2" div="100" />
<resource name="laen" chance="0.05" level="1" base="4" div="100" /> <resource name="laen" chance="0.05" level="1" base="4" div="100" />
</terrain> </terrain>
<terrain name="iceberg_sleep" size="150" road="250" arctic="yes"> <terrain name="iceberg_sleep" size="150" road="250" arctic="yes">
<resource name="iron" chance="0.9" level="1" base="3" div="50" /> <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="stone" chance="0.9" level="1" base="2" div="100" />
<resource name="laen" chance="0.05" level="1" base="4" div="100" /> <resource name="laen" chance="0.05" level="1" base="4" div="100" />
</terrain> </terrain>
<terrain name="iceberg" size="150" arctic="yes"> <terrain name="iceberg" size="150" arctic="yes">
<resource name="iron" chance="0.9" level="1" base="3" div="50" /> <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="stone" chance="0.9" level="1" base="2" div="100" />
</terrain> </terrain>
<terrain name="firewall" road="250" land="no" walk="no" sail="no" fly="no" forbidden="yes" /> <terrain name="firewall" road="250" land="no" walk="no" sail="no" fly="no" forbidden="yes" />
<terrain name="fog" sail="no" land="no" /> <terrain name="fog" sail="no" land="no" />
<terrain name="thickfog" forbidden="yes" sail="no" walk="no" fly="no" land="no" /> <terrain name="thickfog" forbidden="yes" sail="no" walk="no" fly="no" land="no" />
<terrain name="volcano" size="400" road="250" seed="1"> <terrain name="volcano" size="400" road="250" seed="1">
<resource name="iron" chance="0.5" level="1" base="50" div="50" /> <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="stone" chance="0.5" level="1" base="100" div="100" />
<resource name="laen" chance="0.075" level="1" base="4" div="100" /> <resource name="laen" chance="0.075" level="1" base="4" div="100" />
</terrain> </terrain>
<terrain name="activevolcano" size="400" road="250"> <terrain name="activevolcano" size="400" road="250">
<resource name="iron" chance="0.5" level="1" base="50" div="50" /> <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="stone" chance="0.5" level="1" base="100" div="100" />
<resource name="laen" chance="0.075" level="1" base="4" div="100" /> <resource name="laen" chance="0.075" level="1" base="4" div="100" />
</terrain> </terrain>
</terrains> </terrains>

View file

@ -1,25 +1,25 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<resources xmlns:xi="http://www.w3.org/2001/XInclude"> <resources xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- this file contains a lot of weapons --> <!-- this file contains a lot of weapons -->
<xi:include href="eressea:///core/weapons/axe.xml"/> <xi:include href="eressea:///core/weapons/axe.xml"/>
<xi:include href="eressea:///core/weapons/bow.xml"/> <xi:include href="eressea:///core/weapons/bow.xml"/>
<xi:include href="eressea:///core/weapons/catapult.xml"/> <xi:include href="eressea:///core/weapons/catapult.xml"/>
<xi:include href="eressea:///core/weapons/crossbow.xml"/> <xi:include href="eressea:///core/weapons/crossbow.xml"/>
<xi:include href="eressea:///core/weapons/firesword.xml"/> <xi:include href="eressea:///core/weapons/firesword.xml"/>
<xi:include href="eressea:///core/weapons/greatbow.xml"/> <xi:include href="eressea:///core/weapons/greatbow.xml"/>
<xi:include href="eressea:///core/weapons/greatsword.xml"/> <xi:include href="eressea:///core/weapons/greatsword.xml"/>
<xi:include href="eressea:///core/weapons/halberd.xml"/> <xi:include href="eressea:///core/weapons/halberd.xml"/>
<xi:include href="eressea:///core/weapons/laensword.xml"/> <xi:include href="eressea:///core/weapons/laensword.xml"/>
<xi:include href="eressea:///core/weapons/lance.xml"/> <xi:include href="eressea:///core/weapons/lance.xml"/>
<xi:include href="eressea:///core/weapons/mallornbow.xml"/> <xi:include href="eressea:///core/weapons/mallornbow.xml"/>
<xi:include href="eressea:///core/weapons/mallorncrossbow.xml"/> <xi:include href="eressea:///core/weapons/mallorncrossbow.xml"/>
<xi:include href="eressea:///core/weapons/mallornlance.xml"/> <xi:include href="eressea:///core/weapons/mallornlance.xml"/>
<xi:include href="eressea:///core/weapons/mallornspear.xml"/> <xi:include href="eressea:///core/weapons/mallornspear.xml"/>
<xi:include href="eressea:///core/weapons/runesword.xml"/> <xi:include href="eressea:///core/weapons/runesword.xml"/>
<xi:include href="eressea:///core/weapons/rustyaxe.xml"/> <xi:include href="eressea:///core/weapons/rustyaxe.xml"/>
<xi:include href="eressea:///core/weapons/rustygreatsword.xml"/> <xi:include href="eressea:///core/weapons/rustygreatsword.xml"/>
<xi:include href="eressea:///core/weapons/rustyhalberd.xml"/> <xi:include href="eressea:///core/weapons/rustyhalberd.xml"/>
<xi:include href="eressea:///core/weapons/rustysword.xml"/> <xi:include href="eressea:///core/weapons/rustysword.xml"/>
<xi:include href="eressea:///core/weapons/spear.xml"/> <xi:include href="eressea:///core/weapons/spear.xml"/>
<xi:include href="eressea:///core/weapons/sword.xml"/> <xi:include href="eressea:///core/weapons/sword.xml"/>
</resources> </resources>

View file

@ -1,50 +1,50 @@
-- Enno was here -- Enno was here
require "multis" require "multis"
function process(orders) function process(orders)
local confirmed_multis = { } local confirmed_multis = { }
local suspected_multis = { } local suspected_multis = { }
if open_game(get_turn())~=0 then if open_game(get_turn())~=0 then
print("could not read game") print("could not read game")
return -1 return -1
end end
init_summary() init_summary()
-- kill multi-players (external script) -- kill multi-players (external script)
kill_multis(confirmed_multis, false) kill_multis(confirmed_multis, false)
mark_multis(suspected_multis, false) mark_multis(suspected_multis, false)
-- run the turn: -- run the turn:
if read_orders(orders) ~= 0 then if read_orders(orders) ~= 0 then
print("could not read " .. orders) print("could not read " .. orders)
return -1 return -1
end end
-- plan_monsters() -- plan_monsters()
if nmr_check(config.maxnmrs or 80)~=0 then if nmr_check(config.maxnmrs or 80)~=0 then
return -1 return -1
end end
process_orders() process_orders()
-- create new monsters: -- create new monsters:
spawn_braineaters(0.25) spawn_braineaters(0.25)
-- post-turn updates: -- post-turn updates:
update_guards() update_guards()
update_scores() update_scores()
local localechange = { de = { "ii" } } local localechange = { de = { "ii" } }
change_locales(localechange) change_locales(localechange)
write_files(config.locales) write_files(config.locales)
file = "" .. get_turn() .. ".dat" file = "" .. get_turn() .. ".dat"
if write_game(file, "binary")~=0 then if write_game(file, "binary")~=0 then
print("could not write game") print("could not write game")
return -1 return -1
end end
return 0 return 0
end end

View file

@ -1,6 +1,6 @@
require "example.rules" require "example.rules"
local srcpath = config.source_dir local srcpath = config.source_dir
tests = { tests = {
srcpath .. '/server/scripts/tests/common.lua', srcpath .. '/server/scripts/tests/common.lua',
} }

View file

@ -1,8 +1,8 @@
function item_canuse(u, iname) function item_canuse(u, iname)
local race = u.race local race = u.race
if iname=="greatbow" then if iname=="greatbow" then
-- only elves use greatbow -- only elves use greatbow
return race=="elf" return race=="elf"
end end
return true return true
end end

View file

@ -1,171 +1,171 @@
/* /*
Copyright (c) 1998-2010, Enno Rehling <enno@eressea.de> Copyright (c) 1998-2010, Enno Rehling <enno@eressea.de>
Katja Zedel <katze@felidae.kn-bremen.de Katja Zedel <katze@felidae.kn-bremen.de
Christian Schlittchen <corwin@amber.kn-bremen.de> Christian Schlittchen <corwin@amber.kn-bremen.de>
Permission to use, copy, modify, and/or distribute this software for any Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies. copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**/ **/
#include <platform.h> #include <platform.h>
#include <util/log.h> #include <util/log.h>
#include <kernel/types.h> #include <kernel/types.h>
#include <eressea.h> #include <eressea.h>
#include <gmtool.h> #include <gmtool.h>
#include <kernel/config.h> #include <kernel/config.h>
#include <kernel/save.h> #include <kernel/save.h>
#include <iniparser/iniparser.h> #include <iniparser/iniparser.h>
#include <assert.h> #include <assert.h>
#include <locale.h> #include <locale.h>
#include <wctype.h> #include <wctype.h>
#include <tests.h> #include <tests.h>
static const char * luafile = "setup.lua"; static const char * luafile = "setup.lua";
static const char * entry_point = NULL; static const char * entry_point = NULL;
static const char * inifile = "eressea.ini"; static const char * inifile = "eressea.ini";
static int memdebug = 0; static int memdebug = 0;
static void parse_config(const char * filename) static void parse_config(const char * filename)
{ {
dictionary * d = iniparser_new(filename); dictionary * d = iniparser_new(filename);
if (d) { if (d) {
load_inifile(d); load_inifile(d);
memdebug = iniparser_getint(d, "eressea:memcheck", memdebug); memdebug = iniparser_getint(d, "eressea:memcheck", memdebug);
entry_point = iniparser_getstring(d, "eressea:run", entry_point); entry_point = iniparser_getstring(d, "eressea:run", entry_point);
luafile = iniparser_getstring(d, "eressea:load", luafile); luafile = iniparser_getstring(d, "eressea:load", luafile);
/* only one value in the [editor] section */ /* only one value in the [editor] section */
force_color = iniparser_getint(d, "editor:color", force_color); force_color = iniparser_getint(d, "editor:color", force_color);
} }
global.inifile = d; global.inifile = d;
} }
static int static int
usage(const char * prog, const char * arg) usage(const char * prog, const char * arg)
{ {
if (arg) { if (arg) {
fprintf(stderr, "unknown argument: %s\n\n", arg); fprintf(stderr, "unknown argument: %s\n\n", arg);
} }
fprintf(stderr, "Usage: %s [options]\n" fprintf(stderr, "Usage: %s [options]\n"
"-t <turn> : read this datafile, not the most current one\n" "-t <turn> : read this datafile, not the most current one\n"
"-q : be quite (same as -v 0)\n" "-q : be quite (same as -v 0)\n"
"-v <level> : verbosity level\n" "-v <level> : verbosity level\n"
"-C : run in interactive mode\n" "-C : run in interactive mode\n"
"--color : force curses to use colors even when not detected\n" "--color : force curses to use colors even when not detected\n"
"--tests : run test suite\n" "--tests : run test suite\n"
"--help : help\n", prog); "--help : help\n", prog);
return -1; return -1;
} }
static int static int
parse_args(int argc, char **argv, int * exitcode) parse_args(int argc, char **argv, int * exitcode)
{ {
int i, run_tests = 0; int i, run_tests = 0;
for (i=1;i!=argc;++i) { for (i=1;i!=argc;++i) {
if (argv[i][0]!='-') { if (argv[i][0]!='-') {
return usage(argv[0], argv[i]); return usage(argv[0], argv[i]);
} else if (argv[i][1]=='-') { /* long format */ } else if (argv[i][1]=='-') { /* long format */
if (strcmp(argv[i]+2, "version")==0) { if (strcmp(argv[i]+2, "version")==0) {
printf("\n%s PBEM host\n" printf("\n%s PBEM host\n"
"Copyright (C) 1996-2005 C. Schlittchen, K. Zedel, E. Rehling, H. Peters.\n\n" "Copyright (C) 1996-2005 C. Schlittchen, K. Zedel, E. Rehling, H. Peters.\n\n"
"Compilation: " __DATE__ " at " __TIME__ "\nVersion: %f\n\n", global.gamename, version()); "Compilation: " __DATE__ " at " __TIME__ "\nVersion: %f\n\n", global.gamename, version());
} }
else if (strcmp(argv[i]+2, "color")==0) { else if (strcmp(argv[i]+2, "color")==0) {
/* force the editor to have colors */ /* force the editor to have colors */
force_color = 1; force_color = 1;
} }
else if (strcmp(argv[i]+2, "help")==0) { else if (strcmp(argv[i]+2, "help")==0) {
return usage(argv[0], NULL); return usage(argv[0], NULL);
} }
else if (strcmp(argv[i]+2, "tests")==0) { else if (strcmp(argv[i]+2, "tests")==0) {
run_tests = 1; run_tests = 1;
} }
else { else {
return usage(argv[0], argv[i]); return usage(argv[0], argv[i]);
} }
} else switch(argv[i][1]) { } else switch(argv[i][1]) {
case 'C': case 'C':
entry_point = NULL; entry_point = NULL;
break; break;
case 'e': case 'e':
entry_point = argv[++i]; entry_point = argv[++i];
break; break;
case 't': case 't':
turn = atoi(argv[++i]); turn = atoi(argv[++i]);
break; break;
case 'q': case 'q':
verbosity = 0; verbosity = 0;
break; break;
case 'v': case 'v':
verbosity = atoi(argv[++i]); verbosity = atoi(argv[++i]);
break; break;
case 'h': case 'h':
usage(argv[0], NULL); usage(argv[0], NULL);
return 1; return 1;
default: default:
*exitcode = -1; *exitcode = -1;
usage(argv[0], argv[i]); usage(argv[0], argv[i]);
return 1; return 1;
} }
} }
if (run_tests) { if (run_tests) {
*exitcode = RunAllTests(); *exitcode = RunAllTests();
return 1; return 1;
} }
return 0; return 0;
} }
void locale_init(void) void locale_init(void)
{ {
setlocale(LC_CTYPE, ""); setlocale(LC_CTYPE, "");
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");
assert(towlower(0xC4)==0xE4); /* &Auml; => &auml; */ assert(towlower(0xC4)==0xE4); /* &Auml; => &auml; */
} }
int main(int argc, char ** argv) int main(int argc, char ** argv)
{ {
int err, result = 0; int err, result = 0;
parse_config(inifile); parse_config(inifile);
log_open("eressea.log"); log_open("eressea.log");
locale_init(); locale_init();
err = parse_args(argc, argv, &result); err = parse_args(argc, argv, &result);
if (err) { if (err) {
return result; return result;
} }
err = eressea_init(); err = eressea_init();
if (err) { if (err) {
log_error(("initialization failed with code %d\n", err)); log_error(("initialization failed with code %d\n", err));
return err; return err;
} }
err = eressea_run(luafile, entry_point); err = eressea_run(luafile, entry_point);
if (err) { if (err) {
log_error(("server execution failed with code %d\n", err)); log_error(("server execution failed with code %d\n", err));
return err; return err;
} }
eressea_done(); eressea_done();
log_close(); log_close();
return 0; return 0;
} }

View file

@ -1,3 +1,3 @@
#include "stdafx.h" #include "stdafx.h"
#include "main.c" #include "main.c"
#include "tests.c" #include "tests.c"