RacesOfValheim/JotunnModStub/Trol
Ferdinando 34bdf35325 Merge branch 'war-vulture' into main
Sverm Ravager Strain (replacing the Stinger Morph), Trenta Elder Root, the
Trol food and Black Forest truce work, and the faction FindEnemy patch.

Conflicts resolved:

- FactionHostilityPatch.cs: both sides added a class at the same spot and
  they cover different holes, so both are kept - FactionStaticTargetPatch
  (main, stops same-faction mobs smashing structures) and
  FactionHuntPlayerPatch (war-vulture, closes the HuntPlayer fall-through).

- RaceCompendium.cs: both branches independently fixed the same off-by-one
  in the Trol's progression gates. Took main's wording, which matches the
  code - Axes are in the melee bonus (TrolDamagePatches sends them to
  m_slash), the 4th food slot has no gate at all, and Yagluth is +5 not +10
  (TrolConfig.YagluthMeleeBonus). Kept war-vulture's two new lines, the
  Kindling fire weakness and the Black Forest truce.

- Package/manifest.json: 1.4.8, which is what the root manifest and
  PluginVersion already said.

RacesOfValheim.cs referenced SvermConfig.StingerSE/StingerCdSE, which
war-vulture renamed to Ravager. Git merged those lines without a conflict
and the result did not compile; renamed.

Also in this commit:

- Factions on/off switches (FactionsConfig): "Faction truce" and "Faction
  merchants", both default on, both read live so they take effect without a
  restart. The truce gates its three postfixes; the merchants gate the
  Character.Awake setup plus every behavioural patch, so turning them off
  drops the prompt and the trade window on mobs already awake.

- SerpentMeat sells for 200 instead of 1 at the Fuling bench, moved to keep
  the list's ascending price order (the sell panel renders it as declared).

- DraughFoodPatches mapped "SerpentMeatRaw", which is not a prefab; the
  internal id is SerpentMeat, so serpent meat never cooked for a Draugh.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-25 18:52:10 +02:00
..
TMPDebug.cs Initial commit 2026-07-30 19:00:13 +02:00
TrolClearFoodPatch.cs Initial commit 2026-07-30 19:00:13 +02:00
TrolConfig.cs chore(release): v1.4.0 - Factions, Configuration Manager, Trol log-grab fix 2026-08-07 09:56:16 +02:00
TrolDamagePatches.cs feat(trol): make ability numbers and keybinds BepInEx-configurable 2026-08-06 15:34:05 +02:00
TrolExtraFoodUI.cs Initial commit 2026-07-30 19:00:13 +02:00
TrolFarmingPatches.cs feat(trol): make ability numbers and keybinds BepInEx-configurable 2026-08-06 15:34:05 +02:00
TrolFoodDebug.cs Initial commit 2026-07-30 19:00:13 +02:00
TrolFoodDebugUI.cs Initial commit 2026-07-30 19:00:13 +02:00
TrolFoodManager.cs warvulture 2026-08-24 19:17:47 +02:00
TrolFoodPatches.cs warvulture 2026-08-24 19:17:47 +02:00
TrolLogWeapon.cs fix(trol): stop the log weapon's hidden slot from crashing InventoryGrid 2026-08-09 10:48:47 +02:00
TrolPatches.cs Remove leftover TrolSync/SkadiSync debug logging 2026-08-24 13:34:30 +02:00
TrolRace.cs Merge branch 'war-vulture' into main 2026-08-25 18:52:10 +02:00
TrolRegenPatches.cs feat(trol): make ability numbers and keybinds BepInEx-configurable 2026-08-06 15:34:05 +02:00
TrolSkillPatches.cs feat(trol): make ability numbers and keybinds BepInEx-configurable 2026-08-06 15:34:05 +02:00
TrolStatusEffects.cs feat(trol): make ability numbers and keybinds BepInEx-configurable 2026-08-06 15:34:05 +02:00
TrolTotem.cs warvulture 2026-08-16 07:44:44 +02:00
TrolTotemBehaviour.cs feat(trol): war totem and its mercenary store 2026-08-07 17:02:48 +02:00
TrolTotemStore.cs feat(trol): war totem and its mercenary store 2026-08-07 17:02:48 +02:00