Skip to content

Commit

Permalink
Some updates
Browse files Browse the repository at this point in the history
  • Loading branch information
EgorDinamit committed Oct 29, 2023
1 parent be9da5b commit 21c7439
Show file tree
Hide file tree
Showing 6 changed files with 88 additions and 4 deletions.
3 changes: 2 additions & 1 deletion code/modules/spellbook/_spellbook.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ GLOBAL_LIST_EMPTY(spells_by_categories)

/obj/item/spellbook/interact(mob/living/user)
var/dat = null
dat += "Your spell points: [user.mind.mana.spell_points].<br>"
dat += "Your spell power: [user.mind.mana.spell_points].<br>"
dat += "Your mana level: [user.mind.mana.mana_level] / [user.mind.mana.mana_level_max].<br>"
dat += "Applied categories: <A href='byond://?src=\ref[src];categories=1'>[english_list(spell_categories, "None")].</a><br>"
dat += "<hr>"
for(var/spell_type in allowed_spells)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/spells/aimed/water_slash.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
break
var/dense_obj = FALSE
for(var/obj/O in T)
if(O.density)
if(O.density && !istype(O, /obj/structure/table) && !istype(O, /obj/structure/railing))
dense_obj = TRUE
break
if(dense_obj)
Expand Down Expand Up @@ -76,7 +76,7 @@
blood_col = H.species.blood_color
// BLOOD BLOOD BLOOD
for(var/i = 1 to min(round(slash_damage * 0.05), 15))
new /obj/effect/temp_visual/bloodsplatter(LT, get_dir(LT, start_turf), blood_col)
new /obj/effect/temp_visual/bloodsplatter(LT, prob(25) ? pick(GLOB.alldirs) : get_dir(LT, start_turf), blood_col)
if(!istype(LT))
continue
LT.add_blood(L)
Expand Down
83 changes: 83 additions & 0 deletions code/modules/spells/general/end_of_everything.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
/datum/spell/end_of_everything
name = "End of Everything"
desc = "Forbidden art of summoning darkest energies from within the veil of magic itself. You are a part of \"everything\", so it might be a bad idea to do it..."
invocation_type = INVOKE_SHOUT
invocation = "Arcesso!"
spell_flags = NEEDSCLOTHES
charge_max = 2 MINUTES
categories = list(SPELL_CATEGORY_FORBIDDEN)
level_max = list(UPGRADE_TOTAL = 0, UPGRADE_SPEED = 0, UPGRADE_POWER = 0)
cast_sound = 'sound/magic/churchbell.ogg'
hud_state = "wiz_endall"

spell_cost = 100
mana_cost = 200

var/list/active_effects = list()

/datum/spell/end_of_everything/Destroy()
ClearEffects()
return ..()

/datum/spell/end_of_everything/cast(list/targets, mob/user)
if(!do_after(user, 10 SECONDS))
to_chat(user, SPAN_NOTICE("You cancel the ritual!"))
ClearEffects()
return
if(!CastCheck(user))
to_chat(user, SPAN_NOTICE("You cancel the ritual!"))
ClearEffects()
return

user.say("Interitus!")

if(!do_after(user, 10 SECONDS))
to_chat(user, SPAN_NOTICE("You cancel the ritual!"))
ClearEffects()
return
if(!CastCheck(user))
to_chat(user, SPAN_NOTICE("You cancel the ritual!"))
ClearEffects()
return

user.say("Annihilatio!")

if(!do_after(user, 10 SECONDS))
to_chat(user, SPAN_NOTICE("You cancel the ritual!"))
ClearEffects()
return
if(!CastCheck(user))
to_chat(user, SPAN_NOTICE("You cancel the ritual!"))
ClearEffects()
return

user.say("Mors et aegritudo!")

if(!do_after(user, 10 SECONDS))
to_chat(user, SPAN_NOTICE("You cancel the ritual!"))
ClearEffects()
return
if(!CastCheck(user))
to_chat(user, SPAN_NOTICE("You cancel the ritual!"))
ClearEffects()
return

user.say("Cruel gods, end it all!!")
to_chat(user, SPAN_WARNING("You feel like you should run..."))
log_and_message_admins("finished casting [src] spell!", user)

new /obj/effect/end_of_everything(get_turf(user))

/datum/spell/end_of_everything/proc/CastCheck(mob/user)
if(!user || QDELETED(user))
return FALSE
if(user.stat)
return FALSE
return TRUE

/datum/spell/end_of_everything/proc/ClearEffects()
for(var/datum/D in active_effects)
qdel(D)
active_effects = null

/obj/effect/end_of_everything
Binary file modified icons/mob/screen_spells.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion maps/away/wizard_den/wizard_den.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

/datum/map_template/ruin/away_site/wizard_den
name = "Wizard Den"
description = "Three z-level map with a shrouded planet with big wizard den."
description = "Three z-level map on a shrouded planet with big wizard den."
id = "wizard_den"
spawn_cost = 4
suffixes = list("wizard_den/wizard_den-1.dmm")
Expand Down
Binary file added sound/magic/churchbell.ogg
Binary file not shown.

0 comments on commit 21c7439

Please sign in to comment.