From b5908002159cf5b697a9e043b731c3c1a65d8744 Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 7 Sep 2017 12:18:53 -0700 Subject: [PATCH] Changes nerf. No more damage. Now longer delay / blocked by mindshields --- code/game/objects/items/weapons/holy_weapons.dm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 0321a742c2b..36e8c76784a 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -570,7 +570,7 @@ if(!target.mind) //no mind means no conversion, but also means no faith lost. to_chat(missionary, "You halt the conversion as you realize [target] is mindless! Best to save your faith for someone more worthwhile.") return - if(do_after(missionary, 40)) //4 seconds to temporarily convert, roughly 1 second faster than a vampire's enthrall ability + if(do_after(missionary, 80)) //8 seconds to temporarily convert, roughly 3 seconds slower than a vamp's enthrall, but its a ranged thing if(faith < 100) //to stop people from trying to exploit the do_after system to multi-convert, we check again if you have enough faith when it completes to_chat(missionary, "You don't have enough faith to complete the conversion on [target]!") return @@ -591,14 +591,9 @@ faith -= 25 //same faith cost as losing sight of them mid-conversion, but did you just find someone who can lead you to a fellow traitor? return if(ismindshielded(target)) - if(prob(20)) //loyalty implants typically overpower this, but you CAN get lucky and convert still (20% chance of success) - faith -= 125 //yes, this puts it negative. it's gonna take longer to recharge if you manage to convert a one of these people to balance the new power you gained through them - to_chat(missionary, "Through sheer willpower, you overcome their closed mind and rally [target] to your cause! You may need a bit longer than usual before your faith is fully recharged, and they won't remain loyal to you for long ...") - convert_duration = 3000 //5 min, because the loyalty implant will attempt to counteract the subversion - else //80% chance to fail - faith -= 75 - to_chat(missionary, "Your faith is strong, but their mind remains closed to your ideals. Your resolve helps you retain a bit of faith though.") - return + faith -= 75 + to_chat(missionary, "Your faith is strong, but their mind remains closed to your ideals. Your resolve helps you retain a bit of faith though.") + return else if(target.mind.assigned_role == "Psychiatrist" || target.mind.assigned_role == "Librarian") //fancy book lernin helps counter religion (day 0 job love, what madness!) if(prob(35)) //35% chance to fail to_chat(missionary, "This one is well trained in matters of the mind... They will not be swayed as easily as you thought...") @@ -621,8 +616,6 @@ target.mind.make_zealot(missionary, convert_duration, team_color) zealots_made++ - missionary.adjustBruteLoss(8 * zealots_made * pick(0.5,1,2)) - target << sound('sound/misc/wololo.ogg', 0, 1, 25) missionary.say("WOLOLO!") missionary << sound('sound/misc/wololo.ogg', 0, 1, 25)