Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,485 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

2408 Commits

Author SHA1 Message Date
Enno Rehling da12fb8586 lua properties for get/set familiar. 2006-04-22 11:32:28 +00:00
Enno Rehling 7db317b2e0 passengers on drifting ships receive a message. 2006-04-17 18:48:24 +00:00
Enno Rehling 4c3e912a30 added the forgotten bindings to gamecode 2006-04-17 10:08:13 +00:00
Enno Rehling 139fceb5f8 http://eressea.upb.de/mantis/view.php?id=885 
und und
 2006-04-16 23:16:19 +00:00
Enno Rehling 4d82a5eca3 saving also on 'S' (since F2 isn't reliable) 2006-04-16 17:26:50 +00:00
Enno Rehling 7c80bbfebb lua-skripting für gmtool fertig 2006-04-16 16:32:14 +00:00
Enno Rehling 1e5aeac0e5 familiarmage attribute in CR 
bindings for the GM tool (selection, current region)
 2006-04-16 16:11:16 +00:00
Enno Rehling 288961e38a lua bindings: 
- moved gamecode-related ones to a new object file
- added bindings to the gmtool
- fixed scripts that used set_brain()
 2006-04-16 14:18:09 +00:00
Enno Rehling ec1f6c9963 lua-gmtool kompiliert unter linux 2006-04-16 13:04:52 +00:00
Enno Rehling 4316903e9a lua for the gmtool 2006-04-16 12:48:55 +00:00
Enno Rehling b74a0b6b50 a little more precision on the "cannot move" error messages. again. 2006-04-16 10:50:24 +00:00
Enno Rehling 85efcd6511 Ausgabefehler Kampfreihen 2006-04-15 22:34:03 +00:00
Enno Rehling 34fce9b8a7 - removing cruft 
- fixing print_fighters() since list is not ordered by status anymore
 2006-04-15 22:10:57 +00:00
Enno Rehling 573d283e92 'H': highlight (by terrain/units/faction/ships/none) 
'T': tag (by terrain/units/faction/ships/none)
't': tag/untag current region
 2006-04-14 16:56:48 +00:00
Enno Rehling 0aa0be8557 unnecessary function 2006-04-13 21:41:27 +00:00
Enno Rehling 0b63b23d34 Heer-Nummerierung andersrum. 2006-04-13 19:54:24 +00:00
Enno Rehling 4d8ed2c854 Simplified the combat code, removing battle::fighters and putting things in lists rather than vectors. 
Removed the unnecessary shuffling and sorting that takes quite some time.
Fixed a few bugs in ally-selection, I think.
 2006-04-13 17:16:15 +00:00
Enno Rehling 50b94b730d New and simplified combat rules. 
To activate, define SIMPLE_COMBAT in your settings.h
 2006-04-10 21:13:22 +00:00
Enno Rehling 5e57e78818 fix familiar-fixes 2006-04-09 19:19:18 +00:00
Enno Rehling 11bc581285 gmtool, angefangen highlighting zu implementieren. 
bugfixes letzter eressea-commit
 2006-04-09 18:13:47 +00:00
Enno Rehling 2f8e9e2053 on a hunch, checking that number of mages is correct. Also, removing invalid familiars. 2006-04-09 18:10:57 +00:00
Enno Rehling 64ca5c666e log_* routines write complete log to logfile, abbreviated (last message...) only to stderr. 2006-04-09 17:53:45 +00:00
Enno Rehling fc70d1d66a fix for fix_familiars complaining about goblins. 
indentation fixes.
 2006-04-09 17:35:15 +00:00
Enno Rehling 8c2e545698 Adresse fuer eressea ist upb.de 2006-04-09 17:30:05 +00:00
Enno Rehling 0b88d46667 http://eressea.upb.de/mantis/view.php?id=879 
- kopflose, blutleere Wyrme repariert.
 2006-04-09 14:26:02 +00:00
Enno Rehling 2f7ef14898 http://eressea.upb.de/mantis/view.php?id=863 
- Gewichtsberechnung für TRANSPORTIERE
 2006-04-09 10:55:41 +00:00
Enno Rehling c33cd598b5 - summondragon parameter list 
- number of new players.
 2006-04-09 09:31:16 +00:00
Enno Rehling 71ed9ee27a http://eressea.upb.de/mantis/view.php?id=878 
Falsche Regionsparameter für Drachenruf
 2006-04-08 06:55:04 +00:00
Enno Rehling 1dd85e6a02 http://eressea.upb.de/mantis/view.php?id=875 
Folge Schiff hat falschen Befehl in Fehlermeldung
 2006-04-08 06:48:54 +00:00
Enno Rehling 33c1741fff http://eressea.upb.de/mantis/view.php?id=877 
Error 187 passiert nur bei Bewegung, nicht länger im Kampf. Meldung angepasst.
 2006-04-08 06:44:11 +00:00
Enno Rehling 07fbf26a4a http://eressea.upb.de/mantis/view.php?id=876 
- Rundenzählung für Parteien überarbeitet, noch einmal. Sollte jetzt endlich zu den Regeln passen.
 2006-04-07 21:49:38 +00:00
Enno Rehling 029a187be0 -O ausschalten 2006-04-04 20:26:31 +00:00
Enno Rehling 0c5ff9f447 http://eressea.upb.de/mantis/view.php?id=868 
Die "Akademie der Künste" aus dem Künstlerwettbewerb wirkt auf alle Talente
 2006-03-26 22:01:13 +00:00
Enno Rehling 3145295ad4 http://eressea.upb.de/mantis/view.php?id=869 
BEWACHE nach "langen" Kampf nicht möglich; Fehlermeldungen nach "langen" Kampf

Noch ein Flag eingeführt. Hoffe, dass das klappt.
 2006-03-26 21:49:37 +00:00
Enno Rehling a14d57f32d made the save function work, and not print so much (quiet now understands 
'real quiet' as anything >=2 in some places).
Made the listbox code handle PNEXT and PPREV, very helpful for the faction
list.
 2006-03-26 21:14:35 +00:00
Enno Rehling dda37aaee6 http://eressea.upb.de/mantis/view.php?id=870 
Eigener Block für BOTSCHAFTen im NR

Ausserdem den ungenutzten REPORT Befehl entfernt.
 2006-03-26 18:26:52 +00:00
Enno Rehling a04cb3efbd http://eressea.upb.de/mantis/view.php?id=871 
Units with FIGHT FLEE|NOT get -1 in tactics (implementation bug fixed)
 2006-03-26 09:36:55 +00:00
Enno Rehling a4f3784cb3 even less refreshing. 2006-03-26 00:08:34 +00:00
Enno Rehling 6da812e00c missing project file for VC7.1 2006-03-25 18:10:33 +00:00
Enno Rehling 34d5a238a3 improving the update speed of curses windows over my slow ssh connection, 
less redraws.
 2006-03-25 18:05:22 +00:00
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 f261bf2f5b http://eressea.upb.de/mantis/view.php?id=853 
Einheiten die Goliathwasser benutzt haben sind überladen

- Gewicht von Pferden war falsch berechnet.
 2006-02-26 18:03:16 +00:00
Enno Rehling 96941e04f2 http://eressea.upb.de/mantis/view.php?id=859 
- Insekten können durch Gletscher transportiert werden
- Drachen können aus Gletschern wegfliegen

Problem wa, dass das aRCTIC_REGION flag an der region, nicht dem terrain abgefragt wurde. ohauerha.
 2006-02-26 17:28:55 +00:00
Enno Rehling cc9714fca6 http://eressea.upb.de/mantis/view.php?id=847 
Frisch auferstandene Untote kämpfen mit

- join_allies checkt jetzt auf UFL_ISNEW
 2006-02-26 15:58:44 +00:00
Enno Rehling 1d0bbfd0b8 http://eressea.upb.de/mantis/view.php?id=860 
- Frische Untote führen lange Befehle aus.
 2006-02-26 15:55:43 +00:00
Enno Rehling d5b6803137 http://eressea.upb.de/mantis/view.php?id=845 
Vertrauter hat keine Zauber
- Korrekturroutine komplett
 2006-02-26 15:48:56 +00:00
Enno Rehling d598babbb1 http://eressea.upb.de/mantis/view.php?id=845 
- Vertraute haben keine Zauber, korrektur-routine.
 2006-02-26 14:08:19 +00:00
Enno Rehling 6ed9ea2a9b call create_mage() for familiars 
created a new lua file for familiar specializations, not really any content for now.
 2006-02-26 13:24:16 +00:00
Enno Rehling c78f64de00 http://eressea.upb.de/mantis/view.php?id=845 
- cry havoc when trying to apply spells to a non-mage.
 2006-02-26 13:14:46 +00:00
Enno Rehling caab8471ed http://eressea.upb.de/mantis/view.php?id=856 
Durchreisemeldungen fehlen

Kleiner Bug bei der Änderung von attrib::nexttype
 2006-02-26 11:59:58 +00:00
Enno Rehling 23247f1831 avoiding a_select some more, and removing the unused compare-functions 2006-02-26 11:12:25 +00:00
Enno Rehling 5c474b9eb7 a_select is not fast, so we try to avoid it 2006-02-26 11:09:00 +00:00
Enno Rehling 318f348f27 use snowman 2006-02-26 00:59:49 +00:00
Enno Rehling 3fb3e7b201 New way of storing attrib-lists should make it faster to find a specific one and jump over entire classes of attribs. 2006-02-25 00:12:48 +00:00
Enno Rehling 2ab8cc7564 - report_building() faster 
- indentation cleanup
 2006-02-20 21:24:09 +00:00
Enno Rehling b7552f0d06 - New random number generator 
- Faster get_pooled/use_pooled
- faster peasants()
- faster plagues()
- faster horses()
 2006-02-19 22:43:56 +00:00
Enno Rehling dceb83c6a7 The incomplete fspecial functions cause quite a bit of attribute-lookups, so I'm putting them in a #define until they get implemented (if ever). 
#define KARMA_MODULE is you want to use fspecial in the future.
 2006-02-17 22:59:03 +00:00
Enno Rehling da213e5f16 shock: apply also to units with 0 people, because they need to e.g. kill familiar-attributes. 2006-02-17 17:47:11 +00:00
Enno Rehling 61a6a52665 Bessere hashgröße für seenhash 2006-02-14 23:03:49 +00:00
Enno Rehling 7d856b43da Extrem blöder Bug in Schneemann-Routine 2006-02-12 23:37:56 +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 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 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 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 d63090111d return statement in void function = evil 2006-02-11 08:31:18 +00:00
Enno Rehling d5c94df710 the awkwardly named 'young tree' is now called 'sapling' 2006-02-10 22:24:20 +00:00
Enno Rehling 127f32d0ef removing unused attribute (aggressive) 
fixed normalvariate
familiars, ignore missing init function
 2006-02-10 22:10:41 +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 a66e90c25b at_allince (WDW-feature?) gefixt. 2006-02-10 20:38:07 +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 e02a7afb78 do not init familiars without an init function. 2006-02-09 20:24:12 +00:00
Enno Rehling 2db05460a3 (old eressea binaries) 
this is still crashing, but not due to familiars, i think.
 2006-02-09 20:06:31 +00:00
Enno Rehling b654c89773 due to lua not being available, there are no familiars 2006-02-09 20:01:06 +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 3248053efe Messages benutzen alte Hashfunktion für Typ-Key. 2006-02-07 21:31:55 +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 fc0e58bf82 Anzeige des erforderlichen Bautalents bei der WdW-Pyramide 2006-02-05 18:21:11 +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 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 3feb139071 name in message doesn't match name in code. 2006-02-05 08:52:08 +00:00
Enno Rehling adaf410d37 inlined code 2006-02-04 23:45:20 +00:00
Enno Rehling e119a29142 inline optimizations for string functions 
a little more speed for locale_string (less strcmp)
 2006-02-04 23:41:23 +00:00
Enno Rehling 9a343df8fc more intelligent hashing = less divisions 2006-02-04 21:09:16 +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 4b0074cb3a don't use MT library for release 2006-02-04 13:08:44 +00:00
Enno Rehling 74b15fcd70 global warming only in summer - fix 2006-02-04 11:59:03 +00:00
Enno Rehling fcbc834a2b global warming only in summer 2006-02-04 11:54:51 +00:00
Enno Rehling f2e2ec4e67 restoring old indentation-style for b, sh display 2006-01-29 23:17:38 +00:00
Enno Rehling 5230bfd473 LUA: making faction.info writeable 2006-01-29 22:52:42 +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 3a313515c0 you should be able to guard even after combat (and if UFL_MOVED is set). 2006-01-29 15:50:38 +00:00
Enno Rehling 7580c0fd72 doppelspieler 2006-01-29 15:11:20 +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 584cea02ed fixed a few includes, problem caused by the header move yesterday 2006-01-29 08:31:54 +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 6c6c1174d8 Speeding up the hashing in findtoken even more. 2006-01-25 20:40:19 +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 779c790f6d who would have guessed that the % operator in findtoken would show up so prominently in a code profile? 2006-01-24 21:44:20 +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 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 6e0e9543cf http://eressea.upb.de/mantis/view.php?id=796 
typo in spell
 2006-01-22 02:07:27 +00:00
Enno Rehling 5dd2542586 Fehler bei neuem itemlisten-argument 2006-01-21 18:10:46 +00:00
Enno Rehling 9c8eb1028f Gewichtsanzeige eindeutiger. 2006-01-21 09:58:11 +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 6df45d2a93 weight, cargo & capacity in the CR. 2006-01-18 23:12:59 +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 81d3e94b6f small bug in raceinfo construction 2006-01-18 22:48:49 +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 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 c1edcffe85 http://eressea.upb.de/mantis/view.php?id=784 
- Falsche Katapultpreise
 2006-01-15 13:54:12 +00:00
Enno Rehling bde8256028 http://eressea.upb.de/mantis/view.php?id=788 
- Muschelmeldung
 2006-01-15 13:44:52 +00:00
Enno Rehling 7ad5ed06cb number of new players in statistics corrected. 2006-01-15 11:05:23 +00:00
Enno Rehling c768096df3 What the hell was the \b supposed to do? it fucks up the output! 2006-01-14 09:45:42 +00:00
Enno Rehling 2ac568cfa7 compile-fix 2006-01-13 23:11:50 +00:00
Enno Rehling ba0851da7a There is probably no good way to do this in a CR: writing out a list of missing objects in a message object. 2006-01-13 22:30:24 +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 f1b344f7e9 syntaxfic claimable 2006-01-08 11:03:57 +00:00