Skip to content

Commit

Permalink
Channeling fix (#8518)
Browse files Browse the repository at this point in the history
* channeling fix

* Update code/modules/core_implant/cruciform/rituals/group.dm

Co-authored-by: SirRichardFrancis <65828539+SirRichardFrancis@users.noreply.github.com>

* Update group.dm

---------

Co-authored-by: SirRichardFrancis <65828539+SirRichardFrancis@users.noreply.github.com>
  • Loading branch information
TheLeopold and SirRichardFrancis authored Sep 14, 2024
1 parent 9178ce4 commit 1eb429a
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/perks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#define PERK_CODESPEAK_SERB /datum/perk/codespeak/serbian
#define PERK_TECHNOMANCER /datum/perk/inspiration
#define PERK_CLUB /datum/perk/job/club
#define PERK_CHANNELING /datum/perk/channeling

//cooldown perks
#define PERK_COOLDOWN_REASON /datum/perk/cooldown/reason
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/church.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
STAT_COG = 20,
)

perks = list(/datum/perk/channeling)
perks = list(PERK_CHANNELING)

software_on_spawn = list(/datum/computer_file/program/records,
/datum/computer_file/program/reports)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/core_implant/cruciform/cruciform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var/list/lost_cruciforms = list()
var/true_power_regen = power_regen
true_power_regen += max(round(wearer.stats.getStat(STAT_COG) / 4), 0) * power_regen * 0.05
true_power_regen += power_regen * 1.5 * righteous_life / max_righteous_life
if(wearer && wearer.stats?.getPerk(/datum/perk/channeling))
if(wearer && wearer.stats?.getPerk(PERK_CHANNELING))
true_power_regen += power_regen * disciples.len / 5 // Proportional to the number of cruciformed people on board

restore_power(true_power_regen)
Expand Down
5 changes: 4 additions & 1 deletion code/modules/core_implant/cruciform/rituals/group.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@
to_chat(M, SPAN_NOTICE("Insufficient participants."))
return FALSE
if(!get_active_mutation(M, MUTATION_ATHEIST))
M.stats.changeStat(stat_buff, buff_value + cnt * aditional_value)
if(M.stats.getPerk(PERK_CHANNELING))
M.stats.changeStat(stat_buff, buff_value + cnt + (cnt * aditional_value))
else
M.stats.changeStat(stat_buff, buff_value + (cnt * aditional_value))
to_chat(M, SPAN_NOTICE(stat_message))

/datum/ritual/group/cruciform/stat/mechanical
Expand Down

0 comments on commit 1eb429a

Please sign in to comment.