Skip to content
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.

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

Wizard NPCs Rework #1522

Draft
wants to merge 30 commits into
base: master
Choose a base branch
from

Conversation

ErhardSteinhauer
Copy link
Contributor

@ErhardSteinhauer ErhardSteinhauer commented Jun 15, 2024

About the PR

Very much WIP.

New items:

  • Blue, Red and purple Wizard robes (sprites by @GentleButter).
  • Staff Altar.
  • Rechargeable wizard's and cultist's staves. Can only be recharged at Staff Altars.
  • Staff altars and Cultist Forge can be disassembled now.

To Do

  • More robes.
  • More staves.
  • Cult specific altar for cultists staves.
  • Funky spells.
  • Distribute new items among NPCs.
  • Loot.
  • Rework wizard NPCs inventory and attacks.
  • Single use spell scrolls.

Why / Balance

The aim of this PR is to flesh out Wizard Federation NPCs and provide more content for players to engage with. WIP.

How to test

Spawn new items

Media

Later

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

  • Changes to \Resources\Prototypes\Entities\Structures\Power\chargers.yml

Changelog
🆑 gentlebutter and erhardsteinhauer

  • add: Later.

Copy link
Contributor

github-actions bot commented Jun 15, 2024

RSI Diff Bot; head commit ddeb77d merging into 30fc4f1
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Clothing/Belt/wizard_sash.rsi

State Old New Status
equipped-belt-base-01 Added
icon-base-01 Added
inhand-left-base-01 Added
inhand-right-base-01 Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_purple.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Mask/wizard.rsi

State Old New Status
equipped-mask-base-01 Added
icon-base-01 Added
inhand-left-base-01 Added
inhand-right-base-01 Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_purple.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi

State Old New Status
hand Added

Resources/Textures/_NF/Effects/wizardbeams.rsi

State Old New Status
green-beam-01 Added
lightning-beam-01 Added
lightning-hit-01 Added
lightning-muzzle-01 Added

Resources/Textures/_NF/Effects/wizardmuzzleflash.rsi

State Old New Status
spell-muzzle-flash-01 Added

Resources/Textures/_NF/Objects/Specific/Wizard/crystal.rsi

State Old New Status
crystalthingy Added

Resources/Textures/_NF/Objects/Specific/Wizard/crystal_paper.rsi

State Old New Status
crystalpaper Added

Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi

State Old New Status
rune-center-01 Added
rune-center-02 Added
rune-center-03 Added
rune-center-04 Added
rune-center-05 Added
rune-center-06 Added
rune-center-07 Added
rune-inner-01 Added
rune-inner-02 Added
rune-inner-03 Added
rune-inner-04 Added
rune-inner-05 Added
rune-inner-06 Added
rune-inner-07 Added
rune-outer-01 Added
rune-words-01 Added
rune-words-02 Added
rune-words-03 Added
rune-words-04 Added
rune-words-05 Added
rune-words-06 Added
rune-words-07 Added

Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi

State Old New Status
base Added
scroll-0 Added
scroll-1 Added
scroll-blank Added
scroll-rolled Added
scroll-seal-rolled Added
scroll-seal-unrolled Added
scroll-text Added
scroll-torn Added

Resources/Textures/_NF/Structures/Specific/BloodCult/recharger_altar_cult.rsi

State Old New Status
empty Added
full Added
light-charged Added
light-charging Added
light-empty Added
light-off Added

Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi

State Old New Status
empty Added
full Added
light-charged Added
light-charging Added
light-empty Added
light-off Added

Edit: diff updated after ddeb77d

Copy link
Contributor

github-actions bot commented Jul 2, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Jul 2, 2024
@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Jul 4, 2024
Copy link
Contributor

github-actions bot commented Jul 8, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Jul 8, 2024
@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Jul 8, 2024
Copy link
Contributor

github-actions bot commented Sep 7, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Sep 7, 2024
@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Sep 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants