Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 37 additions & 37 deletions ProjectZ_2.5/Config/Localization.txt

Large diffs are not rendered by default.

84 changes: 54 additions & 30 deletions ProjectZ_2.5/Config/XUi/controls.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,62 @@

<insertAfter xpath="controls/item_stack">
<backpack_item_stack controller="ItemStack" on_scroll="false" allow_dropping="true" prefix_id="false">
<rect controller="${controller}" style="itemStack, hover" collider_scale="1.0" on_scroll="${on_scroll}" allow_dropping="${allow_dropping}" prefix_id="${prefix_id}" tooltip="{tooltip}" enabled="{# !userlockmode}" >
<sprite depth="2" name="backgroundMain" sprite="menu_empty3px" pos="-3,3" width="62" height="56" color="[black]" type="sliced" fillcenter="false" />
<sprite depth="3" name="background" sprite="menu_empty3px" width="56" height="50" color="{selectionbordercolor}" type="sliced" globalopacity="true" fillcenter="false"/>

<sprite depth="4" pos="2,-2" color="140,128,98" width="52" height="46" type="sliced" visible="{# userlockedslot and !userlockmode}"/>

<!-- <sprite depth="4" name="background" width="56" height="50" color="175,35,175" type="filled" globalopacity="true" fillcenter="false" visible="{# userlockedslot and !userlockmode}"/> -->


<sprite depth="2" name="highlightOverlay" width="56" height="50" color="{backgroundcolor}" pos="0,0" type="sliced" globalopacity="true"/>

<texture depth="3" name="backgroundTexture" material="Materials/Transparent Colored" size="58,52" globalopacity="true"/>

<sprite depth="6" name="itemIcon" width="44" height="44" atlas="ItemIconAtlas" sprite="{itemicon}" pos="28,-24" pivot="center" foregroundlayer="true" color="{iconcolor}" />
<sprite depth="8" name="lockTypeIcon" width="17" height="17" sprite="{locktypeicon}" pos="2,-2" foregroundlayer="true"/>
<sprite depth="8" name="itemtypeicon" width="17" height="17" sprite="ui_game_symbol_{itemtypeicon}" pos="2,-2" foregroundlayer="true" visible="{hasitemtypeicon}" color="{itemtypeicontint}" />

<sprite depth="3" name="durabilityBackground" width="51" height="8" sprite="menu_empty3px" color="[darkGrey]" type="sliced" pos="2, -39" foregroundlayer="true" visible="{hasdurability}" />
<filledsprite depth="4" name="durability" width="51" height="8" sprite="menu_empty2px" color="{durabilitycolor}" fill="{durabilityfill}" type="filled" pos="2, -39" foregroundlayer="true" visible="{hasdurability}" />

<sprite depth="5" name="disabledOverlay" width="58" height="52" color="[darkGrey_half_alpha]" pos="1,-1" type="sliced" visible="false"/>
<rect controller="${controller}" style="itemStack, hover" collider_scale="1.0" on_scroll="${on_scroll}" allow_dropping="${allow_dropping}" prefix_id="${prefix_id}" tooltip="{tooltip}" enabled="{# !userlockmode}"
width="58" height="52">

<!-- BACKGROUND -->
<sprite depth="2" name="backgroundMain" sprite="menu_empty3px" color="[black]" type="sliced" fillcenter="false"
width="61" height="55" pos="-3,3" /> <!-- 3px larger than slot size-->
<sprite depth="3" name="background" sprite="menu_empty3px" color="{selectionbordercolor}" type="sliced" globalopacity="true" fillcenter="false"
width="56" height="50" pos="0,0" /> <!-- 2px smaller -->
<texture depth="3" name="backgroundTexture" material="Materials/Transparent Colored" globalopacity="true"
size="56,50" pos="0,0" /> <!-- 2px smaller -->

<!-- Highlight -->
<sprite depth="2" name="highlightOverlay" color="{backgroundcolor}" type="sliced" globalopacity="true"
width="55" height="49" pos="0,0" /> <!-- 3px smaller -->

<!-- ITEM -->
<sprite depth="6" name="itemIcon" atlas="ItemIconAtlas" sprite="{itemicon}" pivot="center" foregroundlayer="true" color="{iconcolor}"
width="55" height="49" pos="29,-26" /> <!-- 3px smaller -->

<!-- LOCK -->
<sprite depth="8" name="lockTypeIcon" sprite="{locktypeicon}" foregroundlayer="true"
width="15" height="15" pos="2,-2" />
<sprite depth="8" name="itemtypeicon" sprite="ui_game_symbol_{itemtypeicon}" foregroundlayer="true" visible="{hasitemtypeicon}" color="{itemtypeicontint}"
width="15" height="15" pos="2,-2" />

<!-- LOCK Highlight -->
<sprite depth="4" color="140,128,98" type="sliced" visible="{# userlockedslot and !userlockmode}"
width="56" height="50" pos="0,0" />

<!-- LOCK Button -->
<button name="rectSlotLock" depth="15" style="press, hover" visible="{userlockmode}" sprite="" hoverscale="1" use_selection_box="true"
width="58" height="52" pos="0,0">
<sprite depth="16" name="button" sprite="{# userlockedslot ? 'ui_game_symbol_lock' : 'ui_game_symbol_unlock' }" style="icon32px" pivot="center" color="{# userlockedslot ? '222,206,163' : '255,255,255' }"
width="16" height="16" pos="46,-9" />
</button>

<label depth="7" name="stackValue" pos="3,-33" width="50" height="28" text="{itemcount}" font_size="18" effect="outline" justify="{#hasdurability ? 'Center' : 'Right'}" />
<label depth="7" name="timer" pos="35,-33" width="56" height="24" font_size="18" justify="center" pivot="center" effect="outline" color="[beige]"/>
<sprite depth="9" name="cancel" sprite="ui_game_symbol_x" width="56" height="56" color="255,0,0,255" type="sliced" visible="{# ishovered and islocked}" foregroundlayer="true"/>
<sprite depth="13" name="assembleIcon" size="31,31" sprite="{stacklockicon}" color="{stacklockcolor}" visible="{isassemblelocked}" pos="11,-11" foregroundlayer="true" />
<!-- DURABILITY -->
<sprite depth="3" name="durabilityBackground" sprite="menu_empty3px" color="[darkGrey]" type="sliced" foregroundlayer="true" visible="{hasdurability}"
width="56" height="8" pos="0, -42" /> <!-- 2px smaller width, 8px height-->
<filledsprite depth="4" name="durability" sprite="menu_empty2px" color="{durabilitycolor}" fill="{durabilityfill}" type="filled" foregroundlayer="true" visible="{hasdurability}"
width="56" height="8" pos="0, -42" /> <!-- 2px smaller width, 8px height-->

<!-- DISABLED -->
<sprite depth="5" name="disabledOverlay" color="[darkGrey_half_alpha]" type="sliced" visible="false"
width="57" height="51" pos="1,-1" /> <!-- 1px smaller -->

<!-- MISC -->
<label depth="7" name="stackValue" text="{itemcount}" font_size="18" effect="outline" justify="{#hasdurability ? 'Center' : 'Right'}"
width="50" height="28" pos="2,-33" /> <!-- -3px width, 28px height-->
<label depth="7" name="timer" font_size="18" justify="center" pivot="center" effect="outline" color="[beige]"
width="55" height="24" pos="31,-33" /> <!-- -3px width, 24px height -->
<sprite depth="9" name="cancel" sprite="ui_game_symbol_x" color="255,0,0,255" type="sliced" visible="{# ishovered and islocked}" foregroundlayer="true"
width="55" height="49" pos="0,0" /> <!-- 3px smaller -->
<sprite depth="13" name="assembleIcon" sprite="{stacklockicon}" color="{stacklockcolor}" visible="{isassemblelocked}" foregroundlayer="true"
size="32,30" pos="12,-11" /> <!-- -2px then /2 -->

<button name="rectSlotLock" depth="15" style="press, hover" width="61" height="65" visible="{userlockmode}" sprite="" hoverscale="1" use_selection_box="true">
<sprite depth="16" name="button" width="17" height="17" sprite="{# userlockedslot ? 'ui_game_symbol_lock' : 'ui_game_symbol_unlock' }" pos="47, -11" style="icon32px" pivot="center" color="{# userlockedslot ? '222,206,163' : '255,255,255' }" />
</button>
<!-- <sprite depth="15" name="iconSlotLock" width="17" height="17" sprite="ui_game_symbol_lock" pos="47, -11" style="icon32px" pivot="center" visible="{# userlockedslot and !userlockmode}" color="222,206,163" /> -->

</rect>
</backpack_item_stack>
</insertAfter>
Expand Down
34 changes: 32 additions & 2 deletions ProjectZ_2.5/Config/XUi/windows.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<remove xpath="windows/window[@name='windowBackpack']"/>

<!-- adjust windowlooting to match the size of the new player dropped backpack container -->
<set xpath="/windows/window[@name='windowLooting']/rect[@name='content']/grid[@name='queue']/@rows">10</set>
<set xpath="/windows/window[@name='windowLooting']/rect[@name='content']/grid[@name='queue']/@rows">12</set>
<set xpath="/windows/window[@name='windowLooting']/rect[@name='content']/grid[@name='queue']/@cols">10</set>

<insertAfter xpath="windows/popupMenu[@name='popupMenu']">
Expand Down Expand Up @@ -377,6 +377,36 @@
<!-- </rect> -->
</window>
</append>

<!-- STORM WARNING & BIOME ENTRY -->
<remove xpath="/windows/window[@name='windowEntering']/rect"/>
<append xpath="/windows/window[@name='windowEntering']">
<window name="windowEntering" controller="EnteringArea" anchor="CenterTop" difficulty_color="[red]" biome_color="[green]" inactive_color="[lightGrey]" difficulty_icon="ui_game_symbol_skull" biome_icon="ui_game_symbol_foliage" >
<rect pos="-170,-85" width="340" height="100" >
<!--sprite depth="1" name="background" sprite="menu_empty3px" color="65,65,65,150" type="sliced" /-->
<label depth="3" name="TextContent" pos="5,-3" font_size="42" color="[white]" style="outline" pivot="topleft" text="{locationname}" justify="center" width="330" height="60" />
<label depth="3" name="MessageContent" pos="0,-40" font_size="28" color="[white]" style="outline" pivot="topleft" text="{messagename}" justify="center" width="340" height="98" />

<!-- No longer used. Keep for modding. -->
<!-- <sprite depth="2" pos="5, -60" name="windowicon" style="icon32px" sprite="ui_game_loot_stage_bad" visible="{visible_loot_max}"/> -->

<grid padding="8,10" pos="170, -78" pivot="center" cols="8" cell_width="34" cell_height="32">
<sprite depth="2" name="windowicon" style="icon32px" sprite="ui_game_symbol_skull" color="{color1}" visible="{visible1}"/>
<sprite depth="2" name="windowicon" style="icon32px" sprite="ui_game_symbol_skull" color="{color2}" visible="{visible2}"/>
<sprite depth="2" name="windowicon" style="icon32px" sprite="ui_game_symbol_skull" color="{color3}" visible="{visible3}"/>
<sprite depth="2" name="windowicon" style="icon32px" sprite="ui_game_symbol_skull" color="{color4}" visible="{visible4}"/>
<sprite depth="2" name="windowicon" style="icon32px" sprite="ui_game_symbol_skull" color="{color5}" visible="{visible5}"/>
<sprite depth="2" name="windowicon" style="icon32px" sprite="ui_game_symbol_skull" color="{color6}" visible="{visible6}"/>
<sprite depth="2" name="windowicon" style="icon32px" sprite="ui_game_symbol_skull" color="{color7}" visible="{visible7}"/>

<rect width="32" height="32" visible="{visible_half}">
<sprite depth="2" name="windowicon" style="icon32px" sprite="ui_game_symbol_skull" type="filled" fill="0.5" color="255,128,0"/>
<sprite depth="2" name="windowicon" style="icon32px" sprite="ui_game_symbol_skull" type="filled" fill="0.5" fillinvert="true" color="[lightGrey]"/>
</rect>
</grid>
</rect>
</window>
</append>

<!-- Left Panel -->
<remove xpath="/windows/window[@name='HUDLeftStatBars']"/>
Expand Down Expand Up @@ -555,7 +585,7 @@
<quest_objective_tracker_entry />
</grid>

<rect pos="-30,{#trackerheight * -1 - 50}" height="100" width="270" visible="{questhintavailable}">
<rect pos="0,{#trackerheight * -1 - 50}" height="100" width="300" visible="{questhintavailable}">
<!-- <sprite pos="6,6" name="Background" sprite="ui_game_popup" /> -->
<label depth="3" text="{questhint}" font_size="20" justify="right" parse_actions="true" actions_default_format="( [e61a16]###[-] )" spacing_y="5" effect="Outline8" effect_color="0,0,0,255" effect_distance="1,1" />
</rect>
Expand Down
70 changes: 33 additions & 37 deletions ProjectZ_2.5/Config/blocks.xml
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,7 @@
<property name="SortOrder1" value="U200"/>
<property name="SortOrder2" value="0000"/>
<property name="FilterTags" value="MC_playerBlocks,SC_playerHelpers"/>
<property name="EconomicValue" value="67"/>
</block>

<!-- *** BIG STORAGE -->
Expand Down Expand Up @@ -1630,7 +1631,7 @@
<property name="HeatMapFrequency" value="500"/>

<property name="BuffsWhenWalkedOn" value="buffBurningEnvironment"/>
<property name="ActiveRadiusEffects" value="buffCampfireAOE(5)"/>
<property name="ActiveRadiusEffects" value="buffCampfireAOE,5"/>
<property name="OpenSound" value="forge_open"/>
<property name="CloseSound" value="forge_close"/>
<property name="CraftSound" value="forge_smelt_click"/>
Expand Down Expand Up @@ -1757,7 +1758,7 @@
<property name="HeatMapStrength" value="3"/>
<property name="HeatMapTime" value="2500"/>
<property name="HeatMapFrequency" value="500"/>
<property name="ActiveRadiusEffects" value="buffCampfireAOE(3)"/>
<property name="ActiveRadiusEffects" value="buffCampfireAOE,3"/>
<property name="OpenSound" value="chem_station_open"/>
<property name="CloseSound" value="chem_station_close"/>
<property name="CraftSound" value="chem_station_mix_click"/>
Expand Down Expand Up @@ -1826,7 +1827,7 @@
<property name="HeatMapTime" value="5000"/>
<property name="HeatMapFrequency" value="1000"/>
<property name="BuffsWhenWalkedOn" value="buffBurningEnvironment"/>
<property name="ActiveRadiusEffects" value="buffCampfireAOE(3)"/>
<property name="ActiveRadiusEffects" value="buffCampfireAOE,3"/>
<property name="OpenSound" value="campfire_open"/>
<property name="CloseSound" value="campfire_close"/>
<property name="CraftSound" value="campfire_cook_click"/>
Expand Down Expand Up @@ -2175,7 +2176,7 @@
<property name="SoundPickup" value="bladetrap_grab"/>
<property name="SoundPlace" value="bladetrap_place"/>
<property name="FuelTypes" value="ammoGasCan,1000,ammoGasCan,1000,ammoGasCan,1000"/>
<property name="ActivationEvent" value="block_autominer_uw"/>
<property name="CloseEvent" value="block_autominer_uw"/>
<property name="RequiredMods" value="toolAutominerSpareParts,toolAutominerResourcePacker,toolAutominerSiren"/>
<property name="RequiredModsOnly" value="true"/>
<property name="CollectorEmptyText" value="dewCollectorEmpty"/>
Expand Down Expand Up @@ -4384,8 +4385,8 @@


<!-- Signal smoke to start the quest -->
<block name="SignalSmokeFaint">
<property name="DescriptionKey" value="SignalSmokeFaintDesc"/>
<block name="SmokeSignalWeak">
<property name="DescriptionKey" value="SmokeSignalWeakDesc"/>
<property name="CustomIcon" value="capChimney"/>
<property name="CustomIconTint" value="#8692FF"/>
<property name="TintColor" value="#8692FF"/>
Expand All @@ -4407,54 +4408,59 @@
<property name="SortOrder2" value="0002"/>
<property name="Group" value="Building,TCScience,advBuilding"/>
<property name="FilterTags" value="MC_playerBlocks,SC_playerHelpers,A21_NEW"/>
<property name="EconomicValue" value="600"/>
</block>

<block name="SignalSmokeMedium">
<property name="Extends" value="SignalSmokeFaint"/>
<property name="DescriptionKey" value="SignalSmokeMediumDesc"/>
<block name="SmokeSignalModerate">
<property name="Extends" value="SmokeSignalWeak"/>
<property name="DescriptionKey" value="SmokeSignalModerateDesc"/>
<property name="CustomIconTint" value="#FFA234"/>
<property name="TintColor" value="#FFA234"/>
<property name="EconomicValue" value="1230"/>
</block>

<block name="SignalSmokeStrong">
<property name="Extends" value="SignalSmokeFaint"/>
<property name="DescriptionKey" value="SignalSmokeStrongDesc"/>
<block name="SmokeSignalStrong">
<property name="Extends" value="SmokeSignalWeak"/>
<property name="DescriptionKey" value="SmokeSignalStrongDesc"/>
<property name="CustomIconTint" value="#FF2F13"/>
<property name="TintColor" value="#FF2F13"/>
<property name="EconomicValue" value="3700"/>
</block>

<block name="SignalSmokeAmmoSmall">
<property name="Extends" value="SignalSmokeFaint"/>
<block name="SmokeSignalWeakAmmo">
<property name="Extends" value="SmokeSignalWeak"/>
<property name="CustomIconTint" value="#5AFF75"/>
<property name="TintColor" value="#5AFF75"/>
</block>

<block name="SignalSmokeAmmoBig">
<property name="Extends" value="SignalSmokeFaint"/>
<property name="DescriptionKey" value="SignalSmokeMediumDesc"/>
<block name="SmokeSignalModerateAmmo">
<property name="Extends" value="SmokeSignalWeak"/>
<property name="DescriptionKey" value="SmokeSignalModerateDesc"/>
<property name="CustomIconTint" value="#009719"/>
<property name="TintColor" value="#009719"/>
<property name="EconomicValue" value="1230"/>
</block>

<block name="SignalSmokeAmmoLarge">
<property name="Extends" value="SignalSmokeFaint"/>
<property name="DescriptionKey" value="SignalSmokeStrongDesc"/>
<block name="SmokeSignalStrongAmmo">
<property name="Extends" value="SmokeSignalWeak"/>
<property name="DescriptionKey" value="SmokeSignalStrongDesc"/>
<property name="CustomIconTint" value="#005D0F"/>
<property name="TintColor" value="#005D0F"/>
<property name="EconomicValue" value="3700"/>
</block>

<block name="SignalSmokeMedicineSmall">
<property name="Extends" value="SignalSmokeFaint"/>
<property name="DescriptionKey" value="SignalSmokeMedicineDesc"/>
<block name="SmokeSignalWeakMedicine">
<property name="Extends" value="SmokeSignalWeak"/>
<property name="DescriptionKey" value="SmokeSignalMedicineDesc"/>
<property name="CustomIconTint" value="#E23C91"/>
<property name="TintColor" value="#E23C91"/>
</block>

<block name="SignalSmokeMedicineBig">
<property name="Extends" value="SignalSmokeFaint"/>
<property name="DescriptionKey" value="SignalSmokeMedicineDesc"/>
<block name="SmokeSignalModerateMedicine">
<property name="Extends" value="SmokeSignalWeak"/>
<property name="DescriptionKey" value="SmokeSignalMedicineDesc"/>
<property name="CustomIconTint" value="#B83CE2"/>
<property name="TintColor" value="#B83CE2"/>
<property name="EconomicValue" value="1230"/>
</block>

<block name="bodyMediumBait">
Expand Down Expand Up @@ -4572,14 +4578,4 @@
<property name="BuffsWhenWalkedOn" value="buffAllergyGrass"/>
</append>

<append xpath="/blocks/block[@name='campfire']">
<property name="ActiveRadiusEffects" value="buffCampfireAOE(3)"/>
</append>
<append xpath="/blocks/block[@name='forge']">
<property name="ActiveRadiusEffects" value="buffCampfireAOE(5)"/>
</append>
<append xpath="/blocks/block[@name='chemistryStation']">
<property name="ActiveRadiusEffects" value="buffCampfireAOE(3)"/>
</append>

</config>
5 changes: 4 additions & 1 deletion ProjectZ_2.5/Config/buffs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18234,7 +18234,7 @@
<stack_type value="replace"/>
<duration value="10"/>
<effect_group>
<passive_effect name="PlayerExpGain" operation="perc_add" value=".05"/>
<passive_effect name="PlayerExpGain" operation="perc_add" value=".10"/>
</effect_group>
</buff>

Expand Down Expand Up @@ -18740,6 +18740,9 @@

</append>

<!-- Defender-Z Phase 2 Storm resist-->
<!-- Will still take damage from buffSnow_Hazard02 , buffBurnt_Hazard02 , buffDesert_Hazard02 , buffWasteland_Hazard02 -->
<!-- TRIGGERED_BY: Buffs = buffSnow_Hazard01 and so on-->
<insertAfter xpath="/buffs/buff[@name='buffBurnt_Storm_Stage02']/effect_group/requirement[@buff='buffBurnt_Storm_Recover01,god']">
<requirement name="CVarCompare" cvar="$StormResist" operation="LT" value="1"/>
</insertAfter>
Expand Down
2 changes: 1 addition & 1 deletion ProjectZ_2.5/Config/entityclasses.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6526,7 +6526,7 @@
<requirement name="RandomRoll" seed_type="Random" min_max="0,100" operation="LTE" value="@$MissChance"/>
<triggered_effect trigger="onOtherAttackedSelf" action="PlaySound" sound="twitch_bucket_hit" play_at_self="true"/>
<triggered_effect trigger="onOtherAttackedSelf" action="AddBuff" buff="buffPackMuleDisplay"/>
<passive_effect name="GeneralDamageResist" operation="base_add" level="5" value="1"/>
<passive_effect name="GeneralDamageResist" operation="base_add" value="1"/>
</effect_group>

<!-- perk Aggressor -->
Expand Down
Loading