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

Updates oz abnos to be less punishing. #2384

Merged
merged 2 commits into from
Aug 27, 2024
Merged

Updates oz abnos to be less punishing. #2384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
448aed0
updates oz abnos to be less punishing.
Kitsunemitsu Aug 13, 2024
f7c3f37
update
Kitsunemitsu Aug 13, 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
14 changes: 12 additions & 2 deletions code/modules/mob/living/simple_animal/abnormality/he/road_home.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,19 @@
///Agents with the "stay home" status effect, they will be driven insane when the home is reached.
var/list/agent_friends = list()

/mob/living/simple_animal/hostile/abnormality/road_home/PostWorkEffect(mob/living/carbon/human/user, work_type, pe, work_time)
// Modifiers for work chance
/mob/living/simple_animal/hostile/abnormality/road_home/WorkChance(mob/living/carbon/human/user, chance, work_type)
var/newchance = chance
if(get_attribute_level(user, JUSTICE_ATTRIBUTE) >= 60) //Apparently the original road home is fortitude but I already made scaredy cat fort and I'm too stubborn to change it.
datum_reference.qliphoth_change(-1)
newchance = chance-20
return newchance

/mob/living/simple_animal/hostile/abnormality/road_home/NeutralEffect(mob/living/carbon/human/user, work_type, pe)
. = ..()
if(get_attribute_level(user, JUSTICE_ATTRIBUTE) >= 60)
if(prob(40))
datum_reference.qliphoth_change(-1)
return

/mob/living/simple_animal/hostile/abnormality/road_home/FailureEffect(mob/living/carbon/human/user, work_type, pe)
. = ..()
Expand Down
13 changes: 11 additions & 2 deletions code/modules/mob/living/simple_animal/abnormality/he/scarecrow.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,23 @@
QDEL_NULL(O)
finishing = FALSE

/mob/living/simple_animal/hostile/abnormality/scarecrow/WorkChance(mob/living/carbon/human/user, chance, work_type)
var/newchance = chance
if(get_attribute_level(user, PRUDENCE_ATTRIBUTE) >= 60)
newchance = chance-20
return newchance

/mob/living/simple_animal/hostile/abnormality/scarecrow/FailureEffect(mob/living/carbon/human/user, work_type, pe)
. = ..()
datum_reference.qliphoth_change(-1)
return

/mob/living/simple_animal/hostile/abnormality/scarecrow/PostWorkEffect(mob/living/carbon/human/user, work_type, pe, work_time)

/mob/living/simple_animal/hostile/abnormality/scarecrow/NeutralEffect(mob/living/carbon/human/user, work_type, pe)
. = ..()
if(get_attribute_level(user, PRUDENCE_ATTRIBUTE) >= 60)
datum_reference.qliphoth_change(-1)
if(prob(40))
datum_reference.qliphoth_change(-1)
return

/mob/living/simple_animal/hostile/abnormality/scarecrow/BreachEffect(mob/living/carbon/human/user, breach_type)
Expand Down
17 changes: 16 additions & 1 deletion code/modules/mob/living/simple_animal/abnormality/he/scaredy_cat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,26 @@
RegisterSignal(SSdcs, COMSIG_GLOB_MOB_DEATH, PROC_REF(OnMobDeath))
RegisterSignal(SSdcs, COMSIG_GLOB_ABNORMALITY_BREACH, PROC_REF(OnAbnoBreach))

/mob/living/simple_animal/hostile/abnormality/scaredy_cat/PostWorkEffect(mob/living/carbon/human/user, work_type, pe, work_time)
/mob/living/simple_animal/hostile/abnormality/scaredy_cat/WorkChance(mob/living/carbon/human/user, chance, work_type)
var/newchance = chance
if(get_attribute_level(user, FORTITUDE_ATTRIBUTE) >= 60)
newchance = chance-20
return newchance

/mob/living/simple_animal/hostile/abnormality/scaredy_cat/NeutralEffect(mob/living/carbon/human/user, work_type, pe)
. = ..()
if(get_attribute_level(user, FORTITUDE_ATTRIBUTE) >= 60)
if(prob(40))
datum_reference.qliphoth_change(-1)
return

/mob/living/simple_animal/hostile/abnormality/scaredy_cat/FailureEffect(mob/living/carbon/human/user, work_type, pe)
. = ..()
if(get_attribute_level(user, FORTITUDE_ATTRIBUTE) >= 60)
datum_reference.qliphoth_change(-1)
return


/mob/living/simple_animal/hostile/abnormality/scaredy_cat/BreachEffect(mob/living/carbon/human/user, breach_type)
protect_cooldown = world.time + protect_cooldown_time //to avoid him teleporting twice for no reason on breach
if(priority_friend) //if an oz abno escape they take absolute priority
Expand Down
13 changes: 11 additions & 2 deletions code/modules/mob/living/simple_animal/abnormality/he/woodsman.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,18 @@
icon_state = icon_living
can_act = TRUE

/mob/living/simple_animal/hostile/abnormality/woodsman/PostWorkEffect(mob/living/carbon/human/user, work_type, pe, work_time)

/mob/living/simple_animal/hostile/abnormality/woodsman/WorkChance(mob/living/carbon/human/user, chance, work_type)
var/newchance = chance
if (get_attribute_level(user, TEMPERANCE_ATTRIBUTE) >= 60)
datum_reference.qliphoth_change(-1)
newchance = chance-20
return newchance

/mob/living/simple_animal/hostile/abnormality/woodsman/NeutralEffect(mob/living/carbon/human/user, work_type, pe)
. = ..()
if (get_attribute_level(user, TEMPERANCE_ATTRIBUTE) >= 60)
if(prob(40))
datum_reference.qliphoth_change(-1)
return

/mob/living/simple_animal/hostile/abnormality/woodsman/FailureEffect(mob/living/carbon/human/user, work_type, pe)
Expand Down
13 changes: 9 additions & 4 deletions code/modules/paperwork/records/info/he.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
abno_type = /mob/living/simple_animal/hostile/abnormality/scarecrow
abno_code = "F-01-87"
abno_info = list(
"When an employee with Prudence Level 3 or higher finished their work, the Qliphoth Counter lowered.",
"Employees with Prudence Level 3 or higher had a workrate reduction when working on F-01-87.",
"When an employee with Prudence Level 3 or higher finished their work with a neutral work result, the Qliphoth Counter lowered at a normal chance.",
"When the work result was Bad, the Qliphoth Counter lowered.",
"When Scarecrow Searching for Wisdom was escaping and killed an employee, it sucked their brain out to recover its HP.")

Expand Down Expand Up @@ -114,8 +115,9 @@
abno_type = /mob/living/simple_animal/hostile/abnormality/woodsman
abno_code = "F-05-32"
abno_info = list(
"Employees with Temperance Level 3 or higher had a workrate reduction when working on F-05-32.",
"When an employee with Temperance Level 3 or higher finished their work with a neutral work result, the Qliphoth Counter lowered at a normal chance.",
"When the work result was Bad, the Qliphoth Counter lowered.",
"When an employee with Temperance Level 3 or higher completed their work, the Qliphoth Counter lowered.",
"When an employee attempts work while the Qliphoth Counter is at 1, they will immediately die. Then, the Abnormality will escape.",
"Whenever a body, living or dead, was placed into the Warm-Hearted Woodsman’s chest while the Qliphoth Counter was at 1, the Qliphoth Counter increased.",
"WARNING: When a body was placed into the Warm-Hearted Woodsman’s chest when the Qliphoth Counter was not at 1, it breached immediately.")
Expand Down Expand Up @@ -148,9 +150,11 @@
abno_type = /mob/living/simple_animal/hostile/abnormality/scaredy_cat
abno_code = "F-02-126"
abno_info = list(
"Employees with Fortitude Level 3 or higher had a workrate reduction when working on F-02-126.",
"When an employee with Fortitude Level 3 or higher finished their work with a neutral work result, the Qliphoth Counter lowered at a normal chance.",
"When an employee with Fortitude Level 3 or higher finished their work with a bad work result, the Qliphoth Counter lowered.",
"When another Abnormality breached containment, the Qliphoth Counter lowered.",
"When another \"Oz\" Abnormality breached containment, the Qliphoth Counter dropped to 0.",
"When an employee with Fortitude Level 3 or higher completed their work, the Qliphoth Counter lowered.",
"When another Abnormality was suppressed, the Qliphoth Counter increased.",
"When the Qliphoth Counter reached 0, Scaredy Cat teleported out of the Containment Unit to protect another breached Abnormality.",
"Scaredy Cat could not be fully suppressed as long as the Abnormality it protected was alive.",
Expand Down Expand Up @@ -259,7 +263,8 @@
abno_type = /mob/living/simple_animal/hostile/abnormality/road_home
abno_code = "F-01-136"
abno_info = list(
"When an employee with Justice Level 3 or higher completed their work, the Qliphoth Counter lowered.",
"Employees with Justice Level 3 or higher had a workrate reduction when working on F-01-136.",
"When an employee with Justice Level 3 or higher finished their work with a neutral work result, the Qliphoth Counter lowered at a normal chance.",
"When the work result was Bad, the Qliphoth Counter lowered.",
"When the Road Home breached containment, a house landed in a random department, dealing massive white damage around it.",
"The Road Home also teleported to another department, and tried to make a golden road to the house.",
Expand Down
Loading