Skip to content

[Z_Master_Skills] Fix tiered solar cell crafting #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rv-jgentile wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[Z_Master_Skills] Fix tiered solar cell crafting #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a51014
fix(master-skills): fix/enable tiered solar cell crafting
rv-jgentile Sep 6, 2024
ff24ce2
chore(master-skills): clean up comment
rv-jgentile Sep 6, 2024
070e3a8
chore(master-skills): newlines
rv-jgentile Sep 6, 2024
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
7 changes: 3 additions & 4 deletions Z_Master_Skills/Config/items.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3266,10 +3266,9 @@
</append>

<!-- Set unlock craft to solarcell -->

<!-- <append xpath="/items/item[@name='solarCell']"> -->
<!-- <property name="UnlockedBy" value="MasterElectrician"/> -->
<!-- </append> -->
<append xpath="/items/item[@name='solarCell']">
<property name="UnlockedBy" value="MasterElectrician"/>
</append>

<!-- Set craft dew tools -->
<set xpath="/items/item[@name='toolDewGatherer']/property[@name='UnlockedBy']/@value">MasterWorkstations</set>
Expand Down
11 changes: 5 additions & 6 deletions Z_Master_Skills/Config/progression.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,18 +318,18 @@
<crafting_skill name="MasterElectrician" max_level="20" parent="attmaster" name_key="MasterElectricianName" desc_key="MasterElectricianDesc" long_desc_key="MasterElectricianLongDesc" icon="ui_game_symbol_electric_generator">

<display_entry item="solarbank" unlock_level="3"/>
<!-- <display_entry item="solarCell" unlock_level="5,7,9,11,13,15"/> -->
<display_entry item="solarCell" unlock_level="5,7,9,11,13,15"/>
<display_entry icon="modMeleeStunBatonRepulsor,controlPanelBase01" name_key="MasterElectricianT3-1,MasterElectricianT3-2" has_quality="false" unlock_level="18,20">
<unlock_entry item="PortableReactor" unlock_tier="1" />
<unlock_entry item="ReactorСhargingStation" unlock_tier="2" />
</display_entry>

<effect_group>
<passive_effect name="RecipeTagUnlocked" operation="base_set" level="3,100" value="1" tags="solarbank"/>
<passive_effect name="RecipeTagUnlocked" operation="base_set" level="5,100" value="1" tags="solarCell"/>
<passive_effect name="RecipeTagUnlocked" operation="base_set" level="5,100" value="1" tags="solarCell" />
<passive_effect name="RecipeTagUnlocked" operation="base_set" level="18,100" value="1" tags="PortableReactor"/>
<passive_effect name="RecipeTagUnlocked" operation="base_set" level="20,100" value="1" tags="ReactorСhargingStation"/>
<!-- <passive_effect name="CraftingTier" operation="base_add" level="5,7,9,11,13,15" value="1,2,3,4,5,5" tags="solarCell"/> -->
<passive_effect name="CraftingTier" operation="base_add" level="7,9,11,13,15,20" value="1,2,3,4,5,5" tags="solarCell" />
</effect_group>
</crafting_skill>

Expand Down Expand Up @@ -469,6 +469,5 @@


</append>


</config>

</config>
24 changes: 12 additions & 12 deletions Z_Master_Skills/Config/recipes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@
<ingredient name="resourceForgedSteel" count="25"/>
</recipe>

<!-- <recipe name="solarCell" count="1" craft_time="1500" craft_area="workbench" tags="learnable,perkMachineGunner"> -->
<!-- <ingredient name="resourceElectricPartsImp" count="10"/> -->
<!-- <ingredient name="resourceBrokenGlass" count="100"/> -->
<!-- <ingredient name="resourceScrapPolymers" count="50"/> -->
<!-- <ingredient name="resourceForgedSteel" count="20"/> -->
<!-- <effect_group> -->
<!-- <passive_effect name="CraftingIngredientCount" level="2,6" operation="base_add" value="3,15" tags="resourceElectricPartsImp"/> -->
<!-- <passive_effect name="CraftingIngredientCount" level="2,6" operation="base_add" value="50,250" tags="resourceBrokenGlass"/> -->
<!-- <passive_effect name="CraftingIngredientCount" level="2,6" operation="base_add" value="30,150" tags="resourceScrapPolymers"/> -->
<!-- <passive_effect name="CraftingIngredientCount" level="5,6" operation="base_add" value="10,50" tags="resourceForgedSteel"/> -->
<!-- </effect_group> -->
<!-- </recipe> -->
<recipe name="solarCell" count="1" craft_time="1500" craft_area="workbench" tags="learnable,perkMachineGunner">

@rv-jgentile rv-jgentile Sep 6, 2024

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<recipe name="solarCell" count="1" craft_time="1500" craft_area="workbench" tags="learnable,perkMachineGunner">
<recipe name="solarCell" count="1" craft_time="1500" craft_area="workbench" tags="learnable,perkAdvancedEngineering">

@BlackRabbitMsk I didn't want to play with this because it's unrelated to the fix in this PR, but is perkMachineGunner correct here? Should this be perkAdvancedEngineering (I think?) instead?

I'm still learning my way around these XMLs but I figured I'd mention it while this PR's open anyway. I added it as a suggestion so you can just click it to update the line if I'm correct.

<ingredient name="resourceElectricPartsImp" count="10"/>
<ingredient name="resourceBrokenGlass" count="100"/>
<ingredient name="resourceScrapPolymers" count="50"/>
<ingredient name="resourceForgedSteel" count="20"/>
<effect_group>
<passive_effect name="CraftingIngredientCount" level="2,6" operation="base_add" value="3,15" tags="resourceElectricPartsImp"/>
<passive_effect name="CraftingIngredientCount" level="2,6" operation="base_add" value="50,250" tags="resourceBrokenGlass"/>
<passive_effect name="CraftingIngredientCount" level="2,6" operation="base_add" value="30,150" tags="resourceScrapPolymers"/>
<passive_effect name="CraftingIngredientCount" level="5,6" operation="base_add" value="10,50" tags="resourceForgedSteel"/>
</effect_group>
</recipe>

<!-- Cement Mixer -->
<recipe name="cementMixerImp" count="1" craft_time="1200" tags="learnable,workbenchCrafting">
Expand Down
4 changes: 2 additions & 2 deletions Z_Master_Skills/ModInfo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<DisplayName value="BR Master Skills"/>
<Description value="New weapons, armor, mods and more"/>
<Author value="BlackRabbit"/>
<Version value="2.0.8"/>
<Version value="2.0.9"/>
<Website value="https://7dtdprojectz.com/"/>
</xml>
</xml>