diff --git a/code/datums/martial.dm b/code/datums/martial/_martial.dm
similarity index 60%
rename from code/datums/martial.dm
rename to code/datums/martial/_martial.dm
index cf2adfce8c..7b7975bedb 100644
--- a/code/datums/martial.dm
+++ b/code/datums/martial/_martial.dm
@@ -5,23 +5,20 @@
var/id = "" //ID, used by mind/has_martialartcode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proccode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proccode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proccode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proccode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proc
var/current_target
var/datum/martial_art/base // The permanent style. This will be null unless the martial art is temporary
- var/deflection_chance = 0 //Chance to deflect projectiles
- var/reroute_deflection = FALSE //Delete the bullet, or actually deflect it in some direction?
var/block_chance = 0 //Chance to block melee attacks using items while on throw mode.
- var/dodge_chance = 0
var/restraining = 0 //used in cqc's disarm_act to check if the disarmed is being restrained and so whether they should be put in a chokehold or not
var/help_verb
var/pacifism_check = TRUE //are the martial arts combos/attacks unable to be used by pacifist.
var/allow_temp_override = TRUE //if this martial art can be overridden by temporary martial arts
/datum/martial_art/proc/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
- return 0
+ return FALSE
/datum/martial_art/proc/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
- return 0
+ return FALSE
/datum/martial_art/proc/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
- return 0
+ return FALSE
/datum/martial_art/proc/can_use(mob/living/carbon/human/H)
return TRUE
@@ -38,51 +35,6 @@
current_target = new_target
streak = ""
-/datum/martial_art/proc/basic_hit(mob/living/carbon/human/A,mob/living/carbon/human/D)
-
- var/damage = rand(A.dna.species.punchdamagelow, A.dna.species.punchdamagehigh)
-
- var/atk_verb = A.dna.species.attack_verb
- if(D.lying)
- atk_verb = "kick"
-
- switch(atk_verb)
- if("kick")
- A.do_attack_animation(D, ATTACK_EFFECT_KICK)
- if("slash")
- A.do_attack_animation(D, ATTACK_EFFECT_CLAW)
- if("smash")
- A.do_attack_animation(D, ATTACK_EFFECT_SMASH)
- else
- A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
-
- if(!damage)
- playsound(D.loc, A.dna.species.miss_sound, 25, 1, -1)
- D.visible_message("[A] has attempted to [atk_verb] [D]!", \
- "[A] has attempted to [atk_verb] [D]!", null, COMBAT_MESSAGE_RANGE)
- log_combat(A, D, "attempted to [atk_verb]")
- return 0
-
- var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected))
- var/armor_block = D.run_armor_check(affecting, "melee")
-
- playsound(D.loc, A.dna.species.attack_sound, 25, 1, -1)
- D.visible_message("[A] has [atk_verb]ed [D]!", \
- "[A] has [atk_verb]ed [D]!", null, COMBAT_MESSAGE_RANGE)
-
- D.apply_damage(damage, BRUTE, affecting, armor_block)
-
- log_combat(A, D, "punched")
-
- if((D.stat != DEAD) && damage >= A.dna.species.punchstunthreshold)
- D.visible_message("[A] has knocked [D] down!!", \
- "[A] has knocked [D] down!")
- D.apply_effect(40, EFFECT_KNOCKDOWN, armor_block)
- D.forcesay(GLOB.hit_appends)
- else if(D.lying)
- D.forcesay(GLOB.hit_appends)
- return 1
-
/datum/martial_art/proc/teach(mob/living/carbon/human/H, make_temporary = FALSE)
if(!istype(H) || !H.mind)
return FALSE
@@ -121,3 +73,7 @@
if(help_verb)
H.verbs -= help_verb
return
+
+///Gets called when a projectile hits the owner. Returning anything other than BULLET_ACT_HIT will stop the projectile from hitting the mob.
+/datum/martial_art/proc/on_projectile_hit(mob/living/carbon/human/A, obj/item/projectile/P, def_zone)
+ return BULLET_ACT_HIT
\ No newline at end of file
diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm
index e38a011db0..71fb00c467 100644
--- a/code/datums/martial/plasma_fist.dm
+++ b/code/datums/martial/plasma_fist.dm
@@ -12,16 +12,16 @@
if(findtext(streak,TORNADO_COMBO))
streak = ""
Tornado(A,D)
- return 1
+ return TRUE
if(findtext(streak,THROWBACK_COMBO))
streak = ""
Throwback(A,D)
- return 1
+ return TRUE
if(findtext(streak,PLASMA_COMBO))
streak = ""
Plasma(A,D)
- return 1
- return 0
+ return TRUE
+ return FALSE
/datum/martial_art/plasma_fist/proc/TornadoAnimate(mob/living/carbon/human/A)
set waitfor = FALSE
@@ -66,23 +66,20 @@
/datum/martial_art/plasma_fist/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
add_to_streak("H",D)
if(check_streak(A,D))
- return 1
- basic_hit(A,D)
- return 1
+ return TRUE
+ return FALSE
/datum/martial_art/plasma_fist/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
add_to_streak("D",D)
if(check_streak(A,D))
- return 1
- basic_hit(A,D)
- return 1
+ return TRUE
+ return FALSE
/datum/martial_art/plasma_fist/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
add_to_streak("G",D)
if(check_streak(A,D))
- return 1
- basic_hit(A,D)
- return 1
+ return TRUE
+ return FALSE
/mob/living/carbon/human/proc/plasma_fist_help()
set name = "Recall Teachings"
diff --git a/code/datums/martial/psychotic_brawl.dm b/code/datums/martial/psychotic_brawl.dm
index be8659949d..75053dbbfc 100644
--- a/code/datums/martial/psychotic_brawl.dm
+++ b/code/datums/martial/psychotic_brawl.dm
@@ -61,8 +61,8 @@
D.throw_at(throwtarget, 4, 2, A)//So stuff gets tossed around at the same time.
D.DefaultCombatKnockdown(60)
if(7,8)
- basic_hit(A,D)
+ return FALSE
if(atk_verb)
log_combat(A, D, "[atk_verb] (Psychotic Brawling)")
- return 1
\ No newline at end of file
+ return TRUE
\ No newline at end of file
diff --git a/code/datums/martial/rising_bass.dm b/code/datums/martial/rising_bass.dm
index 22605e5624..3b143817ce 100644
--- a/code/datums/martial/rising_bass.dm
+++ b/code/datums/martial/rising_bass.dm
@@ -7,7 +7,6 @@
/datum/martial_art/the_rising_bass
name = "The Rising Bass"
id = MARTIALART_RISINGBASS
- dodge_chance = 100
allow_temp_override = FALSE
help_verb = /mob/living/carbon/human/proc/rising_bass_help
var/datum/action/risingbassmove/sidekick = new/datum/action/risingbassmove/sidekick()
@@ -18,24 +17,24 @@
if(findtext(streak,SIDE_KICK_COMBO))
streak = ""
sideKick(A,D)
- return 1
+ return TRUE
if(findtext(streak,SHOULDER_FLIP_COMBO))
streak = ""
shoulderFlip(A,D)
- return 1
+ return TRUE
if(findtext(streak,REPULSE_PUNCH_COMBO))
streak = ""
repulsePunch(A,D)
- return 1
+ return TRUE
if(findtext(streak,FOOT_SMASH_COMBO))
streak = ""
footSmash(A,D)
- return 1
+ return TRUE
if(findtext(streak,DEFT_SWITCH_COMBO))
streak = ""
deftSwitch(A,D)
- return 1
- return 0
+ return TRUE
+ return FALSE
//Repulse Punch - Slams the opponent far away from you.
@@ -94,7 +93,7 @@
D.forceMove(L)
log_combat(A, D, "side kicked (Rising Bass)")
return TRUE
- return basic_hit(A,D)
+ return TRUE
/datum/martial_art/the_rising_bass/proc/shoulderFlip(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(CHECK_MOBILITY(D, MOBILITY_STAND))
@@ -112,7 +111,7 @@
D.forceMove(L)
log_combat(A, D, "shoulder flipped (Rising Bass)")
return TRUE
- return basic_hit(A,D)
+ return FALSE
/datum/martial_art/the_rising_bass/proc/repulsePunch(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(CHECK_MOBILITY(D, MOBILITY_STAND) && repulsecool < world.time)
@@ -127,7 +126,7 @@
log_combat(A, D, "repulse punched (Rising Bass)")
repulsecool = world.time + 3 SECONDS
return TRUE
- return basic_hit(A,D)
+ return FALSE
/datum/martial_art/the_rising_bass/proc/footSmash(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(CHECK_MOBILITY(D, MOBILITY_STAND))
@@ -139,7 +138,7 @@
D.dropItemToGround(D.get_active_held_item())
log_combat(A, D, "foot smashed (Rising Bass)")
return TRUE
- return basic_hit(A,D)
+ return FALSE
/datum/martial_art/the_rising_bass/proc/deftSwitch(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(CHECK_MOBILITY(D, MOBILITY_STAND))
@@ -158,19 +157,19 @@
/datum/martial_art/the_rising_bass/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
add_to_streak("D",D)
if(check_streak(A,D))
- return 1
+ return TRUE
return ..()
/datum/martial_art/the_rising_bass/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
add_to_streak("H",D)
if(check_streak(A,D))
- return 1
+ return TRUE
return ..()
/datum/martial_art/the_rising_bass/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
add_to_streak("G",D)
if(check_streak(A,D))
- return 1
+ return TRUE
return ..()
/datum/martial_art/the_rising_bass/add_to_streak(element,mob/living/carbon/human/D)
@@ -178,6 +177,22 @@
return
. = ..()
+/datum/martial_art/the_rising_bass/on_projectile_hit(mob/living/carbon/human/A, obj/item/projectile/P, def_zone)
+ . = ..()
+ if(A.incapacitated(FALSE, TRUE)) //NO STUN
+ return BULLET_ACT_HIT
+ if(!(A.mobility_flags & MOBILITY_USE)) //NO UNABLE TO USE
+ return BULLET_ACT_HIT
+ if(A.dna && A.dna.check_mutation(HULK)) //NO HULK
+ return BULLET_ACT_HIT
+ if(!isturf(A.loc)) //NO MOTHERFLIPPIN MECHS!
+ return BULLET_ACT_HIT
+ A.visible_message("[A] dodges the bullet cleanly, they're immune to ranged weapons!", "You dodge out of the way of the projectile!")
+ playsound(get_turf(A), pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE)
+ P.firer = A
+ P.setAngle(rand(0, 360))//SHING
+ return BULLET_ACT_FORCE_PIERCE
+
/mob/living/carbon/human/proc/rising_bass_help()
set name = "Recall Teachings"
set desc = "Remember the martial techniques of the Rising Bass clan."
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
index 464c362a44..b5157857e2 100644
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -1,141 +1,101 @@
-#define WRIST_WRENCH_COMBO "DD"
-#define BACK_KICK_COMBO "HG"
-#define STOMACH_KNEE_COMBO "GH"
-#define HEAD_KICK_COMBO "DHH"
-#define ELBOW_DROP_COMBO "HDHDH"
+#define STRONG_PUNCH_COMBO "HH"
+#define LAUNCH_KICK_COMBO "HD"
+#define DROP_KICK_COMBO "HG"
/datum/martial_art/the_sleeping_carp
name = "The Sleeping Carp"
id = MARTIALART_SLEEPINGCARP
- deflection_chance = 100
- reroute_deflection = TRUE
allow_temp_override = FALSE
help_verb = /mob/living/carbon/human/proc/sleeping_carp_help
- var/old_grab_state = null
/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))
+ if(findtext(streak,STRONG_PUNCH_COMBO))
streak = ""
- wristWrench(A,D)
+ strongPunch(A,D)
return TRUE
- if(findtext(streak,BACK_KICK_COMBO))
+ if(findtext(streak,LAUNCH_KICK_COMBO))
streak = ""
- backKick(A,D)
+ launchKick(A,D)
return TRUE
- if(findtext(streak,STOMACH_KNEE_COMBO))
+ if(findtext(streak,DROP_KICK_COMBO))
streak = ""
- kneeStomach(A,D)
- return TRUE
- if(findtext(streak,HEAD_KICK_COMBO))
- streak = ""
- headKick(A,D)
- return TRUE
- if(findtext(streak,ELBOW_DROP_COMBO))
- streak = ""
- elbowDrop(A,D)
+ dropKick(A,D)
return TRUE
return FALSE
-/datum/martial_art/the_sleeping_carp/proc/wristWrench(mob/living/carbon/human/A, mob/living/carbon/human/D)
- if(CHECK_MOBILITY(D, MOBILITY_USE))
- log_combat(A, D, "wrist wrenched (Sleeping Carp)")
- A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
- D.visible_message("[A] grabs [D]'s wrist and wrenches it sideways!", \
- "[A] grabs your wrist and violently wrenches it to the side!")
- playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
- D.emote("scream")
- D.dropItemToGround(D.get_active_held_item())
- D.apply_damage(5, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
- D.DefaultCombatKnockdown(60)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun()
- return TRUE
- return basic_hit(A,D)
+///Gnashing Teeth: Harm Harm, consistent 20 force punch on every second harm punch, has a chance to crit
+/datum/martial_art/the_sleeping_carp/proc/strongPunch(mob/living/carbon/human/A, mob/living/carbon/human/D)
+ ///this var is so that the strong punch is always aiming for the body part the user is targeting and not trying to apply to the chest before deviating
+ var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected))
+ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
+ var/atk_verb = pick("precisely kick", "brutally chop", "cleanly hit", "viciously slam")
+ ///this is the critical hit damage added to the attack if it rolls, it starts at 0 because it'll be changed when rolled
+ var/crit_damage = 0
+ D.visible_message("[A] [atk_verb]s [D]!", \
+ "[A] [atk_verb]s you!", null, null, A)
+ to_chat(A, "You [atk_verb] [D]!")
+ if(prob(10))
+ crit_damage += 20
+ playsound(get_turf(D), 'sound/weapons/bite.ogg', 50, TRUE, -1)
+ D.visible_message("[D] sputters blood as the blow strikes them with inhuman force!", "You are struck with incredible precision by [A]!")
+ log_combat(A, D, "critcal strong punched (Sleeping Carp)")//log it here because a critical can swing for 40 force and it's important for the sake of how hard they hit
+ else
+ playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, TRUE, -1)
+ log_combat(A, D, "strong punched (Sleeping Carp)")//so as to not double up on logging
+ D.apply_damage(20 + crit_damage, BRUTE, affecting)
+ return
-/datum/martial_art/the_sleeping_carp/proc/backKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
- if(CHECK_MOBILITY(D, MOBILITY_STAND))
- if(A.dir == D.dir)
- log_combat(A, D, "back-kicked (Sleeping Carp)")
- A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
- D.visible_message("[A] kicks [D] in the back!", \
- "[A] kicks you in the back, making you stumble and fall!")
- step_to(D,get_step(D,D.dir),1)
- D.DefaultCombatKnockdown(80)
- playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
- return TRUE
- else
- log_combat(A, D, "missed a back-kick (Sleeping Carp) on")
- D.visible_message("[A] tries to kick [D] in the back, but misses!", \
- "[A] tries to kick you in the back, but misses!")
- return basic_hit(A,D)
+///Crashing Wave Kick: Harm Disarm combo, throws people seven tiles backwards
+/datum/martial_art/the_sleeping_carp/proc/launchKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
+ A.do_attack_animation(D, ATTACK_EFFECT_KICK)
+ D.visible_message("[A] kicks [D] square in the chest, sending them flying!", \
+ "You are kicked square in the chest by [A], sending you flying!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)
+ playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
+ var/atom/throw_target = get_edge_target_turf(D, A.dir)
+ D.throw_at(throw_target, 7, 14, A)
+ D.apply_damage(15, BRUTE, BODY_ZONE_CHEST)
+ log_combat(A, D, "launchkicked (Sleeping Carp)")
+ return
-/datum/martial_art/the_sleeping_carp/proc/kneeStomach(mob/living/carbon/human/A, mob/living/carbon/human/D)
- if(CHECK_MOBILITY(D, MOBILITY_STAND))
- log_combat(A, D, "stomach kneed (Sleeping Carp)")
- A.do_attack_animation(D, ATTACK_EFFECT_KICK)
- D.visible_message("[A] knees [D] in the stomach!", \
- "[A] winds you with a knee in the stomach!")
- D.audible_message("[D] gags!")
- D.losebreath += 3
- D.DefaultCombatKnockdown(40)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun()
- playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
- return TRUE
- return basic_hit(A,D)
-
-/datum/martial_art/the_sleeping_carp/proc/headKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
- if(CHECK_MOBILITY(D, MOBILITY_STAND))
- log_combat(A, D, "head kicked (Sleeping Carp)")
- A.do_attack_animation(D, ATTACK_EFFECT_KICK)
- D.visible_message("[A] kicks [D] in the head!", \
- "[A] kicks you in the jaw!")
- D.apply_damage(20, BRUTE, BODY_ZONE_HEAD)
+///Keelhaul: Harm Grab combo, knocks people down, deals stamina damage while they're on the floor
+/datum/martial_art/the_sleeping_carp/proc/dropKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
+ A.do_attack_animation(D, ATTACK_EFFECT_KICK)
+ playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
+ if((D.mobility_flags & MOBILITY_STAND))
+ D.apply_damage(10, BRUTE, BODY_ZONE_HEAD)
+ D.DefaultCombatKnockdown(50) //Not much can really be done about the knockdown being so strong without a refactor
+ D.adjustStaminaLoss(40) //A cit specific change form the tg port to really punish anyone who tries to stand up
+ D.visible_message("[A] kicks [D] in the head, sending them face first into the floor!", \
+ "You are kicked in the head by [A], sending you crashing to the floor!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)
+ if(!(D.mobility_flags & MOBILITY_STAND))
+ D.apply_damage(5, BRUTE, BODY_ZONE_HEAD)
+ D.adjustStaminaLoss(40)
D.drop_all_held_items()
- playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
- D.DefaultCombatKnockdown(80)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun()
- return TRUE
- return basic_hit(A,D)
-
-/datum/martial_art/the_sleeping_carp/proc/elbowDrop(mob/living/carbon/human/A, mob/living/carbon/human/D)
- if(!CHECK_MOBILITY(D, MOBILITY_STAND))
- log_combat(A, D, "elbow dropped (Sleeping Carp)")
- A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
- D.visible_message("[A] elbow drops [D]!", \
- "[A] piledrives you with their elbow!")
- if(D.stat)
- D.death() //FINISH HIM!
- D.apply_damage(50, BRUTE, BODY_ZONE_CHEST)
- playsound(get_turf(D), 'sound/weapons/punch1.ogg', 75, 1, -1)
- return TRUE
- return basic_hit(A,D)
+ D.visible_message("[A] kicks [D] in the head!", \
+ "You are kicked in the head by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)
+ log_combat(A, D, "dropkicked (Sleeping Carp)")
+ return
/datum/martial_art/the_sleeping_carp/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
- if(A.a_intent == INTENT_GRAB && A!=D) // A!=D prevents grabbing yourself
- add_to_streak("G",D)
- if(check_streak(A,D)) //if a combo is made no grab upgrade is done
- return TRUE
- old_grab_state = A.grab_state
- D.grabbedby(A, 1)
- if(old_grab_state == GRAB_PASSIVE)
- D.drop_all_held_items()
- A.setGrabState(GRAB_AGGRESSIVE) //Instant agressive grab if on grab intent
- log_combat(A, D, "grabbed", addition="aggressively")
- D.visible_message("[A] violently grabs [D]!", \
- "[A] violently grabs you!")
+ add_to_streak("G",D)
+ if(check_streak(A,D))
return TRUE
- return FALSE
+ log_combat(A, D, "grabbed (Sleeping Carp)")
+ return ..()
/datum/martial_art/the_sleeping_carp/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
add_to_streak("H",D)
if(check_streak(A,D))
return TRUE
+ var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected))
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
- var/atk_verb = pick("punches", "kicks", "chops", "hits", "slams")
- D.visible_message("[A] [atk_verb] [D]!", \
- "[A] [atk_verb] you!")
- D.apply_damage(rand(10,15), BRUTE)
- playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, 1, -1)
- if(prob(D.getBruteLoss()) && !D.lying)
- D.visible_message("[D] stumbles and falls!", "The blow sends you to the ground!")
- D.DefaultCombatKnockdown(80)
- log_combat(A, D, "[atk_verb] (Sleeping Carp)")
+ var/atk_verb = pick("kick", "chop", "hit", "slam")
+ D.visible_message("[A] [atk_verb]s [D]!", \
+ "[A] [atk_verb]s you!", null, null, A)
+ to_chat(A, "You [atk_verb] [D]!")
+ D.apply_damage(rand(10,15), BRUTE, affecting)
+ playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, TRUE, -1)
+ log_combat(A, D, "punched (Sleeping Carp)")
return TRUE
@@ -143,17 +103,58 @@
add_to_streak("D",D)
if(check_streak(A,D))
return TRUE
+ log_combat(A, D, "disarmed (Sleeping Carp)")
return ..()
+/datum/martial_art/the_sleeping_carp/on_projectile_hit(mob/living/carbon/human/A, obj/item/projectile/P, def_zone)
+ . = ..()
+ if(A.incapacitated(FALSE, TRUE)) //NO STUN
+ return BULLET_ACT_HIT
+ if(!(A.mobility_flags & MOBILITY_USE)) //NO UNABLE TO USE
+ return BULLET_ACT_HIT
+ if(A.dna && A.dna.check_mutation(HULK)) //NO HULK
+ return BULLET_ACT_HIT
+ if(!isturf(A.loc)) //NO MOTHERFLIPPIN MECHS!
+ return BULLET_ACT_HIT
+ if(A.in_throw_mode)
+ A.visible_message("[A] effortlessly swats the projectile aside! They can block bullets with their bare hands!", "You deflect the projectile!")
+ playsound(get_turf(A), pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE)
+ P.firer = A
+ P.setAngle(rand(0, 360))//SHING
+ return BULLET_ACT_FORCE_PIERCE
+ return BULLET_ACT_HIT
+
/datum/martial_art/the_sleeping_carp/teach(mob/living/carbon/human/H, make_temporary = FALSE)
. = ..()
if(!.)
return
ADD_TRAIT(H, TRAIT_NOGUNS, SLEEPING_CARP_TRAIT)
+ ADD_TRAIT(H, TRAIT_PIERCEIMMUNE, SLEEPING_CARP_TRAIT)
+ ADD_TRAIT(H, TRAIT_NODISMEMBER, SLEEPING_CARP_TRAIT)
+ H.physiology.brute_mod *= 0.4 //brute is really not gonna cut it
+ H.physiology.burn_mod *= 0.7 //burn is distinctly more useful against them than brute but they're still resistant
+ H.physiology.stamina_mod *= 0.5 //stun batons prove to be one of the few ways to fight them. They have stun resistance already, so I think doubling down too hard on this resistance is a bit much.
+ H.physiology.stun_mod *= 0.3 //for those rare stuns
+ H.physiology.pressure_mod *= 0.3 //go hang out with carp
+ H.physiology.cold_mod *= 0.3 //cold mods are different to burn mods, they do stack however
+ H.physiology.heat_mod *= 2 //this is mostly so sleeping carp has a viable weakness. Cooking them alive. Setting them on fire and heating them will be their biggest weakness. The reason for this is....filet jokes.
+
+ H.faction |= "carp" //:D
/datum/martial_art/the_sleeping_carp/on_remove(mob/living/carbon/human/H)
. = ..()
REMOVE_TRAIT(H, TRAIT_NOGUNS, SLEEPING_CARP_TRAIT)
+ REMOVE_TRAIT(H, TRAIT_PIERCEIMMUNE, SLEEPING_CARP_TRAIT)
+ REMOVE_TRAIT(H, TRAIT_NODISMEMBER, SLEEPING_CARP_TRAIT)
+ H.physiology.brute_mod = initial(H.physiology.brute_mod)
+ H.physiology.burn_mod = initial(H.physiology.burn_mod)
+ H.physiology.stamina_mod = initial(H.physiology.stamina_mod)
+ H.physiology.stun_mod = initial(H.physiology.stun_mod)
+ H.physiology.pressure_mod = initial(H.physiology.pressure_mod) //no more carpies
+ H.physiology.cold_mod = initial(H.physiology.cold_mod)
+ H.physiology.heat_mod = initial(H.physiology.heat_mod)
+
+ H.faction -= "carp" //:(
/mob/living/carbon/human/proc/sleeping_carp_help()
set name = "Recall Teachings"
@@ -162,11 +163,10 @@
to_chat(usr, "You retreat inward and recall the teachings of the Sleeping Carp...")
- to_chat(usr, "Wrist Wrench: Disarm Disarm. Forces opponent to drop item in hand.")
- to_chat(usr, "Back Kick: Harm Grab. Opponent must be facing away. Knocks down.")
- to_chat(usr, "Stomach Knee: Grab Harm. Knocks the wind out of opponent and stuns.")
- to_chat(usr, "Head Kick: Disarm Harm Harm. Decent damage, forces opponent to drop item in hand.")
- to_chat(usr, "Elbow Drop: Harm Disarm Harm Disarm Harm. Opponent must be on the ground. Deals huge damage, instantly kills anyone in critical condition.")
+ to_chat(usr, "Gnashing Teeth: Harm Harm. Deal additional damage every second punch, with a chance for even more damage!")
+ to_chat(usr, "Crashing Wave Kick: Harm Disarm. Launch people brutally across rooms, and away from you.")
+ to_chat(usr, "Keelhaul: Harm Grab. Kick opponents to the floor. Against prone targets, deal additional stamina damage and disarm them.")
+ to_chat(usr, "In addition, your body has become incredibly resilient to most forms of attack. Weapons cannot readily pierce your hardened skin, and you are highly resistant to stuns and knockdowns, and can block all projectiles in Throw Mode. However, you are not invincible, and sustained damage will take it's toll. Avoid heat at all costs!")
/obj/item/twohanded/bostaff
name = "bo staff"
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 5bedce359b..f2d90a9bbe 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -45,31 +45,11 @@
if(spec_return)
return spec_return
- if(mind)
- if (mind.martial_art && mind.martial_art.dodge_chance)
- if(!lying && dna && !dna.check_mutation(HULK))
- if(prob(mind.martial_art.dodge_chance))
- var/static/dodgemessages = list("dodges under",0,-4,"dodges to the right of",-4,0,"dodges to the left of",4,0,"jumps over",0,4)
- var/pick = pick(1,4,7,10)
- var/oldx = pixel_x
- var/oldy = pixel_y
- animate(src,pixel_x = pixel_x + dodgemessages[pick+1],pixel_y = pixel_y + dodgemessages[pick+2],time=3)
- animate(src,pixel_x = oldx,pixel_y = oldy,time=2)
- visible_message("[src] [dodgemessages[pick]] the projectile!", "You dodge the projectile!")
- return BULLET_ACT_FORCE_PIERCE
- if(mind.martial_art && !incapacitated(FALSE, TRUE) && mind.martial_art.can_use(src) && mind.martial_art.deflection_chance) //Some martial arts users can deflect projectiles!
- if(prob(mind.martial_art.deflection_chance))
- if(!lying && dna && !dna.check_mutation(HULK)) //But only if they're not lying down, and hulks can't do it
- if(mind.martial_art.deflection_chance >= 100) //if they can NEVER be hit, lets clue sec in ;)
- visible_message("[src] deflects the projectile; [p_they()] can't be hit with ranged weapons!", "You deflect the projectile!")
- else
- visible_message("[src] deflects the projectile!", "You deflect the projectile!")
- playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, 1)
- if(mind.martial_art.reroute_deflection)
- P.firer = src
- P.setAngle(rand(0, 360))//SHING
- return BULLET_ACT_FORCE_PIERCE
-
+ if(mind) //martial art stuff
+ if(mind.martial_art && mind.martial_art.can_use(src)) //Some martial arts users can deflect projectiles!
+ var/martial_art_result = mind.martial_art.on_projectile_hit(src, P, def_zone)
+ if(!(martial_art_result == BULLET_ACT_HIT))
+ return martial_art_result
return ..()
/mob/living/carbon/human/check_reflect(def_zone)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index d544671d3e..b738e5b310 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -123,7 +123,7 @@ Difficulty: Very Hard
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(H.mind)
- if(H.mind.martial_art && prob(H.mind.martial_art.deflection_chance))
+ if(istype(H.mind.martial_art, /datum/martial_art/the_sleeping_carp) & istype(H.mind.martial_art, /datum/martial_art/the_rising_bass))
. = TRUE
/mob/living/simple_animal/hostile/megafauna/colossus/proc/alternating_dir_shots()
diff --git a/tgstation.dme b/tgstation.dme
index cd0e1a333d..bd567ffc62 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -331,7 +331,6 @@
#include "code\datums\holocall.dm"
#include "code\datums\hud.dm"
#include "code\datums\map_config.dm"
-#include "code\datums\martial.dm"
#include "code\datums\mind.dm"
#include "code\datums\mutable_appearance.dm"
#include "code\datums\mutations.dm"
@@ -513,6 +512,7 @@
#include "code\datums\looping_sounds\item_sounds.dm"
#include "code\datums\looping_sounds\machinery_sounds.dm"
#include "code\datums\looping_sounds\weather.dm"
+#include "code\datums\martial\_martial.dm"
#include "code\datums\martial\boxing.dm"
#include "code\datums\martial\cqc.dm"
#include "code\datums\martial\krav_maga.dm"