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.

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

Jump to bottom

Modpacking wizard, merging spells and ability_master into ability extension. #4217

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
+2,224 −2,347
Open

Modpacking wizard, merging spells and ability_master into ability extension. #4217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 0 additions & 40 deletions code/__defines/gamemode.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,46 +33,6 @@
#define DEFAULT_TELECRYSTAL_AMOUNT 130
#define IMPLANT_TELECRYSTAL_AMOUNT(x) (round(x * 0.49)) // If this cost is ever greater than half of DEFAULT_TELECRYSTAL_AMOUNT then it is possible to buy more TC than you spend

/////////////////
////WIZARD //////
/////////////////

/* WIZARD SPELL FLAGS */
#define GHOSTCAST BITFLAG(0) //can a ghost cast it?
#define NEEDSCLOTHES BITFLAG(1) //does it need the wizard garb to cast? Nonwizard spells should not have this
#define NEEDSHUMAN BITFLAG(2) //does it require the caster to be human?
#define Z2NOCAST BITFLAG(3) //if this is added, the spell can't be cast at centcomm
#define NO_SOMATIC BITFLAG(4) //spell will go off if the person is incapacitated or stunned
#define IGNOREPREV BITFLAG(5) //if set, each new target does not overlap with the previous one
//The following flags only affect different types of spell, and therefore overlap
//Targeted spells
#define INCLUDEUSER BITFLAG(6) //does the spell include the caster in its target selection?
#define SELECTABLE BITFLAG(7) //can you select each target for the spell?
#define NOFACTION BITFLAG(8) //Don't do the same as our faction
#define NONONFACTION BITFLAG(9) //Don't do people other than our faction
//AOE spells
#define IGNOREDENSE BITFLAG(10) //are dense turfs ignored in selection?
#define IGNORESPACE BITFLAG(11) //are space turfs ignored in selection?
//End split flags
#define CONSTRUCT_CHECK BITFLAG(12) //used by construct spells - checks for nullrods
#define NO_BUTTON BITFLAG(13) //spell won't show up in the HUD with this

//invocation
#define SpI_SHOUT "shout"
#define SpI_WHISPER "whisper"
#define SpI_EMOTE "emote"
#define SpI_NONE "none"

//upgrading
#define Sp_SPEED "speed"
#define Sp_POWER "power"
#define Sp_TOTAL "total"

//casting costs
#define Sp_RECHARGE "recharge"
#define Sp_CHARGES "charges"
#define Sp_HOLDVAR "holdervar"

//Voting-related
#define VOTE_PROCESS_ABORT 1
#define VOTE_PROCESS_COMPLETE 2
Expand Down
292 changes: 0 additions & 292 deletions code/_onclick/hud/screen/screen_abilities.dm
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions code/datums/extensions/abilities/abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,7 @@
for(var/datum/ability_handler/handler in ability_handlers)
handler.refresh_login()

/datum/extension/abilities/proc/refresh_element_positioning()
var/row = 0
for(var/datum/ability_handler/handler in ability_handlers)
row += handler.refresh_element_positioning(row)
Loading
Loading