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.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

The Devil wears a suit and tie #8874

Conversation

ToGWtF
Copy link
Contributor

@ToGWtF ToGWtF commented Jun 11, 2020

Intent of your Pull Request

Devils have obsessions. Can ONLY give contracts to your obsession

Species, Gender, Age range, Bloodtype
This will transfer over to game mode as well, which I haven't touched. Only midround.
Obsessions show up in EndRound screen.

Midround gets its own objectives so the game-mode isn't touched.

Lower soul amount, or default soul quality objective. (Quality = Sell 1-2 contracts of a specific type)
Midround gets devil jaunt by default
Midround Devil can't fully ascend
Will make them able to with objective. Rare. Still requires like 7 souls

Devil powers have been changed slightly.

Infernal Jaunt now sort of shows you know long its going to take to phase in and out
Infernal Jaunt also now has a range of 6 rather than 2 tiles away from a mob
Devil now has shapeshift in his lowest form. 3 minute cooldown.
Devil now has a help spell to explain some of the intricacies.

Contracts have been changed slightly

Added new Life contract, which does what old power contract did by giving one-time use heal organ
Added research point contract

Can only sell your soul once.

Getting your soul back makes you unable to sign a devil contract again

Employment contracts now have a use timer

Can't just slap it on them, they have to sit still for it
Takes longer to deconvert someone if you aren't lawyer
Get the hecking lawyer.

Power Contract changes

Gives Hulk, Giantism, and Telekinesis.
Has a chance to give users spasms, which would punch themselves and others

Wealth contract didnt get touched because its mostly useless and what else can I add to it?

Prestige Contract changes

Get an all access ID card
Will also send an arrivals message that you just arrived as Captain
Already a Captain? Gonna be some big thinks from him
No Captain? Bruh you lucked out enjoy all access

Magic Contract changes

Just read it. I added a few more spells you can get. No real downsides here because I couldn't think of any.

Knowledge Contract changes

1/3 chance for Xray and ability to change view ranger, but you now hallucinate.
1/3 chance for a haunted eightball that lets you get yes or no answers from ghosts.
1/3 chance to see ghosts, but only you

Changelog

馃啈
rscadd: Devils now have obsessions they have to work around.
tweak: Devil boons have changed. You won't always get what you expected
/:cl:

@yogstation13-bot yogstation13-bot added Feature This adds new content to the game Tweak This PR contains changes to the game. labels Jun 11, 2020
@Jumps0
Copy link
Contributor

Jumps0 commented Jun 11, 2020

Great job dude <3

@boodaliboo
Copy link
Contributor

good pr

code/game/gamemodes/devil/objectives.dm Show resolved Hide resolved
code/game/gamemodes/devil/objectives.dm Outdated Show resolved Hide resolved
code/game/gamemodes/devil/objectives.dm Show resolved Hide resolved
code/modules/events/devil.dm Show resolved Hide resolved
code/modules/paperwork/contract.dm Outdated Show resolved Hide resolved
code/modules/paperwork/contract.dm Outdated Show resolved Hide resolved
code/modules/paperwork/contract.dm Outdated Show resolved Hide resolved
code/modules/spells/spell_types/devil.dm Outdated Show resolved Hide resolved
@ynot01
Copy link
Contributor

ynot01 commented Jun 12, 2020

this is amazing

@AdamElTablawy
Copy link
Contributor

I mean, that just makes people less likely to take devil contracts overall since they now come with downsides.

When the downside is, you know, you lose your soul. Make deconverting people also lose their given powers, and it'll fare a little better.

@JamieD1 JamieD1 removed the TESTMERGE label Jun 20, 2020
@Ratvar
Copy link
Contributor

Ratvar commented Jun 22, 2020

Make wealth contract give user a literal midas touch

Comment on lines +946 to +950
// if("life")
// var/obj/item/organ/O = getorgan(/obj/item/organ/regenerative_core)
// if(O)
// O.Remove()
// M.cure_trauma_type(/datum/brain_trauma/mild/phobia/doctors)
Copy link
Contributor

Choose a reason for hiding this comment

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

Using it or losing it

@JamieD1 JamieD1 requested a review from alexkar598 June 29, 2020 20:19
Copy link
Member

@alexkar598 alexkar598 left a comment

Choose a reason for hiding this comment

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

Didnt fully review it yet

Comment on lines 18 to +23
/datum/objective/devil/soulquantity/update_explanation_text()
explanation_text = "Purchase, and retain control over at least [target_amount] souls."

/datum/objective/devil/lessersoulquantity/update_explanation_text()
explanation_text = "Purchase, and retain control over at least [target_amount] souls."

Copy link
Member

Choose a reason for hiding this comment

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

Move the whole lessersoul thing below all the code for the soul quantity, it gets confusing when reading code while it hops around between datums

switch(rand(1,4))
if(1)
var/temp_species_obsession = pick(species_obsession)
obsession = "species"
Copy link
Member

Choose a reason for hiding this comment

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

No magic string, use defines so that you cant typo your way into having an obsession of the spices type

Comment on lines +208 to +211
var/temp_bloodtype_obsession = pick(bloodtype_obsession)
obsession = "blood"
actual_obsession = temp_bloodtype_obsession
actual_obsession_text = "people with the bloodtype [temp_bloodtype_obsession]"
Copy link
Member

Choose a reason for hiding this comment

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

Why not cut the middle man here?
actual_obsession = pick(bloodtype_obsession)
actual_obsession_text = "people with the blo...

@@ -493,6 +547,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
to_chat(owner.current, GLOB.lawlorify[LAW][ban])
to_chat(owner.current, GLOB.lawlorify[LAW][obligation])
to_chat(owner.current, GLOB.lawlorify[LAW][banish])
to_chat(owner.current, "You are obsessed with the thought of collecting souls of [actual_obsession_text].")
Copy link
Member

Choose a reason for hiding this comment

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

Make it clearer thats what they need to do

Suggested change
to_chat(owner.current, "You are obsessed with the thought of collecting souls of [actual_obsession_text].")
to_chat(owner.current, "You are obsessed with the thought of collecting souls of <span class='warning'>[actual_obsession_text].</span>")

@@ -503,8 +558,9 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
obligation = randomdevilobligation()
banish = randomdevilbanish()
GLOB.allDevils[lowertext(truename)] = src
randomobsession()
Copy link
Member

Choose a reason for hiding this comment

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

You dont have to change it here, but in the future, choose proc names that describe what it does, like set_random_obsession


antag_memory += "Your devilic true name is [truename]<br>[GLOB.lawlorify[LAW][ban]]<br>You may not use violence to coerce someone into selling their soul.<br>You may not directly and knowingly physically harm a devil, other than yourself.<br>[GLOB.lawlorify[LAW][bane]]<br>[GLOB.lawlorify[LAW][obligation]]<br>[GLOB.lawlorify[LAW][banish]]<br>"
antag_memory += "Your devilic true name is [truename]<br>[GLOB.lawlorify[LAW][ban]]<br>You may not use violence to coerce someone into selling their soul.<br>You may not directly and knowingly physically harm a devil, other than yourself.<br>[GLOB.lawlorify[LAW][bane]]<br>[GLOB.lawlorify[LAW][obligation]]<br>[GLOB.lawlorify[LAW][banish]]<br>You are obsessed with the thought of collecting souls of [actual_obsession_text]<br>"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
antag_memory += "Your devilic true name is [truename]<br>[GLOB.lawlorify[LAW][ban]]<br>You may not use violence to coerce someone into selling their soul.<br>You may not directly and knowingly physically harm a devil, other than yourself.<br>[GLOB.lawlorify[LAW][bane]]<br>[GLOB.lawlorify[LAW][obligation]]<br>[GLOB.lawlorify[LAW][banish]]<br>You are obsessed with the thought of collecting souls of [actual_obsession_text]<br>"
antag_memory += "Your devilic true name is [truename]<br>[GLOB.lawlorify[LAW][ban]]<br>You may not use violence to coerce someone into selling their soul.<br>You may not directly and knowingly physically harm a devil, other than yourself.<br>[GLOB.lawlorify[LAW][bane]]<br>[GLOB.lawlorify[LAW][obligation]]<br>[GLOB.lawlorify[LAW][banish]]<br>You are obsessed with the thought of collecting souls of <span class='warning'>[actual_obsession_text]</span><br>"

@PettyOfficer
Copy link

Interesting.

@Ethan4303
Copy link
Contributor

The all access contract doesn't work and doesn't give AA nor the announcement, i dont know how this works but was told to post a comment on what happened

@smorgli
Copy link
Contributor

smorgli commented Jul 20, 2020

The all access contract doesn't work and doesn't give AA nor the announcement, i dont know how this works but was told to post a comment on what happened

I forced the midround devil, ask me for info

@Partheo Partheo added the TESTMERGED This PR is currently live in a test merge. label Jul 23, 2020
@Georgeur
Copy link

Overall good PR. I've had rounds in which I've sold my soul 5 times, making me think I'm the dragonborn or some shit.
I hope obsessions change upon going soulless, and etc.

@alexkar598
Copy link
Member

I realize it took a while for the review to come in, but this is stale regardless

@alexkar598 alexkar598 closed this Jul 24, 2020
@alexkar598
Copy link
Member

This PR has been closed due to being stale. Contact me or another maintainer on Discord if you wish for this PR to be reopened.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature This adds new content to the game TESTMERGED This PR is currently live in a test merge. Tweak This PR contains changes to the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet