tweak: MA combo steps explain_text. (#3734)

ss220-space · Oct 21, 2023 · 6d931c2 · 6d931c2
1 parent 89299b6
commit 6d931c2
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 6 deletions.
diff --git a/code/modules/martial_arts/combos/adminfu/healing_palm.dm b/code/modules/martial_arts/combos/adminfu/healing_palm.dm
@@ -2,7 +2,6 @@
 	name = "Healing Palm"
 	steps = list(MARTIAL_COMBO_STEP_GRAB, MARTIAL_COMBO_STEP_HELP)
 	explaination_text = "Heals or revives a creature."
-	combo_text_override = "Grab, switch hands, Help"
 
 /datum/martial_combo/adminfu/healing_palm/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
 	user.do_attack_animation(target)

diff --git a/code/modules/martial_arts/combos/cqc/restrain.dm b/code/modules/martial_arts/combos/cqc/restrain.dm
@@ -1,8 +1,7 @@
 /datum/martial_combo/cqc/restrain
 	name = "Restrain"
 	steps = list(MARTIAL_COMBO_STEP_GRAB, MARTIAL_COMBO_STEP_GRAB)
-	explaination_text = "Locks opponents into a restraining position, disarm to knock them out with a choke hold."
-	combo_text_override = "Grab, switch hands, Grab"
+	explaination_text = "Locks opponents into a restraining position. Disarm grabbed opponents after combo to knock them out with a choke hold."
 
 /datum/martial_combo/cqc/restrain/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
 	var/datum/martial_art/cqc/CQC = MA

diff --git a/code/modules/martial_arts/combos/cqc/slam.dm b/code/modules/martial_arts/combos/cqc/slam.dm
@@ -2,7 +2,6 @@
 	name = "Slam"
 	steps = list(MARTIAL_COMBO_STEP_GRAB, MARTIAL_COMBO_STEP_HARM)
 	explaination_text = "Slam opponent into the ground, knocking them down."
-	combo_text_override = "Grab, switch hands, Harm"
 
 /datum/martial_combo/cqc/slam/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
 	if(!target.IsWeakened() && !target.resting && !target.lying)

diff --git a/code/modules/martial_arts/combos/mimejutsu/silencer.dm b/code/modules/martial_arts/combos/mimejutsu/silencer.dm
@@ -2,7 +2,6 @@
 	name = "Silencer"
 	steps = list(MARTIAL_COMBO_STEP_GRAB, MARTIAL_COMBO_STEP_DISARM)
 	explaination_text = "Weakens the opponent and prevents him from speaking for a while."
-	combo_text_override = "Grab, switch hands, Disarm"
 
 /datum/martial_combo/mimejutsu/silencer/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
 	var/datum/martial_art/mimejutsu/mimejutsu = MA

diff --git a/code/modules/martial_arts/combos/mrchang/steal_card.dm b/code/modules/martial_arts/combos/mrchang/steal_card.dm
@@ -2,7 +2,6 @@
 	name = "Bonus card please!"
 	steps = list(MARTIAL_COMBO_STEP_GRAB, MARTIAL_COMBO_STEP_DISARM)
 	explaination_text = "Забирает у цели любой предмет, находящийся в слоте ID-карты и помещает его в руку атакующего."
-	combo_text_override = "Grab, switch hands, Disarm"
 
 /datum/martial_combo/mr_chang/steal_card/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
 	var/mob/living/carbon/human/T = target

diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm
@@ -192,6 +192,7 @@
 	explaination_header(user)
 	explaination_combos(user)
 	explaination_footer(user)
+	explaination_notice(user)
 
 // Put after the header and before the footer in the explaination text
 /datum/martial_art/proc/explaination_combos(user)
@@ -208,6 +209,9 @@
 /datum/martial_art/proc/explaination_footer(user)
 	return
 
+/datum/martial_art/proc/explaination_notice(user)
+	return to_chat(user, "<b><i>Combo steps can be provided only with empty hand!</b></i>")
+
 /datum/martial_art/proc/try_deflect(mob/user)
 	return prob(deflection_chance)
 

diff --git a/code/modules/martial_arts/mrchang.dm b/code/modules/martial_arts/mrchang.dm
@@ -36,3 +36,6 @@
 	to_chat(user, "<span class='notice'>Business lunch</span>: Глутамат натрия теперь восстанавливает 0,75 ожогового/физического урона. (Содержится в малом количестве в еде Mr. Chang)")
 	to_chat(user, "<span class='notice'>TAKEYOMONEY</span>: Пачка купюр при броске наносит урон, пропорциональный толщине пачки.")
 	to_chat(user, "<span class='notice'>Change please!</span>: Монеты при броске имеют шанс в 30% застрять в теле жертвы, нанося малый периодический урон")
+
+/datum/martial_art/mr_chang/explaination_notice(user)
+	to_chat(user, "<b><i>Шаги комбо могут быть произведены только пустой активной рукой!</i></b>")
diff --git a/code/modules/martial_arts/sleeping_carp.dm b/code/modules/martial_arts/sleeping_carp.dm
@@ -59,5 +59,8 @@
 /datum/martial_art/the_sleeping_carp/explaination_footer(user)
 	to_chat(user, "<b><i>Кроме того, если при стрельбе в вас включен режим броска, вы переходите в режим активной обороны, в котором блокируете и отклоняете все выпущенные в вас снаряды!</i></b>")
 
+/datum/martial_art/the_sleeping_carp/explaination_notice(user)
+	to_chat(user, "<b><i>Шаги комбо могут быть произведены только пустой активной рукой!</i></b>")
+
 /datum/martial_art/the_sleeping_carp/try_deflect(mob/user)
 	return user.in_throw_mode && ..() // in case an admin wants to var edit carp to have less deflection chance