-
Notifications
You must be signed in to change notification settings - Fork 36
Magic Rework Part 2 #748
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
Open
Wollywoger
wants to merge
66
commits into
MrMelbert:master
Choose a base branch
from
Wollywoger:magic-rework-part-2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Magic Rework Part 2 #748
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… the spellbook list and changes its file name
…oncode into magic-rework-part-2
…er/maplestationcode into magic-rework-part-2
…er/maplestationcode into magic-rework-part-2
…er/maplestationcode into magic-rework-part-2
…of spell/charged/
… notable issues for the system (and some performance, ew)
…em down to less than half of its previous
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Modularity Suggested
Read the README in "maplestation_modules" and follow the instructions or risk doom
Sprites
Fixing up coder sprites is nice
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the second half of the magic rework i finished a while ago. This is mostly meant to bring that system further to being integrated with the base game, and adds a number of changes and features to improve this system
List of additions/changes:
Added two (and a half) sources of mana:
New spells:
Lesser Splatter casting, an empowered and faster recharging version of mana charge which drains some of your blood when you use it
Shatter Lights, basically a projectile spell that shoots the fisher bullet that disrupts lights
Summon Rain Cloud [TODO, THIS IS THE ONLY FEATURE NOT IN YET], summons a temporary raincloud
Eyes of Night, a temporary night vision spell
Adds a psionic quirk, which gives you a mana refund on specific spells, currently only mage hand and sending. Also gives you a summonable pseudo-wand.
fixes and rebalances stuff left in until now (meditation spam bug, volite amulet has been nerfed, etc)
I also did some house keeping involving magic stuff, moving them to better folders, and made some mirrored folders for the vars defines and what have you
notable is that i made the starlight checks that i copied from starlight condensation now available on all subtypes of
/atom/movablesince i anticipate this sort of thing being used by other peopleFinalizations needed before full merge: