Re-Adds Obeah #686
+174
−187
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| /// Trait applied by element | ||
| #define DISCIPLINE_TRAIT(source) "discipline_trait_[source]" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| /datum/discipline/obeah | ||
| name = "Obeah" | ||
| desc = "Use your third eye in healing or protecting needs." | ||
| icon_state = "obeah" | ||
| clan_restricted = TRUE | ||
| power_type = /datum/discipline_power/obeah | ||
|
|
||
| /datum/discipline_power/obeah | ||
| name = "Valeren power name" | ||
| desc = "Valeren power description" | ||
|
|
||
| activate_sound = 'modular_darkpack/modules/powers/sounds/obeah.ogg' | ||
|
|
||
| //SENSE VITALITY | ||
| /datum/discipline_power/obeah/sense_vitality | ||
| name = "Sense Vitality" | ||
| desc = "Focus your senses to read the vitality of a target." | ||
|
|
||
| level = 1 | ||
| check_flags = DISC_CHECK_CONSCIOUS | DISC_CHECK_CAPABLE | DISC_CHECK_FREE_HAND | ||
| target_type = TARGET_MOB | TARGET_SELF | ||
| range = 1 | ||
| vitae_cost = 0 | ||
| cooldown_length = 1 TURNS | ||
|
|
||
| // perception + empathy at diff 7 | ||
| // 1 success = splat | ||
| // 2 success = splat + vitals | ||
| // 3 success = splat + vital + current bloodpool | ||
| /datum/discipline_power/obeah/sense_vitality/activate(mob/living/target) | ||
| . = ..() | ||
| var/datum/storyteller_roll/sense_vitality_roll = new() | ||
| sense_vitality_roll.applicable_stats = list(STAT_PERCEPTION, STAT_EMPATHY) | ||
| sense_vitality_roll.difficulty = 7 | ||
| sense_vitality_roll.numerical = TRUE | ||
| sense_vitality_roll.roll_output_type = ROLL_PRIVATE_ADMIN | ||
| var/roll_result = sense_vitality_roll.st_roll(owner) | ||
|
|
||
| var/list/render_list = list() | ||
| render_list = do_roll_results(target, roll_result) | ||
| to_chat(owner, custom_boxed_message("blue_box", jointext(render_list, "")), type = MESSAGE_TYPE_INFO) | ||
|
|
||
| /datum/discipline_power/obeah/sense_vitality/proc/do_roll_results(mob/living/target, roll_result) | ||
| var/list/render_list = list() | ||
| if(roll_result < 1) | ||
| render_list += span_danger("You fail to sense anything.\n") | ||
| return render_list | ||
|
|
||
| // One Success. | ||
| var/datum/splat/sensed_splat = LAZYACCESS(target.splats, 1) | ||
| render_list += span_notice("You identify them to be a [sensed_splat ? sensed_splat.name : "Human"].\n") | ||
|
|
||
| if(roll_result < 2) | ||
| return render_list | ||
| // Two Successes. | ||
| render_list += custom_boxed_message("blue_box", healthscan(user = owner, target = target, mode = SCANNER_VERBOSE, advanced = TRUE, tochat = FALSE)) | ||
|
|
||
| if(roll_result < 3) | ||
| return render_list | ||
| // Three Successes. | ||
| var/mob/living/carbon/human/target_human = target | ||
| var/bloodpool = target_human?.bloodpool | ||
| render_list += span_notice("You sense they have [bloodpool ? bloodpool : "no"] Vitae remaining.\n") | ||
| return render_list | ||
|
|
||
| ////////////////////////////////////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| //ANESTHETIC TOUCH | ||
| /datum/discipline_power/obeah/anesthetic_touch | ||
| name = "Anesthetic Touch" | ||
| desc = "Soothe your patient's pain, or put them to peaceful sleep." | ||
|
|
||
| level = 2 | ||
| check_flags = DISC_CHECK_CONSCIOUS | DISC_CHECK_CAPABLE | DISC_CHECK_FREE_HAND | ||
| target_type = TARGET_LIVING | ||
| range = 1 | ||
| cooldown_length = 1 TURNS | ||
|
|
||
| // TO DO, make this use two mouse buttons instead of radial menu. | ||
| // LMB: Block someone's pain | ||
| // RMB: Put mortal to sleep. | ||
| /datum/discipline_power/obeah/anesthetic_touch/activate(mob/living/target) | ||
| . = ..() | ||
| var/chosen_option = show_radial_menu(owner, target, list("Soothe Pain", "Put To Sleep"), radius = 38, require_near = TRUE) | ||
| switch(chosen_option) | ||
| if("Soothe Pain") | ||
| ADD_TRAIT(target, TRAIT_IGNORESLOWDOWN, DISCIPLINE_TRAIT(type)) | ||
| addtimer(CALLBACK(src, PROC_REF(end_soothe_pain), target), 1 SCENES) | ||
| if("Put To Sleep") | ||
| if(iskindred(target)) | ||
| to_chat(owner, span_warning("You can't put a Kindred to sleep with this power!")) | ||
| return TRUE | ||
| target.SetSleeping(10 SCENES) // 30 minutes if left alone | ||
| target.adjust_blood_pool(1) // Mortal regains a blood point. | ||
| return TRUE | ||
|
|
||
| /datum/discipline_power/obeah/anesthetic_touch/proc/end_soothe_pain(mob/living/target) | ||
| REMOVE_TRAIT(target, TRAIT_IGNORESLOWDOWN, DISCIPLINE_TRAIT(type)) | ||
|
|
||
| ////////////////////////////////////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| /* | ||
| //CORPORE SANO | ||
| /datum/discipline_power/obeah/corpore_sano | ||
| name = "Corpore Sano" | ||
| desc = "Lay hands on your patient and heal their wounds." | ||
|
Comment on lines
+104
to
+106
Member
There was a problem hiding this comment. When you get to this, consider using |
||
|
|
||
| level = 3 | ||
| check_flags = DISC_CHECK_CONSCIOUS | DISC_CHECK_CAPABLE | DISC_CHECK_FREE_HAND | DISC_CHECK_IMMOBILE | ||
| target_type = TARGET_LIVING | ||
| range = 1 | ||
|
|
||
| violates_masquerade = TRUE | ||
|
|
||
| cooldown_length = 5 SECONDS | ||
|
|
||
|
|
||
| //SHEPHERD'S WATCH | ||
| /datum/discipline_power/obeah/shepherds_watch | ||
| name = "Shepherd's Watch" | ||
| desc = "Create a supernatural barrier to protect yourself from harm." | ||
|
|
||
| level = 4 | ||
|
|
||
| cooldown_length = 40 SECONDS | ||
|
|
||
| //UNBURDEN THE BESTIAL SOUL | ||
| /datum/discipline_power/obeah/unburden_the_bestial_soul | ||
| name = "Unburden The Bestial Soul" | ||
| desc = "Draw out a Kindred's soul and heal it of impurities." | ||
|
|
||
| level = 5 | ||
| check_flags = DISC_CHECK_CONSCIOUS | DISC_CHECK_CAPABLE | DISC_CHECK_IMMOBILE | DISC_CHECK_FREE_HAND | ||
| target_type = TARGET_LIVING | ||
| range = 1 | ||
|
|
||
| cooldown_length = 5 SECONDS | ||
|
|
||
| */ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
for this we should likely be consistent about if we use the
/disciplinevs the/discipline_powerright?right now your just using the type of whatever you happen to be in like proximity_monitor rn lol
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we use
type, as all other macros use, after all it doesnt matter what it is, aslong as it lines up with the removal as well.plus uh,
discipline_poweris better sincedisciplinedoesnt have proper procs likediscpline_powerdoes.