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

4661 Commits

Author SHA1 Message Date
Enno Rehling 8fbcf3f379 Neue Option für schnelleres Samenwachstum. 2021-02-16 10:12:04 +01:00
Enno Rehling cc5e062b68 https://bugs.eressea.de/view.php?id=2724 
Magieresistenz reparieren.
 2021-02-16 10:12:04 +01:00
Enno Rehling d03face3c1 simplicate and add more lightness 2021-02-16 10:12:04 +01:00
Enno Rehling 31f589e76f https://bugs.eressea.de/view.php?id=2716 
improved messages when following a ship.
 2021-02-16 10:12:04 +01:00
Enno Rehling 8ef95e6729 https://bugs.eressea.de/view.php?id=2716 
Bei FOLGE Schiff muss das Zile nicht in der gleichen Region sein!
 2021-02-16 10:12:04 +01:00
Enno Rehling f09bed10b7 personen mit racename können eh nicht übergeben werden, code kann man sich sparen. 2021-02-16 10:12:04 +01:00
Enno Rehling af2dadfc8e https://bugs.eressea.de/view.php?id=2719 
fix shapeshifted units without a timer
do not transfer shapeshift spell when giving to a new unit.
 2021-02-16 10:12:04 +01:00
Enno Rehling fb294d9118 add a debug option, -D 
usually do not need to save the game when debugging
 2021-02-16 10:12:04 +01:00
Enno Rehling f4acff67e4 https://bugs.eressea.de/view.php?id=2720 
report study costs to the correct unit
 2021-02-16 10:12:04 +01:00
Enno Rehling 0bbadf2a66 https://bugs.eressea.de/view.php?id=2718 
Better error messages for drifting ship.
 2021-02-16 10:12:04 +01:00
Enno Rehling e97f80ad3c eliminate some high-level warnings 2021-02-16 10:12:04 +01:00
Enno Rehling da83e3f2f6 coverity CID 215803 Dereference after null check 2021-02-16 10:12:04 +01:00
Steffen Mecke 6bba2a2ed7 PR 929: fix memory leak 2021-02-16 10:11:23 +01:00
Enno Rehling 219ec117c6 fix gcc 10 compatibility 2021-02-16 10:09:14 +01:00
Enno Rehling b7b6c4b668 https://bugs.eressea.de/view.php?id=2723 
Meermenschen konnten nicht aus fahrenden Schiffen springen.
 2021-02-07 12:52:35 +01:00
Enno Rehling dde2f3644e fix gcc complaints 2021-02-05 22:39:27 +01:00
Enno Rehling e8aff3b431 https://bugs.eressea.de/view.php?id=2722 
Weitere Schiffe sind nicht gesegelt, wenn ein Schiff Startregion = Ziel hatte.
 2021-02-05 22:36:30 +01:00
Enno Rehling 2103707489 fix follow_ship crash 
error message for non-captains was not generated
 2021-01-03 10:22:17 +01:00
Enno Rehling c02107d037 report monsters if they are only seen by lighthouses 2020-12-10 13:05:51 +01:00
Enno Rehling ddd37688f9 https://bugs.eressea.de/view.php?id=2714 2020-12-10 11:58:52 +01:00
Enno Rehling 67025b65d0 https://bugs.eressea.de/view.php?id=2714 
fix test for seen_travel
 2020-12-09 20:32:09 +01:00
Enno Rehling 592fe18779 Bei der Durchreise konnte man große Monster immer sehen. 
https://bugs.eressea.de/view.php?id=2714
 2020-12-08 23:06:31 +01:00
Enno Rehling ba3b608296 vs 2019 build for x86, not x64 2020-12-08 22:02:46 +01:00
Enno Rehling 65246bc35e Enable new resource visibilty by default. 2020-12-06 19:22:59 +01:00
Enno Rehling 1507090300 avoid type conversion warning in VS2019 2020-12-06 16:02:54 +01:00
Enno Rehling 0cfdee0218 https://bugs.eressea.de/view.php?id=2712 
Make the reports.lua script not break passwords of
 new players.
 2020-12-06 15:47:47 +01:00
Enno Rehling e23d5e6949 remove bad assumption 
units on ships are not all at the end of the list, or ordered.
 2020-12-06 15:47:47 +01:00
Enno Rehling e4e06dfcbe bug 2710 ships moving in circles break guard 2020-12-06 15:47:47 +01:00
Enno Rehling fe463a9f44 bug 2710: add tests, fix land movement 2020-12-06 15:47:47 +01:00
Enno Rehling b50994bb9c add a test for famililar skill modifiers. 2020-12-06 15:47:47 +01:00
Enno Rehling 69c4595282 Build in Visual Studio 2019 
simplify test_create_faction
rewrite lots of tests
 2020-12-06 15:47:47 +01:00
Enno Rehling 9e4e9c2d3e fix integer conversion warning 2020-12-06 15:47:47 +01:00
Enno Rehling 0ee4afc023 initialize building_type.magres 2020-12-06 15:47:47 +01:00
Enno Rehling 65488eb2f8 fix undead spawn chance. 
disable commands for EX.
 2020-12-06 15:47:47 +01:00
Enno Rehling 53fac9ab58 variable-based monster spawns 2020-12-06 15:47:47 +01:00
Enno Rehling 1293b9f27c disable iwyu, it is reporting garbage 2020-12-06 15:47:47 +01:00
Enno Rehling c39bbed2b5 lighthouses protect from drifting 
do not check for maintenance in update_lighthouse, but when the lighthouse is used.
 2020-12-06 15:47:47 +01:00
Enno Rehling 68b409e1e7 ships on a ROUTE can drift. 2020-12-06 15:47:47 +01:00
Enno Rehling 814fda43a0 Regentanz / Segen der Erde 
Der Effekt soll angeblich nur für Bauern gelten, nicht für Spieler.
 2020-12-06 15:47:47 +01:00
Enno Rehling 8c62bd95cd Refactor the wage function for readability. 
Add a test for wages at different castle sizes.
 2020-12-06 15:47:47 +01:00
Enno Rehling 6868cbb928 screw you, iwyu 2020-12-06 15:47:47 +01:00
Enno Rehling 7eb26db2ec move gcc-specific signal handling out of main.c 2020-12-06 15:47:47 +01:00
Enno Rehling 10cafcbdec pointer out of scope 2020-12-06 15:47:47 +01:00
Enno Rehling be17f600eb resource visibility, code clarification. 2020-12-06 15:47:47 +01:00
Enno Rehling 7987317697 add a setting for an alternate resource discovery rule. 2020-12-06 15:47:47 +01:00
Enno Rehling 8cabd04b75 division by zero error 2020-12-06 15:47:47 +01:00
Enno Rehling a3f55de9a7 teachers do not need to be in an academy. 
remove source files for academy.
 2020-12-06 15:47:47 +01:00
Enno Rehling 0c080ad7dd coverity complains about possibly missing warden. 2020-12-06 15:47:47 +01:00
Enno Rehling 2c71e7fb82 start version 3.26 development Q4/2020 2020-12-06 15:47:47 +01:00
Enno Rehling f78aa507f8 https://bugs.eressea.de/view.php?id=2701 
fix the academy
make academy, curses and potions work for LERNE AUTO
remove E3 study.speedup
 2020-12-06 15:47:47 +01:00
Enno Rehling 4e9bc53288 avoid division by zero for uninitialized btype->magres fractions 2020-11-07 21:28:25 +01:00
Enno Rehling 44ce77e0c4 allow setting region age from lua 2020-10-14 18:55:06 +02:00
Enno Rehling 79924f0551 disable iwyu 2020-10-12 08:52:05 +02:00
Enno Rehling 4a7dadfb9b make regions age only once someone discovers then 2020-10-12 08:47:54 +02:00
Enno Rehling c7aab36c6e GIB KOMMANDO erst nach drittem BETRETE 2020-09-24 19:16:46 +02:00
Enno Rehling 513e448976 academy changes light: teacher does not need to be in an academy 2020-09-11 21:58:42 +02:00
Enno Rehling 573404e390 https://bugs.eressea.de/view.php?id=2699 
Sichtbarkeit aus Leuchttürmen korrigiert.
 2020-09-11 21:35:35 +02:00
Enno Rehling ba39de9d25 Fix CR output for list of regions 
Add pvp/pve battle statistics
 2020-09-05 23:08:44 +02:00
Enno Rehling 712e1c3052 FOLGE SCHIFF repariert. 
https://bugs.eressea.de/view.php?id=2698
FOLGE generell verbessert, so daß man mehrere FOLGE Befehle setzen kann.
Bugfix: findship findet auch "leere" Schiffe, der Caller muss jetzt auf sh->number testen.
Schiffe und Burgen können ab sofort die selben IDs benutzen.
Befehlsreihenfolge: FOLGE erst nach VERLASSE/GIB
 2020-09-03 21:42:38 +02:00
Enno Rehling d9a0bc7016 undo the crazy region_id hack. 
accept that the CR is what it is, and it has a coordinate type.
 2020-08-29 10:43:42 +02:00
Enno Rehling f95549a91a Fehlendes \n bei einfachen attributen im CR 2020-08-23 21:28:15 +02:00
Enno Rehling 9c71139bf4 add region_id to messages that include a region. 2020-08-23 20:55:58 +02:00
Enno Rehling 708abf4997 CR version 69, new attribute: section 
MESSAGE.section replaces MESSAGETYPE.section
 2020-08-23 20:19:30 +02:00
Enno Rehling 7ddb7bc181 fix a TODO and a coverity warning. 2020-08-16 21:19:50 +02:00
Enno Rehling b4fb721db4 make var_copy_regions not leaak (coverity) 2020-08-16 21:17:23 +02:00
Enno Rehling 740f4a568b refactor new_border's relationship to nextborder. 
loading a connection was unnecessarily changing nextborder.
 2020-08-16 20:39:08 +02:00
Enno Rehling e9baa06a63 remove existing roads from oceans. 
new datafile version!
 2020-08-16 20:32:19 +02:00
Enno Rehling d53a901d8a https://bugs.eressea.de/view.php?id=2694 
when terraforming, remove roads.
 2020-08-16 20:04:56 +02:00
Enno Rehling 11ce5a2f32 remove deprecated report functions 2020-08-16 16:00:30 +02:00
Enno Rehling d4400bb583 remove deprecated init_order_depr 2020-08-16 16:00:30 +02:00
Enno Rehling 2e44e2dd09 eliminate deprecated function. 2020-08-16 16:00:30 +02:00
Enno Rehling bf00a9a994 create_data: remove short-lived allocation. 2020-08-16 16:00:30 +02:00
Enno Rehling f7dc15b64f move_cmd caller no longer has to call init_order. 
refactor move_cmd to be more like other command processors.
 2020-08-16 16:00:30 +02:00
Enno Rehling 734614ab6f deal with gcc's -Werror=switch 2020-08-16 16:00:30 +02:00
Enno Rehling aa28ad323a LOCALE command: do not delete orders with incomplete translations 
Instead, we let the player fix them from echeck warnings.
 2020-08-16 16:00:30 +02:00
Enno Rehling 7759f7840a VERGESSE <talent> Optimierung wie bei LERNE [AUTO] 
Kein Grund, das in der Datenbank zu speichern.
 2020-08-16 16:00:30 +02:00
Enno Rehling b4e0640c08 add a happy-case test for follow_unit 2020-08-16 16:00:29 +02:00
Enno Rehling afb7b4f8e8 Test error message when following yourself. 2020-08-16 16:00:29 +02:00
Enno Rehling b657873488 let swimming and flying units follow a ship 2020-08-16 16:00:29 +02:00
Enno Rehling 05a200698a https://bugs.eressea.de/view.php?id=2479 
Einheiten folgen sich selbst nicht.
Remove unused copy of follow_ship logic from follow_unit.
 2020-08-16 16:00:29 +02:00
Enno Rehling 55704cfce8 Parser fallback to latin1 when detecting invalid utf-8 2020-08-16 16:00:29 +02:00
Enno Rehling d5f3bf7aed https://bugs.eressea.de/view.php?id=2638 
flying units may leave a ship on the ocean.
 2020-08-16 16:00:29 +02:00
Enno Rehling 73df4adde7 https://bugs.eressea.de/view.php?id=2676 
Neue Meldung für Konvois mit zu wenigen Kapitänen.
 2020-08-16 16:00:29 +02:00
Enno Rehling 043cb88d91 https://bugs.eressea.de/view.php?id=2629 
make ship_ownernot test u->number, hope that wasn't important.
 2020-08-16 16:00:29 +02:00
Enno Rehling d55cfb8cbf https://bugs.eressea.de/view.php?id=2689 
Implement a working LOCALE command.
OBS: Throws away any command that isn't easy to translate.
 2020-08-16 16:00:29 +02:00
Enno Rehling 6c2f6a98eb Reduce weight limit, lighthouses also show all dragons. 2020-08-16 16:00:29 +02:00
Enno Rehling 19a2a69f33 Lighthouse: only show large swimming units (more than 10 weight). 
Eliminate RCF_INVISIBLE and the spell race.
 2020-08-16 16:00:29 +02:00
Enno Rehling 90511b434c update test for lighthouse visibility 2020-08-16 16:00:29 +02:00
Enno Rehling 7cedc4c9dd quick performance improvement for scale_number 2020-08-16 16:00:29 +02:00
Enno Rehling beb673a28b spotting monsters from lighthouses 2020-08-16 16:00:29 +02:00
Enno Rehling 68e2a6e892 tree growth is rounded up. 2020-08-16 16:00:29 +02:00
Enno Rehling 6ccaaee4ea report 2682: simplify tree growth 
each spring, 2/3 of all saplings become trees over a 6 week period (1/9 per week).
 2020-08-16 16:00:28 +02:00
Enno Rehling b2689e3a9e Bug 2621: Fehlermeldung bei fehlender Anzahl 
bei Personen- und Schiffsübergaben.

closing https://bugs.eressea.de/view.php?id=2621
 2020-08-16 16:00:28 +02:00
Enno Rehling 09c9ba32eb small bug: argument is not const. 2020-08-16 16:00:28 +02:00
Enno Rehling 6d542327f9 bug 2660 delayed canibalism 
monsters now eat each other in randenc.
 2020-08-16 16:00:28 +02:00
Enno Rehling d0149f334f test for new parser behavior. 2020-08-16 16:00:28 +02:00
Enno Rehling a3300d5b59 fix parser crash from turn 1179 2020-08-16 16:00:28 +02:00
Enno Rehling 9e3dc18daa bug 2684: update sp_showastral and sp_viewreality. 
add more messages
add unit tests
closes https://bugs.eressea.de/view.php?id=2684
 2020-08-16 16:00:28 +02:00
Enno Rehling b06f3cf0e2 Bug 2684 Astraler Blick 
Old implementation was bad, using set_observer is better. Still missing a test, but improved the one for sp_viewreality, which is almost doing the same thing - adaptation should be easy.

Fixes https://bugs.eressea.de/view.php?id=2684
 2020-08-16 16:00:28 +02:00
Enno Rehling e80701ef35 Allow alternative names for some spells. 2020-08-16 16:00:28 +02:00
Enno Rehling a5bca33bf7 fake wormhole in test had negative size 2020-08-16 16:00:27 +02:00
Enno Rehling a5b39962fd make it impossible to create buildings with size 0 2020-08-16 16:00:27 +02:00
Enno Rehling 2d39641e3f Bug 2668 Spruchstärke Ritual der Aufnahme 
Zauber sollen force benutzen, nicht level.
 2020-08-16 16:00:27 +02:00
Enno Rehling 0c9153396c Bug 2683: fix buildings with size 0 
Fixing the symptoms, not the cause, becasue I don't know how this happened.
 2020-08-16 16:00:27 +02:00
Enno Rehling 76468197d7 empty convoys cannot be built on. 2020-08-16 16:00:27 +02:00
Enno Rehling 1eaa6a9ec4 Bug 2680: shapeshift spell cannot be cast twice. 
Add a message and don't pay for the failed spell.
 2020-08-16 16:00:27 +02:00
Enno Rehling e5be92da19 Bug 2679: Nur Bergwächter bewachen Eisen. 2020-08-16 16:00:27 +02:00
Enno Rehling 183981f3c7 bug 2678: fix trade_needs_castle 
The logic for "insects do not need castles in deserts or swamps" was broken.
 2020-08-16 16:00:27 +02:00
Enno Rehling c35ba4cf92 stop showing unhandled keycodes in status 2020-08-16 16:00:27 +02:00
Enno Rehling 15f2e014d2 make coverity understand that there is no buffer overflow here. 2020-08-16 16:00:27 +02:00
Enno Rehling 515fcb3c86 Lighthouse shows roads in both CR and NR. 
This closes bug 2669.
 2020-08-16 16:00:27 +02:00
Enno Rehling 0ea9717b5a bug 2674 fix null-ptr deref 2020-08-16 16:00:27 +02:00
Enno Rehling 40493bdc64 bug 2674 send message to player, not monsters 2020-08-16 16:00:27 +02:00
Enno Rehling ed0b7f8af2 Durch GIB "leer" gewordene Schiffe können nicht sinken. 2020-08-16 16:00:27 +02:00
Enno Rehling dee8b306d0 update default version number 2020-08-16 16:00:26 +02:00
Enno Rehling 276db404ba bug 2673 ignore commands that have fewer than 2 characters. 2020-08-16 16:00:26 +02:00
Enno Rehling f9c3f74117 Bug 2670 trim &nbsp; and others from strings. 2020-08-16 16:00:26 +02:00
Enno Rehling 83232eb556 remove legacy filereader code 2020-08-16 16:00:26 +02:00
Enno Rehling e19b386e7f fix tests for parsing single-letter keywords. 2020-08-16 16:00:26 +02:00
Steffen Mecke 5455037dbc fix NOTLOST items lost in battle 2020-08-16 16:00:26 +02:00
Enno Rehling 6a9cea219c https://bugs.eressea.de/view.php?id=2692 inherit racial stealth from creator unit 2020-08-16 16:00:08 +02:00
Enno Rehling f1a0a7a55c https://bugs.eressea.de/view.php?id=2693 
STIRB + PARTEI transferiert auch Magier des gleichen Gebietes.
 2020-08-16 12:44:03 +02:00
Enno Rehling afa160c4c3 fix crash in turn 1181 2020-08-15 23:29:40 +02:00
Enno Rehling eed0473421 remove the stealthany race flag 2020-08-03 10:33:24 +02:00
Enno Rehling 3b864b10fc bug 2686: stealth races not translated correctly. 2020-08-03 10:31:58 +02:00
Enno Rehling 085115c4e4 Merge branch 'master' into develop 2020-05-24 16:14:38 +02:00
Enno Rehling 3a76261302 bug 2666 english creport is broken 2020-05-24 15:41:19 +02:00
Enno Rehling 405f8f240a No! Static variables are BAD! 2020-05-23 11:21:16 +02:00
Enno Rehling dc466fef5d join_monsters merge conflict 2020-05-23 10:19:39 +02:00
Enno Rehling c53aa27597 bug 2661: desertierende einheiten, spoils 
Kampfstatus und Tarnung setzen.
Spoils-Texte für mehr Rassen.
 2020-05-23 10:18:18 +02:00
Enno Rehling 2d849b17d7 Merge branch 'master' into develop 2020-05-10 18:01:43 +02:00
Enno Rehling 08b9f03afc Fix demon stealth in English reports. 2020-05-10 17:50:56 +02:00
Enno Rehling 8ef2ec71e9 Merge branch 'master' into develop 2020-05-09 21:08:20 +02:00
Enno Rehling 1a63e41929 Bug 2659: units inside building AND ship 2020-05-09 21:06:25 +02:00
Enno Rehling 97cb46933e typo, ccidental bit-shift operation 2020-05-03 15:16:32 +02:00
Enno Rehling 268d93293c Fehlermeldungen für GIB ALLES 
Entkomplizierung lange Befehle.
 2020-04-18 16:28:23 +02:00
Enno Rehling 6ebb5c7591 Merge branch 'ships' into develop 2020-03-28 09:37:40 +01:00
Enno Rehling a60859ad08 ship report crash, fix error number 2020-03-28 09:05:52 +01:00
Enno Rehling 112126b07b Bug 2653: Fehlermeldungen bei Übergabe von Schiffen. 2020-03-25 19:20:51 +01:00
Enno Rehling 609d0daed3 Merge branch 'master' into develop 2020-03-14 12:00:41 +01:00
Enno Rehling 8bf8b68571 make parse_token trim ignored characters like zero-width spaces. 2020-03-14 11:59:35 +01:00
Enno Rehling b09de26d33 update version 2020-03-14 11:58:39 +01:00
Enno Rehling 34ac5154e7 make parse_token trim ignored characters like zero-width spaces. 2020-03-14 11:57:29 +01:00
Enno Rehling c4cb44f961 better starting conditions 
- demons start cloaked
- regions have at least 50 trees
 2020-03-08 10:07:04 +01:00
Enno Rehling bea657b128 Merge branch 'master' into develop 2020-03-02 21:37:54 +01:00
Enno Rehling b8205893d2 more unused code removed 2020-03-02 21:26:21 +01:00
Enno Rehling fe39eb6cf7 remove unused local functions. 2020-03-02 21:19:02 +01:00
Enno Rehling 0bbee5d1ac kill read_orders, rewrite tests to use parseorders. 2020-03-02 21:05:49 +01:00
Enno Rehling f4af719175 do not read orders when password is wrong 2020-03-02 20:40:45 +01:00
Enno Rehling 64ef6f9c32 change test to match new behavior. 2020-03-01 19:28:45 +01:00
Enno Rehling eb16d7bf47 Bug 2645 TARNE [Stufe] reagiert auf Talentänderungen. 2020-03-01 17:55:07 +01:00
Enno Rehling 41cf41120f Bug 2640: Fehler in LERNE AUTO bei teilweisen Lehrern. 2020-03-01 14:24:31 +01:00
Enno Rehling 6ecd172ff4 LERNE AUTO: fix tests and logic some more. 
still haven't fixed the actual bug, algorithm is wrong.
 2020-02-25 20:35:55 +01:00
Enno Rehling e5e936acc6 Bug 2640: LERNE AUTO sollte nicht alle Einheiten zu Lehrern delegieren. 
Fixt den konkreten Bug, fühlt sich aber immer noch nach einemn Spezialfall an?
 2020-02-21 21:12:19 +01:00
Enno Rehling 5ee5751475 Keine Befehle löschen, ist nicht nötig und verwirtr nur. 2020-02-20 21:09:04 +01:00
Enno Rehling 095e3d39ce Bug 2637: Monster sollen sich nicht parteitarnen. 2020-02-09 15:24:36 +01:00
Enno Rehling b1098f7838 broke several monster behaviors, fixed. 2020-02-08 21:24:07 +01:00
Enno Rehling 3771b88bc6 typo, opps 2020-02-08 21:02:18 +01:00
Enno Rehling 40d63264d3 bug 2635: let only swimming units attack on ocean. 2020-02-07 22:12:24 +01:00
Enno Rehling 4886d29401 small code cleanup 2020-02-02 18:52:30 +01:00
Enno Rehling bf867eb2d6 bug 2634 display number of ships to all factions. 2020-01-31 20:54:32 +01:00
Enno Rehling 63f4853875 crash in quit faction 
fix test modules that have no setup
add test for lazy trolls
 2020-01-26 12:32:31 +01:00
Enno Rehling 80b8bd7158 Merge branch 'master' into develop 2020-01-26 10:15:18 +01:00
Enno Rehling 42e17f3ba9 bug 2221: buildings cannot exceed maxsize. 
* enable the allies.lua tests
 2020-01-26 00:34:31 +01:00
Enno Rehling 356bb54bf3
Merge pull request #888 from ennorehling/develop 
fix tree growth crash, cew CR version
 2020-01-19 13:56:10 +01:00
Enno Rehling 3efcf97289 Fix for negative tree growth crash. 2020-01-19 13:45:38 +01:00
Enno Rehling ec0d5b3754 new CR VERSION: remove MESSAGETYPES 2020-01-19 13:45:19 +01:00
Enno Rehling 54d0784b54 Kampfreport: Jede Partei hilft sich selbst, duh. 2020-01-18 21:25:40 +01:00
Enno Rehling 010487ac8d
Merge pull request #887 from ennorehling/develop 
trees and seeds
 2020-01-18 21:11:55 +01:00
Enno Rehling a94e4219b1 automatic tree growth is a b*tch 2020-01-18 21:06:48 +01:00
Enno Rehling 3b09b401f7 Revert unnecessary trade limit bugfix 
This reverts commit 27aac671a4.
 2020-01-16 18:22:01 +01:00
Enno Rehling b88f9e8610 remove duplicate calculation. 2020-01-15 23:08:11 +01:00
Enno Rehling 7aaa0fc301 Bug 2633: Porting the test from my "fix" to prove that it wasn't required. 2020-01-15 22:48:20 +01:00
Enno Rehling 27aac671a4 simplicate and add lightness 2020-01-14 21:00:54 +01:00
Enno Rehling 6626cfe297 Bug 2633: implement combined trade limits. 2020-01-14 20:57:29 +01:00
Enno Rehling e02c1e9d00 Bug 2631: Kein Konvoi mit Sonnensegel. 2020-01-13 22:24:48 +01:00
Enno Rehling 06f00cae53 Bug 2632: no flying convoy 2020-01-13 22:21:26 +01:00
Enno Rehling 00ac549750 idiot-proofing the newfactions file parser 2020-01-08 20:57:29 +01:00
Enno Rehling bfd89687cd when planting saplings, plant remaining seeds. 2020-01-07 20:37:21 +01:00
Enno Rehling 043949c8d0 Bug 2625 PFLANZE Implementation aufgeklärt, Tests geschrieben. 2020-01-07 20:28:43 +01:00
Enno Rehling 2e054f27cc Bug 2630: Drachen 
1. Jungdrachen sind Drachen (RCF_DRAGON)
2. Ein Monster das nicht kämpfen kann, braucht nicht zu plündern.
3. make code more readable.
4. Wer schon bewacht, braucht keinen BEWACHE Befehl.
 2020-01-07 19:24:10 +01:00
Enno Rehling fb21d6d932 kill ancient godcursezone code. 
add some tests for planting seeds.
 2020-01-04 12:22:14 +01:00
Enno Rehling 32d2970965
Merge pull request #886 from ennorehling/develop 
Baumwachstum und Flotten-Meldungen
 2020-01-03 20:28:00 +01:00
Enno Rehling 84dfe46ce5 Revert "bug 2625 samen werden direkt zu schoesslingen" 
This reverts commit 4f88bf137e.
 2020-01-03 20:21:14 +01:00
Enno Rehling e337b8b494 Bug 2626: Korrekter Meldungstext. 2020-01-03 17:14:44 +01:00
Enno Rehling c8c22aea1b bug 2624: short range conversion bug in tree growth 2020-01-02 12:52:39 +01:00
Enno Rehling 4f88bf137e bug 2625 samen werden direkt zu schoesslingen 2020-01-02 12:10:38 +01:00
Enno Rehling dcf9b9df26 bug 2626: fehlende neue messages nachtragen 2020-01-02 11:34:26 +01:00
Enno Rehling d949d9a6d0 Bug 2623: Untote dürfen nicht in heilige Regionen ziehen. 
Code style fixes.
 2019-12-29 14:28:55 +01:00
Enno Rehling cef5ff44eb Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-12-01 17:30:34 +01:00
Enno Rehling 5428211751 Merge remote-tracking branch 'upstream/master' into develop 2019-12-01 17:29:25 +01:00
Enno Rehling 0b623d0768 monster include structure, contd. 2019-12-01 17:28:51 +01:00
Enno Rehling 2573ab19b5 begin work on v3.23 2019-12-01 17:20:34 +01:00
Enno Rehling 08f7d267b8 version 3.22 is released 2019-12-01 17:18:59 +01:00
Enno Rehling d6b5dea014 version 3.22 is released 2019-12-01 17:16:12 +01:00
Enno Rehling b0792b57e9 move binding function declarations to headers. 2019-12-01 17:07:09 +01:00
Enno Rehling 633866c814 STIRB PARTEI: Versuche, Helden zu übernehmen. 2019-11-30 16:29:23 +01:00
Enno Rehling 1a8b94da59 STIRB PARTEI löscht die Befehle nicht. 
Reparatur des Tests für VERGESSE MAGIE (Vertraute)
 2019-11-24 16:39:21 +01:00
Enno Rehling 6b1baec2de Merge branch 'master' into develop 2019-11-18 19:44:37 +01:00
Enno Rehling cd165d94ec Magier dürfen bei STIRB nicht übergeben werden. 2019-11-18 19:44:24 +01:00
Enno Rehling dccde58221 Merge branch 'master' into develop 2019-11-18 19:34:05 +01:00
Enno Rehling 1bff7801ff transfer_faction respects magic schools. 2019-11-18 19:33:37 +01:00
Enno Rehling beffa1d536 CID 205842: con is never NULL. 2019-11-18 18:48:28 +01:00
Enno Rehling 75000f2663 reduce struct person by 12 bytes on a 32-bit arch. 2019-11-17 19:55:41 +01:00
Enno Rehling 7850e84cea let's try increasing MAX_UNITSIZE to 128K 2019-11-02 21:37:33 +01:00
Enno Rehling fd1b981983 simplify sail/travel, remove route from arguments. 2019-11-02 21:32:11 +01:00
Enno Rehling 52ee682a48 Bug 2617: Berechnung von Überladung berechnet Flotten korrekt. 2019-11-02 19:09:15 +01:00
Enno Rehling 0db8f2167b Bug 2618: Zusätzlicher Test Piraterie 2019-10-28 20:12:52 +01:00
Enno Rehling 7f57aa2a18 small copy/paste error 2019-10-27 10:57:32 +01:00
Enno Rehling 9b54784c94 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-10-27 10:56:32 +01:00
Enno Rehling c8769a4412 Fehler in ship_crewed Berechnung 2019-10-27 10:56:16 +01:00
Enno Rehling 533a0aceec fix crash when following a lost ship 2019-10-23 23:17:31 +02:00
Enno Rehling c82b3b27dd Bug 2616: FOLGE schiesst über das Ziel hinaus. 2019-10-22 21:30:14 +02:00
Enno Rehling 75a71c36aa ZERSTOERE Schiffe evtl. auch richtig? Best effort. 2019-10-22 18:46:00 +02:00
Enno Rehling 70b148296f MACHE beschädigte Konvois 2019-10-21 20:04:32 +02:00
Enno Rehling d04fe741a9 https://bugs.eressea.de/view.php?id=2615 
in the report, calculate max size of ships correctly.
 2019-10-20 18:55:40 +02:00
Enno Rehling d9cbbd9052 Bug 2614: Einheiten bewachen Region vor sich selbst. 2019-10-20 17:11:58 +02:00
Enno Rehling 12491ffc16 GIB 0 an Land kann alle Schiffe geben, auf Ozean nicht. 2019-10-10 20:24:18 +02:00
Enno Rehling 1d405e2ef8 GIB 0 n SCHIFFE 
Keine Boote erlauben
Übergabe an eigene Besatzung.
 2019-10-10 20:17:25 +02:00
Enno Rehling 78e44e0fe3 check compatible costs 2019-10-10 16:12:25 +02:00
Enno Rehling 24978a5b80 Schiffstransfer nur zwischen Kapitänen. 2019-10-08 21:14:01 +02:00
Enno Rehling 1e0afdc961 spells can only be cast on single ships. 2019-10-08 21:08:33 +02:00
Enno Rehling b0e6ed430b GIB alle Schiffe an andere Einheit. 2019-10-08 04:52:41 +02:00
Enno Rehling 4052cb71ff Show convoy in reports. 2019-10-07 22:01:02 +02:00
Enno Rehling f4011af784 GIB unit n SCHIFF implementiert. 2019-10-07 21:50:52 +02:00
Enno Rehling 39e3001a50 start implementing give_ship 2019-10-06 20:42:47 +02:00
Enno Rehling 5cf417d16d must have one captain per ship. 2019-10-06 20:22:19 +02:00
Enno Rehling 178f7c2e19 add number of ships for convoys. 
check required crew skills.
require number of captains >= ship.number.
 2019-10-06 18:11:10 +02:00
Enno Rehling 84633b50e1 gamedata version SHIP_NUMBER_VERSION 2019-10-05 21:00:17 +02:00
Enno Rehling f02c4cbaeb disable magic resistant to prevent 2% intermittent test. 2019-10-05 20:59:55 +02:00
Enno Rehling b4f3120658 delete unused function 2019-09-29 18:31:11 +02:00
Enno Rehling 7b9ea75d16 make disrupt_astral use callback, not region_list. 2019-09-29 18:28:44 +02:00
Enno Rehling 17fbd0d67d Bug 2612 Zauberreparatur. 2019-09-29 17:56:56 +02:00
Enno Rehling a6ea80f5f8 create a for_all_in_range function to avoid use of region_list. 
functional programming is good.
 2019-09-29 16:57:26 +02:00
Enno Rehling 2ef753bd16 Tod den region_list Listen. 
Weg mit astralregions().
 2019-09-24 21:42:53 +02:00
Enno Rehling 24552613c8 fetch_astral braucht astralregions eigentlich nicht. 2019-09-24 21:26:34 +02:00
Enno Rehling 7335d8c5c9 fix build (bad merge, self is now f) 2019-09-24 09:35:38 +02:00
Enno Rehling 00e39717e1 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-24 09:28:44 +02:00
Enno Rehling ddc23ca3ab Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-23 20:45:09 +02:00
Enno Rehling a2ece4e749 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-23 20:44:59 +02:00
Enno Rehling a2963a8621 stop using astralregions, avoid dynamic allocations. 2019-09-23 20:44:19 +02:00
Enno Rehling ade50af60b Merge branch 'master' into develop 2019-09-23 17:37:02 +02:00
Enno Rehling b6edc0b940 Bug 2611: password_cmd erzeugt ungültige Passworte. 2019-09-22 16:31:02 +02:00
Enno Rehling c1a36a0963 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-22 13:51:23 +02:00
Enno Rehling 3ac343a997 Pestmeldung, Regionen Singular/Plural. 2019-09-22 13:51:02 +02:00
Enno Rehling 0db9389df6 coverity thinks I should check return values 2019-09-21 22:28:13 +02:00
Enno Rehling 08e45dc722 appease gcc const-check 2019-09-21 22:18:41 +02:00
Enno Rehling 6c73a58608 Bug 2607: BEnutze format_list für Schemen. 2019-09-21 22:16:46 +02:00
Enno Rehling 8433052c64 CID 204092: Memory - illegal accesses (NEGATIVE_RETURNS) 2019-09-19 05:05:13 +02:00
Enno Rehling 96facd21d9 Merge remote-tracking branch 'upstream/develop' into develop 2019-09-19 05:03:55 +02:00