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.

Sign up for GitHub

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

Update adms request #5908

Closed
wants to merge 3 commits into from
+57 −15
Closed

Update adms request #5908

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ceb1fb
Update adms.dm
Trilbyspaceclone Dec 16, 2024
d4f7dfa
point fix
Trilbyspaceclone Dec 16, 2024
7b862d7
Apply suggestions from code review
Trilbyspaceclone Dec 17, 2024
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
72 changes: 57 additions & 15 deletions code/modules/maint_expeditions/adms.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@

/obj/machinery/exploration/adms
name = "\improper Anomalous Data Measurement System"
desc = "A large piece of equipment for gathering data from anomalous regions. It has an habit of angering the local population pest."
desc = "A large piece of equipment for gathering data from anomalous regions. \
It has an habit of angering the local population pest. \
Trilbyspaceclone marked this conversation as resolved.
Show resolved Hide resolved
Has a slider that sets from 0 to 5, depending on the setting more habitents angered but more points are generated."
Trilbyspaceclone marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "adms"

circuit = /obj/item/circuitboard/adms
Expand All @@ -21,6 +23,7 @@
emagged = FALSE
var/list/monster_list = list("Roaches", "Spiders")
var/ping_sound = 'sound/ambience/sonar2.ogg'
var/difficulty = 0 //0-5

/obj/machinery/exploration/adms/examine(mob/user)
. = ..()
Expand All @@ -29,6 +32,9 @@
else
to_chat(user, SPAN_NOTICE("The disk drive is empty!"))

to_chat(user, SPAN_NOTICE("The slider is set to [difficulty]"))


/obj/machinery/exploration/adms/emag_act(mob/user)
if(!emagged)
emagged = TRUE
Expand Down Expand Up @@ -69,34 +75,40 @@
playsound(src.loc, ping_sound, 60, 1, 8, 8)
soundcooldown = initial(soundcooldown)


var/area = get_area(src)
var/difficulty_point_adder = 0
var/mob_odds_mult = 1
if(difficulty)
difficulty_point_adder = difficulty * 0.2 //20% more points per level
mob_odds_mult = difficulty


if(istype(area, /area/deepmaint))
give_points(1.2) //1000 research points PER size. 300 points per tick per tier of laser. ~1,000-5,000 before mobs spawn.
if(prob(3))
give_points(1.2 + difficulty_point_adder) //1000 research points PER size. 300 points per tick per tier of laser. ~1,000-5,000 before mobs spawn.
if(prob(3 * mob_odds_mult))
spawn_monsters(4) //Full Furher retinue

else if(istype(area, /area/mine/unexplored))
give_points(0.4) //100 points per tick per tier of laser
if(prob(2))
else if(istype(area, /area/mine))
give_points(0.4 + difficulty_point_adder) //100 points per tick per tier of laser
if(prob(2 * mob_odds_mult))
spawn_monsters(2) //Fewer than deepmaint, since this area is not as dangerous. Need to make a new spacemob spawner!

else if(istype(area, /area/awaymission))
give_points(0.8) //200 points per tick per tier of laser
if(prob(1))
give_points(0.8 + difficulty_point_adder) //200 points per tick per tier of laser
if(prob(1 * mob_odds_mult))
spawn_monsters(2)

else if(istype(area, /area/nadezhda/rnd))
give_points(0.1) //Anti-Cheese
if(prob(10))
if(prob(10 * mob_odds_mult))
spawn_monsters(5)
spawn_monsters(1) //Some infighting
spawn_monsters(1) //Some infighting

else
give_points(0.2)
if(prob(10))
src.spawn_monsters(1)//On the station is just calls groups of roaches!
give_points(0.2 + difficulty_point_adder)
if(prob(10 * mob_odds_mult))
spawn_monsters(1)//On the station is just calls groups of roaches!

/obj/machinery/exploration/adms/Destroy()
for(var/obj/A in contents)
Expand All @@ -105,7 +117,7 @@
component_parts -= A
if(A in contents)
component_parts -= A
spawn(5)
spawn(1)
..()

// Proc to add more points in the data disk.
Expand All @@ -125,6 +137,7 @@
playsound(src.loc, 'sound/voice/shriek1.ogg', 80, 1, 8, 8)
sleep(9)
playsound(src.loc, 'sound/voice/shriek1.ogg', 100, 1, 8, 8)
number += difficulty
if(emagged)
new /mob/living/carbon/superior_animal/roach/kaiser(src.loc)
visible_message(SPAN_DANGER("[src] get destroyed as a Kaiser emerge from underneath it!"))
Expand Down Expand Up @@ -176,8 +189,9 @@
var/area = get_area(src)
if(istype(area, /area/deepmaint))
monster_list.Add("Xenomorph")
if(istype(area, /area/mine/unexplored))
if(istype(area, /area/mine))
monster_list.Add("Underground")
monster_list.Add("Termite")

/obj/machinery/exploration/adms/proc/system_error(var/error)
if(error)
Expand Down Expand Up @@ -308,13 +322,41 @@
else
to_chat(usr, SPAN_NOTICE("No disk is inside."))


/obj/machinery/exploration/adms/verb/set_difficulty()
set name = "Set Difficulty"
set category = "Object"
set src in view(1)

if(isliving(usr))
set_new_difficulty(usr)

/obj/machinery/exploration/adms/update_icon()
if(active)
icon_state = "adms-on"
else
icon_state = "adms"
return

/obj/machinery/exploration/adms/proc/set_new_difficulty(mob/user)
var/choice = input(user, "How far do you set the slider?") as null|anything in list("Notch Zero", "Notch One","Notch Two","Notch Three","Notch Four","Notch Five" )
switch(choice)
if("Notch Zero")
difficulty = 0
if("Notch One")
difficulty = 1
if("Notch Two")
difficulty = 2
if("Notch Three")
difficulty = 3
if("Notch Four")
difficulty = 4
if("Notch Five")
difficulty = 5

to_chat(usr, SPAN_NOTICE("The slider is now set to [difficulty]."))


/datum/design/research/circuit/adms
name = "Anomalous Data Measurement System"
build_path = /obj/item/circuitboard/adms
Expand Down
Loading