Merge pull request #10157 from KorPhaeron/rightandwrong

Summon Guns once again creates antagonists

code/game/gamemodes/objective.dm

@@ -576,3 +576,21 @@ var/global/list/possible_items_special = list()
 		explanation_text = "Destroy [target.name], the experimental AI."
 	else
 		explanation_text = "Free Objective"
+
+/datum/objective/summon_guns
+	explanation_text = "Steal at least five guns!"
+
+/datum/objective/summon_guns/check_completion()
+	if(!isliving(owner.current))	return 0
+	var/guncount = 0
+	var/list/all_items = owner.current.GetAllContents()	//this should get things in cheesewheels, books, etc.
+	for(var/obj/I in all_items) //Check for guns
+		if(istype(I, /obj/item/weapon/gun))
+			guncount++
+	if(guncount >= 5)
+		return 1
+	else
+		return 0
+	return 0
+
+

code/game/gamemodes/wizard/rightandwrong.dm

@@ -12,15 +12,18 @@
 	for(var/mob/living/carbon/human/H in player_list)
 		if(H.stat == 2 || !(H.client)) continue
 		if(H.mind)
-			if(H.mind.special_role == "Wizard" || H.mind.special_role == "apprentice") continue
+			if(H.mind.special_role == "Wizard" || H.mind.special_role == "apprentice" || H.mind.special_role == "survivalist") continue
 		if(prob(survivor_probability) && !(H.mind in ticker.mode.traitors))
 			ticker.mode.traitors += H.mind
-			H.mind.special_role = "traitor"
+			var/datum/objective/summon_guns/guns = new
+			guns.owner = H.mind
+			H.mind.objectives += guns
+			H.mind.special_role = "survivalist"
 			var/datum/objective/survive/survive = new
 			survive.owner = H.mind
 			H.mind.objectives += survive
-			H.attack_log += "\[[time_stamp()]\] <font color='red'>Was made into a survivor, and trusts no one!</font>"
-			H << "<B>You are the survivor! Your own safety matters above all else, trust no one and kill anyone who gets in your way. However, armed as you are, now would be the perfect time to settle that score or grab that pair of yellow gloves you've been eyeing...</B>"
+			H.attack_log += "\[[time_stamp()]\] <font color='red'>Was made into a survivalist, and trusts no one!</font>"
+			H << "<B>You are the survivalist! Your own safety matters above all else, and the only way to ensure your safety is to stockpile weapons! Grab as many guns as possible, by any means necessary. Kill anyone who gets in your way.</B>"
 			var/obj_count = 1
 			for(var/datum/objective/OBJ in H.mind.objectives)
 				H << "<B>Objective #[obj_count]</B>: [OBJ.explanation_text]"

code/game/gamemodes/wizard/spellbook.dm

@@ -327,9 +327,9 @@
 
 /datum/spellbook_entry/summon/guns
 	name = "Summon Guns"
-	category = "Challenges"
+	category = "Rituals"
 	desc = "Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill you. Just be careful not to stand still too long!"
-	cost = 0
+	cost = 1
 	log_name = "SG"
 
 /datum/spellbook_entry/summon/guns/IsAvailible()
@@ -337,11 +337,9 @@
 
 /datum/spellbook_entry/summon/guns/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book)
 	feedback_add_details("wizard_spell_learned",log_name)
-	rightandwrong(0, user, 0)
-	book.uses += 1
-	active = 1
+	rightandwrong(0, user, 25)
 	playsound(get_turf(user),"sound/magic/CastSummon.ogg",50,1)
-	user << "<span class='notice'>You have cast summon guns and gained an extra charge for your spellbook.</span>"
+	user << "<span class='notice'>You have cast summon guns!</span>"
 	return 1
 
 /datum/spellbook_entry/summon/magic

html/changelogs/KORPHAERON-SUMMONGUNS.yml

@@ -0,0 +1,7 @@
+author: Kor
+
+delete-after: True
+
+changes: 
+  - tweak: "Summon Guns has returned to its former glory. The spell will once again create antagonists, now with the objective to steal as many guns as possible."
+  - tweak: "Summon Guns once again costs a spell point, rather than granting one."