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 202642e7d0 paused factions are not allied to anyone. 2021-06-08 19:13:26 +02:00
Enno Rehling 48fd0bd4af paused factions do not execute orders, do not join battles. 
lots of change, didn't write any tests for this yet.
 2021-06-08 19:13:26 +02:00
Enno Rehling 0fcc1b8d29 fix compilation, add tests for upkeep 2021-06-08 19:13:26 +02:00
Enno Rehling bed6cdff58 paused units have no weekly maintenance cost. 2021-06-08 19:13:26 +02:00
Enno Rehling e5b4d925c6 paused factions: resume when new orders arrive 2021-06-08 19:13:26 +02:00
Enno Rehling 18b1139616 test not sorting before building and ship owners. 2021-06-06 16:31:07 +02:00
Enno Rehling 62aaf71b35 move unit reordering into sort.c 2021-06-06 13:14:19 +02:00
Enno Rehling 4a79960cb1 Große Monster können sich auf dem Ozean nicht verstecken. 2021-06-05 14:55:20 +02:00
Enno Rehling 895818c7c7 https://bugs.eressea.de/view.php?id=2750 
Katpaulte schiessen nicht wenn KAEMPFE FLIEHE gesetzt ist.
Wenn Katapulte nicht schiessen, versuchen sie keine alternative Attacke, für die sie bihser das Katapult als Bogen benutzt haben.
 2021-05-19 21:55:56 +02:00
Enno Rehling ff80cb52ba https://bugs.eressea.de/view.php?id=2751 
Keine Anzeige von Durchreise in von Leuchtturm gesehenem Land
Gleichschaltung NR und CR
 2021-05-19 21:27:34 +02:00
Enno Rehling 9b3f5e7a55 remove unused objtype_t constants. 2021-05-08 18:21:14 +02:00
Enno Rehling c68a356202 fix crash in release build 2021-05-04 21:06:53 +02:00
Enno Rehling 7d7842b849 do_combatspell didn't check that the unit was a mage. 2021-05-03 20:15:23 +02:00
Enno Rehling 13a4388b9c Merge branch 'master' into develop 2021-05-01 22:03:31 +02:00
Enno Rehling ff7cd7d20d check for dead curse-magician 2021-05-01 21:53:01 +02:00
Enno Rehling 9cee6a8115 use even fewer single quotes 
debug travis builds
 2021-04-29 17:33:59 +02:00
Enno Rehling 22b8c7da22 https://bugs.eressea.de/view.php?id=2745 
use double quotation marks in generated orders.
 2021-04-29 17:33:59 +02:00
Steffen Mecke eb5ddfaeda report newbie immuniy clearly 2021-04-26 21:31:00 +02:00
Enno Rehling 557f5458ea don't cast level 0 combat spells 2021-04-21 18:05:40 +02:00
Enno Rehling 374d9d0bb6 https://bugs.eressea.de/view.php?id=2740 
Do not put a UTF-8 BOM into the Zugvorlage.
 2021-04-18 11:33:14 +02:00
Enno Rehling ba51efb06b Kröten und Schlümpfe können nichts lernen. 2021-04-12 20:14:19 +02:00
Enno Rehling 56beb0f4ab covevrity CID 220614 2021-04-09 22:35:11 +02:00
Enno Rehling adc03b75bc move skill.h to kernel, use enum in struct skill 2021-04-09 21:52:50 +02:00
Enno Rehling e3f2ca9aaf catch attempts to cast a spell without the magic skill 2021-04-09 21:30:26 +02:00
Enno Rehling 250c098bf6 https://bugs.eressea.de/view.php?id=2737 
finalize spell cost bugfix.
fix familiar spellcost calculation tests.
remove debug names from tests.
 2021-04-08 21:25:37 +02:00
Enno Rehling c8e975333b WIP bug 2737 
fix cost of spells with ring of power.
test and fix cost and limits of familiars casting spells.
 2021-04-08 21:25:37 +02:00
Enno Rehling 5564543bfd fix gcc build 2021-04-05 19:40:22 +02:00
Enno Rehling 4d8a3d1947 https://bugs.eressea.de/view.php?id=2737 
using a ring does not increase the spell's cost
adding tests for spell effectiveness revealed many inconsistencies that are now fixed.
 2021-04-05 19:19:49 +02:00
Enno Rehling bb12ffa2a2 Mit GIB 0 können hungernde Personen an die Bauern gegeben werden. 2021-04-01 18:54:56 +02:00
Enno Rehling 4e1a124801 https://bugs.eressea.de/view.php?id=2734 
additional testing for GIVE UNIT
 2021-03-28 19:07:42 +02:00
Enno Rehling 50cdf39245 https://bugs.eressea.de/view.php?id=2736 
report the correct region for drifting ships.
 2021-03-28 18:58:09 +02:00
Enno Rehling 58c310de29 a working stone circle boosts magic resistance of people inside. 2021-03-27 19:12:12 +01:00
Enno Rehling 721442584c testing for magic resistance curses. 2021-03-27 18:56:17 +01:00
Enno Rehling 60fe8e6200 more testing: magic skill grants additional 5% resistance 2021-03-27 11:17:20 +01:00
Enno Rehling 9a9a9c7a5d https://bugs.eressea.de/view.php?id=2733 
add tests for magic resistance formula.
 2021-03-27 00:01:44 +01:00
Enno Rehling 8ba80d7dbf https://bugs.eressea.de/view.php?id=2733 
magicians resisting their own spells.
 2021-03-26 19:56:32 +01:00
Enno Rehling 5a8d0221e8 remove unused variable 2021-03-26 17:59:43 +01:00
Enno Rehling 4582db917a remove battle.alive it was no longer used. 2021-03-25 19:23:20 +01:00
Enno Rehling ce5ac00b80 remove rowcache optimization, it had hardly any effect. 2021-03-25 19:21:58 +01:00
Enno Rehling 53d4010958 code style: use quotes on local includes 2021-03-24 21:41:20 +01:00
Enno Rehling 3cf58f74af
Merge pull request #936 from stm2/dreams_and_allies 
FFL_DEFENDER is deprecated and interfers with dreams
 2021-03-24 21:24:27 +01:00
Enno Rehling 081965f0bc remove BATTLE_FAST code 
it didn't actually make battles fast.
 2021-03-24 21:13:59 +01:00
Enno Rehling 44765edede Merge branch 'develop' into stm2-confusion_and_panic 2021-03-24 21:07:16 +01:00
Enno Rehling 35f562a53f fix damage calculation, again 
scale_number was messing with the hp
 2021-03-24 21:04:50 +01:00
Enno Rehling 195e49e7f0 disable the battle.fast cache 
it doesn't look very good, anyhow
let's see how much that actually costs
 2021-03-24 20:58:33 +01:00
Enno Rehling b5cc4e6fac flee_spell did not need an extra argument 
checking for precombat spells is easy and safe!
 2021-03-24 20:58:32 +01:00
Enno Rehling a2d4345f49 fix recent change for terraforming herbs 2021-03-24 20:58:32 +01:00
Enno Rehling fc438fe0a7 terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-24 20:58:32 +01:00
Enno Rehling 8ed2738bc0 fix recent change for terraforming herbs 2021-03-24 20:58:32 +01:00
Enno Rehling 0928fe0d02 terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-24 20:58:32 +01:00
Enno Rehling 52ba83addd fix recent change for terraforming herbs 2021-03-24 20:58:32 +01:00
Enno Rehling d85ac9b2f9 terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-24 20:58:32 +01:00
Steffen Mecke fae0c2608c fix for flee spell 2021-03-24 20:58:32 +01:00
Enno Rehling 8b2857f582 fix recent change for terraforming herbs 2021-03-24 20:58:32 +01:00
Enno Rehling 6feb616c2d terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-24 20:58:32 +01:00
Enno Rehling 235075b54e fix recent change for terraforming herbs 2021-03-24 20:58:31 +01:00
Enno Rehling d3b8c7a2d2 terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-24 20:58:31 +01:00
Enno Rehling 48b0e41c86 fix recent change for terraforming herbs 2021-03-24 20:58:31 +01:00
Enno Rehling 970e3c5432 terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-24 20:58:31 +01:00
Steffen Mecke 807177cc68 reverting "fix" 2021-03-24 20:57:46 +01:00
Steffen Mecke a713779f34 Gesang der Verwirrung bringt Buchhaltung durcheinander 2021-03-24 20:57:46 +01:00
Enno Rehling 19db01af67 new volcano damage calculation was broken. 2021-03-24 20:56:30 +01:00
Steffen Mecke 598b566ab8 FFL_DEFENDER is deprecated and interfers with dreams 2021-03-24 11:29:19 +01:00
Enno Rehling 335740d12b undo curse_active change 
curses should survive the death of a magician.
good dreams needs a magician to decide allegiance.
 2021-03-23 21:03:12 +01:00
Enno Rehling 13f9006148 add a test for gooddreams skill modifier. 2021-03-23 20:01:42 +01:00
Enno Rehling a9a7609a9a make curse_active check for a magician. 
fix tests that were using curses without a creator.
 2021-03-23 19:27:11 +01:00
Enno Rehling 5e7fba50d6 Dämonen können magisch reanimiert werden. 2021-03-23 18:53:11 +01:00
Enno Rehling 5452987cb7 flee_spell did not need an extra argument 
checking for precombat spells is easy and safe!
 2021-03-23 18:53:11 +01:00
Enno Rehling b6e084c758 fix recent change for terraforming herbs 2021-03-23 18:52:42 +01:00
Enno Rehling bb82df04c4 terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-23 18:52:42 +01:00
Enno Rehling de9918f018 fix recent change for terraforming herbs 2021-03-23 18:52:06 +01:00
Enno Rehling 3ef6559c5f terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-23 18:52:06 +01:00
Enno Rehling 181d82819a fix unsigned mismatch 2021-03-23 18:51:38 +01:00
Enno Rehling 9c9be163d8 fix review comments, 
extract meffect_protection and add a test.
 2021-03-23 18:51:38 +01:00
Enno Rehling f11802d817 eliminate some type conversion warnings (MSVC) 2021-03-23 18:51:38 +01:00
Enno Rehling 521ae1f769 fix recent change for terraforming herbs 2021-03-23 18:51:38 +01:00
Enno Rehling eb1785568d terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-23 18:51:37 +01:00
Steffen Mecke 5a595bd315 fix for flee spell 2021-03-23 18:50:49 +01:00
Steffen Mecke 4ee01be75f fix für Schild des Fisches 2021-03-23 18:50:49 +01:00
Enno Rehling 3548722a58 clarification: at_dict is deprecated but has a conversion. 2021-03-23 18:50:48 +01:00
Enno Rehling 0573ddfbab https://bugs.eressea.de/view.php?id=2732 
fix permanent smurfs
 2021-03-23 18:50:48 +01:00
Enno Rehling 5fef373181 fix recent change for terraforming herbs 2021-03-23 18:50:48 +01:00
Enno Rehling 316188531e terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-23 18:50:48 +01:00
Enno Rehling e19bd8bd08 fix unsigned mismatch 2021-03-21 18:55:31 +01:00
Enno Rehling dea6149902 fix review comments, 
extract meffect_protection and add a test.
 2021-03-21 18:35:08 +01:00
Enno Rehling 76e99c6957 eliminate some type conversion warnings (MSVC) 2021-03-21 18:09:21 +01:00
Enno Rehling fb52bc8846 clarification: at_dict is deprecated but has a conversion. 2021-03-21 18:02:04 +01:00
Enno Rehling 7fcecc9468 https://bugs.eressea.de/view.php?id=2732 
fix permanent smurfs
 2021-03-21 18:02:04 +01:00
Enno Rehling d7b0da327b fix recent change for terraforming herbs 2021-03-21 18:02:04 +01:00
Enno Rehling 9a1765d917 terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-21 18:02:04 +01:00
Steffen Mecke 109b5d78a7 good dreams end when magician is dead 2021-03-21 14:14:01 +01:00
Steffen Mecke 5f7860b6e6 fix für Schild des Fisches 2021-03-21 12:47:51 +01:00
Enno Rehling 36653ec65b fix highly theoretical source of crash. 
bind_eressea now checks if bindings were called without filename
 2021-03-15 20:00:58 +01:00
Enno Rehling 56141ee7a1 include what you use 2021-03-14 17:42:18 +01:00
Enno Rehling d1aff44d7b Happy Pi day! 
Let's use M_PI, it's available in all known math.h implementations.
 2021-03-14 17:39:53 +01:00
Enno Rehling 07c1dee907 materials array is terminated with number == 0 
we say nothing about rtype.
 2021-03-14 16:35:55 +01:00
Enno Rehling 5b7a3cba32 buildings offer protection from volcano damage 2021-03-13 21:19:40 +01:00
Enno Rehling 5876c1a011 https://bugs.eressea.de/view.php?id=2729 
castles were giving too much protection.
 2021-03-13 21:18:47 +01:00
Enno Rehling 812907ffb5 Add_compile_options(/FC) fixes error messages. 
The build output window was showing the wrong filename. See:
https://developercommunity.visualstudio.com/t/cmake-project-cant-click-on-error/729350
https://gitlab.kitware.com/cmake/cmake/-/issues/18261
 2021-03-13 17:08:15 +01:00
Enno Rehling 14e95c9675 refactoring building_stage.construction 
every building_stage has a construction.
no need to malloc it separately.
optimize some more allocations.
replace some memset and calloc calls.
 2021-03-13 15:38:16 +01:00