From 347b63cbf53ecdae17a664c9d185eb5237c8f6d4 Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Sat, 29 Dec 2018 22:44:00 -0200
Subject: [PATCH] Wizard tweaks and fixes (#5850)

-removes mind control and golem summon from the battlemage, so they can't be a robust combat focused wizard that can also create a legion of followers

-fixes an issue with mind control not taking in consideration the target moving away

-increases the golem spell cooldown
---
 code/modules/spells/aoe_turf/conjure/golem.dm | 2 +-
 code/modules/spells/spellbook/battlemage.dm   | 2 --
 code/modules/spells/targeted/mindcontrol.dm   | 2 +-
 html/changelogs/alberyk-wizardthings.yml      | 7 +++++++
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 html/changelogs/alberyk-wizardthings.yml

diff --git a/code/modules/spells/aoe_turf/conjure/golem.dm b/code/modules/spells/aoe_turf/conjure/golem.dm
index 3d82b6c8934..77e41d48db2 100644
--- a/code/modules/spells/aoe_turf/conjure/golem.dm
+++ b/code/modules/spells/aoe_turf/conjure/golem.dm
@@ -3,7 +3,7 @@
 	desc = "Summon a golem rune at your location, allowing you to create a servant golem with the right materials."
 	feedback = "SGE"
 	summon_type = list(/obj/effect/golemrune/wizard)
-	charge_max = 3000
+	charge_max = 6000
 	spell_flags = 0
 	range = 0
 
diff --git a/code/modules/spells/spellbook/battlemage.dm b/code/modules/spells/spellbook/battlemage.dm
index 61d1bec4768..a7ae0a771c1 100644
--- a/code/modules/spells/spellbook/battlemage.dm
+++ b/code/modules/spells/spellbook/battlemage.dm
@@ -22,9 +22,7 @@
 				/spell/targeted/projectile/dumbfire/stuncuff = 			2,
 				/spell/aoe_turf/conjure/mirage = 		    			1,
 				/spell/targeted/shapeshift/corrupt_form = 				1,
-				/spell/targeted/mindcontrol =							2,
 				/spell/targeted/flesh_to_stone =                        1,
-				/spell/aoe_turf/conjure/golem =							1,
 				/spell/aoe_turf/blink = 								1,
 				/spell/noclothes = 					            		1,
 				/obj/structure/closet/wizard/armor = 					1,
diff --git a/code/modules/spells/targeted/mindcontrol.dm b/code/modules/spells/targeted/mindcontrol.dm
index 21c57226b8a..85d65125421 100644
--- a/code/modules/spells/targeted/mindcontrol.dm
+++ b/code/modules/spells/targeted/mindcontrol.dm
@@ -51,7 +51,7 @@
 		user << "<span class='warning'>You invade the mind of \the [H]!</span>"
 		H << "<span class='danger'>Your mind is invaded by the presence of \the [user]! They are trying to make you a slave!</span>"
 
-		if(!do_after(user, H.stat == CONSCIOUS ? 80 : 40, target, 0, 1))
+		if (!do_mob(user, H, 80))
 			user << "<span class='warning'>Your concentration is broken!</span>"
 			return FALSE
 
diff --git a/html/changelogs/alberyk-wizardthings.yml b/html/changelogs/alberyk-wizardthings.yml
new file mode 100644
index 00000000000..ad5fb90a70d
--- /dev/null
+++ b/html/changelogs/alberyk-wizardthings.yml
@@ -0,0 +1,7 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - rscdel: "Removed mind control and golem rune summon from the battle mage spell books."
+  - balance: "Increased the cooldown of the summon golem rune spell."