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

2154 commits

Author SHA1 Message Date
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
d215d26f45 http://eressea.upb.de/mantis/view.php?id=762 
Teufelchen als Vertrauter einmal mit und einmal ohne Aura

Neue Vertraute haben kein mage-attribut gekriegt beim ersten lernen.
 2005-11-25 17:07:41 +00:00
Christian Schlittchen
82fc69254c turn-Datei wurde nicht aktualisiert 2005-11-21 21:22:00 +00:00
Enno Rehling
40ef16c53f removed warnings 2005-11-20 14:50:15 +00:00
Enno Rehling
6978b09a06 removed warnings for unused() 2005-11-20 13:04:01 +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
422008c0e2 exporting the origin of a faction to lua (so factions can be relocated) 2005-11-20 11:41:16 +00:00
Enno Rehling
7c2b1e3445 that stupid warning triggers too often for anyone to pay attention to it 2005-11-20 00:15:16 +00:00
Enno Rehling
802228db41 null-pointer check if no terrain was picked for terraforming 2005-11-19 15:54:16 +00:00
Enno Rehling
881f1ff2df terraforming from the mapper broke with last terrain-changes 2005-11-19 15:42:30 +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
4660c690a8 wyrms don't make room for upstart newcomers. 2005-11-18 21:12:27 +00:00
Enno Rehling
83b2feffa6 Wyrms are solitary creatures. 2005-11-18 21:02:29 +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
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
028753b06b - MACHEN ALLES "Wasser des Lebens" sollte jetzt gehen. 
- Alte Funktion entfernt.
 2005-11-06 11:33:19 +00:00
Christian Schlittchen
b34b63fd25 Fehlendes Include report.h 2005-11-06 08:53:17 +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
cc7a1d15bb it helps to include version.hpp 2005-11-01 20:49:58 +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
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
eba19999f4 noch mehr funktionen mit new_ prefix aus pool.h bekommen den entfernt. 2005-10-30 15:42:15 +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
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
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
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
adbefd89c5 Fixing order of libraries 2005-10-29 11:10:58 +00:00
Enno Rehling
13efa939c1 ao_daemon, not daemoneye 2005-10-26 20:44:49 +00:00
Enno Rehling
756b65b1ed functions need to be defined before used by items (before xml) 2005-10-26 20:30:02 +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
e67f9b0892 still fixing the seeds. mapper comes later 2005-10-26 19:47:28 +00:00
Enno Rehling
0e0f37d970 bugfix seed-registrierung 2005-10-26 19:02:45 +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
a306d0ebc8 bugfix antimagiekristall 2005-10-25 13:17:55 +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
193b69b049 new xml data 2005-10-25 13:02:55 +00:00
Enno Rehling
6107e84b54 making the mapper compile 2005-10-25 13:01:55 +00:00
Enno Rehling
19a7624fe8 making the mapper compile 2005-10-25 12:59:23 +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
f269ebbf75 listnames, total nutzlose funktion 2005-10-25 09:02:24 +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
dabbeb39a6 noch eine Stelle vergessen 2005-10-24 22:02:39 +00:00
Enno Rehling
f371ca5ef1 NEW_RESOURCEGROWTH define entfernt 2005-10-24 20:19:46 +00:00
Enno Rehling
4ce88dad13 removing the old NEW_RESOURCEGROWTh macro 2005-10-24 20:06:40 +00:00
Enno Rehling
5cc18d1e37 bugfix AMK 2005-10-23 15:11:22 +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
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