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

1353 commits

Author SHA1 Message Date
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
6c3f4e7e79 http://eressea.upb.de/mantis/view.php?id=819 
- MACHE Holz scheitert an xmlreader Bugs
 2006-02-12 11:05:43 +00:00
Enno Rehling
ef2165e764 fprintf/fscanf fu. 2006-02-12 09:42:52 +00:00
Christian Schlittchen
fdc07aa0ea enno needs more sleep fixes 2006-02-12 09:22:37 +00:00
Enno Rehling
f07c80563a writing characters as numeric bytes is trickier. 2006-02-11 23:44:17 +00:00
Enno Rehling
9475e47606 - bugfix capacities 
- a little cleanup
 2006-02-11 23:18:10 +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
8b0314be3b new english potion descriptions 2006-02-10 21:49:16 +00:00
Enno Rehling
af9a86efa7 some time ago when races were added to xml, the global familiarrace-list was broken. fixed. 2006-02-10 21:15:08 +00:00
Enno Rehling
3efd05206e replacing read/write_default with a function that doesn't abuse layout of the union or endianness. new savefile-format 
removeing some old attributes that were never used.
 2006-02-10 19:48:43 +00:00
Enno Rehling
102a68f01e eliminating iconv in favor of the encoding in libxml2 2006-02-09 22:43:31 +00:00
Enno Rehling
589b1b036a making the old eressea binary run on x64: 
- normalvariate fix.
- familiars again
- invalid assert
- forgot init_reports
 2006-02-09 22:20:28 +00:00
Enno Rehling
a1de5d5701 old eressea executable has problems with non-existing lua spells. 2006-02-09 19:57:25 +00:00
Enno Rehling
ef2e1c8da9 project eressa64: trying to run eressea natively on 64 bit hardware. 2006-02-09 19:39:17 +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
77602d1316 http://eressea.upb.de/mantis/view.php?id=810 
cast_level statt co->level in der message
 2006-02-05 13:06:27 +00:00
Enno Rehling
21f88cf801 bugfix default-befehle (english) 2006-02-05 12:55:12 +00:00
Enno Rehling
9466428c4d bugfix: create_mage u. Dämonen/VERGESSE 
Windows: weg mit der Debug-CRT
 2006-02-05 10:47:28 +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
4b0074cb3a don't use MT library for release 2006-02-04 13:08:44 +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
546524fe0c duplicate attribute error 2006-01-29 15:57:47 +00:00
Enno Rehling
7a3ca3ce5b - indentation fixes 
- statistics beautification
 2006-01-29 14:05:28 +00:00
Enno Rehling
7819848524 fixed buffersize-calculation for orders. 2006-01-29 13:52:49 +00:00
Enno Rehling
bc2cedd34f fix invalid create_mage calls 
prepare to re-enable worldmap
remove some dead code
 2006-01-29 08:50:53 +00:00
Enno Rehling
b0e5f436cd - lots of memory leaks fixed. 2006-01-29 01:55:36 +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
0efb0807c0 teeny bit faster reports (save strdup again) 2006-01-26 23:56:33 +00:00
Enno Rehling
cf996bc5fb removing a strdup() call and a buffer from rparagraph. 2006-01-26 23:05:40 +00:00
Enno Rehling
0fe3e9ad4b Project files: Not using MT libraries in VC7 really speeds up the CRT calls. 2006-01-24 23:20:33 +00:00
Enno Rehling
fe4ce3261f saving some strdup() calls 2006-01-24 23:19:09 +00:00
Enno Rehling
64318eaab3 ugroups code entfernt: 
- Es ist unwahrscheinlich, dass er je genutzt wird,
- Er ist nicht vollständig
- Er ist gründlich veraltet
 2006-01-22 23:29:15 +00:00
Enno Rehling
5dd2542586 Fehler bei neuem itemlisten-argument 2006-01-21 18:10:46 +00:00
Enno Rehling
55b9af27c2 http://eressea.upb.de/mantis/view.php?id=787 
Signifikanter CR/NR-Unterschied 

- das Regionsintervall wurde in write_plaintext() nicht korrekt benutzt.
 2006-01-21 08:34:01 +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
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
9b2014d3b4 http://eressea.upb.de/mantis/view.php?id=708 
Kampf-Announce 13.9.: Gruppen werden nicht von Einzeleinheiten beeinflusst.
 2006-01-15 17:29:41 +00:00
Enno Rehling
7ad5ed06cb number of new players in statistics corrected. 2006-01-15 11:05:23 +00:00
Enno Rehling
2ac568cfa7 compile-fix 2006-01-13 23:11:50 +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
6ad7a5562e code cleanup: removed all old cases of new_message being called, and the function itself. 2006-01-08 11:33:10 +00:00
Enno Rehling
5b5026cefd Vereinfachung des Bauerncodes. 2006-01-07 12:30:25 +00:00
Enno Rehling
68389e2ba6 another leak in mistake() 2006-01-02 22:41:36 +00:00
Enno Rehling
c5585a3520 more memory leaks fixed 2006-01-02 22:29:07 +00:00
Enno Rehling
517f8e3f81 fixed some memory leaks 2006-01-02 21:50:57 +00:00
Enno Rehling
bf6dbe4b26 fixing a few crashes when new_race[i] is null. 
error handling for missing seenspells.
 2006-01-02 08:38:46 +00:00
Enno Rehling
ba555c842a somehow random_terrain still crashes. oh, and tha familiar stuff was in the 
wrong function
 2006-01-01 22:20:52 +00:00
Enno Rehling
f8991a844f bischen durcheinandergekommen beim nummerieren. 2006-01-01 21:29:22 +00:00
Enno Rehling
b2f1b213d4 Regionsalter auf Startwert setzen 2006-01-01 20:56:11 +00:00
Enno Rehling
4dec5c914d code-polishing: Vertraute werden nicht mehr als RC_* gebraucht.find_spellbyid() kriegt nen magietyp für den fall wo zwei zauber gleich heissen, und nicht über ihre 'alte' id erkannt werden, sondern den hash des namens (für seenspell) 2006-01-01 20:53:12 +00:00
Enno Rehling
9eb50890c6 code-polishing: Vertraute werden nicht mehr als RC_* gebraucht. 2006-01-01 20:50:36 +00:00
Enno Rehling
c60502bfc8 find_spellbyid() kriegt nen magietyp für den fall wo zwei zauber gleich heissen, und nicht über ihre 'alte' id erkannt werden, sondern den hash des namens (für seenspell) 2006-01-01 20:11:09 +00:00
Enno Rehling
eb35aab047 work in progress 2006-01-01 19:40:01 +00:00
Enno Rehling
bd5f6e5683 that line is now obsolete. 2006-01-01 19:12:50 +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
Enno Rehling
c456b8aceb descriptions xmas 2003 2005-12-31 16:36:57 +00:00
Enno Rehling
9bf60a5451 Spezialfall: Einheiten, die nicht laufen können. 
LUA: Rasse ändern ändert auch irace.
 2005-12-31 16:13:20 +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
40b5fa20be only indentation changes. 2005-12-31 14:01:54 +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
76976a970e bugfix terraforming in regionen ohne production 2005-12-21 10:11:19 +00:00
Enno Rehling
df94b39f8c http://eressea.upb.de/mantis/view.php?id=775 
noch ein nachtrag
 2005-12-19 18:27:07 +00:00
Enno Rehling
520a485b16 production-chance ist falsch. 2005-12-19 18:09:35 +00:00
Enno Rehling
5c07121a9f http://eressea.upb.de/mantis/view.php?id=775 
Berge ohne Eisen (und generell Regionen ohne Resourcen).
 2005-12-19 17:31:27 +00:00
Enno Rehling
945a60a20c Sicherstellen, dass keien hardlinks automatisch übermeiert werden (unlink). 
Schnelleres Backup ohne system() mit Hardlinks.
 2005-12-18 21:53:12 +00:00
Enno Rehling
d187097fad - bugfix broken subset-selection 
- bugfix lighthouse-update
 2005-12-11 15:39:53 +00:00
Enno Rehling
b2bd092252 do not crash when there's no generic building type 2005-12-11 15:30:05 +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
a8b9c29be4 har du data saa er det altid en god ide aa spare den, ellers forsvinne ting plutselig 2005-12-11 14:31:06 +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
b09d0a89a7 http://eressea.upb.de/mantis/view.php?id=769 
Seltsames Ergebnis von Übergaben

RTF_SNEAK wurde bei fehlendem attribut falsch gesetzt.
 2005-12-02 23:04:36 +00:00
Enno Rehling
5aa0ca5ff5 source formatting. 2005-12-02 20:23:54 +00:00
Enno Rehling
5f43830f59 http://eressea.upb.de/mantis/view.php?id=765 
http://eressea.upb.de/mantis/view.php?id=764

PopulationDamage war um Faktor 100 zu hoch.
 2005-11-28 08:07:01 +00:00
Enno Rehling
d808de65c8 new attribute "object" allows arbitrary named data to be added to any object (improvement on the "key" attribute) 
exported to LUA: x.objects returns the collection of objects, accessible through :get() and :set() functions
 2005-11-26 15:28:11 +00:00
Enno Rehling
10b2d08a0a new attribute "object" allows arbitrary named data to be added to any object (improvement on the "key" attribute) 2005-11-26 11:49:20 +00:00
Enno Rehling
531115b392 - spawning new dragons and undead is now optional (lua function) 
- battle-effect on peasants is configurable (by XML param)
 2005-11-26 11:00:20 +00:00
Enno Rehling
ba2e0fef8c more code that fails when there are no luxuries 2005-11-26 01:24:28 +00:00
Enno Rehling
38062fa990 more code that fails when there are no luxuries 2005-11-26 01:16:55 +00:00
Enno Rehling
b04b3ea168 kingdoms: missing mallorn seeds 2005-11-26 00:09:29 +00:00
Enno Rehling
f0ce33304b kingdoms: handling lack of luxuries 2005-11-26 00:08:47 +00:00
Enno Rehling
e8a022ae75 kingdoms: error -> warning if we cannot find a hard-coded race 2005-11-26 00:01:26 +00:00
Enno Rehling
3ae0abad4b bugfix old lua versions 
removing some instances of oldterrain() calls

kingdoms: removing assert on missing old races
kingdoms: handling missing potions gracefully
 2005-11-25 23:52:53 +00:00
Enno Rehling
aa4fda7e26 kingdoms: null-pointer crash if potion type does not exist 2005-11-25 23:39:50 +00:00
Enno Rehling
cd70cfcb8b syntax error 2005-11-25 22:17:41 +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
40ef16c53f removed warnings 2005-11-20 14:50:15 +00:00
Enno Rehling
7783077517 simplified the work() functions 
splitting more functionality from process_orders into separate functions
 2005-11-20 12:58:59 +00:00
Enno Rehling
e006d8a4d0 smallish compile-fixes for linux 2005-11-18 23:42:11 +00:00
Enno Rehling
357a73e826 XML reports - incomplete implementation, might finish it eventually. 2005-11-18 23:23:47 +00:00
Enno Rehling
2380573d77 crashfix terraform w/ oldterrain==NULL 2005-11-14 18:58:09 +00:00
Enno Rehling
29b84b640e More gentle terraforming: If a region is terraformed and has the same size as before, no need to change the trees. No need to change peasants or money either 2005-11-11 22:53:58 +00:00
Enno Rehling
028753b06b - MACHEN ALLES "Wasser des Lebens" sollte jetzt gehen. 
- Alte Funktion entfernt.
 2005-11-06 11:33:19 +00:00
Enno Rehling
d2a75f15fe code cleanup, reports. report types are now registered (some code I had on my disk since the days I was writing xml reports), and a new mailit format (reports.txt replaces mailit). Also, no more writing of shellscripts from the server, since that's done by an external script now. 2005-11-02 21:10:40 +00:00
Enno Rehling
f6952988e4 made compatible to earlier luabind version (just to avoid some work non VC++), but a little hackishly through the BOOST_VERSION define. 
removed some almost unused funtions (pt_find, etc).
 2005-11-01 20:33:21 +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
db9589bed1 luxusgueter raus aus dem code, rein in die CML files 2005-10-30 18:22:28 +00:00
Enno Rehling
eba19999f4 noch mehr funktionen mit new_ prefix aus pool.h bekommen den entfernt. 2005-10-30 15:42:15 +00:00
Enno Rehling
7cfc188e64 bug in pool-parameters (mode and amount mixed up in production code) 2005-10-30 11:55:22 +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
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
3eef9447e9 renaming the pool funtions (no need for a new_ prefix anymore) 2005-10-29 12:25:53 +00:00
Enno Rehling
7017f27304 quick changes to remove the old pool functions that use resource_t 2005-10-29 12:08:40 +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
91da1f6e89 The quest to remove resource_t from the game continues (finally) 2005-10-29 11:17:21 +00:00
Enno Rehling
e31215f8f1 removing hardcoded itemtypes that now give warnings. 2005-10-26 20:12:28 +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
3c749d4121 ships mentioning terrain-types that don't exist. 2005-10-25 13:11:50 +00:00
Enno Rehling
b6160f32ac ships mentioning terrain-types that don't exist. 2005-10-25 13:06:59 +00:00
Enno Rehling
70b3e9ad50 autoseed had some unused code there. not sure what it's good for, really. 2005-10-25 12:46:25 +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
Enno Rehling
00fab33aaf nachbesserung zu den letzten 2 commits 2005-10-25 08:45:59 +00:00
Enno Rehling
1b4aa36874 removed old get_/set_change_herb functions, no longer in use 2005-10-25 08:28:00 +00:00
Enno Rehling
4ce88dad13 removing the old NEW_RESOURCEGROWTh macro 2005-10-24 20:06:40 +00:00
Christian Schlittchen
1c7ace7556 WdW-Pyramiden 2005-10-23 11:27:55 +00:00
Enno Rehling
f6cc641d9c initializing new member variable in equipment 2005-10-23 10:42:26 +00:00
Enno Rehling
4d38380766 removed R_ANTIMAGICCRYSTAL as well. 2005-10-23 10:15:30 +00:00
Enno Rehling
8483c555fc moving combatspells.c to the spells/ directory 2005-10-23 09:10:41 +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
67ba7b7960 removing an unused function 2005-10-22 21:03:29 +00:00
Enno Rehling
a0ee76abe2 Many new spell translations. 2005-10-22 19:53:44 +00:00
Enno Rehling
3c3b1bad8a http://eressea.upb.de/mantis/view.php?id=725 
Beschreibung Gehirnschmalz

tage -> lernversuche
 2005-10-17 17:56:39 +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
b58303211f http://eressea.upb.de/mantis/view.php?id=728 
Straße Richtung Ozean

man kann Richtung Ozean nicht mehr bauen.
 2005-10-16 20:45:30 +00:00
Enno Rehling
71dc067213 http://eressea.upb.de/mantis/view.php?id=733 
Vertraute und Kampfzauber

separated combat spells from regular attacks to allow monsters without regular attacks to have combat spells.
 2005-10-16 20:11:34 +00:00
Enno Rehling
10e5dfb92e spell ids, compatibility list 2005-10-16 19:33:30 +00:00
Enno Rehling
40385e2d3e mapper should not try to load gamecode functions of objects 2005-10-16 19:19:40 +00:00
Enno Rehling
af447d3034 rename nomagic -> gray 2005-10-09 21:53:18 +00:00
Enno Rehling
31e3384165 compilation errors 2005-10-09 21:48:56 +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
Enno Rehling
873404d8f4 crashbugs in randenc und rostregen 2005-10-09 19:52:21 +00:00
Christian Schlittchen
9ba5ebedb9 wdw-Zauber angepasst 2005-10-09 15:13:39 +00:00
Enno Rehling
7f0e08dd07 uninitialized variable 2005-10-09 10:07:43 +00:00
Enno Rehling
72fd99987b typo, kompiliert nicht 2005-10-09 10:06:37 +00:00
Enno Rehling
73ed11b893 sinnvollere Fehlermeldung bei nicht-existierendem farcasting-ziel 2005-10-09 10:04:31 +00:00