Skip to content

Merge changes that only exist in master - #1167

Merged
ennorehling merged 43 commits into
developfrom
integration
Oct 11, 2026
Merged

ennorehling merged 43 commits into
developfrom
integration

Conversation

@ennorehling

Copy link
Copy Markdown
Member

No description provided.

ennorehling and others added 30 commits September 4, 2026 16:09
* fix intermittent rustshield test
use rng_uint where it makes sense

* fix intermittent test
build causes produceexp, which spoils the skill for the next test
* Verzauberungen, die eigene Daten speichern, müssen Speicher reservieren, in den sie sie laden (null-pointer crash).

* update announce mailing list after the turn

* fix some minor coverity finds.

* fix orcs learning every skill slowly

* INT_MAX needs limits.h

* Apply study_speed when new level is reached.

* increase skills by days, not weeks (WIP)
fixes a lot of rounding errors.

* fix tests related to studying, remove the inject_learn logic

* fix intermittent rustshield test
use rng_uint where it makes sense

* reduce skill is broken (WIP)

* fix reduce_skill_days and test

* unsigned mess

* eliminate compiler warnings

* fix intermittent test
build causes produceexp, which spoils the skill for the next test

* test: study_cmd with study_speed

* Test: LERNE AUTO korrekt für Orks.
* KAEMPFE FLIEHE löst Bewachung auf.
* combat spells must handle new select_enemy behavior
may not return a target.
mindblast requires special exception code, since size of the target unit is required.

* fix select_enemy for loot and test

* github's iwyu says I don't need these headers.
but not the iwyu on erdbaer? what version is this, github?

* reorder steps

* fix version commands in action
iwyu 0.21 seems to be active

* fix bug in escape_tactics
this should have a test
fix compile, pragma once
* remove unused editor config options

* embassy module always use_seashell function
even if disabled!

* replace -i argument with ERESSEA_INSTALL envvar

* reduce setup footprint for new game
* Bug 3112: Hafen als Kanal braucht HELFE

* Hafenbesitzer kann Kapitän KONTAKTIEREN
fix a complaint about tiny bitfields
* simplify/eliminate set_curseingmagician

* new rule: antimagiz zone is immune to antimagic crystals

* refactor: move all item-use functions to items.c

* refactor item-use functions to their own test suite.

* Test: Antimagiekristall erzeugt Schwächezone

* Test: AMK reduziert Effekte auf der Region.

* Vom AMK erzeugte Stärkezone hat keinen Magier

* Zeige die Resteffekte von AMK allen in der Region
TODO: curse_cansee needs a test.

* Additional messages when dissolving a curse.

* IWYU for test refactoring

* IWYU pragma for variant

* minimal tests for spellpower
TODO: antimagic zone, messages

* refactor spellpower and what messages it sends
* no dropout warning when faction disappears

* ld: duplicate library
we're still working towards a 31.2 release here
missing count_enemies declaration
* refactor drifting ships
export drifting_ships() so it can be tested
upgrade code style forand rename old drift_target test
add new test, not doing much yet.

* test: drifting ships cannot fish
drifting sets the SF_DRIFTING flag
drifting sets the SF_FISHING flag

* test: ships drift to nearby region

* test: under-crewed ship gets correct message

* delete old debug tests

* refactor: extract drift_reason
Added MIN and MAX macro needed for testing
* deal with the obsolete -i argument by ignoring it

* Bug 3120: BEWACHE-Tricks mit TEMP-Einheiten (#1165)

Bei Übergabe von Personen wird das UFL_FLEEING Flag übertragen, Problem gelöst.
Solange eine Person in der Einheit aus einer unbefangenen Einheit kommt, kann sie trotzdem bewachen.

* Bug 3120: Neue Fehlermeldung für aus dem Kampf geflohene.

* adjust test to new guard error message

* Bug 3128: Untote lassen alle Talente vergessen

In drain_exp wurde die verloren gegangene XP nicht durch die Anzahl Personen geteilt. XP-Verluste werden jetzt über den Kampf gesammelt, und am Ende wird reduziert.

* Bug 3127: save the "password sent" flag

* Bug 3121 & 3122: PARTEI wird nicht korrekt erkannt.

* Bug 3116: Skill-Änderungen korrekt berechnen (#1163)

* change_skill gets total days per unit, not pre-divided by u->number.

* Talentverlust durch Schock testen.
New code makes static analysis slightly happier.
@ennorehling ennorehling self-assigned this Oct 11, 2026
@ennorehling
ennorehling merged commit 62dca38 into develop Oct 11, 2026
1 check passed
@ennorehling
ennorehling deleted the integration branch October 11, 2026 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant