Assorted DARKPACK TODOs and code cleanup#600
Assorted DARKPACK TODOs and code cleanup#600FalloutFalcon merged 25 commits intoDarkPack13:masterfrom
Conversation
| var/mob/living/carbon/human/kindred = src // This is stupid... Also TECHNICLY you can have a splat without being human now... | ||
| var/hunger_threshold = 7 - (kindred_splat.enlightenment ? st_get_stat(STAT_INSTINCT) : st_get_stat(STAT_SELF_CONTROL)) | ||
| var/previous_hunger = HAS_TRAIT(kindred, TRAIT_NEEDS_BLOOD) |
There was a problem hiding this comment.
the var 'kindred' is only used once in line ten, cant it just be HAS_TRAIT(src, TRAIT_NEEDS_BLOOD) considering mob/living can have traits?
|
|
||
| if(!previous_hunger && will_be_hungry) // enter hunger | ||
| ADD_TRAIT(src, TRAIT_NEEDS_BLOOD, SPECIES_TRAIT) | ||
| ADD_TRAIT(src, TRAIT_NEEDS_BLOOD, SPECIES_TRAIT) // That is not a species trait. |
There was a problem hiding this comment.
We dont have a splat trait lol. They go based of the splat ID since its all applied from init rn
| if(iskindred(pulling) || !iskindred(src)) | ||
| if(!CAN_HAVE_BLOOD(bit_human) || (bit_human.blood_volume <= 50) || (bit_human.bloodpool <= 0)) | ||
| SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', 0, 0, 75)) | ||
| to_chat(src, span_warning("This vessel is empty. You'll have to find another.")) | ||
| return |
There was a problem hiding this comment.
something doesnt seem right here. specifically regarding line 23 and the changed boolean logic, since (!iskindred(pulling)) -> (iskindred(pulling)).
also this entire proc needs to be looked over by one of us at some point. the mixed use of bit_human and pulling is really bugging me.
There was a problem hiding this comment.
I think i simply made a mistake. This is why single letter vars are bad lol
| if(bit_human.stat == DEAD && !HAS_TRAIT(src, TRAIT_GULLET)) | ||
| SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', 0, 0, 75)) | ||
| to_chat(src, span_warning("Your Beast requires life, not the tepid swill of corpses.")) | ||
| return |
There was a problem hiding this comment.
not even sure if the 'iron gullet' trait is lore accurate at all. makes no sense why they wouldnt be able to drink the blood of a dead body but would be able to drink the blood in a plastic bag. most likely slated for removal unless we get a lore check
There was a problem hiding this comment.
Iron Gullet is a V5 merit. In V5 it seems like they nerfed blood sources that aren't live humans based on reddit. From a quick skim it seems like V20 its equal to or worse then blood-bags or animals blood???
| return | ||
| if(LV.stat == DEAD && !HAS_TRAIT(src, TRAIT_GULLET)) | ||
| var/mob/living/bit_living = pulling | ||
| if(bit_living.stat == DEAD && !HAS_TRAIT(src, TRAIT_GULLET)) |
| if(!iskindred(pulling) || !iskindred(src)) // We already ran these checks for humans, Why we we doing this again... | ||
| if(!CAN_HAVE_BLOOD(bit_living) || (bit_living.blood_volume <= 50) || (bit_living.bloodpool <= 0)) | ||
| SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', 0, 0, 75)) | ||
| to_chat(src, span_warning("This vessel is empty. You'll have to find another.")) | ||
| return |
There was a problem hiding this comment.
what...
thanks flav
gonna go out on a limb here and say that we likely only need checks on mob/living (since all mob/living have bloodpool) and we can handle special logic for things like diablerie by checking splats (which exist on the /living level)?
again not necessary in this pr... just... yknow...
| /obj/item/stocks_license/examine(mob/user) | ||
| . = ..() | ||
| . += "<b>Balance</b>: [balance] dollars" | ||
| . += "<b>Balance</b>: [balance] [MONEY_NAME]" |
There was a problem hiding this comment.
This object is deprecated and will probably be removed when stock market gets reworked to be fun and not terrible just FYI
Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com>
…bite interactions)
3 participants
About The Pull Request
Would atomize into diff prs but Im doing all of this on my laptop rn.
just a whole lotta random bullshit, bulk of it was ensuring BP is only interacted with via adjust_bloodpool
and alot of the rest was item interaction cleanup. item interactions being in attack procs will mess with melberts eventual swing combat pr he had planned (which i still hope for)
Why It's Good For The Game
should fix #401
Changelog
🆑
qol: first key checked on a door has no delay
fix: abyss tentacles should be able to acctually make a sound as intended
fix: fixed tranforming BP dupe
fix: typhon brew is craftable
fix: humanity 10 vamps wont burn in the sun (IF ENABLED VIA CONFIG)
image: blood hunt skull uses its onfloor
code: more non-combat item interactions are no longer in attack-by
code: all changes in BP should update your hud
/:cl: