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

2084 commits

Author SHA1 Message Date
Enno Rehling
570055a493 kompiliert nun 2005-10-23 10:20:55 +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
1202578ab0 removing unused function (again) 2005-10-23 09:06:12 +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
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
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
3c3b1bad8a http://eressea.upb.de/mantis/view.php?id=725 
Beschreibung Gehirnschmalz

tage -> lernversuche
 2005-10-17 17:56:39 +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
114b40d85c http://eressea.upb.de/mantis/view.php?id=710 
Zauber "Süsse Träume" vermehrt Einheit nicht

bugfix static variables
 2005-10-16 21:08:22 +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
d4a0c6c06c only updating firstturn if it's less than before or was nul 2005-10-12 20:34:32 +00:00
Enno Rehling
6b27b2a0c2 updating firstturn from the server 2005-10-12 20:27:50 +00:00
Enno Rehling
ff761f22b3 bugfix mapper-initialization 2005-10-11 20:39:53 +00:00
Enno Rehling
e0f6999a4f typo 2005-10-11 20:39:16 +00:00
Enno Rehling
1e3877e8a2 irgend etwas am fixing des ozean-alters ist nicht richtig und zerstört die neuaussetzung. 2005-10-11 20:37:48 +00:00
Enno Rehling
14a3077f6e http://eressea.upb.de/mantis/view.php?id=718 
Nach 150 Runden ist eine neue Partei erlaubt.
 2005-10-10 04:59:54 +00:00
Enno Rehling
a9b704f6a2 Dummes Cisual Studio hat meine Datei versaut 2005-10-09 22:06:16 +00:00
Enno Rehling
3415216610 more verbose exception handling 2005-10-09 22:01:08 +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
12906232f1 calculating score based on unmodified skill-level (faster, more accurate). 2005-10-09 20:36:44 +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
fa929a855d Kräuterbeutel: WdL, nicht Holz, als Zutat. 2005-10-09 12:22:14 +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
Enno Rehling
a461d06aa6 Disabling multiplayer-marking again. 2005-10-09 09:10:55 +00:00
Enno Rehling
046290ebdb Bugfix: spellnames sind nicht von sp->info abhängig. 2005-10-09 09:09:51 +00:00
Enno Rehling
46cb474885 Zaubernamen weniger deutsch & Patzerfunktion vereinheitlicht 2005-10-09 02:10:03 +00:00
Enno Rehling
e208a2ba8d added exception handling 2005-10-09 01:19:44 +00:00
Enno Rehling
b6b5b9709b cleaning up the spell-scripts 2005-10-08 22:02:42 +00:00
Enno Rehling
8b0518690f always default-fumble to report failure. 2005-10-08 21:43:24 +00:00
Enno Rehling
9230a0a074 I must remember to load the spells, too 2005-10-08 21:34:00 +00:00
Enno Rehling
2cb9b7bdaa Fallback für zwei weitere Zauber in find_spellbyid 2005-10-08 20:04:13 +00:00
Enno Rehling
ea8539cb15 Zauber trollbelt war verloren gegangen. 
find_spellbyid bekommt ein Fallback für Zauber, die die ID gewechselt haben.
 2005-10-08 19:47:13 +00:00
Enno Rehling
2e897bfbf7 race special attack spells use name instead of id. 2005-10-08 19:22:56 +00:00
Enno Rehling
594683d077 replaced spellids by spellnames 2005-10-08 18:43:00 +00:00
Enno Rehling
f34f09e7b6 order of execution for XML parser changed. 2005-10-08 18:38:26 +00:00
Enno Rehling
c7c6f169cb Englische Namen für alle Zauber. 
Rassen-Spells in XML müssen keine ID mehr nutzen.
 2005-10-08 18:27:40 +00:00
Enno Rehling
fed680604a missing includes for spell.cpp 
bugfix memset in create_mage
 2005-10-08 16:14:15 +00:00
Enno Rehling
2602a8db67 Mehr const, weniger Warnungen. 
Bugfix für spelllist_add (aufsteigend sortiert)
 2005-10-08 15:44:40 +00:00
Enno Rehling
1771a81c52 Neues Datenformat macht Schluss mit der Speicherung von spell-ids im Datenfile. 2005-10-08 15:25:21 +00:00
Enno Rehling
128b5d0b9a spells, defined in XML 2005-10-08 11:45:45 +00:00
Enno Rehling
b3c4dda44a Messages als LUA-Objekte. Damit lassen sich jetzt auch von LUA aus lokalisierte messages an Parteien versenden. 2005-10-08 11:42:45 +00:00
Enno Rehling
6426004640 Neu: Zaubersprüche können in LUA programmiert werden, und per XML-Datei (siehe spells.xml) in ein Spiel integriert werden. 
Ich habe angefangen, die Item-erzeugenden Zauber aus dem Code in Skripte zu verlagern.
 2005-10-08 11:02:10 +00:00
Enno Rehling
fd364ba0f9 new name: nestwarmth 2005-10-03 21:55:39 +00:00
Enno Rehling
66fbb409a0 nein, anders... 2005-10-03 21:52:09 +00:00
Enno Rehling
1d09adb884 splitting old resource registration in two parts. 2005-10-03 21:46:57 +00:00
Enno Rehling
17958f9683 Armbrust aus dem Code genommen. 
Abbruch, wenn ein Item aus dem Datenfile nicht in den XML-Resourcen ist.
 2005-10-03 21:15:47 +00:00
Enno Rehling
5dfc2f08b6 Apfel, Nuss und Mandelkern (und Kekse) fleigen raus aus dem Source. 
Burgen fliegen aus dem Source.

XML reader unterstützt jetzt auch Gebäude mit mehreren Ausbaustufen.
 2005-10-03 20:59:11 +00:00
Enno Rehling
23d7205a8b removed I_GREATSWORD and I_RUSTY_GREATSWORD from the source. 2005-10-02 21:32:20 +00:00
Enno Rehling
b65917bb97 removed I_SWORD and I_RUSTY_SWORD from the source. 2005-10-02 21:11:17 +00:00
Enno Rehling
883840c460 new files added 2005-10-02 20:31:28 +00:00
Enno Rehling
afd1af92c9 changes to the Jamfile (add equipment.c) 2005-10-02 20:29:21 +00:00
Enno Rehling
49bd595d69 New code: 
"equipment-sets" in the XML definition files (equipment.xml) can define skills and items for a unit. these can be applied using the equip_unit() function (from both LUA and C).

I've rewritten the random first encounters and addplayer() functions to use these. As a result, there's now even less dependency on fixed item types in the source, and I can take more items out.
 2005-10-02 20:28:44 +00:00
Enno Rehling
5358c876d2 reanming SK_SWORD -> SK_MELEE (since all the axes use it, too and I get confused so easily) 2005-10-02 17:35:25 +00:00
Enno Rehling
74f03ab496 daemon -> demon 2005-10-02 17:34:00 +00:00
Enno Rehling
6b87faf047 First test to remove items from code: AXE and RUSTY_AXE are out. 
Rewriting the rust-spell. Now affecting armor as well (with lower chance)
 2005-10-02 17:04:16 +00:00
Enno Rehling
b04b01814b new, more informative format for the dropouts file 2005-10-02 16:25:27 +00:00
Enno Rehling
5edd84e47e removing unused code for reading the dropouts-file. 2005-10-02 16:20:11 +00:00
Enno Rehling
9f97148163 spawning of new braineaters moved into a separate LUA function which is not called for wdw. 2005-10-02 16:06:12 +00:00
Enno Rehling
a72a43c384 starting equipment & skills for new factions is read from the equipment.xml file instead of hardcoded. Makes give_starting_equipment a lot smaller and reduces the number of I_* item-constants used in the code. 2005-10-02 15:54:24 +00:00
Christian Schlittchen
1049ef4a76 NO_RANDOM_BRAINEATER fix 2005-10-02 15:33:50 +00:00
Enno Rehling
f7a17ff3d0 http://eressea.upb.de/mantis/view.php?id=712 
rusty shields disappear because of stupid reverse_lookup code.
 2005-10-02 13:31:56 +00:00
Enno Rehling
2d2ed6f7ea http://eressea.upb.de/mantis/view.php?id=712 
rusty shields disappear because of stupid reverse_lookup code.

removed a bit of dead code.
 2005-10-02 13:21:29 +00:00
Enno Rehling
dd9c6e50c2 Fixed a null-pointer crash in randenc. 
Dead code in economy removed.
 2005-10-02 07:33:21 +00:00
Enno Rehling
e240860486 http://eressea.upb.de/mantis/view.php?id=711 
rostiges schild -> rostiger schild
 2005-10-01 09:27:44 +00:00
Enno Rehling
ee64acff21 http://eressea.upb.de/mantis/view.php?id=684 
Straßen durch Wüste ohne Karawanserei

Der Code scheint okay zu sein, nur Altdaten nicht. Habe eine Korrektur-Routine eingebaut.
 2005-09-28 18:52:18 +00:00
Enno Rehling
130adacb43 http://eressea.upb.de/mantis/view.php?id=704 
Benennung und Beschreibung eines Monumentes

klappt jetzt, habe das erkennen von bereits benannten Gebäuden vereinheitlicht.
 2005-09-24 20:34:34 +00:00
Enno Rehling
a1daf2f3b2 Mehr Doppelspieler 2005-09-17 20:15:46 +00:00
Christian Schlittchen
b917430561 Diverser Kleinkram für WdW: 
- Papyrus-Dummy-Item
- NO_RANDOM_BRAINEATERS
- ...
 2005-09-11 20:16:04 +00:00
Enno Rehling
b915bf74f3 last of the GROWING_TREES defines 2005-09-11 08:16:31 +00:00
Enno Rehling
ec86c9a572 Prevent micro-islands from being extended. 2005-09-10 21:57:02 +00:00
Enno Rehling
bcf0b8d446 removed the old GROWING_TREES macro. 
Also, made sure starting regions always have at least a few trees and horses, because I'm sick and tired of the complaints.
 2005-09-10 21:09:51 +00:00
Enno Rehling
170eed6b62 put the faction's age into the CR 2005-09-08 22:55:31 +00:00
Enno Rehling
f175d0804d Noch mehr Doppelspieler 2005-09-08 22:25:56 +00:00
Enno Rehling
4ac9cf30e8 tote übergeben items nur bei gegenseitigem HELFE SILBER bzw. HELFE GIB 2005-09-08 21:41:39 +00:00
Enno Rehling
9f315c32aa Parteien mit leerem Passwort (Doppelspieler, etc) geben ihre Items nicht an Alliierte ab, sondern vernichten sie. 2005-09-08 21:15:06 +00:00
Enno Rehling
8276a63c1e http://eressea.upb.de/mantis/view.php?id=680 
Einheit verhungert und Gegenstände gehen verloren

Aauflösen von Einheiten vereinheitlicht, und einige alte #defines mitsamt Code entfernt.
 2005-09-08 19:03:42 +00:00
Enno Rehling
c1b275dad9 http://eressea.upb.de/mantis/view.php?id=698 
Auf der Einheit liegen -3 Wirkungen Schaffenstrunk.
 2005-09-08 18:38:14 +00:00
Enno Rehling
11f9e607ca Spell translations. 2005-09-03 09:27:01 +00:00
Enno Rehling
0ee59cf55e http://eressea.upb.de/mantis/view.php?id=694 
global warming "infection" not with regular glaciers
 2005-09-03 09:13:36 +00:00
Enno Rehling
118230a737 implemented global warming (glacier belts with age > 200 can melt) 2005-09-03 08:54:19 +00:00
Enno Rehling
b7ebf40866 Better version of the ocean-age fixes produces proper firewalls around the 
world
 2005-09-03 07:50:00 +00:00
Enno Rehling
d09071eff7 null-pointer crash when running with --lomem 2005-09-03 06:49:26 +00:00
Enno Rehling
0e74ca4ef7 stone golem -> stonegolem, for the last time 2005-09-03 06:29:29 +00:00
Enno Rehling
6ec1bbe52e Drawing borders around regions requires that oceans have an age, too. Fixed. 
Also, removing some unnecessary race-enums
 2005-09-03 00:30:03 +00:00
Enno Rehling
b87c87cea6 http://eressea.upb.de/mantis/view.php?id=693 
Meldung für fehlenden Gebäudeunterhalt nicht korrekt
 2005-08-22 20:43:10 +00:00
Enno Rehling
951ad4a615 oldrace young dragon had another space. 
updated todo-file
some indentation in battle.c
 2005-08-22 20:14:42 +00:00
Enno Rehling
a3bef667d1 initializing oldrace, sanity checks. 2005-08-22 20:10:03 +00:00
Enno Rehling
1b15838f4e Not saving more than 128 orders in the datafile (damn those script-kiddies) 2005-08-22 19:49:51 +00:00
Enno Rehling
16679a9346 bugfix spaces in oldraces. 2005-08-22 19:35:31 +00:00
Enno Rehling
ccfc5549af bugfix space-removal 2005-08-22 09:31:28 +00:00
Enno Rehling
b252b00163 Der server mag es nicht, wenn Rassen ein space im internal name haben, weil 
trigger den rassennamen ohne "" schreiben. also operiere ich die mal raus,
spaces soll man da auch nicht haben.
 2005-08-21 09:24:14 +00:00
Enno Rehling
923ea5bcf8 http://eressea.upb.de/mantis/view.php?id=683 
Name von Monumenten änderbar
 2005-08-20 18:04:09 +00:00
Katja Zedel
0127f3446c überladene drachen fix 2005-08-14 11:50:23 +00:00
Katja Zedel
5a756a03f0 neue wdw rasse 2005-08-14 11:48:02 +00:00
Enno Rehling
db7c4914f3 script-fix welcome-text für neue spieler. 2005-08-07 14:37:25 +00:00
Enno Rehling
e639a1258b autoseed, creating island controlled from script. 
bugfix empty orders in savefile
 2005-08-07 13:48:18 +00:00
Enno Rehling
3b671396c1 SCORE_MODULE fuer das tutorial (kompiliert sonst nicht, muss ich mir ansehen) 2005-08-01 07:58:55 +00:00
Enno Rehling
bfd26dc9b4 COMPATIBILITY macro removed, hasn't been used since item_type got introduced. 2005-07-31 19:49:04 +00:00
Enno Rehling
fc6e6d40dc when you delete an I_ enum, you must also delete the R_ enum that belongs to it. 2005-07-31 19:44:56 +00:00
Enno Rehling
f7502f08cf item-scores were broken 
removed laen shield and laen mail from the sorce and put them in the XML files - because I can.
 2005-07-31 19:22:14 +00:00
Enno Rehling
db82711cc3 falsche locale in undeadrise message 2005-07-31 18:45:42 +00:00
Enno Rehling
6ef380b824 falsche locale in maintenance_none message 2005-07-31 18:44:52 +00:00
Enno Rehling
3a2d23907a http://eressea.upb.de/mantis/view.php?id=657 
sea serpents didn't drop any items.
 2005-07-31 18:41:58 +00:00
Enno Rehling
4de62148fa http://eressea.upb.de/mantis/view.php?id=621 
kosmetischer fehler spell-level
 2005-07-31 17:49:46 +00:00
Enno Rehling
c9e8c80c60 race spoils 2005-07-31 17:48:50 +00:00
Enno Rehling
47cf1024f8 racespoils raus aus dem jamfile 2005-07-31 17:13:16 +00:00
Enno Rehling
62a51a8bf0 scores are now an optional module. 
spoils are moved to the XMl data, and the racespoils functions are greatly reduced (less LOC -> less bugs).

phoenix feather is a wdw-only item
 2005-07-31 16:07:02 +00:00
Enno Rehling
a6a98faebd http://eressea.upb.de/mantis/view.php?id=620 
Meldung über fehlenden Upkeep zum Wochenbeginn etwas klarer gemacht.
 2005-07-31 14:51:06 +00:00
Enno Rehling
8bee14a0ea translated two more ship movement messages to english. 2005-07-31 09:12:36 +00:00
Enno Rehling
7b0340b69c missing message type for english reports. 2005-07-31 08:52:52 +00:00
Enno Rehling
137e26e670 cleaning up armor structs 
rearranging code to avoid nullpointer-crashes
 2005-07-31 08:28:21 +00:00
Enno Rehling
d026b324fd uninitialized variables 2005-07-31 08:11:29 +00:00
Enno Rehling
e4d264681d null-pointer check neuer rüstungscode. 2005-07-31 07:42:13 +00:00
Enno Rehling
04ac02ebd9 armor_type wie weapon_type gelöst. Jetzt extern per XML definierbar. 
Monster versuchen, Waffen und Rüstungen zu behalten, ehe sie sich bewegen.
 2005-07-31 01:07:07 +00:00
Enno Rehling
0eb91f7ab7 http://eressea.upb.de/mantis/view.php?id=617 
monsters are shedding extra weight in a smarter way.
 2005-07-31 00:01:25 +00:00
Enno Rehling
e39b51bc13 base35 converter mit reverse-option 2005-07-28 22:26:18 +00:00
Enno Rehling
513bdef26c maximum persistent orders = 128 2005-07-28 13:20:36 +00:00
Enno Rehling
90f24a0ae4 neat trick to extract the origin from a faction in LUA 2005-07-28 12:42:46 +00:00
Enno Rehling
f33c875756 we can do this reading of orders from the savefile much faster if we remember how lists should be used. 2005-07-27 12:09:53 +00:00
Enno Rehling
200201b384 started limiting the maximum number of orders for a unit. 
removed num_migrants as it was not updated properly.
 2005-07-27 11:48:16 +00:00
Enno Rehling
8e260ce6be xml formatting errors 2005-07-27 10:21:20 +00:00
Enno Rehling
7efda2d265 a *lot* more English feedback for errors, spells, etc. 2005-07-27 09:23:54 +00:00
Enno Rehling
d78123a924 bugfix in yet another message (will it ever stop) 
more error messages for the parser to make them easier to find.
 2005-07-26 22:40:53 +00:00
Enno Rehling
b1703d27d4 local linux fixes 2005-07-26 21:03:08 +00:00
Enno Rehling
c088273a9d Even more message fixing. 2005-07-26 21:02:04 +00:00
Enno Rehling
5ebac77a1c proper translation of items in the faction pool. 2005-07-26 20:39:36 +00:00
Enno Rehling
30e4a626f2 stupidly mucking about with message syntax. 2005-07-26 20:13:53 +00:00
Enno Rehling
823179a315 Number of new players in summary counted properly. 2005-07-26 20:03:55 +00:00
Enno Rehling
ab3dd3bfeb falsche reihenfolge message-parameter 2005-07-26 19:44:12 +00:00
Enno Rehling
aabb1ef180 $string() gibt es natürlich (?) nicht. 2005-07-26 18:54:23 +00:00
Enno Rehling
c9fa3abcac new iteminfos in english. moved gemran iteminfos from separate files into xml. 
reset UFL_LONGACTION before a turn, so I can run several turns from a single script run.
 2005-07-26 18:14:13 +00:00
Enno Rehling
aa9a89d603 bugfix autoseeding. this should no longer make those gigantic islands we've had before. 2005-07-26 16:37:07 +00:00
Enno Rehling
ba29935965 magic item creation gets a translated message 2005-07-26 15:26:53 +00:00
Enno Rehling
e4bdec8e7c crwritemap has been exported to lua as write_map(filename). 2005-07-26 10:50:00 +00:00
Enno Rehling
8e2225e4d5 translating a couple more spells 
removing unnecessary includes of spell.h
 2005-07-26 10:17:43 +00:00
Enno Rehling
f054d324aa NEW RULE: aftermath marks either all or none of the fighters in an army (side) as having had a long battle. 2005-07-26 10:16:38 +00:00
Enno Rehling
d674bf8f13 Automatic conversion LIEFERE -> @GIVE 2005-07-25 21:14:52 +00:00
Enno Rehling
58335dd9e8 Translations for herbs and potions 2005-07-25 20:13:10 +00:00