From e61af42f00987c55f8bde8b31d123b9539822e6b Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 7 Sep 2017 02:06:43 -0700 Subject: [PATCH 1/5] Nerfs missionary staff --- code/game/objects/items/weapons/holy_weapons.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 968aac67272..ee5ba4c24ea 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -519,6 +519,8 @@ var/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/robes = null //the robes linked with this staff var/faith = 99 //a conversion requires 100 faith to attempt. faith recharges over time while you are wearing missionary robes that have been linked to the staff. + var/zealots_made = 0 + /obj/item/weapon/nullrod/missionary_staff/New() team_color = pick("red", "blue") icon_state = "godstaff-[team_color]" @@ -617,6 +619,9 @@ faith -= 100 //if you made it this far: congratulations! you are now a religious zealot! target.mind.make_zealot(missionary, convert_duration, team_color) + zealots_made++ + + missionary.adjustBruteLoss(8 * zealots_made) target << sound('sound/misc/wololo.ogg', 0, 1, 25) missionary.say("WOLOLO!") From c2db663d62a8d0d68194b55bc84d33d9e3503637 Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 7 Sep 2017 02:26:18 -0700 Subject: [PATCH 2/5] Adds random multiplier --- code/game/objects/items/weapons/holy_weapons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index ee5ba4c24ea..0321a742c2b 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -621,7 +621,7 @@ target.mind.make_zealot(missionary, convert_duration, team_color) zealots_made++ - missionary.adjustBruteLoss(8 * zealots_made) + missionary.adjustBruteLoss(8 * zealots_made * pick(0.5,1,2)) target << sound('sound/misc/wololo.ogg', 0, 1, 25) missionary.say("WOLOLO!") From b5908002159cf5b697a9e043b731c3c1a65d8744 Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 7 Sep 2017 12:18:53 -0700 Subject: [PATCH 3/5] 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) From 1935856563371da2052cd4be513b8447ca47f973 Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 7 Sep 2017 12:51:48 -0700 Subject: [PATCH 4/5] Warning on conversion attempt --- code/game/objects/items/weapons/holy_weapons.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 36e8c76784a..acb8638b4da 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -570,6 +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 + to_chat(target, "Your mind seems foggy. For a moment, all you can think about is serving the greater good... the greater good...") 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]!") From 3a70eb0e31a39799d7c805e8efccdb0239119140 Mon Sep 17 00:00:00 2001 From: Kyep Date: Fri, 8 Sep 2017 16:46:39 -0700 Subject: [PATCH 5/5] Removes zealots_made --- code/game/objects/items/weapons/holy_weapons.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index acb8638b4da..64b7dfcdf76 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -519,8 +519,6 @@ var/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/robes = null //the robes linked with this staff var/faith = 99 //a conversion requires 100 faith to attempt. faith recharges over time while you are wearing missionary robes that have been linked to the staff. - var/zealots_made = 0 - /obj/item/weapon/nullrod/missionary_staff/New() team_color = pick("red", "blue") icon_state = "godstaff-[team_color]" @@ -615,7 +613,6 @@ faith -= 100 //if you made it this far: congratulations! you are now a religious zealot! target.mind.make_zealot(missionary, convert_duration, team_color) - zealots_made++ target << sound('sound/misc/wololo.ogg', 0, 1, 25) missionary.say("WOLOLO!")