tweak(necromancer): nerfs the imbalanced class

ChaoticOnyx · Jan 30, 2024 · 0b64486 · 0b64486
1 parent ad1fe2e
commit 0b64486
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/code/_onclick/hud/ability_screen_objects.dm b/code/_onclick/hud/ability_screen_objects.dm
@@ -401,7 +401,7 @@
 		var/datum/spell/toggled/attached_spell = spell
 		AddOverlays(spell.icon_state)
 		if(attached_spell.toggled)
-			overlays.Add("vampire_spell_active")
+			AddOverlays("vampire_spell_active")
 		if(attached_spell.mana_drain_per_tick)
 			var/image/T = image(icon, "blank")
 			T.maptext = MAPTEXT("[attached_spell.mana_current]/[attached_spell.mana_max]")

diff --git a/code/modules/spells/hand/marsh_of_the_dead.dm b/code/modules/spells/hand/marsh_of_the_dead.dm
@@ -1,6 +1,6 @@
 #define MARSH_ACTIVE_TIME 60 SECONDS
-#define MARSH_MIN_UNBUCKLE_TIME 20 SECONDS
-#define MARSH_MAX_UNBUCKLE_TIME 40 SECONDS
+#define MARSH_MIN_UNBUCKLE_TIME 7 SECONDS
+#define MARSH_MAX_UNBUCKLE_TIME 14 SECONDS
 #define MARSH_DAMAGE_PER_UPGRADE 10
 
 /datum/spell/hand/charges/marsh_of_the_dead

diff --git a/code/modules/spells/toggled/immaterial_form.dm b/code/modules/spells/toggled/immaterial_form.dm
@@ -1,4 +1,7 @@
-#define MANA_PER_EMPOWER 40
+#define MANA_PER_EMPOWER         15
+#define MANA_REGEN_PER_QUICKEN   0.5
+#define MIN_MOVEMENT_DELAY       1
+#define MAX_MOVEMENT_DELAY       4
 
 /datum/spell/toggled/immaterial_form
 	name = "Immaterial form"
@@ -22,8 +25,8 @@
 
 	mana_current = 60
 	mana_max = 60
-	mana_drain_per_tick = 5
-	mana_regen_per_tick = 1
+	mana_drain_per_tick = 10
+	mana_regen_per_tick = 0.8
 
 /datum/spell/toggled/immaterial_form/activate()
 	. = ..()
@@ -67,7 +70,7 @@
 
 	spell_levels[SP_SPEED]++
 
-	mana_regen_per_tick++
+	mana_regen_per_tick += MANA_REGEN_PER_QUICKEN
 
 	var/temp = ""
 	name = initial(name)
@@ -134,7 +137,9 @@
 	else
 		to_chat(user, SPAN_WARNING("Some strange aura is blocking the way!"))
 
-	nextmove = world.time + 1 // Better than timers.
+	var/delay = clamp(user.movement_delay(), MIN_MOVEMENT_DELAY, MAX_MOVEMENT_DELAY)
+
+	nextmove = world.time + delay // Better than timers.
 
 /obj/effect/dummy/immaterial_form/bullet_act(obj/item/projectile/Proj, def_zone)
 	if(buckled_mob)
@@ -148,3 +153,5 @@
 	return ..()
 
 #undef MANA_PER_EMPOWER
+#undef MIN_MOVEMENT_DELAY
+#undef MAX_MOVEMENT_DELAY
diff --git a/code/modules/spells/toggled/lich_form.dm b/code/modules/spells/toggled/lich_form.dm
@@ -17,6 +17,7 @@
 	var/mob/living/carbon/human/H = holder
 
 	H.mutations.Add(MUTATION_SKELETON)
+	H.mutations.Add(MUTATION_CLUMSY)
 	for(var/obj/item/organ/external/head/h in H.organs)
 		h.status |= ORGAN_DISFIGURED
 	H.update_body(TRUE)

diff --git a/code/modules/spells/toggled/toggled.dm b/code/modules/spells/toggled/toggled.dm
@@ -35,6 +35,7 @@
 	if(toggled)
 		mana_current -= mana_drain_per_tick
 		if(mana_current <= 0)
+			mana_current = 0
 			toggled = FALSE
 			deactivate()
 	else if(mana_current < mana_max)