Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
2520 commits 10 branches 0 tags 41 MiB
Commit graph

587 commits

Author SHA1 Message Date
Enno Rehling
bb1ba6b366 The new GM tool, added to the eressea/ directory. All that remains is to 
salvage some mapper functionality and stuff it in there (and cleanup), then
the mapper/ directory can go.
 2006-03-24 07:35:51 +00:00
Enno Rehling
bcac3bc47a http://eressea.upb.de/mantis/view.php?id=824 
Kapazität für Vertraute ist 540
 2006-02-12 22:22:36 +00:00
Enno Rehling
4bc803ef2c http://eressea.upb.de/mantis/view.php?id=826 
Wrong wages for orcs

also:
- removing some really old GMcommand code.
 2006-02-12 20:10:32 +00:00
Enno Rehling
e681eec072 leading/trailing spaces in text are significant. 2006-02-12 11:33:19 +00:00
Enno Rehling
f1d0f522b8 leading/trailing spaces in text are significant. 2006-02-12 11:30:12 +00:00
Enno Rehling
8265c9ea7f http://eressea.upb.de/mantis/view.php?id=818 
Hirntöter auf Eressea
- message to the target region when braineaters are sent to earth.
 2006-02-12 00:24:11 +00:00
Enno Rehling
e936284347 Massive changes: 
- removed all hadcoded weapons
- added code to put resources like iron&wood in XML
- added laen & wood to XML
- fixed damage for mallorn lance
- removed the old entrise code
- added new ent code in lua, eressea-only
 2006-02-11 16:11:16 +00:00
Enno Rehling
d5c94df710 the awkwardly named 'young tree' is now called 'sapling' 2006-02-10 22:24:20 +00:00
Enno Rehling
8b0314be3b new english potion descriptions 2006-02-10 21:49:16 +00:00
Katja Zedel
522a0bd8a2 neuer kram 2006-02-05 21:37:08 +00:00
Katja Zedel
d706e0410d neues "Schiff": fliegender Teppich, Werte wie Langboot, 
Mindestbautalent 100
 2006-02-05 19:32:35 +00:00
Christian Schlittchen
4439843867 confusion about the spelling of the magic realms 2006-02-05 17:00:22 +00:00
Christian Schlittchen
ab492fb637 Too much copy'n'paste 2006-02-05 16:50:11 +00:00
Enno Rehling
640652ef99 earn_silver Zauber in script/xml ausgelagert. 
bugfix snowman
avoid huge amounts of log-messages
handle renaming of spells.
 2006-02-05 15:48:52 +00:00
Enno Rehling
21f88cf801 bugfix default-befehle (english) 2006-02-05 12:55:12 +00:00
Enno Rehling
3feb139071 name in message doesn't match name in code. 2006-02-05 08:52:08 +00:00
Enno Rehling
3cd617fe39 new hash function is faster than the old 2006-02-04 18:53:34 +00:00
Enno Rehling
939773826b init of old items fails with new hash function 2006-02-04 17:28:19 +00:00
Enno Rehling
88ac2f2496 Ungünstig benannter Beutel 2006-02-04 17:19:26 +00:00
Enno Rehling
673fbb8921 MSG_LEVELS remove 
rparagraph() detects existing indentation and markers (for battle-messages)
 2006-01-29 22:14:43 +00:00
Enno Rehling
7a3ca3ce5b - indentation fixes 
- statistics beautification
 2006-01-29 14:05:28 +00:00
Enno Rehling
b524e7e392 move study.h where it belongs 
tutorial gets a "defaultorder" string
 2006-01-29 00:28:46 +00:00
Enno Rehling
10f53b6ae8 http://eressea.upb.de/mantis/view.php?id=797 
Einhorn raceinfo, nicht iteminfo
 2006-01-24 21:02:17 +00:00
Enno Rehling
9c8eb1028f Gewichtsanzeige eindeutiger. 2006-01-21 09:58:11 +00:00
Enno Rehling
2f3181af53 do *not* remove the construction block from ships, it's required (dang!) 2006-01-18 23:07:27 +00:00
Enno Rehling
3918484f42 typos in XML files 2006-01-18 22:41:44 +00:00
Enno Rehling
103814c765 small fix duplicate ao_daemon item 2006-01-18 22:41:10 +00:00
Enno Rehling
57d86e59e6 removing the old files in the items/ subdirectory (added to strings.xml), cleaning up the code a bit. 2006-01-18 22:28:58 +00:00
Christian Schlittchen
d8de765bb7 - Quickfix fuer Crashbug im Mapper beim Erzeugen neuer Einheiten 
- WdW-Sphinx-Kram
 2006-01-15 18:47:52 +00:00
Enno Rehling
08fec11034 http://eressea.upb.de/mantis/view.php?id=708 
Umsetzung Announce 13.9.: Die Kampfauswirkung auf Bewegung war nicht implementiert.
 2006-01-15 17:50:01 +00:00
Enno Rehling
c1edcffe85 http://eressea.upb.de/mantis/view.php?id=784 
- Falsche Katapultpreise
 2006-01-15 13:54:12 +00:00
Enno Rehling
e19a918291 magic uses new argument type to report missing components. 2006-01-13 21:27:16 +00:00
Enno Rehling
7eee06c285 continued: new argument type "items" or "resources" (previous solution didn't allow lists of resources, which come in handy for build-error messages). 2006-01-13 21:20:19 +00:00
Enno Rehling
8ca86912cf splitting quit in two parts so that the analysis can be done in instant_orders, and dying does not interfere with quitting. 2006-01-13 19:43:33 +00:00
Enno Rehling
af59e2f09c new argument-type for messages: items. 
not the most efficient, since it takes a deep copy of the list.
 2006-01-08 12:25:00 +00:00
Enno Rehling
2ddc4ac9c2 duplicate string 2006-01-02 22:29:14 +00:00
Enno Rehling
bde330b131 trails for icebergs (en) 2006-01-02 22:12:33 +00:00
Enno Rehling
83e9b7a994 slightly improved, but still hackish way to recognize luabind versions. 2006-01-02 20:24:33 +00:00
Katja Zedel
88ea1b27b7 sphinx muss sachen geben können 2006-01-01 20:04:09 +00:00
Enno Rehling
e9a7108423 LUASPL_* ids entfernt, weil jetzt ein System existiert, die spell-id in XML zu setzen um zu alten Daten kompatibel zu bleiben. 2006-01-01 19:03:35 +00:00
Enno Rehling
b49d1cadca Aus dem TODO: 
- WDW spells per XML definiert, so dass sie nicht in Eressea auftauchen, aber auch kein define benötigen

- Neue Variante des seenspell-attributes.

- weniger find_spellbyid() aufrufe.
 2006-01-01 18:35:55 +00:00
Enno Rehling
eadda41bcb no more find_spellbyid for resource files. 2006-01-01 17:19:51 +00:00
Enno Rehling
657fc3d123 WDW_PHOENIX define removed: 
- Der Initialisierungs-Code ist in LUA reimplementiert.

- Ich habe das ganze spoils-Konzept etwas allgemeiner gemacht, man kann jetzt einfach ein equipment-objekt in XML definieren (siehe vinyambar-wdw.xml) der die spoils für eine Rassea angibt, (z.B. phonix_spoils nennen).

- Das gleiche für Drachen und Seeschlange gemacht.
 2006-01-01 16:58:59 +00:00
Christian Schlittchen
5fa56103cc Fehlende Dateien, Umlautkorrektur 2006-01-01 15:17:08 +00:00
Christian Schlittchen
29df2263c6 Phoenixkompass fuer wdw, noch ungetestet 2006-01-01 15:15:41 +00:00
Enno Rehling
c456b8aceb descriptions xmas 2003 2005-12-31 16:36:57 +00:00
Enno Rehling
90e8fb11fd http://eressea.upb.de/mantis/view.php?id=779 
Zauber Nebel der Verwirrung hat keine Funktion
- verwirrung für schiffe implementiert.

- neue waffe: schneeball. nur für schneemänner, hoffe ich
 2005-12-31 15:20:36 +00:00
Enno Rehling
80186ba627 - error handling missing terrains 
- bugfix terrain-xml
 2005-12-31 13:45:10 +00:00
Enno Rehling
d0d03c08af Compile-fixes. 2005-12-31 13:18:35 +00:00
Enno Rehling
988a0078c4 Bessere Lösung für das auto-seeding: Jeder Terraintyp kriegt eine relative Häufigkeit in die XML-Daten. 2005-12-31 13:13:44 +00:00
Enno Rehling
c30cebd352 Beim erzeugen neuer Inseln keine Eisberge und Vulkane mehr machen. 2005-12-31 13:01:11 +00:00
Enno Rehling
619a3f5387 Beginn einer Implementation von Schneemännern für Eressea 2005-12-26 23:49:16 +00:00
Enno Rehling
3372e17530 Implemntation Stardust 2005-12-25 19:13:51 +00:00
Enno Rehling
18153f5614 http://eressea.upb.de/mantis/view.php?id=775 
Es gibt auch noch ältere Berge und Gletscher ohne Eisen.
 2005-12-19 18:56:20 +00:00
Enno Rehling
73123575a6 Weihnachtsitem 2005 2005-12-18 18:09:53 +00:00
Enno Rehling
3b3e93f62b http://eressea.upb.de/mantis/view.php?id=774 
message-einordnungen
 2005-12-16 19:39:52 +00:00
Enno Rehling
ca352dc60a kingdoms: 
- buildings/castle
 2005-12-11 15:26:11 +00:00
Enno Rehling
bbcc80643a - bugfix fehlender burgenbonus (maxcapacity 4) 
- removed old xml-writing code
- fixed a crash related to astralspace

kingdoms:
- building type castle
 2005-12-11 14:54:50 +00:00
Enno Rehling
5d541465b1 initialize the world with some items 2005-12-11 14:21:53 +00:00
Enno Rehling
28be52c1b2 LUA: 
- messages an regionen versenden

Eressea:
- Besucher von Muschelplateau kriegen ein Spezialgimmick
- Diverse magische Items im Gewicht auf 0 reduziert.
 2005-12-11 11:43:18 +00:00
Enno Rehling
4635c46ec2 - dice_rand kann einfaches multiplizieren 
- als dice_roll nach lua exportiert
- equipment kann in inventories getan werden
- region::land bekommt ein inventory
- terraform legt equipment in neue regionen

kingdoms:
- neues terrain berge.
 2005-12-11 09:58:17 +00:00
Enno Rehling
402fbb24e5 - spawning new dragons and undead is now optional (lua function) 
- battle-effect on peasants is configurable (by XML param)
 2005-11-26 11:03:44 +00:00
Enno Rehling
6772d1892e kingdoms: templates race needs to exist to make monsterfaction 2005-11-26 01:09:11 +00:00
Enno Rehling
b04b3ea168 kingdoms: missing mallorn seeds 2005-11-26 00:09:29 +00:00
Enno Rehling
49cd3e08ad kingdoms: resource files. 2005-11-25 23:37:27 +00:00
Enno Rehling
bb1e86ebb4 new code for 'kingdoms': 
- disabling skills
- region owners
- maintenance costs configurable
- wage configurable
 2005-11-25 22:09:59 +00:00
Enno Rehling
532eb77c51 http://eressea.upb.de/mantis/view.php?id=761 
Doppelte Angriffsmeldungen

battle message only reported once per round&unit
 2005-11-25 21:11:05 +00:00
Enno Rehling
357a73e826 XML reports - incomplete implementation, might finish it eventually. 2005-11-18 23:23:47 +00:00
Enno Rehling
3081922ad7 http://eressea.upb.de/mantis/view.php?id=747 
Übergabe eines Sonnensegels

was wrongfully marked as cursed.
 2005-11-07 18:23:48 +00:00
Enno Rehling
dfc6f83c62 upgrade to luabind beta-7 devel-2 
upgrade to g++ 4.0
 2005-10-31 22:34:45 +00:00
Enno Rehling
40fb0c5528 plural kraeuterbeutel 2005-10-31 20:01:27 +00:00
Enno Rehling
6ca3befa29 http://eressea.upb.de/mantis/bug_change_status_page.php 
Fehler bei Produktion von Stufe 1 Traenken

herbalism instead of alchemy
 2005-10-31 19:20:10 +00:00
Enno Rehling
db9589bed1 luxusgueter raus aus dem code, rein in die CML files 2005-10-30 18:22:28 +00:00
Enno Rehling
9b7128b660 http://eressea.upb.de/mantis/view.php?id=743 
Prozentangaben fuer Wuestenstrassen sind verdoppelt.
 2005-10-30 15:36:10 +00:00
Enno Rehling
ada8c3a52d bugfix: water of life 
initialization of potion text
removing #if 0 code.
 2005-10-30 09:51:02 +00:00
Enno Rehling
1113d3d7e9 bugfix luxuries. now possible (though not done) to read them from xml. 2005-10-29 16:28:10 +00:00
Enno Rehling
89e8c622c7 more weapons out of the code. 2005-10-29 16:10:08 +00:00
Enno Rehling
baab10febe the last of the item_type constants disappear. 2005-10-29 15:03:18 +00:00
Enno Rehling
f6524ee015 kicking out a few more hardcoded item_type objects. 2005-10-29 14:48:37 +00:00
Enno Rehling
cb9106473b Special non-item resources like hp and peasant can now be defined externally. 
removed all the hardcoded armor from the source.
 2005-10-29 14:12:46 +00:00
Enno Rehling
43e44a083e bugfix init_oditems: if a resource was later in the list than one that used it, the game would crash 2005-10-29 11:39:34 +00:00
Enno Rehling
13efa939c1 ao_daemon, not daemoneye 2005-10-26 20:44:49 +00:00
Enno Rehling
e31215f8f1 removing hardcoded itemtypes that now give warnings. 2005-10-26 20:12:28 +00:00
Enno Rehling
a8480e3865 fixing seeds, one commit at a time 2005-10-26 19:56:28 +00:00
Enno Rehling
b19c4f5cc6 skill fuer spear heisst polearm 2005-10-26 15:15:18 +00:00
Enno Rehling
abcaac8f97 removing seeds and mallornseeds from the source (less warnings, too). 2005-10-25 21:24:15 +00:00
Enno Rehling
ac30257333 removed a lot of old code that used or initialized potions and herbs, moved those to the xml data instead. also made spells use resource_type instead of resource_t to have one less place where those are used. 
The tech-tree loading is now smart enough that a resource can depend on another one that isn't loaded yet (it builds a dummy of the resource at first). his can backfire if you then forget to define that resource for real, i'll eventually need error-handling there.
 2005-10-25 20:44:18 +00:00
Enno Rehling
688b796aec - sk_ prefixes von den skillnames entfernt. 2005-10-25 14:51:15 +00:00
Enno Rehling
28f41c3edd - sk_ prefixes von den skillnames entfernt. 2005-10-25 14:27:24 +00:00
Enno Rehling
193b69b049 new xml data 2005-10-25 13:02:55 +00:00
Enno Rehling
68433ad0d1 Der Eressea-Code hat jetzt auch extern definierte Terrains. Ich war so gründlich wie es ging dabei, die alten T_ Konstanten zu entfernen, aber einzelne Regeln sind ziemlich hardgecodet (wo Drachen geboren werden, usw), und benötigen daher noch das terrainid.h include, in das der alte enum verfrachtet ist. 
Konfigurierbarkeit ahoi.
 2005-10-25 12:38:01 +00:00
Christian Schlittchen
1c7ace7556 WdW-Pyramiden 2005-10-23 11:27:55 +00:00
Enno Rehling
4dc1339ec3 New: familiars are initialized with an equipment-set. 
New: familiars can have a LUA initialization function.

Moved the spell implementations from spell.c to spells.c where they "belong".

Spell ids moved to a separate header (to phase them out eventually)
 2005-10-23 09:05:11 +00:00
Enno Rehling
b7a8660eef Fehlende spellinfo nach letzten Änderungen 2005-10-23 08:08:55 +00:00
Enno Rehling
a0ee76abe2 Many new spell translations. 2005-10-22 19:53:44 +00:00
Enno Rehling
38ec0dc2ad http://eressea.upb.de/mantis/view.php?id=723 
Zauber Gürtel der Trollstärke jetzt mit Drachenblut

wieder mit permannter aura.
 2005-10-17 18:16:03 +00:00
Enno Rehling
b8f8981c96 http://eressea.upb.de/mantis/view.php?id=722 
Zauber Rostregen, Beschreibungsupdate.
 2005-10-16 21:44:00 +00:00
Enno Rehling
2d86eff74f http://eressea.upb.de/mantis/view.php?id=720 
Boote koennen nicht auf Gletscher landen

Schlafende Eisberge wurden als Gletscher angezeigt, aber von Schiffen nicht so behandelt.
 2005-10-16 21:41:44 +00:00
Enno Rehling
a521385b13 even more create_ spells are now scripted. 
started on another spell (earn_silver), needs enabling and testing.
 2005-10-09 21:41:04 +00:00
Christian Schlittchen
9ba5ebedb9 wdw-Zauber angepasst 2005-10-09 15:13:39 +00:00