Skip to content

Commit

Permalink
DotD 1.1
Browse files Browse the repository at this point in the history
Fixed some shit I forgot and made it so you can only get Death Dealer once per Ckey.
  • Loading branch information
X3ros committed Jul 28, 2024
1 parent c6ab989 commit 7c26423
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 8 deletions.
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/ego_gifts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1502,7 +1502,7 @@
return
owner.adjustBruteLoss(-damage*0.75)

/datum/ego_gifts/homing_instinct
/datum/ego_gifts/luckdraw
name = "Luck of the Draw"
icon_state = "luckdraw"
temperance_bonus = -1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/mob/living/simple_animal/hostile/abnormality/dealerdamned
name = "Dealer of the Damned"
desc = "A girl with hair flowing over her eyes."
desc = "A floating playing card with what appears to be a cursor acting as its hand."
icon = 'ModularTegustation/Teguicons/48x48.dmi'
icon_state = "dealerdamned"
portrait = "penitent"
maxHealth = 400
health = 400
threat_level = TETH_LEVEL
Expand All @@ -25,10 +24,12 @@
/datum/ego_datum/weapon/luckdraw,
/datum/ego_datum/armor/luckdraw,
)
gift_type = /datum/ego_gifts/regret
gift_type = /datum/ego_gifts/luckdraw
abnormality_origin = ABNORMALITY_ORIGIN_ORIGINAL
var/coin_status
var/has_flipped
var/static/gambled_prior = list()
var/work_count = 0

//Coinflip V1; Expect Jank
/mob/living/simple_animal/hostile/abnormality/dealerdamned/funpet(mob/petter)
Expand All @@ -52,6 +53,14 @@
say("Tails. Sorry, high roller, but a deal's a deal.")
return

/mob/living/simple_animal/hostile/abnormality/dealerdamned/AttemptWork(mob/living/carbon/human/user, work_type)
..()
if((work_type == "Gamble") && (user.ckey in gambled_prior))
say("Hey, I know I'm all for high stakes, but you've already put your life on the line once. I've got standards.")
return FALSE
else
return TRUE

//TODO: Prevent people from working Gamble more than once, similarly to Realization Engine's restriction
/mob/living/simple_animal/hostile/abnormality/dealerdamned/PostWorkEffect(mob/living/carbon/human/user, work_type, pe, work_time)
..()
Expand All @@ -60,6 +69,7 @@
user.Immobilize(15)
SLEEP_CHECK_DEATH(10)
playsound(user, "revolver_spin", 30, FALSE)
gambled_prior |= user.ckey

//We need to set if the game is going on, who's being shot, and then spent chambers
var/russian_roulette = TRUE
Expand Down Expand Up @@ -94,4 +104,4 @@
newchance = 20
coin_status = FALSE
has_flipped = FALSE
return chance + newchance
return chance + newchance
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/ego_gun/he.dm
Original file line number Diff line number Diff line change
Expand Up @@ -314,9 +314,9 @@
special = "This weapon changes its projectile each time it is reloaded. It cannot be reloaded without firing all six shots first."
ammo_type = /obj/item/ammo_casing/caseless/ego_gaze
weapon_weight = WEAPON_HEAVY
fire_delay = 10
fire_delay = 8
shotsleft = 6
reloadtime = 1.5 SECONDS
reloadtime = 1.3 SECONDS
fire_sound = 'sound/weapons/gun/revolver/shot_alt.ogg'
vary_fire_sound = FALSE
var/list/ammotypes = list(/obj/item/ammo_casing/caseless/ego_magicbullet,/obj/item/ammo_casing/caseless/ego_supershotgun,/obj/item/ammo_casing/caseless/ego_solemnlament,/obj/item/ammo_casing/caseless/ego_harmony,/obj/item/ammo_casing/caseless/ego_match,/obj/item/ammo_casing/caseless/ego_gaze)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/projectile/ego_bullets/waw.dm
Original file line number Diff line number Diff line change
Expand Up @@ -343,5 +343,5 @@

/obj/projectile/ego_bullet/ego_supershotgun
name = "super shotgun"
damage = 8
damage = 10
damage_type = RED_DAMAGE
Binary file modified icons/mob/clothing/ego_gear/abnormality/teth.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/ego_gear/ego_gifts.dmi
Binary file not shown.

0 comments on commit 7c26423

Please sign in to comment.