shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes the fork?

Browse Source
This commit is contained in:
Seris02
2019-11-09 21:38:17 +08:00
parent 8a4197bbf5
commit 68014392ca
1 changed files with 2 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/martial/rising_bass.dm
+2 -53
View File
@@ -1,9 +1,5 @@
#define SIDE_KICK_COMBO "DH"
<<<<<<< HEAD
#define SHOULDER_FLIP_COMBO "GHDGGHD"
=======
#define SHOULDER_FLIP_COMBO "GHDGG"
>>>>>>> b9238d02905fa75ed8589cfa6c18e2b7997bcb3c
#define REPULSE_PUNCH_COMBO "GHGH"
#define FOOT_SMASH_COMBO "HH"
#define DEFT_SWITCH_COMBO "GDD"
@@ -11,20 +7,12 @@
/datum/martial_art/the_rising_bass
name = "The Rising Bass"
id = MARTIALART_RISINGBASS
<<<<<<< HEAD
dodge_chance = 100
=======
var/dodge_chance = 100
>>>>>>> b9238d02905fa75ed8589cfa6c18e2b7997bcb3c
no_guns = TRUE
allow_temp_override = FALSE
help_verb = /mob/living/carbon/human/proc/rising_bass_help
<<<<<<< HEAD
/datum/martial_art/the_rising_bass/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D)
=======
/datum/martial_art/the_sleeping_carp/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D)
>>>>>>> b9238d02905fa75ed8589cfa6c18e2b7997bcb3c
if(findtext(streak,SIDE_KICK_COMBO))
streak = ""
sideKick(A,D)
@@ -47,7 +35,7 @@
return 1
return 0
<<<<<<< HEAD
/datum/martial_art/the_rising_bass/proc/sideKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(!D.IsKnockdown())
var/turf/H
@@ -60,19 +48,13 @@
H = get_step(get_step(A,SOUTH),pick(EAST,WEST))
if(WEST)
H = get_step(get_step(A,WEST),pick(SOUTH,NORTH))
=======
/datum/martial_art/the_sleeping_carp/proc/sideKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(!D.IsKnockdown())
>>>>>>> b9238d02905fa75ed8589cfa6c18e2b7997bcb3c
A.do_attack_animation(D, ATTACK_EFFECT_KICK)
D.visible_message("<span class='warning'>[A] kicks [D] in the side, sliding them over!</span>", \
"<span class='userdanger'>[A] kicks you in the side, forcing you to step away!</span>")
playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
<<<<<<< HEAD
D.apply_damage(5, BRUTE, BODY_ZONE_CHEST)
D.Knockdown(60)
var/turf/L = H
//for(var/obj/i in H.contents)
for(var/obj/i in H.contents)
if(!istype(i,/mob) && i.density == 1)//(i.anchored == 1 && i.density == 1) || istype(i,/obj/structure) || istype(i,/turf/closed)
L = D.loc
@@ -81,8 +63,6 @@
log_combat(A, D, "side kicked (Rising Bass)")
return basic_hit(A,D)
/datum/martial_art/the_rising_bass/proc/shoulderFlip(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(!D.IsKnockdown())
var/turf/H
@@ -155,10 +135,6 @@
add_to_streak("D",D)
if(check_streak(A,D))
return 1
//D.dropItemToGround(D.get_active_held_item())
//D.visible_message("<span class='danger'>[A] disarms [D]!</span>", \
"<span class='userdanger'>[A] disarms you!</span>")
//return 1
return ..()
/datum/martial_art/the_rising_bass/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
@@ -184,31 +160,4 @@
to_chat(usr, "<span class='notice'>Shoulder Flip</span>: Grab Harm Disarm Grab Grab. Flips opponent over your shoulder and stuns.")
to_chat(usr, "<span class='notice'>Repulse Punch</span>: Grab Harm Grab Harm. Slams the opponent far away from you.")
to_chat(usr, "<span class='notice'>Foot Smash</span>: Harm Harm. Stuns opponent, minor damage.")
to_chat(usr, "<span class='notice'>Deft Switch</span>: Grab Disarm Disarm. Switches the opponent's held item for your own. Most useful with nothing in your hand.")
=======
D.apply_damage(10, BRUTE, BODY_ZONE_CHEST)
D.Knockdown(60)
return 1
log_combat(A, D, "side kicked (Rising Bass)")
return basic_hit(A,D)
/datum/martial_art/the_sleeping_carp/proc/shoulderFlip(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(!D.IsKnockdown())
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
D.visible_message("<span class='warning'>[A] flips [D] over their shoulder, slamming them into the ground!</span>", \
"<span class='userdanger'>[A] flips you over their shoulder, slamming you into the ground!</span>")
playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
D.emote("scream")
D.apply_damage(10, BRUTE, BODY_ZONE_CHEST)
D.apply_damage(30, BRUTE, BODY_ZONE_HEAD)
D.Knockdown(300)
return 1
log_combat(A, D, "shoulder flipped (Rising Bass)")
return basic_hit(A,D)
>>>>>>> b9238d02905fa75ed8589cfa6c18e2b7997bcb3c
to_chat(usr, "<span class='notice'>Deft Switch</span>: Grab Disarm Disarm. Switches the opponent's held item for your own. Most useful with nothing in your hand.")