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

Adjusts spell Flares Lifetime and Lesser Cooldown #464

Merged
merged 1 commit into from
Apr 13, 2024
Merged

Adjusts spell Flares Lifetime and Lesser Cooldown #464

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
2 changes: 1 addition & 1 deletion ...ion_modules/code/modules/client/preferences/spellbook/items/spellbook_item_lumenomancy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ GLOBAL_LIST_INIT(spellbook_lumenomancy_items, generate_spellbook_items(SPELLBOOK
// Customization to allow lesser flare
/datum/spellbook_item/spell/conjure_item/flare/generate_customization_params()
. = list()
.["lesser"] = new /datum/spellbook_customization_entry/boolean("lesser", "Lesser, weaker, somewhat cheaper version", "A cheap less lasting flare that fizzles out faster than expected, for those just learning magic or unable to grasp the full concept of luminosity.")
.["lesser"] = new /datum/spellbook_customization_entry/boolean("lesser", "Lesser, weaker, somewhat cheaper version", "A cheap less lasting flare that fizzles out faster than normally, along with a considerable cooldown between casts, for those just learning magic or unable to grasp the full concept of luminosity.")

/datum/spellbook_item/spell/illusion
name = "Illusion"
Expand Down
6 changes: 4 additions & 2 deletions maplestation_modules/code/modules/magic/story_spells/flare.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@
if (lesser)
our_spell.item_type = /obj/item/flashlight/glowstick/magic/lesser
our_spell.flare_cost = 10
our_spell.cooldown_time = 2 MINUTES
our_spell.name = "Lesser Flare"
our_spell.desc = "Conjure lumens into a glob to be held or thrown to light an area. Right-click the spell icon to set the light color. This weaker version burns up quicker and may fizzle out after casting."
our_spell.desc = "Conjure lumens into a glob to be held or thrown to light an area. Right-click the spell icon to set the light color. This weaker version burns up quicker and has a considerable cooldown between conjures."
return

/datum/action/cooldown/spell/conjure_item/flare/make_item()
Expand All @@ -59,6 +60,7 @@

/obj/item/flashlight/glowstick/magic/Initialize(mapload)
. = ..()
fuel = rand(5 MINUTES, 10 MINUTES)
set_light_on(TRUE)

/obj/item/flashlight/glowstick/magic/lesser
Expand All @@ -68,7 +70,7 @@

/obj/item/flashlight/glowstick/magic/lesser/Initialize(mapload)
. = ..()
fuel = rand(2, 100)
fuel = rand(1 MINUTES, 5 MINUTES)

//Will have the flare start on and slowly burn through its fuel, when it runs out it will fizzle, fade out and delete itself. Similar to magic lockers from the staff.
/obj/item/flashlight/glowstick/magic/Initialize(mapload)
Expand Down
Loading