From da324e7661c33ee9cf1ec44e57187cef19574c2a Mon Sep 17 00:00:00 2001 From: Akke Date: Sun, 20 Dec 2015 23:25:06 +0000 Subject: [PATCH 01/10] nyet cyka russian mumbles --- code/datums/martial.dm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/code/datums/martial.dm b/code/datums/martial.dm index 71dca89f54f..40fcb13bb40 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -255,6 +255,15 @@ basic_hit(A,D) return 1 +/mob/living/carbon/human/proc/plasma_fist_help() + set name = "Recall Teachings" + set desc = "Remember the martial techniques of the Plasma Fist." + set category = "Plasma Fist" + + usr << "You clench your fists and have a flashback of knowledge..." + usr << "Tornado Sweep: Harm Harm Disarm. Repulses target and everyone back." + usr << "Throwback: Disarm Harm Disarm. Throws the target and an item at them." + usr << "The Plasma Fist: Harm Disarm Disarm Disarm Harm. Knocks the brain out of the opponent and gibs their body." //Used by the gang of the same name. Uses combos. Basic attacks bypass armor and never miss #define WRIST_WRENCH_COMBO "DD" @@ -442,11 +451,25 @@ var/datum/martial_art/plasma_fist/F = new/datum/martial_art/plasma_fist(null) F.teach(H) H << "You have learned the ancient martial art of Plasma Fist." + user.verbs += /mob/living/carbon/human/proc/plasma_fist_help used = 1 desc = "It's completely blank." name = "empty scroll" icon_state = "blankscroll" + +/mob/living/carbon/human/proc/sleeping_carp_help() + set name = "Recall Teachings" + set desc = "Remember the martial techniques of the Sleeping Carp clan." + set category = "Sleeping Carp" + + usr << "You retreat inward and recall the teachings of the Sleeping Carp..." + usr << "Wrist Wrench: Disarm Disarm. Forces opponent to drop item in hand." + usr << "Back Kick: Harm Grab. Opponent must be facing away. Knocks down." + usr << "Stomach Knee: Grab Harm. Knocks the wind out of opponent and stuns." + usr << "Head Kick: Disarm Harm Harm. Decent damage, forces opponent to drop item in hand." + usr << "Elbow Drop: Harm Disarm Harm Disarm Harm. Opponent must be on the ground. Deals huge damage, instantly kills anyone in critical condition." + /obj/item/weapon/sleeping_carp_scroll name = "mysterious scroll" desc = "A scroll filled with strange markings. It seems to be drawings of some sort of martial art." From 39e7e7f5bab601d449655467a2eef14321973ce5 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Mon, 21 Dec 2015 00:12:36 +0000 Subject: [PATCH 02/10] Update martial.dm --- code/datums/martial.dm | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/code/datums/martial.dm b/code/datums/martial.dm index 40fcb13bb40..c0cb3dfe6de 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -457,19 +457,6 @@ name = "empty scroll" icon_state = "blankscroll" - -/mob/living/carbon/human/proc/sleeping_carp_help() - set name = "Recall Teachings" - set desc = "Remember the martial techniques of the Sleeping Carp clan." - set category = "Sleeping Carp" - - usr << "You retreat inward and recall the teachings of the Sleeping Carp..." - usr << "Wrist Wrench: Disarm Disarm. Forces opponent to drop item in hand." - usr << "Back Kick: Harm Grab. Opponent must be facing away. Knocks down." - usr << "Stomach Knee: Grab Harm. Knocks the wind out of opponent and stuns." - usr << "Head Kick: Disarm Harm Harm. Decent damage, forces opponent to drop item in hand." - usr << "Elbow Drop: Harm Disarm Harm Disarm Harm. Opponent must be on the ground. Deals huge damage, instantly kills anyone in critical condition." - /obj/item/weapon/sleeping_carp_scroll name = "mysterious scroll" desc = "A scroll filled with strange markings. It seems to be drawings of some sort of martial art." From 9bb1585b592fb2a8cd1858b06cb0f301e5ef9d4e Mon Sep 17 00:00:00 2001 From: Akke Date: Mon, 21 Dec 2015 12:31:30 +0000 Subject: [PATCH 03/10] adds wrestling data --- code/datums/martial.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/datums/martial.dm b/code/datums/martial.dm index 40fcb13bb40..148aa431ca1 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -175,6 +175,16 @@ D.apply_damage(10, STAMINA, affecting, armor_block) return 1 +/mob/living/carbon/human/proc/wrestling_help() + set name = "Recall Teachings" + set desc = "Remember how to wrestle." + set category = "Wrestling" + + usr << "You flex your muscles and have a revelation..." + usr << "Clinch: Grab. Passively gives you a chance to immediately aggressively grab someone. Not always successful." + usr << "Suplex: Disarm someone you are grabbing. Suplexes your target to the floor. Greatly injures them and leaves both you and your target on the floor." + usr << "Advanced grab: Grab. Passively causes stamina damage when grabbing someone. + #define TORNADO_COMBO "HHD" #define THROWBACK_COMBO "DHD" #define PLASMA_COMBO "HDDDH" @@ -426,6 +436,8 @@ if(slot == slot_belt) var/mob/living/carbon/human/H = user style.teach(H,1) + user.verbs += /mob/living/carbon/human/proc/wrestling_help + user << "You have an urge to flex your muscles and get into a fight. You have the knowledge of a thousand wrestlers before you. You can remember more by using the Recall teaching verb in the wresting tab." return /obj/item/weapon/storage/belt/champion/wrestling/dropped(mob/user) @@ -434,6 +446,8 @@ var/mob/living/carbon/human/H = user if(H.get_item_by_slot(slot_belt) == src) style.remove(H) + user.verbs -= /mob/living/carbon/human/proc/wrestling_help + user << "You no longer have an urge to flex your muscles." return /obj/item/weapon/plasma_fist_scroll From 61ae415ae06c5f8c01609fa41883a8f4a4c8564d Mon Sep 17 00:00:00 2001 From: Akke Date: Mon, 21 Dec 2015 12:38:40 +0000 Subject: [PATCH 04/10] fixes missing " --- code/datums/martial.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/martial.dm b/code/datums/martial.dm index de25cc885fd..eb7150b459a 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -183,7 +183,7 @@ usr << "You flex your muscles and have a revelation..." usr << "Clinch: Grab. Passively gives you a chance to immediately aggressively grab someone. Not always successful." usr << "Suplex: Disarm someone you are grabbing. Suplexes your target to the floor. Greatly injures them and leaves both you and your target on the floor." - usr << "Advanced grab: Grab. Passively causes stamina damage when grabbing someone. + usr << "Advanced grab: Grab. Passively causes stamina damage when grabbing someone." #define TORNADO_COMBO "HHD" #define THROWBACK_COMBO "DHD" From c0ef8696e0da97fc7c6d2c69e43b53e0a902f1d6 Mon Sep 17 00:00:00 2001 From: Akke Date: Mon, 21 Dec 2015 23:08:35 +0000 Subject: [PATCH 05/10] Adds help functions to learning and forgetting fighting styles --- code/datums/martial.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/martial.dm b/code/datums/martial.dm index eb7150b459a..6523aacc6c0 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -68,12 +68,14 @@ base = H.martial_art.base else H.martial_art.base = src //temporary styles have priority + += /mob/living/carbon/human/proc/martial_art_help return H.martial_art = src /datum/martial_art/proc/remove(mob/living/carbon/human/H) if(H.martial_art != src) return + -= /mob/living/carbon/human/proc/martial_art_help H.martial_art = base /datum/martial_art/boxing From a8faf3e4e78040ed5bd079c11df3c5344cd4d741 Mon Sep 17 00:00:00 2001 From: Akke Date: Thu, 24 Dec 2015 17:18:07 +0000 Subject: [PATCH 06/10] i think this should do it --- code/datums/martial.dm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/code/datums/martial.dm b/code/datums/martial.dm index 6523aacc6c0..da54f4d4dab 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -6,6 +6,7 @@ var/temporary = 0 var/datum/martial_art/base = null // The permanent style var/deflection_chance = 0 //Chance to deflect projectiles + var/help_verb/base /datum/martial_art/proc/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) return 0 @@ -68,14 +69,12 @@ base = H.martial_art.base else H.martial_art.base = src //temporary styles have priority - += /mob/living/carbon/human/proc/martial_art_help return H.martial_art = src /datum/martial_art/proc/remove(mob/living/carbon/human/H) if(H.martial_art != src) return - -= /mob/living/carbon/human/proc/martial_art_help H.martial_art = base /datum/martial_art/boxing @@ -177,11 +176,10 @@ D.apply_damage(10, STAMINA, affecting, armor_block) return 1 -/mob/living/carbon/human/proc/wrestling_help() + var/help_verb/wrestling set name = "Recall Teachings" set desc = "Remember how to wrestle." set category = "Wrestling" - usr << "You flex your muscles and have a revelation..." usr << "Clinch: Grab. Passively gives you a chance to immediately aggressively grab someone. Not always successful." usr << "Suplex: Disarm someone you are grabbing. Suplexes your target to the floor. Greatly injures them and leaves both you and your target on the floor." @@ -267,7 +265,7 @@ basic_hit(A,D) return 1 -/mob/living/carbon/human/proc/plasma_fist_help() + var/help_verb/plasma_fist set name = "Recall Teachings" set desc = "Remember the martial techniques of the Plasma Fist." set category = "Plasma Fist" @@ -395,12 +393,13 @@ return 1 return ..() -/mob/living/carbon/human/proc/sleeping_carp_help() + var/help_verb/base/sleeping_carp set name = "Recall Teachings" set desc = "Remember the martial techniques of the Sleeping Carp clan." set category = "Sleeping Carp" usr << "You retreat inward and recall the teachings of the Sleeping Carp..." + usr << "Wrist Wrench: Disarm Disarm. Forces opponent to drop item in hand." usr << "Back Kick: Harm Grab. Opponent must be facing away. Knocks down." usr << "Stomach Knee: Grab Harm. Knocks the wind out of opponent and stuns." @@ -438,7 +437,7 @@ if(slot == slot_belt) var/mob/living/carbon/human/H = user style.teach(H,1) - user.verbs += /mob/living/carbon/human/proc/wrestling_help + user.verbs +=help_verb/wrestling user << "You have an urge to flex your muscles and get into a fight. You have the knowledge of a thousand wrestlers before you. You can remember more by using the Recall teaching verb in the wresting tab." return @@ -448,7 +447,7 @@ var/mob/living/carbon/human/H = user if(H.get_item_by_slot(slot_belt) == src) style.remove(H) - user.verbs -= /mob/living/carbon/human/proc/wrestling_help + user.verbs -=help_verb/wrestling user << "You no longer have an urge to flex your muscles." return @@ -467,7 +466,7 @@ var/datum/martial_art/plasma_fist/F = new/datum/martial_art/plasma_fist(null) F.teach(H) H << "You have learned the ancient martial art of Plasma Fist." - user.verbs += /mob/living/carbon/human/proc/plasma_fist_help + user.verbs += help_verb/plasma_fist used = 1 desc = "It's completely blank." name = "empty scroll" @@ -487,7 +486,7 @@ return 0 user << "You have learned the ancient martial art of the Sleeping Carp! Your hand-to-hand combat has become much more effective, and you are now able to deflect any projectiles \ directed toward you. However, you are also unable to use any ranged weaponry. You can learn more about your newfound art by using the Recall Teachings verb in the Sleeping Carp tab." - user.verbs += /mob/living/carbon/human/proc/sleeping_carp_help + user.verbs += help_verb/sleeping_carp var/datum/martial_art/the_sleeping_carp/theSleepingCarp = new(null) theSleepingCarp.teach(user) user.drop_item() From 6179b857117dfa610a408725db6c2f25908e840f Mon Sep 17 00:00:00 2001 From: Akke Date: Thu, 24 Dec 2015 17:45:13 +0000 Subject: [PATCH 07/10] thanks tkrg --- code/datums/martial.dm | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/code/datums/martial.dm b/code/datums/martial.dm index da54f4d4dab..df93fc60c2a 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -6,7 +6,7 @@ var/temporary = 0 var/datum/martial_art/base = null // The permanent style var/deflection_chance = 0 //Chance to deflect projectiles - var/help_verb/base + var/help_verb = null /datum/martial_art/proc/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) return 0 @@ -62,6 +62,8 @@ return 1 /datum/martial_art/proc/teach(mob/living/carbon/human/H,make_temporary=0) + if(help_verb) + H.verbs += help_verb if(make_temporary) temporary = 1 if(H.martial_art && H.martial_art.temporary) @@ -76,6 +78,8 @@ if(H.martial_art != src) return H.martial_art = base + if(help_verb) + H.verbs -= help_verb /datum/martial_art/boxing name = "Boxing" @@ -126,6 +130,12 @@ /datum/martial_art/wrestling name = "Wrestling" + help_verb = /mob/living/carbon/human/proc/wrestling_help + +// combo refence since wrestling uses a different format to sleeping carp and plasma fist. +// Clinch "G" +// Suplex "GD" +// Advanced grab "G" /datum/martial_art/wrestling/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) D.grabbedby(A,1) @@ -176,10 +186,11 @@ D.apply_damage(10, STAMINA, affecting, armor_block) return 1 - var/help_verb/wrestling + /mob/living/carbon/human/proc/wrestling_help() set name = "Recall Teachings" set desc = "Remember how to wrestle." set category = "Wrestling" + usr << "You flex your muscles and have a revelation..." usr << "Clinch: Grab. Passively gives you a chance to immediately aggressively grab someone. Not always successful." usr << "Suplex: Disarm someone you are grabbing. Suplexes your target to the floor. Greatly injures them and leaves both you and your target on the floor." @@ -191,6 +202,8 @@ /datum/martial_art/plasma_fist name = "Plasma Fist" + help_verb = /mob/living/carbon/human/proc/plasma_fist_help + /datum/martial_art/plasma_fist/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D) if(findtext(streak,TORNADO_COMBO)) @@ -265,7 +278,7 @@ basic_hit(A,D) return 1 - var/help_verb/plasma_fist + /mob/living/carbon/human/proc/plasma_fist_help() set name = "Recall Teachings" set desc = "Remember the martial techniques of the Plasma Fist." set category = "Plasma Fist" @@ -284,6 +297,7 @@ /datum/martial_art/the_sleeping_carp name = "The Sleeping Carp" deflection_chance = 100 + help_verb = /mob/living/carbon/human/proc/sleeping_carp_help /datum/martial_art/the_sleeping_carp/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D) if(findtext(streak,WRIST_WRENCH_COMBO)) @@ -393,7 +407,7 @@ return 1 return ..() - var/help_verb/base/sleeping_carp + /mob/living/carbon/human/proc/sleeping_carp_help() set name = "Recall Teachings" set desc = "Remember the martial techniques of the Sleeping Carp clan." set category = "Sleeping Carp" @@ -437,7 +451,6 @@ if(slot == slot_belt) var/mob/living/carbon/human/H = user style.teach(H,1) - user.verbs +=help_verb/wrestling user << "You have an urge to flex your muscles and get into a fight. You have the knowledge of a thousand wrestlers before you. You can remember more by using the Recall teaching verb in the wresting tab." return @@ -447,7 +460,6 @@ var/mob/living/carbon/human/H = user if(H.get_item_by_slot(slot_belt) == src) style.remove(H) - user.verbs -=help_verb/wrestling user << "You no longer have an urge to flex your muscles." return @@ -466,7 +478,6 @@ var/datum/martial_art/plasma_fist/F = new/datum/martial_art/plasma_fist(null) F.teach(H) H << "You have learned the ancient martial art of Plasma Fist." - user.verbs += help_verb/plasma_fist used = 1 desc = "It's completely blank." name = "empty scroll" @@ -486,7 +497,6 @@ return 0 user << "You have learned the ancient martial art of the Sleeping Carp! Your hand-to-hand combat has become much more effective, and you are now able to deflect any projectiles \ directed toward you. However, you are also unable to use any ranged weaponry. You can learn more about your newfound art by using the Recall Teachings verb in the Sleeping Carp tab." - user.verbs += help_verb/sleeping_carp var/datum/martial_art/the_sleeping_carp/theSleepingCarp = new(null) theSleepingCarp.teach(user) user.drop_item() From 9550bf20bc265e7eb6d2bb90f05279b9e3bd3c74 Mon Sep 17 00:00:00 2001 From: Akke Date: Thu, 24 Dec 2015 17:54:08 +0000 Subject: [PATCH 08/10] js first code --- code/datums/martial.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code/datums/martial.dm b/code/datums/martial.dm index df93fc60c2a..f29f376335f 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -6,7 +6,7 @@ var/temporary = 0 var/datum/martial_art/base = null // The permanent style var/deflection_chance = 0 //Chance to deflect projectiles - var/help_verb = null + var/help_verb = null /datum/martial_art/proc/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) return 0 @@ -62,8 +62,8 @@ return 1 /datum/martial_art/proc/teach(mob/living/carbon/human/H,make_temporary=0) - if(help_verb) - H.verbs += help_verb + if(help_verb) + H.verbs += help_verb if(make_temporary) temporary = 1 if(H.martial_art && H.martial_art.temporary) @@ -79,7 +79,7 @@ return H.martial_art = base if(help_verb) - H.verbs -= help_verb + H.verbs -= help_verb /datum/martial_art/boxing name = "Boxing" @@ -130,7 +130,7 @@ /datum/martial_art/wrestling name = "Wrestling" - help_verb = /mob/living/carbon/human/proc/wrestling_help + help_verb = /mob/living/carbon/human/proc/wrestling_help // combo refence since wrestling uses a different format to sleeping carp and plasma fist. // Clinch "G" @@ -202,7 +202,7 @@ /datum/martial_art/plasma_fist name = "Plasma Fist" - help_verb = /mob/living/carbon/human/proc/plasma_fist_help + help_verb = /mob/living/carbon/human/proc/plasma_fist_help /datum/martial_art/plasma_fist/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D) @@ -278,7 +278,7 @@ basic_hit(A,D) return 1 - /mob/living/carbon/human/proc/plasma_fist_help() +/mob/living/carbon/human/proc/plasma_fist_help() set name = "Recall Teachings" set desc = "Remember the martial techniques of the Plasma Fist." set category = "Plasma Fist" @@ -297,7 +297,7 @@ /datum/martial_art/the_sleeping_carp name = "The Sleeping Carp" deflection_chance = 100 - help_verb = /mob/living/carbon/human/proc/sleeping_carp_help + help_verb = /mob/living/carbon/human/proc/sleeping_carp_help /datum/martial_art/the_sleeping_carp/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D) if(findtext(streak,WRIST_WRENCH_COMBO)) @@ -407,7 +407,7 @@ return 1 return ..() - /mob/living/carbon/human/proc/sleeping_carp_help() +/mob/living/carbon/human/proc/sleeping_carp_help() set name = "Recall Teachings" set desc = "Remember the martial techniques of the Sleeping Carp clan." set category = "Sleeping Carp" From b4c9dc60eb36537fce527901a27b74937608f0fc Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Mon, 28 Dec 2015 13:59:07 +0000 Subject: [PATCH 09/10] Update martial.dm --- code/datums/martial.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/martial.dm b/code/datums/martial.dm index f29f376335f..e2ebe71152f 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -186,7 +186,7 @@ D.apply_damage(10, STAMINA, affecting, armor_block) return 1 - /mob/living/carbon/human/proc/wrestling_help() +/mob/living/carbon/human/proc/wrestling_help() set name = "Recall Teachings" set desc = "Remember how to wrestle." set category = "Wrestling" From a4977e3e2d58f76d20c33706a3d3cb61d29bc129 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Mon, 28 Dec 2015 17:06:27 +0000 Subject: [PATCH 10/10] fixes drunk typo --- code/datums/martial.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/martial.dm b/code/datums/martial.dm index e2ebe71152f..3ba9425b915 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -451,7 +451,7 @@ if(slot == slot_belt) var/mob/living/carbon/human/H = user style.teach(H,1) - user << "You have an urge to flex your muscles and get into a fight. You have the knowledge of a thousand wrestlers before you. You can remember more by using the Recall teaching verb in the wresting tab." + user << "You have an urge to flex your muscles and get into a fight. You have the knowledge of a thousand wrestlers before you. You can remember more by using the Recall teaching verb in the wrestling tab." return /obj/item/weapon/storage/belt/champion/wrestling/dropped(mob/user)