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.

Sign up for GitHub

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

Jump to bottom

Балансируем культ #3487

Merged
merged 5 commits into from Jun 7, 2019
Merged

Балансируем культ #3487

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b00cdc2
Балансируеи культ
dred1792 May 14, 2019
490ef66
Поднимаем кап максимально урона у бладбойла
dred1792 May 15, 2019
95e249a
Убрано лишнее условие
dred1792 May 25, 2019
5493c27
Убираем удаление других рун бладбоила
dred1792 May 28, 2019
e21c1dc
Чиним кодировку
dred1792 Jun 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 10 additions & 8 deletions code/game/gamemodes/cult/cult_datums.dm
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@ var/list/cult_runes = list()
/datum/cult/proc/nearest_heretics(range = 7, ignore_nullrod = FALSE)
var/list/heretics = list()
var/turf/center = get_turf(holder)
for(var/mob/living/heretic in range(range, center))
for(var/mob/living/heretic in view(range, center))
Copy link
Contributor

Choose a reason for hiding this comment

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

учитывая что нам нужны только мобы стоит заменить view() на viewers()

Copy link
Contributor

Choose a reason for hiding this comment

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

а может и нет, потому-что тогда те кто слепы или просто не видят руну не будут задеты. в зависимости от того хочешь ли ты дальше копаться с этим или нет.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ну, смысл руны таки не в том, дабы от неё огребали только те, кто её фактически видит, а те, кого "видит" она, мне кажется.

Copy link
Contributor

Choose a reason for hiding this comment

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

учитывая что viewers() не учитывает всякие условия видения клиентом то в принципе разницы нет

if(iscultist(heretic))
continue
if(!ignore_nullrod)
Expand Down Expand Up @@ -938,7 +938,7 @@ var/list/cult_runes = list()
var/list/heretics = nearest_heretics()
if(length(heretics) < 1)
return fizzle(user)
var/damage_modifier = min(153 / length(heretics), 71)
var/damage_modifier = min(150 / length(heretics), 45)

for(var/mob/living/carbon/M in heretics)
M.take_overall_damage(damage_modifier, damage_modifier)
Expand All @@ -962,7 +962,7 @@ var/list/cult_runes = list()
var/list/heretics = nearest_heretics()
if(length(heretics) < 1)
return fizzle(user)
var/stun_modifier = 6 / length(heretics)
var/stun_modifier = 12 / length(heretics)
for(var/mob/living/carbon/C in heretics)
C.flash_eyes()
if(C.stuttering < 1 && (!(HULK in C.mutations)))
Expand All @@ -977,6 +977,8 @@ var/list/cult_runes = list()
var/obj/item/weapon/nullrod/N = locate() in affected
if(N)
affected.visible_message("<span class='danger'>[user] invokes a talisman at [affected], but they are unaffected!</span>")
qdel(holder)
return
else
affected.visible_message("<span class='danger'>[user] invokes a talisman at [affected]!</span>")

Expand All @@ -986,9 +988,9 @@ var/list/cult_runes = list()
var/mob/living/carbon/C = affected
C.flash_eyes()
if(!(HULK in C.mutations))
C.silent += 15
C.Weaken(25)
C.Stun(25)
C.silent += 10
C.Weaken(15)
C.Stun(15)
qdel(holder)

/datum/cult/stun/action(mob/living/carbon/user)
Expand All @@ -1012,7 +1014,7 @@ var/list/cult_runes = list()
for(var/mob/living/target in holder.loc)
if(!do_checks(user, target))
return
user.whisper("Yu[pick("'","`")]Ai! Lauri lantar lassi srinen,ni n�tim ve rmar aldaron!")
user.whisper("Yu[pick("'","`")]Ai! Lauri lantar lassi srinen,ni nótim ve rmar aldaron!")
Copy link
Member

Choose a reason for hiding this comment

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

Сломалась кодировка. Нужно в дриммейкере перекопировать версию до этих коммитов

to_chat(user, "<span class='warning'>You feel your mind floating away...</span>")
to_chat(target, "<span class='warning'>You feel your mind floating away...</span>")
brainswapping = TRUE
Expand All @@ -1022,7 +1024,7 @@ var/list/cult_runes = list()
to_chat(user, "<span class='warning'>You feel weakend.</span>")
target.adjustBrainLoss(bdam)
user.adjustBrainLoss(bdam)
user.say ("Yu[pick("'","`")]Ai! Lauri lantar lassi srinen,ni n�tim ve rmar aldaron!")
user.say ("Yu[pick("'","`")]Ai! Lauri lantar lassi srinen,ni nótim ve rmar aldaron!")
Copy link
Member

Choose a reason for hiding this comment

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

Тут тоже

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Сделал.

to_chat(user, "<span class='danger'>Your mind flows into other body. You feel a lack of intelligence.</span>")
var/mob/dead/observer/ghost = target.ghostize(FALSE)
user.mind.transfer_to(target)
Expand Down