Fix ammo loading on all turrets after w237/238 (ammo-table migration + slot-filter fix)#15
Fix ammo loading on all turrets after w237/238 (ammo-table migration + slot-filter fix)#15asconley wants to merge 2 commits into
Conversation
…p of v3.4 meshes - TV_ ammo rows, slot tag-queries, custom inventories for spears/stone
|
Thanks for this, @asconley — genuinely sharp work. 🙏 The slot tag-filter catch was the missing piece — spears ( I've folded your ammo fix into v3.6 rather than merging directly, because All 15 turrets now load and fire their correct ammo in-game — tested and confirmed. You're credited in the changelog. Closing since it's all live on PS: that red ✗ on the checks wasn't your code — GitHub blocks fork PRs from posting the validator's result comment (a 403). I've fixed the workflow so it won't fail like that for contributors anymore. |
Summary
Restores ammo loading on all 15 turret variants, which broke with the Week 237/238
update. Builds on v3.3 (mesh fix) — this PR is purely the ammo side. All changes are
additive; no vanilla rows are overwritten.
What broke
Two separate things, both from the update streamlining game tables:
ValidAmmoTypesrows the turretsreferenced (
AllPistol,AllArrows,AllBolts,AllJavelins,Rock_Golem_Gun,etc.) were removed/renamed, so every turret's ammo reference dangled.
Inventory_Turret_Pistol,whose slot only admits
Item.Ammo.*-tagged items. Even after fixing the ammo rows,arrows/bolts loaded but throwing spears (
Item.Weapon.Spear.Thrown) and stone(
Item.Resource.Stone) were rejected at the slot beforeValidAmmoTypeswas checked.Javelins were also renamed
*_Throwing_Spear(the word "Javelin" was dropped).Changes (all additive)
D_ValidAmmoTypes— 9 self-containedTV_rows (Pistol, AssaultRifle, Rifle,Sniper, Shotgun, Bolts, Arrows, Javelin, Rock) populated from current item names.
D_TagQueries— 2 new slot queries:TV_Thrown_Ammo(ANY(Item.Weapon.Spear.Thrown))and
TV_Rock_Ammo(ANY(Item.Resource.Stone)).D_Inventory/D_InventoryInfo— 3 custom turret inventories at 4 slots each:standard ammo, thrown spears, and stone.
D_Turret— repointed 14 turrets to the newTV_ammo rows (Flamethrower left onvanilla
BioFuel, which survived the update).D_ItemsStatic— repointed 5 turret items (Bow, Crossbow, RapidCrossbow, Javelin,Rock) to the matching new inventory.
Ammo lists were verified against the current extracted
D_ItemsStaticand cross-checkedwith Jimk72's
All_Ammo_Turretand Ferani'sCompatible_Ammofor the current naming(e.g. the 5.56
Ammo_AssaultRifle_Roundvs 7.62Ammo_Rifle_Roundsplit, and the*_Throwing_Spearrename). Self-containedTV_rows mean future vanilla table changeswon't re-break this.
Testing
a weapon-side projectile-damage bonus the turret won't have, so the Rock Thrower's
stone may hit softer — likely a damage-tuning tweak, not a mechanic issue.
Notes
The Rock Thrower fires real
Stone(which carries its ownBallistic+AmmoType),not a substitute. Open to feedback on naming/conventions for the
TV_rows if you'dprefer something else.