Belligerent now prevents you from running even between chants

2017-05-01 12:49:28 -05:00
parent 1842665af6
commit 301ad1b0fc
12 changed files with 122 additions and 27 deletions
@@ -21,7 +21,6 @@
 	var/obj/effect/proc_holder/slab/slab_ability //the slab's current bound ability, for certain scripture
 	var/list/quickbound = list(/datum/clockwork_scripture/ranged_ability/geis_prep, /datum/clockwork_scripture/create_object/replicant, \
 	/datum/clockwork_scripture/create_object/tinkerers_cache) //quickbound scripture, accessed by index
-	var/maximum_quickbound = 5 //how many quickbound scriptures we can have
 	actions_types = list(/datum/action/item_action/clock/hierophant)

 /obj/item/clockwork/slab/starter
@@ -52,7 +51,6 @@
 	nonhuman_usable = TRUE
 	quickbound = list(/datum/clockwork_scripture/ranged_ability/judicial_marker, /datum/clockwork_scripture/ranged_ability/linked_vanguard, \
 	/datum/clockwork_scripture/create_object/tinkerers_cache)
-	maximum_quickbound = 6 //we usually have one or two unique scriptures, so if ratvar is up let us bind one more
 	actions_types = list()

 /obj/item/clockwork/slab/cyborg/engineer //five scriptures, plus a proselytizer
@@ -372,12 +370,11 @@
 		The remaining functions are several buttons in the top left while holding the slab.<br>From left to right, they are:<br>\
 		<b><font color=#DAAA18>Hierophant Network</font></b>, which allows communication to other Servants.<br>")
 		if(LAZYLEN(quickbound))
-			for(var/i in 1 to maximum_quickbound)
-				if(LAZYLEN(quickbound) < i || !quickbound[i])
-					textlist += "A <b>Quickbind</b> slot, currently set to <b><font color=#BE8700>Nothing</font></b>.<br>"
-				else
-					var/datum/clockwork_scripture/quickbind_slot = quickbound[i]
-					textlist += "A <b>Quickbind</b> slot, currently set to <b><font color=[get_component_color_bright(initial(quickbind_slot.primary_component))]>[initial(quickbind_slot.name)]</font></b>.<br>"
+			for(var/i in 1 to quickbound.len)
+				if(!quickbound[i])
+					continue
+				var/datum/clockwork_scripture/quickbind_slot = quickbound[i]
+				textlist += "A <b>Quickbind</b> slot, currently set to <b><font color=[get_component_color_bright(initial(quickbind_slot.primary_component))]>[initial(quickbind_slot.name)]</font></b>.<br>"
 		textlist += "<br>\
 		Examine the slab or swap to Recital to check the number of components it has available.<br><br>\
 		\
@@ -489,8 +486,8 @@
 					quickbound[found_index] = null //otherwise, leave it as a null so the scripture maintains position
 				update_quickbind()
 			else
-				var/target_index = input("Position of [initial(path.name)], 1 to [maximum_quickbound]?", "Input")  as num|null
-				if(isnum(target_index) && target_index > 0 && target_index <= maximum_quickbound && !..())
+				var/target_index = input("Position of [initial(path.name)], 1 to 5?", "Input")  as num|null
+				if(isnum(target_index) && target_index > 0 && target_index < 6 && !..())
 					var/datum/clockwork_scripture/S
 					if(LAZYLEN(quickbound) >= target_index)
 						S = quickbound[target_index]
@@ -0,0 +1,46 @@
+diff a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm	(rejected hunks)
+@@ -21,6 +21,7 @@
+ 	var/obj/effect/proc_holder/slab/slab_ability //the slab's current bound ability, for certain scripture
+ 	var/list/quickbound = list(/datum/clockwork_scripture/ranged_ability/geis_prep, /datum/clockwork_scripture/create_object/replicant, \
+ 	/datum/clockwork_scripture/create_object/tinkerers_cache) //quickbound scripture, accessed by index
+	var/maximum_quickbound = 5 //how many quickbound scriptures we can have
+ 	actions_types = list(/datum/action/item_action/clock/hierophant)
+ 
+ /obj/item/clockwork/slab/starter
+@@ -51,6 +52,7 @@
+ 	nonhuman_usable = TRUE
+ 	quickbound = list(/datum/clockwork_scripture/ranged_ability/judicial_marker, /datum/clockwork_scripture/ranged_ability/linked_vanguard, \
+ 	/datum/clockwork_scripture/create_object/tinkerers_cache)
+	maximum_quickbound = 6 //we usually have one or two unique scriptures, so if ratvar is up let us bind one more
+ 	actions_types = list()
+ 
+ /obj/item/clockwork/slab/cyborg/engineer //five scriptures, plus a proselytizer
+@@ -362,11 +364,12 @@
+ 		The remaining functions are several buttons in the top left while holding the slab.<br>From left to right, they are:<br>\
+ 		<b><font color=#DAAA18>Hierophant Network</font></b>, which allows communication to other Servants.<br>")
+ 		if(LAZYLEN(quickbound))
+-			for(var/i in 1 to quickbound.len)
+-				if(!quickbound[i])
+-					continue
+-				var/datum/clockwork_scripture/quickbind_slot = quickbound[i]
+-				textlist += "A <b>Quickbind</b> slot, currently set to <b><font color=[get_component_color_bright(initial(quickbind_slot.primary_component))]>[initial(quickbind_slot.name)]</font></b>.<br>"
+			for(var/i in 1 to maximum_quickbound)
+				if(LAZYLEN(quickbound) < i || !quickbound[i])
+					textlist += "A <b>Quickbind</b> slot, currently set to <b><font color=#BE8700>Nothing</font></b>.<br>"
+				else
+					var/datum/clockwork_scripture/quickbind_slot = quickbound[i]
+					textlist += "A <b>Quickbind</b> slot, currently set to <b><font color=[get_component_color_bright(initial(quickbind_slot.primary_component))]>[initial(quickbind_slot.name)]</font></b>.<br>"
+ 		textlist += "<br>\
+ 		Examine the slab or swap to Recital to check the number of components it has available.<br><br>\
+ 		\
+@@ -478,8 +481,8 @@
+ 					quickbound[found_index] = null //otherwise, leave it as a null so the scripture maintains position
+ 				update_quickbind()
+ 			else
+-				var/target_index = input("Position of [initial(path.name)], 1 to 5?", "Input")  as num|null
+-				if(isnum(target_index) && target_index > 0 && target_index < 6 && !..())
+				var/target_index = input("Position of [initial(path.name)], 1 to [maximum_quickbound]?", "Input")  as num|null
+				if(isnum(target_index) && target_index > 0 && target_index <= maximum_quickbound && !..())
+ 					var/datum/clockwork_scripture/S
+ 					if(LAZYLEN(quickbound) >= target_index)
+ 						S = quickbound[target_index]
@@ -129,6 +129,7 @@
 	if(ishuman(owner))
 		var/mob/living/carbon/human/H = owner
 		apply_eye_damage(H)
+		return ..()

 /datum/status_effect/wraith_spectacles/tick()
 	if(!ishuman(owner))
@@ -17,23 +17,10 @@
 	sort_priority = 1
 	quickbind = TRUE
 	quickbind_desc = "Forces nearby non-Servants to walk, doing minor damage with each chant.<br><b>Maximum 15 chants.</b>"
-	var/noncultist_damage = 2 //damage per chant to noncultists
-	var/cultist_damage = 8 //damage per chant to non-walking cultists

 /datum/clockwork_scripture/channeled/belligerent/chant_effects(chant_number)
 	for(var/mob/living/carbon/C in hearers(7, invoker))
-		var/number_legs = C.get_num_legs()
-		if(!is_servant_of_ratvar(C) && !C.null_rod_check() && number_legs) //you have legs right
-			C.apply_damage(noncultist_damage * 0.5, BURN, "l_leg")
-			C.apply_damage(noncultist_damage * 0.5, BURN, "r_leg")
-			if(C.m_intent != MOVE_INTENT_WALK)
-				if(!iscultist(C))
-					to_chat(C, "<span class='warning'>Your leg[number_legs > 1 ? "s shiver":" shivers"] with pain!</span>")
-				else //Cultists take extra burn damage
-					to_chat(C, "<span class='warning'>Your leg[number_legs > 1 ? "s burn":" burns"] with pain!</span>")
-					C.apply_damage(cultist_damage * 0.5, BURN, "l_leg")
-					C.apply_damage(cultist_damage * 0.5, BURN, "r_leg")
-				C.toggle_move_intent()
+		C.apply_status_effect(STATUS_EFFECT_BELLIGERENT)
 	return TRUE


@@ -77,7 +77,7 @@
 		if(!prey && LAZYLEN(meals))
 			prey = pick(meals)
 			to_chat(prey, "<span class='heavy_brass'><font size=5>\"You will do, heretic.\"</font></span>\n\
-			<span class='userdanger'You feel something massive turn its crushing focus to you...</span>")
+			<span class='userdanger'>You feel something massive turn its crushing focus to you...</span>")
 			prey << 'sound/effects/ratvar_reveal.ogg'
 	else
 		if((!istype(prey, /obj/singularity/narsie) && prob(10) && LAZYLEN(meals) > 1) || prey.z != z || !(prey in meals))