Commit graph

6 commits

Author SHA1 Message Date
58f70f1a4c Merge branch 'war-vulture' into main
Brings in the Sverm race, the War Vulture flying mount, and Skadi's
Crystal Golem (replacing the Hidden Hollow). Resolved conflicts:
AswidVisuals.cs took war-vulture's skeleton-eye-light rewrite with
main's attach/attack/sleep timing guard re-applied on top, and
RaceCompendium.cs kept main's rewritten race entries while folding in
war-vulture's Sverm/War Vulture pages and the new Claws paragraphs for
Aswid and Fenrir.
2026-08-11 20:35:48 +02:00
Ferdinando
0294d6a71b feat(skadi): remove Skadis Nokkel and the hidden hollow
The staff opened a pair of client-side portals into a claimed troll cave,
and that whole mechanism broke in multiplayer. The two Harmony patches it
needed were the sharpest edge: SkadiNokkelCastPatch prefixed
Attack.OnAttackTrigger and SkadiNokkelFreeCastPatch postfixed the three
cost getters, so every attack by every character in the game went through
mod code before being filtered.

Nothing is put in its place, on purpose. The Crystal Golem is the Skadi's
station now and the balance was already settled around it, and the part of
the hollow that was actually worth having - Skadi and Trol building inside
any troll cave - lives in RaceCaveBuilding and is untouched.

Removed: SkadiNokkel.cs, SkadiHollow.cs, SkadiHollowPortal.cs, the
"Skadi - Hidden Hollow" config section, the HOLLOW_COOLDOWN_SE status
effect, the F8 dump, and the "Nothing takes root here" rule in
PieceDensityLimit, which existed only for the hollow.

Kept: SkadiIce, which the staff's file happened to host but the Frost
Heart and the golem both use - moved to its own file. Greater Frost Heart
stays on sale from the Fenring_Cultist at 1500 as it was.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-11 07:55:23 +02:00
fac6e3986c fix(factions): stop same-faction mobs from smashing player structures
The truce only ever patched BaseAI.IsEnemy, but MonsterAI.UpdateTarget
picks a structure to attack (m_targetStatic) through a completely
separate gate - m_attackPlayerObjects, a flag baked into the prefab
(true for Troll among others) - and never calls IsEnemy at all. A Trol
player, exempt from a cave's resident Troll in combat, could still
watch it flatten a workbench built moments earlier in its own cave.

FactionStaticTargetPatch postfixes UpdateTarget and vetoes the pick if
a same-faction player is within 20 m (matching FindRandomStaticTarget's
own 10 m search radius with room to spare), rather than trying to
intercept the two private target-selection methods themselves.

Confirmed fixed by build+playtest.
2026-08-09 16:46:23 +02:00
Ferdinando
5c5b8c34d2 feat(races): Skadi hollow chain, plus the pending Dvergar and Fenrir ones
Three per-race item chains had accumulated uncommitted. They land
together because FactionMerchantCatalog.cs carries hunks from all
three and cannot be split without interactive staging.

Skadi (new this session):
- SkadiNokkel - "Skadis Nokkel", a StaffSkeleton clone recoloured to
  ice, stripped of its eitr and health costs and of the skeleton
  summon, opening an ice-blue portal to a troll cave the player
  claims as their own. Crafted at the forge after Moder from a
  1500-coin Greater Frost Heart, a DragonTear and a TrophySkeleton.
- SkadiFrostHeart - the bought leg of that recipe, sold by the
  Cultist bench.
- SkadiHollow / SkadiHollowPortal - claims one existing TrollCave02
  in the Black Forest, half a world radius out and south of the
  equator, and opens a linked local portal pair to it.
- RaceCaveBuilding - Skadi and Trol may build inside any troll cave.

Two facts worth keeping, both paid for the hard way:
- a troll cave counts as a DUNGEON, so the flag that refuses a piece
  there is the per-piece Piece.m_allowedInDungeons, not the
  per-location Location.m_noBuild. Player.m_placementStatus names the
  exact refusal reason and is now logged.
- Object.DestroyImmediate is forbidden inside an animation event
  callback, and a staff cast runs in one - it fails silently there.

Also carried in, from earlier sessions and unverified in game:
- Dvergar contract bank and barrel (DvergarBanco*, DvergarBotte*)
- Fenrir Ulvsblod trough (FenrirMangiatoia*)
- the Wolf -> Ulv merchant bench move, so tameable wolves stop
  answering the E key with a shop window

Status: compiles clean with no new warnings. The Skadi chain has NOT
been confirmed working in game - the most recent fix to the troll
cave detection is still untested.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-08 14:58:43 +02:00
Ferdinando
91eb5ca8e5 feat(factions): merchant catalog entries and hostility rules
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-07 17:02:48 +02:00
Ferdinando
ce87e987c9 factionsmerchants 2026-08-06 10:13:57 +02:00