Skip to content

Commit

Permalink
TGS Test Merge (#16663)
Browse files Browse the repository at this point in the history
  • Loading branch information
comfyorange committed Oct 26, 2024
2 parents 605b2e6 + d22ddb1 commit 6683de6
Show file tree
Hide file tree
Showing 11 changed files with 352 additions and 0 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/cooldowns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#define COOLDOWN_HUD_ORDER "hud_order"
#define COOLDOWN_CLOAK_IMPLANT "cloak_implant"
#define COOLDOWN_DRONE_CLOAK "drone_cloak"
#define COOLDOWN_MAW_GLOB "maw_glob"
#define COOLDOWN_XENO_TURRETS_ALERT "xeno_turrets_alert"
#define COOLDOWN_PARALYSE_ACID "acid_spray_paralyse"
#define COOLDOWN_RELAY_MOVE "remote_relay_moves"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,10 @@ GLOBAL_DATUM_INIT(flare_particles, /particles/flare_smoke, new)
/obj/effect/temp_visual/oppose_shatter/Initialize(mapload)
. = ..()
animate(src, alpha = 0, time = 3 SECONDS)

/obj/effect/temp_visual/hugger_ball_launch
icon = 'icons/mob/radial.dmi'
icon_state = "hugger_ball"
duration = 4 SECONDS
resistance_flags = RESIST_ALL
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
51 changes: 51 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/hive_upgrades.dm
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,57 @@ GLOBAL_LIST_INIT(tier_to_primo_upgrade, list(
to_chat(buyer, span_xenowarning("You cannot build in a dense location!"))
return FALSE

/datum/hive_upgrade/building/acid_jaws
name = "acid jaws"
desc = "Constructs an acid maw that allows the hive to bombard it's enemies from afar. Requires open space and time to place."
psypoint_cost = 600
icon = "jaws"
gamemode_flags = ABILITY_NUCLEARWAR
upgrade_flags = UPGRADE_FLAG_USES_TACTICAL
building_type = /obj/structure/xeno/acid_maw/acid_jaws

/datum/hive_upgrade/building/acid_jaws/can_buy(mob/living/carbon/xenomorph/buyer, silent = TRUE)
. = ..()
if(!.)
return

var/turf/buildloc = get_step(buyer, building_loc)
if(!buildloc)
return FALSE

if(buildloc.density)
if(!silent)
to_chat(buyer, span_xenowarning("You cannot build in a dense location!"))
return FALSE
var/area/buildzone = get_area(buyer)
if(buildzone.ceiling > CEILING_UNDERGROUND)
if(!silent)
to_chat(buyer, span_xenowarning("We need open space to allow this structure to bombard enemies!"))
return FALSE

/datum/hive_upgrade/building/acid_maw
name = "acid maw"
desc = "Constructs an acid maw that allows the hive to unleash it's most devastating bombardments from any location. Requires time to place and to prepare globs, but this structures acid is strong enough to eat through any cieling above it."
psypoint_cost = 1600
icon = "maw"
gamemode_flags = ABILITY_NUCLEARWAR
building_type = /obj/structure/xeno/acid_maw

/datum/hive_upgrade/building/acid_maw/can_buy(mob/living/carbon/xenomorph/buyer, silent = TRUE)
. = ..()
if(!.)
return

var/turf/buildloc = get_step(buyer, building_loc)
if(!buildloc)
return FALSE

if(buildloc.density)
if(!silent)
to_chat(buyer, span_xenowarning("You cannot build in a dense location!"))
return FALSE


/datum/hive_upgrade/defence
category = "Defences"

Expand Down
292 changes: 292 additions & 0 deletions code/modules/xenomorph/maw.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,292 @@
/// non-singleton ammo datum for maw launches. One is created every time the maw fires for every fire.
/datum/maw_ammo
///dont change this var name it makes the tooltip show the name when you hover in the radial
var/name = "generic maw ammo"
///radial icon to display in the selection radial for this ammo
var/radial_icon_state = "acid_smoke"
/// time in ticks this maw ammo will cause the maw to go on cooldown for
var/cooldown_time = 1
///NEVER SET THIS BELOW 2 SECONDS, THATS THE IMPACT ANIM TIME, PROBABLY SET IT HIGHER CUS LAUNCH ANIMS EXIST
var/impact_time = 6 SECONDS

///called when the maw fires its payload
/datum/maw_ammo/proc/launch_animation(turf/target, obj/structure/xeno/acid_maw/maw)
CRASH("UNIMPLEMENTED MAW OR CALLED PARENT")

///called 2 seconds before impact
/datum/maw_ammo/proc/impact_visuals(turf/target)
return

///actual impact effects after the impact visuals
/datum/maw_ammo/proc/on_impact(turf/target)
CRASH("UNIMPLEMENTED MAW OR CALLED PARENT")


/datum/maw_ammo/smoke
name = "GENERIC_SMOKEAMMOTYPE"
cooldown_time = 4 MINUTES
///radius of the smoke we deploy
var/smokeradius = 4
///The duration of the smoke in 2 second ticks
var/duration = 5
///datum typepath for the smoke we wanna use
var/datum/effect_system/smoke_spread/smoke_type = /datum/effect_system/smoke_spread/bad

/particles/maw_smoke_glob
width = 100
height = 200
count = 300
spawning = 30
gravity = list(0, 0.95, 0)
icon = 'icons/effects/effects.dmi'
icon_state = "smoke"
lifespan = 10
fade = generator(GEN_NUM, 12, 2, LINEAR_RAND)
fadein = 1
color = "#ffbf58" // set by glob type
position = generator(GEN_SPHERE, 15, 0, SQUARE_RAND)
velocity = list(0, 12, 0)
scale = 0.4
grow = -0.02
spin = generator(GEN_NUM, 0, 10, UNIFORM_RAND)
friction = 0.2

/particles/maw_smoke_glob/launch
velocity = list(0, -12, 0)
gravity = list(0, -0.95, 0)

/obj/effect/temp_visual/maw_gas_launch
duration = 4 SECONDS

/obj/effect/temp_visual/maw_gas_launch/Initialize(mapload)
. = ..()
particles = new /particles/maw_smoke_glob/launch

/obj/effect/temp_visual/maw_gas_land
duration = 2 SECONDS

/obj/effect/temp_visual/maw_gas_land/Initialize(mapload)
. = ..()
particles = new /particles/maw_smoke_glob

/datum/maw_ammo/smoke/launch_animation(turf/target, obj/structure/xeno/acid_maw/maw)
. = ..()
var/obj/effect/temp_visual/maw_gas_launch/anim = new(maw.loc)
var/obj/effect/particle_effect/smoke/smoke_effecttype = smoke_type::smoke_type
anim.particles.color = smoke_effecttype::color
anim.pixel_x = (maw.bound_width/2) - 16
animate(anim, anim.duration, easing=EASE_IN|CUBIC_EASING, pixel_y=600)

/datum/maw_ammo/smoke/impact_visuals(turf/target)
. = ..()
var/obj/effect/temp_visual/maw_gas_land/anim = new(target)
var/obj/effect/particle_effect/smoke/smoke_effecttype = smoke_type::smoke_type
anim.particles.color = smoke_effecttype::color
anim.pixel_y = 700
animate(anim, anim.duration, easing=EASE_IN|CUBIC_EASING, pixel_y=0)
animate(alpha = 0, pixel_y = 700)

/datum/maw_ammo/smoke/on_impact(turf/target)
var/datum/effect_system/smoke_spread/smoke = new smoke_type
smoke.set_up(smokeradius, target, duration)
smoke.start()

/datum/maw_ammo/smoke/neuro
name = "neurotoxin maw glob"
radial_icon_state = "smoke_mortar"
smoke_type = /datum/effect_system/smoke_spread/xeno/neuro

/datum/maw_ammo/smoke/acid_big
name = "strategic acid maw glob"
cooldown_time = 10 MINUTES
radial_icon_state = "acid_smoke_mortar"
smoke_type = /datum/effect_system/smoke_spread/xeno/acid
smokeradius = 12
duration = 10

/datum/maw_ammo/smoke/acid_big/launch_animation(turf/target, obj/structure/xeno/acid_maw/maw)
. = ..()
playsound_z_humans(target.z, 'sound/voice/strategic_launch_detected.ogg', 100)


/datum/maw_ammo/hugger
name = "ball of huggers"
radial_icon_state = "hugger_ball"
cooldown_time = 3 MINUTES
/// range_turfs that huggers will be dropped around the target
var/drop_range = 8
/// how many huggers get dropped at once, does not stack on turfs if theres not enough turfs
var/hugger_count = 30
///huggers to choose to spawn
var/list/hugger_options = list(
/obj/item/clothing/mask/facehugger,
/obj/item/clothing/mask/facehugger/combat/slash,
/obj/item/clothing/mask/facehugger/combat/acid,
/obj/item/clothing/mask/facehugger/combat/resin,
/obj/item/clothing/mask/facehugger/combat/chem_injector/ozelomelyn,
)
/// used to track our spawned huggers for animations and stuff
var/list/spawned_huggers = list()

/datum/maw_ammo/hugger/launch_animation(turf/target, obj/structure/xeno/acid_maw/maw)
. = ..()
var/obj/effect/temp_visual/hugger_ball_launch/anim = new(maw.loc)
anim.pixel_x = (maw.bound_width/2) - 16
animate(anim, anim.duration, easing=EASE_OUT|CUBIC_EASING, pixel_y=600)

/datum/maw_ammo/hugger/impact_visuals(turf/target)
var/list/turf/turfs = RANGE_TURFS(drop_range, target)
assignturfs:
while(length(turfs) && hugger_count) // does not double stackhuggers: if 5 tiles free 5 huggers spawn
var/turf/candidate = pick_n_take(turfs)
if(candidate.density)
continue assignturfs
for(var/atom/blocker AS in candidate.contents)
if(blocker.density)
continue assignturfs
hugger_count--
var/hugger_type = pick(hugger_options)
var/obj/item/clothing/mask/facehugger/paratrooper = new hugger_type(candidate)
paratrooper.go_idle()

var/xoffset = (target.x - candidate.x) * 32
var/yoffset = (target.y - candidate.y) * 32 + 600
paratrooper.pixel_x = xoffset
paratrooper.pixel_y = yoffset

var/current_hugger_iconstate = paratrooper.icon_state
animate(paratrooper, 2 SECONDS, pixel_x=0, pixel_y=0, icon_state=initial(paratrooper.icon_state)+"_thrown", easing=EASE_OUT|CUBIC_EASING)
animate(icon_state=current_hugger_iconstate)
spawned_huggers += paratrooper
CHECK_TICK // not in a hurry, we have 2 sec after all :)

/datum/maw_ammo/hugger/on_impact(turf/target)
for(var/obj/item/clothing/mask/facehugger/paratrooper AS in spawned_huggers)
paratrooper.go_active()



/datum/maw_ammo/xeno_fire
name = "plasma fire fireball"
radial_icon_state = "incendiary_mortar"
cooldown_time = 5 MINUTES

/obj/effect/temp_visual/fireball
icon = 'icons/obj/items/projectiles.dmi'
icon_state = "xeno_fireball"
duration = 4 SECONDS

/datum/maw_ammo/xeno_fire/launch_animation(turf/target, obj/structure/xeno/acid_maw/maw)
var/obj/effect/temp_visual/fireball/fireball = new
maw.vis_contents += fireball
fireball.pixel_x = (maw.bound_width/2) - 16
animate(fireball, fireball.duration, easing=EASE_IN|CUBIC_EASING, pixel_y=600)
animate(icon=null)

/datum/maw_ammo/xeno_fire/impact_visuals(turf/target)
var/obj/effect/temp_visual/fireball/fireball = new(target)
fireball.transform = matrix().Turn(180)
fireball.pixel_y = 800
animate(fireball, 2 SECONDS, easing=EASE_IN|CUBIC_EASING, pixel_y=0)
animate(icon=null)

/datum/maw_ammo/xeno_fire/on_impact(turf/target)
for(var/turf/affecting AS in RANGE_TURFS(4, target))
new /obj/fire/melting_fire(affecting)
for(var/mob/living/carbon/fired in affecting)
fired.take_overall_damage(20, BURN, FIRE, FALSE, FALSE, TRUE, 0, , max_limbs = 2)



/obj/structure/xeno/acid_maw
name = "acid maw"
desc = "A deep hole in the ground. it's walls are coated with resin and you see the occasional vent or fang."
icon = 'icons/Xeno/3x3building.dmi'
icon_state = "maw"
bound_width = 96
bound_height = 64
max_integrity = 400
appearance_flags = PIXEL_SCALE|LONG_GLIDE
xeno_structure_flags = CRITICAL_STRUCTURE|IGNORE_WEED_REMOVAL
///icon state to use for minimap icon
var/minimap_icon = "acid_maw"
///list of paths that we can choose from when using this maw. converts to a list for radials on init (path = image)
var/list/maw_options = list(
/datum/maw_ammo/smoke/acid_big,
)

/obj/structure/xeno/acid_maw/Initialize(mapload, _hivenumber)
. = ..()
SSminimaps.add_marker(src, MINIMAP_FLAG_XENO, image('icons/UI_icons/map_blips.dmi', null, minimap_icon, ABOVE_FLOAT_LAYER))
var/list/parsed_maw_options = list()
for(var/datum/maw_ammo/path AS in maw_options)
parsed_maw_options[path] = image(icon='icons/mob/radial.dmi', icon_state=path::radial_icon_state)
maw_options = parsed_maw_options

/obj/structure/xeno/acid_maw/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount, damage_type, armor_type, effects, armor_penetration, isrightclick)
. = ..()
if(xeno_attacker.hivenumber != hivenumber)
balloon_alert(xeno_attacker, "wrong hive")
return FALSE
if(!isxenoqueen(xeno_attacker) && !isxenoshrike(xeno_attacker) && !isxenoking(xeno_attacker) && !(xeno_attacker.xeno_flags & XENO_LEADER))
balloon_alert(xeno_attacker, "must be leader")
return FALSE
if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_MAW_GLOB)) // repeat this every time after we have a sleep for quick feedback
var/timeleft = S_TIMER_COOLDOWN_TIMELEFT(src, COOLDOWN_MAW_GLOB)
balloon_alert(xeno_attacker, "cooldown: [timeleft/10] seconds")
return FALSE
var/custom_cb = CALLBACK(src, TYPE_PROC_REF(/datum, Adjacent), xeno_attacker)// cant use is near arg because that is within 1 tile of loc and we are multitile
var/selected_type = show_radial_menu(xeno_attacker, src, maw_options, custom_check=custom_cb)
if(!selected_type)
return FALSE

if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_MAW_GLOB))
var/timeleft = S_TIMER_COOLDOWN_TIMELEFT(src, COOLDOWN_MAW_GLOB)
balloon_alert(xeno_attacker, "cooldown: [timeleft/10] seconds")
return FALSE

var/atom/movable/screen/minimap/map = SSminimaps.fetch_minimap_object(z, MINIMAP_FLAG_XENO)
xeno_attacker.client.screen += map
var/list/polled_coords = map.get_coords_from_click(xeno_attacker)
xeno_attacker?.client?.screen -= map
if(!polled_coords)
return
if(!Adjacent(xeno_attacker))
balloon_alert(xeno_attacker, "moved too far away")
return FALSE
if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_MAW_GLOB))
var/timeleft = S_TIMER_COOLDOWN_TIMELEFT(src, COOLDOWN_MAW_GLOB)
balloon_alert(xeno_attacker, "cooldown: [timeleft/10] seconds")
return FALSE

var/datum/maw_ammo/ammo = new selected_type
var/turf/clicked_turf = locate(polled_coords[1], polled_coords[2], z)
addtimer(CALLBACK(src, PROC_REF(maw_impact_start), ammo, clicked_turf, xeno_attacker), ammo.impact_time-2 SECONDS)
ammo.launch_animation(clicked_turf, src)
S_TIMER_COOLDOWN_START(src, COOLDOWN_MAW_GLOB, ammo.cooldown_time)

/// incoming effects for this ammo, 2 sec prior to impact
/obj/structure/xeno/acid_maw/proc/maw_impact_start(datum/maw_ammo/ammo, turf/target, mob/living/user)
addtimer(CALLBACK(src, PROC_REF(maw_impact), ammo, target, user), 2 SECONDS)
ammo.impact_visuals(target)
user.reset_perspective(target)

///actually does damage effects
/obj/structure/xeno/acid_maw/proc/maw_impact(datum/maw_ammo/ammo, turf/target, mob/living/user)
ammo.on_impact(target)
addtimer(CALLBACK(user, TYPE_PROC_REF(/mob, reset_perspective)), 1 SECONDS)

/obj/structure/xeno/acid_maw/acid_jaws
name = "acid jaws"
desc = "A hole in the ground. It's walls are coated with resin and there is some smoke billowing out."
icon = 'icons/Xeno/2x2building.dmi'
icon_state = "jaws"
bound_width = 64
bound_height = 64
appearance_flags = TILE_BOUND|PIXEL_SCALE|LONG_GLIDE
minimap_icon = "acid jaw"
maw_options = list(
/datum/maw_ammo/smoke/neuro,
/datum/maw_ammo/hugger,
/datum/maw_ammo/xeno_fire,
)
Binary file modified icons/UI_Icons/buyable_icons.dmi
Binary file not shown.
Binary file modified icons/Xeno/2x2building.dmi
Binary file not shown.
Binary file modified icons/Xeno/3x3building.dmi
Binary file not shown.
Binary file modified icons/Xeno/Effects.dmi
Binary file not shown.
Binary file modified icons/mob/radial.dmi
Binary file not shown.
Binary file added sound/voice/strategic_launch_detected.ogg
Binary file not shown.
1 change: 1 addition & 0 deletions tgmc.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2274,6 +2274,7 @@ F// DM Environment file for baystation12.dme.
#include "code\modules\xenomorph\acid_pools.dm"
#include "code\modules\xenomorph\acidwell.dm"
#include "code\modules\xenomorph\jellypod.dm"
#include "code\modules\xenomorph\maw.dm"
#include "code\modules\xenomorph\pherotower.dm"
#include "code\modules\xenomorph\resin_gargoyle.dm"
#include "code\modules\xenomorph\silo.dm"
Expand Down

0 comments on commit 6683de6

Please sign in to comment.