Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

QOL: Перевод sleeping carp #5967

Open
wants to merge 33 commits into
base: master220
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
bf2d069
Update head_kick.dm
pilygun Oct 1, 2024
2b4f54f
Update back_kick.dm
pilygun Oct 1, 2024
13a1a58
Update elbow_drop.dm
pilygun Oct 1, 2024
037f5e6
Update head_kick.dm
pilygun Oct 1, 2024
c660723
Update head_kick.dm
pilygun Oct 1, 2024
97ac1b5
Update stomach_knee.dm
pilygun Oct 1, 2024
2f45940
Update head_kick.dm
pilygun Oct 1, 2024
98297f3
Update wrist_wrench.dm
pilygun Oct 1, 2024
0bcfe2e
Update back_kick.dm
pilygun Oct 1, 2024
efd7b93
Update back_kick.dm
pilygun Oct 1, 2024
f2a477d
Update stomach_knee.dm
pilygun Oct 1, 2024
8a8b955
Update martial.dm
pilygun Oct 1, 2024
1420e2b
Update sleeping_carp.dm
pilygun Oct 1, 2024
3732a01
Update code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm
pilygun Oct 31, 2024
d8a3338
Update code/modules/martial_arts/combos/sleeping_carp/head_kick.dm
pilygun Oct 31, 2024
05f5412
Update code/modules/martial_arts/combos/sleeping_carp/wrist_wrench.dm
pilygun Oct 31, 2024
dcf567b
Update code/modules/martial_arts/martial.dm
pilygun Oct 31, 2024
85efd32
фиксы
pilygun Oct 31, 2024
500351f
Update sleeping_carp.dm
pilygun Oct 31, 2024
1bc0622
Update code/modules/martial_arts/martial.dm
pilygun Oct 31, 2024
ae56e35
Update martial.dm
pilygun Oct 31, 2024
1298439
Update stomach_knee.dm
pilygun Oct 31, 2024
bf442fe
Update elbow_drop.dm
pilygun Oct 31, 2024
c180766
Update back_kick.dm
pilygun Oct 31, 2024
0b5704a
спаны
pilygun Nov 15, 2024
caba346
дефлайны
pilygun Nov 15, 2024
db59f32
cgfys ltakfqys
pilygun Nov 15, 2024
3933f70
cgfys
pilygun Nov 15, 2024
6b2420a
Update back_kick.dm
pilygun Nov 15, 2024
5ab717a
Update wrist_wrench.dm
pilygun Nov 15, 2024
168047d
ДОБАВИЛ СЛОООООВО
pilygun Nov 15, 2024
56a7021
Update sleeping_carp.dm
pilygun Nov 15, 2024
f4ed904
fix
pilygun Nov 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions code/modules/martial_arts/combos/sleeping_carp/back_kick.dm
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/datum/martial_combo/sleeping_carp/back_kick
name = "Back Kick"
steps = list(MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_GRAB)
explaination_text = "Opponent must be facing away. Knocks down."
explaination_text = "Пинает оппонента в спину, заставляя его скорчиться от боли."

/datum/martial_combo/sleeping_carp/back_kick/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
if(user.dir == target.dir && !target.stat && !target.IsWeakened())
user.do_attack_animation(target, ATTACK_EFFECT_KICK)
target.visible_message("<span class='warning'>[user] kicks [target] in the back!</span>", \
"<span class='userdanger'>[user] kicks you in the back, making you stumble and fall!</span>")
target.visible_message(span_warning("[user] пинает [target] в спину!"), \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

genderize_ru() использовать?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

надо надо
щя поправим

span_warning("[user] ударяет вас в спину, заставляя споткнуться и упасть!"))
step_to(target,get_step(target,target.dir),1)
target.Weaken(6 SECONDS)
playsound(get_turf(target), 'sound/weapons/punch1.ogg', 50, 1, -1)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Back Kick", ATKLOG_ALL)
if(prob(80))
user.say(pick("SURRPRIZU!","BACK STRIKE!","WOPAH!", "WATAAH", "ZOTA!", "Never turn your back to the enemy!"))
user.say(pick("СЮРПРИЗ!","УДАР В СПИНУ!","КУААА!", "ВАТААА", "СКИДЫЩ!", "НИКОГДА НЕ ПОВОРАЧИВАЙСЯ СПИНОЙ К ПРОТИВНИКУ!"))
return MARTIAL_COMBO_DONE
return MARTIAL_COMBO_DONE_BASIC_HIT
6 changes: 3 additions & 3 deletions code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/datum/martial_combo/sleeping_carp/elbow_drop
name = "Elbow Drop"
steps = list(MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_DISARM, MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_DISARM, MARTIAL_COMBO_STEP_HARM)
explaination_text = "Opponent must be on the ground. Deals huge damage, instantly kills anyone in critical condition."
explaination_text = "Вы прыгаете на лежачего оппонента, ударяя локтем по спине. Наносит приличный урон и мгновенно убивает жертву, если она находится в критическом состоянии."

/datum/martial_combo/sleeping_carp/elbow_drop/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
if(target.body_position == LYING_DOWN)
user.do_attack_animation(target, ATTACK_EFFECT_PUNCH)
target.visible_message("<span class='warning'>[user] elbow drops [target]!</span>", \
target.visible_message("<span class='warning'>[user] ударяет локтем [target]!</span>", \
"<span class='userdanger'>[user] piledrives you with [user.p_their()] elbow!</span>")
if(target.health <= HEALTH_THRESHOLD_CRIT)
target.death() //FINISH HIM!
Expand All @@ -15,6 +15,6 @@
playsound(get_turf(target), 'sound/weapons/punch1.ogg', 75, 1, -1)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Elbow Drop", ATKLOG_ALL)
if(prob(80))
user.say(pick("BANZAIII!", "KIYAAAA!", "OMAE WA MOU SHINDEIRU!", "YOU CAN'T SEE ME!", "MY TIME IS NOW!", "COWABUNGA"))
user.say(pick("БАНЗАЙ!", "КИЯЯЯЯ!", "Я ХОЧУ ПИЦЦЫ!", "ТЫ МЕНЯ НЕ ВИДИШЬ!", "МОЕ ВРЕМЯ СЕЙЧАС!", "КАВАБАНГА!"))
return MARTIAL_COMBO_DONE
return MARTIAL_COMBO_DONE_BASIC_HIT
8 changes: 4 additions & 4 deletions code/modules/martial_arts/combos/sleeping_carp/head_kick.dm
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
/datum/martial_combo/sleeping_carp/head_kick
name = "Head Kick"
steps = list(MARTIAL_COMBO_STEP_DISARM, MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_HARM)
explaination_text = "Decent damage, forces opponent to drop item in hand."
explaination_text = "Пинает оппонента в голову, нанося ему приличный урон и заставляя его выбросить вещь из активной руки."

/datum/martial_combo/sleeping_carp/head_kick/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
if(!target.stat && !target.IsWeakened())
user.do_attack_animation(target, ATTACK_EFFECT_KICK)
target.visible_message("<span class='warning'>[user] kicks [target] in the head!</span>", \
"<span class='userdanger'>[user] kicks you in the jaw!</span>")
target.visible_message("<span class='warning'>[user] бьет [target] в голову!</span>", \
"<span class='userdanger'>[user] бьет вас ногой в челюсть!</span>")
target.apply_damage(20, BRUTE, "head")
objective_damage(user, target, 20, BRUTE)
target.drop_from_active_hand()
playsound(get_turf(target), 'sound/weapons/punch1.ogg', 50, 1, -1)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Head Kick", ATKLOG_ALL)
if(prob(60))
user.say(pick("OOHYOO!", "OOPYAH!", "HYOOAA!", "WOOAAA!", "SHURYUKICK!", "HIYAH!"))
user.say(pick("УАХУААА!", "КИЯ!", "БИИИЯ!", "ПЛАВНИКОМ В ЛИЦО!", "УКУС В ГОЛОВУ!", "УДАР ПО ГОООЛОВЕ!"))
target.Weaken(6 SECONDS)
return MARTIAL_COMBO_DONE
return MARTIAL_COMBO_DONE_BASIC_HIT
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
/datum/martial_combo/sleeping_carp/stomach_knee
name = "Stomach Knee"
steps = list(MARTIAL_COMBO_STEP_GRAB, MARTIAL_COMBO_STEP_HARM)
explaination_text = "Knocks the wind out of opponent and stuns."
explaination_text = "Вы пинаете оппонента по животу, заставляя его скорчится от боли и неровно дышать."
combo_text_override = "Grab, switch hands, Harm"

/datum/martial_combo/sleeping_carp/stomach_knee/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
if(!target.stat && !target.IsWeakened())
user.do_attack_animation(target, ATTACK_EFFECT_KICK)
target.visible_message("<span class='warning'>[user] knees [target] in the stomach!</span>", \
"<span class='userdanger'>[user] winds you with a knee in the stomach!</span>")
target.visible_message(span_warning("[user] пинает коленом [target] прямо в живот!"), \
span_userdanger("[user] ударяет вас коленом в живот!"))
target.audible_message("<b>[target]</b> gags!")
target.AdjustLoseBreath(20 SECONDS)
target.Weaken(6 SECONDS)
target.adjustStaminaLoss(15)
playsound(get_turf(target), 'sound/weapons/punch1.ogg', 50, 1, -1)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Stomach Knee", ATKLOG_ALL)
if(prob(80))
user.say(pick("HWOP!", "KUH!", "YAKUUH!", "KYUH!", "KNEESTRIKE!"))
user.say(pick("ВОХОП!", "КУХ!", "ДЫШИ ЖАБРАМИ!", "ЗАДЕРЖИ ДЫХАНИЕ!", "УДАР КОЛЕНОМ!"))
return MARTIAL_COMBO_DONE
return MARTIAL_COMBO_DONE_BASIC_HIT
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
/datum/martial_combo/sleeping_carp/wrist_wrench
name = "Wrist Wrench"
steps = list(MARTIAL_COMBO_STEP_DISARM, MARTIAL_COMBO_STEP_DISARM)
explaination_text = "Forces opponent to drop item in hand."
explaination_text = "Сворачивает запястье оппоненту, заставляя его выбросить вещь из активной руки."

/datum/martial_combo/sleeping_carp/wrist_wrench/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
if(!target.stat && !target.IsStunned() && !target.IsWeakened())
user.do_attack_animation(target, ATTACK_EFFECT_PUNCH)
target.visible_message("<span class='warning'>[user] grabs [target]'s wrist and wrenches it sideways!</span>", \
"<span class='userdanger'>[user] grabs your wrist and violently wrenches it to the side!</span>")
target.visible_message(span_warning("[user] хватает запастье [target] и резко выворачивает его в сторону!"), \
span_userdanger("[user] хватает вас за запястье и резко выкручивает его в сторону!"))
playsound(get_turf(user), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Wrist Wrench", ATKLOG_ALL)
if(prob(60))
user.say(pick("WRISTY TWIRLY!", "WE FIGHT LIKE MEN!", "YOU DISHONOR YOURSELF!", "POHYAH!", "WHERE IS YOUR BATON NOW?", "SAY UNCLE!"))
user.say(pick("КРУТИМ ЗАПЯТЬЕ!", "ВЕДИ СЕБЯ КАК МУЖЧИНА СОСУНОК!", "НЕ ПОЗОРЬСЯ!", "ВУХАХАХА!", "И ГДЕ ТЕПЕРЬ ТВОЙ СТАНБАТОН?", "НЕ НАДО ДЯДЯ!"))
target.emote("scream")
target.drop_from_active_hand()
target.apply_damage(5, BRUTE, pick("l_arm", "r_arm"))
Expand Down
14 changes: 7 additions & 7 deletions code/modules/martial_arts/martial.dm
Original file line number Diff line number Diff line change
Expand Up @@ -392,20 +392,20 @@
return
if(user.mind && (ischangeling(user) || isvampire(user))) //Prevents changelings and vampires from being able to learn it
if(ischangeling(user)) //Changelings
to_chat(user, "<span class ='warning'>We try multiple times, but we are not able to comprehend the contents of the scroll!</span>")
to_chat(user, span_warning("Мы пытаемся много раз, но не можем понять содержимое свитка!"))
return
else //Vampires
to_chat(user, "<span class ='warning'>Your blood lust distracts you too much to be able to concentrate on the contents of the scroll!</span>")
to_chat(user, span_warning("Ваши мысли полностью окутаны жаждой крови, вы не в состоянии сосредоточиться на содержимом свитка!"))
return

if(istype(user.mind.martial_art, /datum/martial_art/the_sleeping_carp))
to_chat(user, span_warning("You realise, that you have learned everything from Carp Teachings and decided to not read the scroll."))
to_chat(user, span_warning("Вы понимаете, что узнали всё из Учения Карпа и его дальнейшее изучение бессмысленно."))
return

to_chat(user, "<span class='sciradio'>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.</span>")
to_chat(user, "<span class='sciradio'>Вы изучили древнее боевое искусство Спящего Карпа! \
Ваш рукопашный бой стал намного эффективнее, и теперь вы можете отклонять любые снаряды, направленные в вашу сторону. \
Однако вы также не можете использовать любое дальнобойное оружие. \
Вы можете узнать больше о своем новом боевом искусстве, во вкладке Sleeping Carp.</span>")


var/datum/martial_art/the_sleeping_carp/theSleepingCarp = new(null)
Expand Down
14 changes: 7 additions & 7 deletions code/modules/martial_arts/sleeping_carp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
weight = 9
deflection_chance = 100
no_guns = TRUE
no_guns_message = "Use of ranged weaponry would bring dishonor to the clan."
no_guns_message = "использование огнестрела позорит клан" // уменьшен текст так как используется баллун алерт
reroute_deflection = FALSE
has_explaination_verb = TRUE
grab_speed = 2 SECONDS
Expand Down Expand Up @@ -32,22 +32,22 @@
/datum/martial_art/the_sleeping_carp/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
MARTIAL_ARTS_ACT_CHECK
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
var/atk_verb = pick("punches", "kicks", "chops", "hits", "slams")
D.visible_message("<span class='danger'>[A] [atk_verb] [D]!</span>", \
"<span class='userdanger'>[A] [atk_verb] you!</span>")
var/atk_verb = pick("кусает", "пинает", "ломает", "бьет", "крушит")
D.visible_message(span_danger("[A] [atk_verb] [D]!"), \
span_userdanger("[A] [atk_verb] вас!"))

var/damage = rand(10,15)
D.apply_damage(damage, BRUTE)
objective_damage(A, D, damage, BRUTE)

playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, 1, -1)
if(prob(50))
A.say(pick("HUAH!", "HYA!", "CHOO!", "WUO!", "KYA!", "HUH!", "HIYOH!", "CARP STRIKE!", "CARP BITE!"))
A.say(pick("КУАХ!", "ХАЙЯ!", "КУОХ!", "ХУ!", "КИЯ!", "ХУХ!", "БУЙЯ!", "ХЛЫСТ ПЛАВНИКА!", "УДАР КАРПА!"))
if(prob(D.getBruteLoss()) && D.body_position != LYING_DOWN)
D.visible_message("<span class='warning'>[D] stumbles and falls!</span>", "<span class='userdanger'>The blow sends you to the ground!</span>")
D.visible_message(span_warning("[D] stumbles and falls!"), span_userdanger("Удар отправляет тебя на землю!"))
D.Weaken(6 SECONDS)
add_attack_logs(A, D, "Melee attacked with martial-art [src] : Punched", ATKLOG_ALL)
return TRUE

/datum/martial_art/the_sleeping_carp/explaination_header(user)
to_chat(usr, "<b><i>You retreat inward and recall the teachings of the Sleeping Carp...</i></b>")
to_chat(usr, "<b><i>Вы уходите в себя и вспоминаете учение Спящего Карпа...</i></b>")