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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WORK IN PROGRESS] Drone tier three [reaper is a placeholder name] #5776

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions code/__DEFINES/typecheck/xenos.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#define isxeno_human(A) (isxeno(A) || ishuman(A))
//ask walter if i should turn into castechecks
#define isreaper(A) (istype(A, /mob/living/carbon/xenomorph/reaper))
#define isboiler(A) (istype(A, /mob/living/carbon/xenomorph/boiler))
#define iscarrier(A) (istype(A, /mob/living/carbon/xenomorph/carrier))
#define iscrusher(A) (istype(A, /mob/living/carbon/xenomorph/crusher))
Expand Down
4 changes: 3 additions & 1 deletion code/__DEFINES/xeno.dm
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@
#define XENO_PLASMA_TIER_6 600 * XENO_UNIVERSAL_PLASMAMULT
#define XENO_PLASMA_TIER_8 800 * XENO_UNIVERSAL_PLASMAMULT
#define XENO_PLASMA_TIER_10 1000 * XENO_UNIVERSAL_PLASMAMULT
#define XENO_PLASMA_TIER_12 2000 * XENO_UNIVERSAL_PLASMAMULT

// Plasma gain bands
#define XENO_PLASMA_GAIN_TIER_1 1
Expand Down Expand Up @@ -685,11 +686,12 @@
#define XENO_CASTE_SPITTER "Spitter"
#define XENO_T2_CASTES list(XENO_CASTE_BURROWER, XENO_CASTE_CARRIER, XENO_CASTE_HIVELORD, XENO_CASTE_LURKER, XENO_CASTE_WARRIOR, XENO_CASTE_SPITTER)
//t3
#define XENO_CASTE_REAPER "Reaper"
#define XENO_CASTE_BOILER "Boiler"
#define XENO_CASTE_PRAETORIAN "Praetorian"
#define XENO_CASTE_CRUSHER "Crusher"
#define XENO_CASTE_RAVAGER "Ravager"
#define XENO_T3_CASTES list(XENO_CASTE_BOILER, XENO_CASTE_PRAETORIAN, XENO_CASTE_CRUSHER, XENO_CASTE_RAVAGER)
#define XENO_T3_CASTES list(XENO_CASTE_BOILER, XENO_CASTE_PRAETORIAN, XENO_CASTE_CRUSHER, XENO_CASTE_RAVAGER, XENO_CASTE_REAPER)
//special
#define XENO_CASTE_QUEEN "Queen"
#define XENO_CASTE_PREDALIEN "Predalien"
Expand Down
14 changes: 13 additions & 1 deletion code/_globalvars/global_lists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,18 @@ GLOBAL_LIST_INIT(resin_build_order_drone, list(
/datum/resin_construction/resin_obj/resin_spike
))

GLOBAL_LIST_INIT(resin_build_order_reaper, list(
/datum/resin_construction/resin_turf/wall/thick,
/datum/resin_construction/resin_turf/wall/reflective,
/datum/resin_construction/resin_turf/membrane/thick,
/datum/resin_construction/resin_obj/door/thick,
/datum/resin_construction/resin_obj/acid_pillar,
/datum/resin_construction/resin_obj/sticky_resin,
/datum/resin_construction/resin_obj/fast_resin,
/datum/resin_construction/resin_obj/resin_spike,
/datum/resin_construction/resin_obj/shield_dispenser
))

GLOBAL_LIST_INIT(resin_build_order_hivelord, list(
/datum/resin_construction/resin_turf/wall/thick,
/datum/resin_construction/resin_turf/wall/reflective,
Expand All @@ -78,7 +90,7 @@ GLOBAL_LIST_INIT(resin_build_order_hivelord, list(
/datum/resin_construction/resin_obj/acid_pillar,
/datum/resin_construction/resin_obj/sticky_resin,
/datum/resin_construction/resin_obj/fast_resin,
/datum/resin_construction/resin_obj/resin_spike
/datum/resin_construction/resin_obj/resin_spike,
))

GLOBAL_LIST_INIT(resin_build_order_hivelord_whisperer, list(
Expand Down
2 changes: 2 additions & 0 deletions code/game/jobs/role_authority.dm
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,8 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
M = /mob/living/carbon/xenomorph/predalien
if(XENO_CASTE_HELLHOUND)
M = /mob/living/carbon/xenomorph/hellhound
if(XENO_CASTE_REAPER)
M = /mob/living/carbon/xenomorph/reaper
return M


Expand Down
27 changes: 27 additions & 0 deletions code/game/objects/items/explosives/grenades/xeno_nades.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,30 @@
create_shrapnel(loc, shrapnel_count, , ,shrapnel_type, cause_data)
qdel(src)
..()



/obj/item/explosive/grenade/xeno_weed_grenade
name = "Node Ball"
desc = "a small resin node pulsating and turning in itself."
icon_state = "neuro_nade"
det_time = 1 SECONDS
item_state = "neuro_nade"

rebounds = FALSE

/obj/item/explosive/grenade/xeno_weed_grenade/prime()


var/turf/current_turf = get_turf(src)
var/obj/effect/alien/weeds/weed = locate() in current_turf

if((locate(/obj/effect/alien/weeds/node) in current_turf))
qdel(src)
return
if(weed && weed.weed_strength >= WEED_LEVEL_HIVE)
qdel(src)
return
else
new /obj/effect/alien/weeds/node(current_turf)
qdel(src)
5 changes: 5 additions & 0 deletions code/modules/admin/player_panel/actions/transform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ GLOBAL_LIST_INIT(pp_transformables, list(
name = XENO_CASTE_CRUSHER,
key = /mob/living/carbon/xenomorph/crusher,
color = "purple"
),
list(
name = XENO_CASTE_REAPER,
key = /mob/living/carbon/xenomorph/reaper,
color = "purple"
)
),

Expand Down
6 changes: 3 additions & 3 deletions code/modules/cm_aliens/XenoStructures.dm
Original file line number Diff line number Diff line change
Expand Up @@ -706,9 +706,9 @@
icon_state = "resin_pillar"
invisibility = INVISIBILITY_MAXIMUM
var/width = 3
var/height = 3
var/time_to_brittle = 45 SECONDS
var/time_to_collapse = 45 SECONDS
var/height = 1
var/time_to_brittle = 5 SECONDS
var/time_to_collapse = 5 SECONDS

var/turf_icon = WALL_THICKRESIN
var/brittle_turf_icon = WALL_MEMBRANE
Expand Down
2 changes: 2 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/Evolution.dm
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,8 @@
xeno_type = /mob/living/carbon/xenomorph/defender
if(XENO_CASTE_BURROWER)
xeno_type = /mob/living/carbon/xenomorph/burrower
if(XENO_CASTE_REAPER)
xeno_type = /mob/living/carbon/xenomorph/reaper

var/mob/living/carbon/xenomorph/new_xeno = new xeno_type(get_turf(src), src)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,21 +161,6 @@
SIGNAL_HANDLER
hide_from(Q)


/datum/action/xeno_action/activable/blockade
name = "Place Blockade"
action_icon_state = "place_blockade"
ability_name = "place blockade"
plasma_cost = 300
action_type = XENO_ACTION_CLICK

var/obj/effect/alien/resin/resin_pillar/pillar_type = /obj/effect/alien/resin/resin_pillar
var/time_taken = 6 SECONDS
charges = 0

var/brittle_time = 45 SECONDS
var/decay_time = 45 SECONDS

/datum/action/xeno_action/activable/blockade/give_to(mob/living/carbon/xenomorph/queen/Q)
. = ..()
if(!Q.ovipositor)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -672,65 +672,6 @@
return TRUE


/datum/action/xeno_action/activable/blockade/use_ability(atom/A)
var/mob/living/carbon/xenomorph/queen/Q = owner
if(!Q.check_state())
return FALSE

if(!action_cooldown_check())
return FALSE

if(Q.action_busy)
return FALSE

var/width = initial(pillar_type.width)
var/height = initial(pillar_type.height)

var/turf/T = get_turf(A)
if(T.density)
to_chat(Q, SPAN_XENOWARNING("You can only construct this blockade in open areas!"))
return FALSE

if(T.z != owner.z)
to_chat(Q, SPAN_XENOWARNING("That's too far away!"))
return FALSE

if(!T.weeds)
to_chat(Q, SPAN_XENOWARNING("You can only construct this blockade on weeds!"))
return FALSE

if(!Q.check_plasma(plasma_cost))
return

var/list/alerts = list()
for(var/i in RANGE_TURFS(Floor(width/2), T))
alerts += new /obj/effect/warning/alien(i)

if(!do_after(Q, time_taken, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY))
QDEL_NULL_LIST(alerts)
return FALSE
QDEL_NULL_LIST(alerts)

if(!check_turf(Q, T))
return FALSE

if(!check_and_use_plasma_owner())
return

var/turf/new_turf = locate(max(T.x - Floor(width/2), 1), max(T.y - Floor(height/2), 1), T.z)
to_chat(Q, SPAN_XENONOTICE("You raise a blockade!"))
var/obj/effect/alien/resin/resin_pillar/RP = new pillar_type(new_turf)
RP.start_decay(brittle_time, decay_time)

return ..()

/datum/action/xeno_action/activable/blockade/proc/check_turf(mob/living/carbon/xenomorph/queen/Q, turf/T)
if(T.density)
to_chat(Q, SPAN_XENOWARNING("You can't place a blockade here."))
return FALSE

return TRUE

/mob/living/carbon/xenomorph/proc/xeno_tacmap()
set name = "View Xeno Tacmap"
set desc = "This opens a tactical map, where you can see where every xenomorph is."
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/datum/action/xeno_action/activable/blockade
name = "Place Blockade"
action_icon_state = "place_blockade"
ability_name = "place blockade"
plasma_cost = 300
action_type = XENO_ACTION_CLICK
xeno_cooldown = 15 SECONDS

var/obj/effect/alien/resin/resin_pillar/pillar_type = /obj/effect/alien/resin/resin_pillar
var/time_taken = 1 SECONDS

var/brittle_time = 5 SECONDS
var/decay_time = 5 SECONDS


/datum/action/xeno_action/activable/weed_nade
name = "Lob Resin"
action_icon_state = "prae_dodge"
plasma_cost = 300
action_type = XENO_ACTION_CLICK
xeno_cooldown = 10 SECONDS

var/explode_delay = 1 SECONDS
var/priming_delay = 1 SECONDS

Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
/datum/action/xeno_action/activable/blockade/use_ability(atom/A) // blockade, this abiltiy should always either last a short time or the walls should be destructible in 1-3 hits.
var/mob/living/carbon/xenomorph/reaper = owner
if(!reaper.check_state())
return FALSE

if(!action_cooldown_check())
return FALSE

if(reaper.action_busy)
return FALSE

var/width = initial(pillar_type.width)
var/height = initial(pillar_type.height)

var/turf/active_turf = get_turf(A)
if((locate (/obj/effect/alien/weeds/node/pylon/core) in active_turf)) //core has resin node in it, wall ontop of resin node deletes it, wall ontop of hive core delets all hive weeds if put ontop of it.
return FALSE
if(active_turf.density)
to_chat(reaper, SPAN_XENOWARNING("We can only construct this blockade in open areas!"))
return FALSE

if(active_turf.z != owner.z)
to_chat(reaper, SPAN_XENOWARNING("That's too far away!"))
return FALSE

if(!active_turf.weeds)
to_chat(reaper, SPAN_XENOWARNING("We can only construct this blockade on weeds!"))
return FALSE

if(!reaper.check_plasma(plasma_cost))
return


if(!check_turf(reaper, active_turf))
return FALSE

if(!check_and_use_plasma_owner())
return

var/turf/new_turf = locate(max(active_turf.x - Floor(width/2), 1), max(active_turf.y - Floor(height/2), 1), active_turf.z)
to_chat(reaper, SPAN_XENONOTICE("We raise a blockade!"))
var/obj/effect/alien/resin/resin_pillar/resin_blockade = new pillar_type(new_turf)
resin_blockade.start_decay(brittle_time, decay_time)
apply_cooldown()
return ..()



/datum/action/xeno_action/activable/blockade/proc/check_turf(mob/living/carbon/xenomorph/reaper, turf/T)
if(T.density)
to_chat(reaper, SPAN_XENOWARNING("We can't place a blockade here."))
return FALSE

return TRUE




/datum/action/xeno_action/activable/weed_nade/use_ability(atom/A) // weed nade
var/mob/living/carbon/xenomorph/reaper_spit = owner
if (!reaper_spit.check_state() || reaper_spit.action_busy)
return
if (!action_cooldown_check())
return
if (!check_and_use_plasma_owner())
return

var/turf/current_turf = get_turf(reaper_spit)

if (!current_turf)
return

if (!do_after(reaper_spit, explode_delay, INTERRUPT_ALL | BEHAVIOR_IMMOBILE, BUSY_ICON_HOSTILE))
to_chat(reaper_spit, SPAN_XENODANGER("We stop preparing a resin node in our glands."))
return

apply_cooldown()
to_chat(reaper_spit, SPAN_XENOWARNING("We throw a resin node through the air."))

var/obj/item/explosive/grenade/xeno_weed_grenade/reaper_grenade = new /obj/item/explosive/grenade/xeno_weed_grenade
reaper_grenade.cause_data = create_cause_data(initial(reaper_spit.caste_type), reaper_spit)
reaper_grenade.forceMove(get_turf(reaper_spit))
reaper_grenade.throw_atom(A, 5, SPEED_SLOW, reaper_spit, TRUE)
addtimer(CALLBACK(reaper_grenade, TYPE_PROC_REF(/obj/item/explosive, prime)), priming_delay)
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/castes/Drone.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
build_time_mult = BUILD_TIME_MULT_BUILDER

caste_desc = "A builder of hives. Only drones may evolve into Queens."
evolves_to = list(XENO_CASTE_QUEEN, XENO_CASTE_BURROWER, XENO_CASTE_CARRIER, XENO_CASTE_HIVELORD) //Add more here separated by commas
evolves_to = list(XENO_CASTE_QUEEN, XENO_CASTE_BURROWER, XENO_CASTE_CARRIER, XENO_CASTE_HIVELORD, XENO_CASTE_REAPER) //Add more here separated by commas
deevolves_to = list("Larva")
can_hold_facehuggers = 1
can_hold_eggs = CAN_HOLD_TWO_HANDS
Expand Down
Loading
Loading