Жестяные банки вынесены в отдельный мод ReusableTinCans
Из книги ушли: три банки и патч консервов (items.xml), кипячение на костре (recipes.xml), 6 строк локализации, бандл necrocan, иконки (цветные и серые). Имена предметов прежние - сейвы находят их по имени (itemmappings.nim), в каком бы моде они ни лежали. DLL: исправления оссуария (окно топлива) и логиста (банки - в «Напитки»). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
AlexCube
co-authored by
Claude Opus 5.5
Claude Opus 5.5
parent
86c833733b
commit
66ee53c05f
@@ -9,131 +9,6 @@
|
||||
dropped entirely. See progression.xml/entityclasses.xml: the skill now levels from
|
||||
zombie kills instead, which already worked. -->
|
||||
|
||||
<!-- Reusable tin cans: eating canned food leaves you an empty can, which works like the
|
||||
vanilla mason jar (drinkJarEmpty/drinkJarRiverWater/drinkJarBoiledWater - fill from
|
||||
water, drink, get the empty can back). Ported from AC-EnergyBow (__NoMods reference
|
||||
library), fixing one bug in it along the way: it extends the jar items but never
|
||||
overrides Meshfile, so its "tin can" is visually a mason jar in hand. We use the mesh
|
||||
from vanilla's own disabled-but-fully-built "drinkCanEmpty" item (items.xml, commented
|
||||
out under "*** Drinks") instead - a real can model, just never wired up by TFP.
|
||||
|
||||
BUG FIXED 2026-09-01 (canned water didn't quench thirst): the initial port only copied
|
||||
each item's own property/property-class nodes and dropped the effect_group blocks,
|
||||
on the wrong assumption that Extends would pull those in from drinkJarRiverWater/
|
||||
drinkJarBoiledWater - it doesn't (see the comment above: effect_group is parsed from
|
||||
each item's own XML node only, never inherited through Extends). So tinCanRiverWater/
|
||||
tinCanBoiledWater ran their Eat action (sound, delay, empty-can-back) but never applied
|
||||
$waterAmountAdd - the can "drank" and did nothing. Restored the effect_group from
|
||||
AC-EnergyBow verbatim (river water still carries dysentery risk/HP hit without
|
||||
buffWaterPurifier, same as a jar; boiled water is clean), fixing one more small bug in
|
||||
the source along the way: its dDysenteryRisk display_value said .16 while the actual
|
||||
roll it sets is 8 (i.e. .08) - tooltip now matches what the roll does. -->
|
||||
<append xpath="/items">
|
||||
<item name="tinCanEmpty">
|
||||
<property name="Extends" value="drinkJarEmpty"/>
|
||||
<property name="CustomIcon" value="tinCanEmpty"/>
|
||||
<property name="DescriptionKey" value="tinCanEmptyDesc"/>
|
||||
<!-- Своя модель (01.10.2026): ванильная консервная банка без отогнутой крышки - пустая
|
||||
открытая банка. Бандл necrocan; текстура пока ванильная cannedfood01 - до релиза
|
||||
перерисовать (гигиена ассетов). Банки с водой - свои модели с водой внутри. -->
|
||||
<property name="Meshfile" value="#@modfolder(NecromancerTome):Resources/necrocan?necroTinCanPrefab.prefab"/>
|
||||
<!-- HoldType 87 = хват пустой стеклянной банки (drinkJarEmpty), единственный с анимацией набора воды;
|
||||
консервный 14 её не имеет - банка набирала воду без движения рук (05.10.2026). -->
|
||||
<property name="HoldType" value="87"/>
|
||||
<property name="Material" value="Mmetal"/>
|
||||
<property class="Action1"> <!-- UseAction -->
|
||||
<property name="Class" value="CollectWater"/>
|
||||
<property name="Delay" value="3.4"/>
|
||||
<property name="Change_item_to" value="tinCanRiverWater"/>
|
||||
<property name="Sound_start" value="bucketfill_water"/>
|
||||
</property>
|
||||
</item>
|
||||
|
||||
<item name="tinCanRiverWater">
|
||||
<property name="Extends" value="drinkJarRiverWater"/>
|
||||
<property name="CustomIcon" value="tinCanRiverWater"/>
|
||||
<property name="DescriptionKey" value="tinCanRiverWaterDesc"/>
|
||||
<!-- Своя модель (01.10.2026): банка без крышки, внутри мутная бурая вода (бандл necrocan). -->
|
||||
<property name="Meshfile" value="#@modfolder(NecromancerTome):Resources/necrocan?necroTinCanMurkyPrefab.prefab"/>
|
||||
<!-- HoldType 3 = хват стеклянной банки (drinkJar*): сразу питьё, без фазы вскрытия, которая есть у консервного хвата 14 (05.10.2026). -->
|
||||
<property name="HoldType" value="3"/>
|
||||
<property name="Material" value="Mmetal"/>
|
||||
<property class="Action0">
|
||||
<property name="Class" value="Eat"/>
|
||||
<property name="Delay" value="4"/>
|
||||
<property name="Sound_start" value="player_drinking"/>
|
||||
<property name="Create_item" value="tinCanEmpty"/>
|
||||
<property name="Use_jar_refund" value="false"/>
|
||||
</property>
|
||||
|
||||
<effect_group tiered="false" name="Drink Tier 0">
|
||||
<requirement name="!HasBuff" buff="buffIsOnFire"/>
|
||||
|
||||
<triggered_effect trigger="onSelfPrimaryActionEnd" action="ModifyCVar" cvar="$waterAmountAdd" operation="add" value="10"/>
|
||||
<display_value name="dStaminaRegen" value=".15"/>
|
||||
<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="buffProcessConsumables"/>
|
||||
<triggered_effect trigger="onSelfPrimaryActionEnd" action="ModifyStats" stat="Health" operation="add" value="-5">
|
||||
<requirement name="!HasBuff" buff="buffWaterPurifier"/>
|
||||
</triggered_effect>
|
||||
<display_value name="foodHealthAmount" value="-5"/>
|
||||
<triggered_effect trigger="onSelfPrimaryActionEnd" action="ModifyCVar" cvar=".DiseaseRoll" operation="set" value="8"/>
|
||||
<display_value name="dDysenteryRisk" value=".08"/>
|
||||
<triggered_effect trigger="onSelfPrimaryActionEnd" action="ModifyCVar" cvar=".DiseaseRoll" operation="add" value="@$MetabolismResist"/>
|
||||
<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="buffDysenteryCatchDrink">
|
||||
<requirement name="RandomRoll" seed_type="Random" min_max="1,100" operation="LTE" value="@.DiseaseRoll"/>
|
||||
</triggered_effect>
|
||||
<triggered_effect trigger="onSelfPrimaryActionEnd" action="PlaySound" sound="player#vomit">
|
||||
<requirement name="!HasBuff" buff="buffWaterPurifier"/>
|
||||
</triggered_effect>
|
||||
</effect_group>
|
||||
|
||||
<effect_group tiered="false">
|
||||
<requirement name="HasBuff" buff="buffIsOnFire"/>
|
||||
<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="buffExtinguishFire"/>
|
||||
</effect_group>
|
||||
</item>
|
||||
|
||||
<item name="tinCanBoiledWater">
|
||||
<property name="Extends" value="drinkJarBoiledWater"/>
|
||||
<property name="CustomIcon" value="tinCanBoiledWater"/>
|
||||
<property name="DescriptionKey" value="tinCanBoiledWaterDesc"/>
|
||||
<!-- Своя модель (01.10.2026): банка без крышки, внутри чистая прозрачная голубоватая вода (бандл necrocan). -->
|
||||
<property name="Meshfile" value="#@modfolder(NecromancerTome):Resources/necrocan?necroTinCanCleanPrefab.prefab"/>
|
||||
<property name="HoldType" value="3"/> <!-- хват стеклянной банки, без вскрытия - см. tinCanRiverWater -->
|
||||
<property name="Material" value="Mmetal"/>
|
||||
<property class="Action0">
|
||||
<property name="Class" value="Eat"/>
|
||||
<property name="Delay" value="4"/>
|
||||
<property name="Sound_start" value="player_drinking"/>
|
||||
<property name="Create_item" value="tinCanEmpty"/>
|
||||
<property name="Use_jar_refund" value="false"/>
|
||||
</property>
|
||||
|
||||
<effect_group tiered="false" name="Drink Tier 0/1">
|
||||
<requirement name="!HasBuff" buff="buffIsOnFire"/>
|
||||
|
||||
<triggered_effect trigger="onSelfPrimaryActionEnd" action="ModifyCVar" cvar="$waterAmountAdd" operation="add" value="16"/>
|
||||
<display_value name="dStaminaRegen" value=".15"/>
|
||||
<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="buffProcessConsumables"/>
|
||||
</effect_group>
|
||||
|
||||
<effect_group tiered="false">
|
||||
<requirement name="HasBuff" buff="buffIsOnFire"/>
|
||||
<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="buffExtinguishFire"/>
|
||||
</effect_group>
|
||||
</item>
|
||||
</append>
|
||||
|
||||
<!-- Only foodCanBeef needs patching, even though Chicken/Lamb/Catfood should also leave a
|
||||
can behind: those three Extends="foodCanBeef" without their own Action0 element, so
|
||||
there's nothing for a foodCanChicken/foodCanLamb/foodCanCatfood xpath to match - but for
|
||||
the same reason, they'll all inherit foodCanBeef's patched Action0 (Create_item included)
|
||||
at load time anyway, same as how our zombie kill counter above only had to patch
|
||||
zombieTemplateMale once. -->
|
||||
<append xpath="/items/item[@name='foodCanBeef']/property[@class='Action0']">
|
||||
<property name="Create_item" value="tinCanEmpty"/>
|
||||
</append>
|
||||
|
||||
<!-- Письмо архимага (ванильная записка noteDuke01) прочитано -> открыта глава «Письмо архимага»
|
||||
в книге с оглавлением (HarmonySrc/NecroTome.cs). Ваниль сама ставит .dukeNoteRead, но cvar
|
||||
с точкой в сейв не пишется (EntityBuffs.Write пропускает key[0]=='.', декомпиляция 3.3) -
|
||||
|
||||
Reference in New Issue
Block a user