mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 16:47:13 +01:00
Adds more bitrunning antagonists + fixes (READY) (#79522)
## About The Pull Request Reopened #78997 Larger patch for bitrunning that addresses a few issues. - Two new antagonists: cyber tac and netguardian - Quantum server emag opportunity - Modular mob packs: Like random spawners, but for groups - Antag spawning fixed: vdom antags now have up to a 10% chance to spawn based on domains loaded - Virtual domains are no longer all fullbright by default, only the outdoorsy ones - Actually deletes legion map file, since it was removed in #79424 <details> <summary>images</summary> The netguardian prime   The glitch effect - this mob is being mutated  Cyber tac (t2 antagonist)  </details> ## Why It's Good For The Game - Bitrunning antagonists are so incredibly rare that it's underwhelming to play as one for the solid second they offer if you even get the role - Bitrunners had basically no traitor route to follow, they became assistants with black outfits Fixes #79465 <details> <summary>More info</summary> Bitrunners don't have any type of traitor options. If they're made into traitors, there's nothing bitrunner related they can do, and their access is particularly bad so it's like they're a worse assistant. I've coupled this with the bitrunning antagonist system, which is now fixed.\. Bitrunners can now attempt to coax these entities to come onto the station, however they are not given any form of allegiance for doing so (and are quite counterable). Previously, vdom antagonists relied on so many factors to spawn that it basically wouldn't happen. Now, it runs on the server each time there is a map loaded, with increasing probability as the round progresses. This builds up the list of spawnable antagonists, of which two are new, including an entirely new giant mech megafauna. This is the first "megafauna-esque" basic mob in the game. Its AI is bad, it's really only meant to be player controlled, but this does mean an admin can spawn them. Being mech, they are very counterable with ion rifles and the like. Several refactors, rewrites, and overall bug fixes are included in this PR. Lastly, I added a framework for making bitrunner maps more random, the modular mob spawning system, which works in conjunction with random crate locations. </details> ## Changelog jlsnow301, infraredbaron 🆑 add: Bitrunning Patch 1 features a host of changes! add: Added randomized mobs to virtual domains, which will be indicated with a unique icon. add: New emag interaction with the quantum server. Antags will spawn more frequently, and they can hack themselves onto the station. You have been warned. add: Both living and dead players can now see which mob is going to spawn an antagonist in the vdom. add: Two new vdom antagonists: Cyber Tac and the NetGuardian. These unlock at specific thresholds. balance: You can no longer stack copies of the same ability with bitrunning disks. balance: Some of the disk items have been replaced with stronger versions. fix: You can no longer spy on crew using the advanced camera console on syndicate assault. fix: Fixed the spawning mechanism of virtual domain antagonists. You should now have a chance of playing as one. This chance increases as more domains are completed. fix: Vdom antagonists shouldn't spawn at the end of the run any longer. fix: The preference for vdom antagonists has been changed to factor in the new types. Check your preferences! fix: The quantum server will now show its balloon alerts to all observers. fix: Random domains should be fully random again. /🆑 --------- Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
This commit is contained in:
Jeremiah
co-authored by
LemonInTheDark
LemonInTheDark
parent
df80653bcb
commit
ba5ae73dac
@@ -4,6 +4,7 @@
|
||||
help_text = "It's simple! Enjoy some rays, catch some fish, and have a good time! Don't get bit by the crabs, though."
|
||||
key = "breeze_bay"
|
||||
map_name = "breeze_bay"
|
||||
reward_points = BITRUNNER_REWARD_LOW
|
||||
safehouse_path = /datum/map_template/safehouse/wood
|
||||
|
||||
/datum/lazy_template/virtual_domain/breeze_bay/setup_domain(list/created_atoms)
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
/datum/lazy_template/virtual_domain/gondola_asteroid
|
||||
name = "Gondola Asteroid"
|
||||
desc = "An asteroid home to a bountiful forest of gondolas. Peaceful."
|
||||
map_name = "gondola_asteroid"
|
||||
help_text = "What a lovely forest. There's a loot crate here in the middle of the map. \
|
||||
Hmm... It doesn't budge. The gondolas don't seem to have any trouble moving it, though. \
|
||||
I bet there's a way to move it myself."
|
||||
|
||||
@@ -2,13 +2,18 @@
|
||||
name = "Disposal Pipe Factory"
|
||||
cost = BITRUNNER_COST_LOW
|
||||
desc = "An abandoned and infested factory manufacturing disposal pipes."
|
||||
difficulty = BITRUNNER_DIFFICULTY_MEDIUM
|
||||
difficulty = BITRUNNER_DIFFICULTY_LOW
|
||||
extra_loot = list(/obj/item/stack/pipe_cleaner_coil/random/five = 1)
|
||||
help_text = "Not long ago, this place was thriving with activity. The workers \
|
||||
seemed to have left in a hurry, and now productivity is in the bin. Something \
|
||||
must have trashed the place, but what?"
|
||||
is_modular = TRUE
|
||||
key = "pipedream"
|
||||
map_name = "pipedream"
|
||||
mob_modules = list(
|
||||
/datum/modular_mob_segment/hivebots,
|
||||
/datum/modular_mob_segment/hivebots_strong
|
||||
)
|
||||
reward_points = BITRUNNER_REWARD_LOW
|
||||
safehouse_path = /datum/map_template/safehouse/shuttle
|
||||
|
||||
|
||||
@@ -7,7 +7,9 @@
|
||||
help_text = "A group of Syndicate operatives have stolen valuable cargo from the station. \
|
||||
They have boarded their ship and are attempting to escape. Infiltrate their ship and recover \
|
||||
the crate. Be careful, they are extremely armed."
|
||||
is_modular = TRUE
|
||||
key = "syndicate_assault"
|
||||
map_name = "syndicate_assault"
|
||||
mob_modules = list(/datum/modular_mob_segment/syndicate_team)
|
||||
reward_points = BITRUNNER_REWARD_MEDIUM
|
||||
safehouse_path = /datum/map_template/safehouse/shuttle
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/datum/lazy_template/virtual_domain/vaporwave
|
||||
name = "Cosmic Vestige"
|
||||
cost = BITRUNNER_COST_EXTREME
|
||||
desc = "Suspended in the silent void of space, the Neon Relic is a haunting echo of a retro-futuristic era."
|
||||
desc = "Suspended in the silent void of space, the Neon Relic is a haunting echo of a retro-futuristic era. Hang out, enjoy the view."
|
||||
difficulty = BITRUNNER_DIFFICULTY_NONE
|
||||
extra_loot = list(/obj/item/stack/spacecash/c500 = 3)
|
||||
key = "vaporwave"
|
||||
|
||||
@@ -6,7 +6,9 @@
|
||||
extra_loot = list(/obj/item/toy/plush/rouny = 1)
|
||||
help_text = "You are on a barren planet filled with hostile creatures. There is a crate here, not hidden, \
|
||||
simply protected. Expect resistance."
|
||||
is_modular = TRUE
|
||||
key = "xeno_nest"
|
||||
map_name = "xeno_nest"
|
||||
mob_modules = list(/datum/modular_mob_segment/xenos)
|
||||
reward_points = BITRUNNER_REWARD_LOW
|
||||
safehouse_path = /datum/map_template/safehouse/shuttle
|
||||
|
||||
@@ -0,0 +1,156 @@
|
||||
#define SPAWN_ALWAYS 100
|
||||
#define SPAWN_LIKELY 85
|
||||
#define SPAWN_UNLIKELY 35
|
||||
#define SPAWN_RARE 10
|
||||
|
||||
/datum/modular_mob_segment
|
||||
/// Spawn no more than this amount
|
||||
var/max = 4
|
||||
/// Set this to false if you want explicitly what's in the list to spawn
|
||||
var/exact = FALSE
|
||||
/// The list of mobs to spawn
|
||||
var/list/mob/living/mobs = list()
|
||||
/// The mobs spawned from this segment
|
||||
var/list/spawned_mob_refs = list()
|
||||
/// Chance this will spawn (1 - 100)
|
||||
var/probability = SPAWN_LIKELY
|
||||
|
||||
/// Spawns mobs in a circle around the location
|
||||
/datum/modular_mob_segment/proc/spawn_mobs(turf/origin)
|
||||
if(!prob(probability))
|
||||
return
|
||||
|
||||
var/total_amount = exact ? rand(1, max) : length(mobs)
|
||||
|
||||
shuffle_inplace(mobs)
|
||||
|
||||
|
||||
var/list/turf/nearby = list()
|
||||
for(var/turf/tile as anything in RANGE_TURFS(2, origin))
|
||||
if(!tile.is_blocked_turf())
|
||||
nearby += tile
|
||||
|
||||
if(!length(nearby))
|
||||
stack_trace("Couldn't find any valid turfs to spawn on")
|
||||
return
|
||||
|
||||
for(var/index in 1 to total_amount)
|
||||
// For each of those, we need to find an open space
|
||||
var/turf/destination = pick(nearby)
|
||||
|
||||
var/path // Either a random mob or the next mob in the list
|
||||
if(exact)
|
||||
path = mobs[index]
|
||||
else
|
||||
path = pick(mobs)
|
||||
|
||||
var/mob/living/mob = new path(destination)
|
||||
nearby -= destination
|
||||
spawned_mob_refs.Add(WEAKREF(mob))
|
||||
|
||||
// Some generic mob segments. If you want to add generic ones for any map, add them here
|
||||
|
||||
/datum/modular_mob_segment/gondolas
|
||||
mobs = list(
|
||||
/mob/living/simple_animal/pet/gondola,
|
||||
)
|
||||
|
||||
/datum/modular_mob_segment/corgis
|
||||
max = 2
|
||||
mobs = list(
|
||||
/mob/living/basic/pet/dog/corgi,
|
||||
)
|
||||
|
||||
/datum/modular_mob_segment/monkeys
|
||||
mobs = list(
|
||||
/mob/living/carbon/human/species/monkey,
|
||||
)
|
||||
|
||||
/datum/modular_mob_segment/syndicate_team
|
||||
mobs = list(
|
||||
/mob/living/basic/trooper/syndicate/ranged,
|
||||
/mob/living/basic/trooper/syndicate/melee,
|
||||
)
|
||||
|
||||
/datum/modular_mob_segment/syndicate_elite
|
||||
mobs = list(
|
||||
/mob/living/basic/trooper/syndicate/melee/sword/space/stormtrooper,
|
||||
/mob/living/basic/trooper/syndicate/ranged/space/stormtrooper,
|
||||
)
|
||||
|
||||
/datum/modular_mob_segment/bears
|
||||
max = 2
|
||||
mobs = list(
|
||||
/mob/living/basic/bear,
|
||||
)
|
||||
|
||||
/datum/modular_mob_segment/bees
|
||||
exact = TRUE
|
||||
mobs = list(
|
||||
/mob/living/basic/bee,
|
||||
/mob/living/basic/bee,
|
||||
/mob/living/basic/bee,
|
||||
/mob/living/basic/bee,
|
||||
/mob/living/basic/bee/queen,
|
||||
)
|
||||
|
||||
/datum/modular_mob_segment/bees_toxic
|
||||
mobs = list(
|
||||
/mob/living/basic/bee/toxin,
|
||||
)
|
||||
|
||||
/datum/modular_mob_segment/blob_spores
|
||||
mobs = list(
|
||||
/mob/living/basic/blob_minion,
|
||||
)
|
||||
|
||||
/datum/modular_mob_segment/carps
|
||||
mobs = list(
|
||||
/mob/living/basic/carp,
|
||||
)
|
||||
|
||||
/datum/modular_mob_segment/hivebots
|
||||
mobs = list(
|
||||
/mob/living/basic/hivebot,
|
||||
/mob/living/basic/hivebot/range,
|
||||
)
|
||||
|
||||
/datum/modular_mob_segment/hivebots_strong
|
||||
mobs = list(
|
||||
/mob/living/basic/hivebot/strong,
|
||||
/mob/living/basic/hivebot/range,
|
||||
)
|
||||
|
||||
/datum/modular_mob_segment/lavaland_assorted
|
||||
mobs = list(
|
||||
/mob/living/basic/mining/basilisk,
|
||||
/mob/living/basic/mining/goliath,
|
||||
/mob/living/basic/mining/brimdemon,
|
||||
/mob/living/basic/mining/lobstrosity,
|
||||
)
|
||||
|
||||
/datum/modular_mob_segment/spiders
|
||||
mobs = list(
|
||||
/mob/living/basic/spider/giant/ambush,
|
||||
/mob/living/basic/spider/giant/hunter,
|
||||
/mob/living/basic/spider/giant/nurse,
|
||||
/mob/living/basic/spider/giant/tarantula,
|
||||
/mob/living/basic/spider/giant/midwife,
|
||||
)
|
||||
|
||||
/datum/modular_mob_segment/venus_trap
|
||||
mobs = list(
|
||||
/mob/living/basic/venus_human_trap,
|
||||
)
|
||||
|
||||
/datum/modular_mob_segment/xenos
|
||||
mobs = list(
|
||||
/mob/living/simple_animal/hostile/alien,
|
||||
/mob/living/simple_animal/hostile/alien/sentinel,
|
||||
/mob/living/simple_animal/hostile/alien/drone,
|
||||
)
|
||||
|
||||
#undef SPAWN_ALWAYS
|
||||
#undef SPAWN_LIKELY
|
||||
#undef SPAWN_UNLIKELY
|
||||
#undef SPAWN_RARE
|
||||
@@ -6,51 +6,49 @@
|
||||
/datum/map_template/safehouse
|
||||
name = "virtual domain: safehouse"
|
||||
|
||||
returns_created_atoms = TRUE
|
||||
/// The map file to load
|
||||
var/filename = "den.dmm"
|
||||
var/filename = "den"
|
||||
|
||||
/datum/map_template/safehouse/New()
|
||||
mappath = "_maps/safehouses/" + filename
|
||||
mappath = "_maps/safehouses/[filename].dmm"
|
||||
..(path = mappath)
|
||||
|
||||
/datum/map_template/safehouse/test_only
|
||||
filename = "test_only_safehouse.dmm"
|
||||
|
||||
|
||||
/// The default safehouse map template.
|
||||
/datum/map_template/safehouse/wood
|
||||
filename = "wood.dmm"
|
||||
|
||||
/datum/map_template/safehouse/den
|
||||
filename = "den.dmm"
|
||||
filename = "den"
|
||||
|
||||
/datum/map_template/safehouse/wood
|
||||
filename = "wood"
|
||||
|
||||
/datum/map_template/safehouse/dig
|
||||
filename = "dig.dmm"
|
||||
filename = "dig"
|
||||
|
||||
/datum/map_template/safehouse/shuttle
|
||||
filename = "shuttle.dmm"
|
||||
filename = "shuttle"
|
||||
|
||||
// Has space tiles on the four corners.
|
||||
/datum/map_template/safehouse/shuttle_space
|
||||
filename = "shuttle_space.dmm"
|
||||
filename = "shuttle_space"
|
||||
|
||||
/datum/map_template/safehouse/mine
|
||||
filename = "mine.dmm"
|
||||
filename = "mine"
|
||||
|
||||
// Comes preloaded with mining combat gear.
|
||||
/datum/map_template/safehouse/lavaland_boss
|
||||
filename = "lavaland_boss.dmm"
|
||||
filename = "lavaland_boss"
|
||||
|
||||
// Chill out
|
||||
/datum/map_template/safehouse/ice
|
||||
filename = "ice.dmm"
|
||||
filename = "ice"
|
||||
|
||||
/datum/map_template/safehouse/bathroom
|
||||
filename = "bathroom.dmm"
|
||||
filename = "bathroom"
|
||||
|
||||
/**
|
||||
* Your safehouse here
|
||||
* /datum/map_template/safehouse/your_type
|
||||
* filename = "your_map.dmm"
|
||||
* filename = "your_map"
|
||||
*/
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
/**
|
||||
* # Virtual Domains
|
||||
* This loads a base level, then users can select the preset upon it.
|
||||
* Create your own: Read the readme file in the '_maps/virtual_domains' folder.
|
||||
*/
|
||||
/datum/lazy_template/virtual_domain
|
||||
@@ -10,22 +9,30 @@
|
||||
|
||||
/// Cost of this map to load
|
||||
var/cost = BITRUNNER_COST_NONE
|
||||
/// The description of the map
|
||||
var/desc = "A map."
|
||||
/// The 'difficulty' of the map, which affects the ui and ability to scan info.
|
||||
var/difficulty = BITRUNNER_DIFFICULTY_NONE
|
||||
/// An assoc list of typepath/amount to spawn on completion. Not weighted - the value is the amount
|
||||
var/list/extra_loot
|
||||
/// The map file to load
|
||||
var/filename = "virtual_domain.dmm"
|
||||
/// The safehouse to load into the map
|
||||
var/datum/map_template/safehouse/safehouse_path = /datum/map_template/safehouse/den
|
||||
/// Any outfit that you wish to force on avatars. Overrides preferences
|
||||
var/datum/outfit/forced_outfit
|
||||
/// The description of the map for the console UI
|
||||
var/desc = "A map."
|
||||
/// Affects the ui and ability to scan info.
|
||||
var/difficulty = BITRUNNER_DIFFICULTY_NONE
|
||||
/// The map file to load
|
||||
var/filename = "virtual_domain.dmm"
|
||||
/// If this domain blocks the use of items from disks, for whatever reason
|
||||
var/forbids_disk_items = FALSE
|
||||
/// If this domain blocks the use of spells from disks, for whatever reason
|
||||
var/forbids_disk_spells = FALSE
|
||||
/// Information given to connected clients via ability
|
||||
var/help_text
|
||||
/// Whether to display this as a modular map
|
||||
var/is_modular = FALSE
|
||||
/// Byond will look for modular mob segment landmarks then choose from here at random. You can make them unique also.
|
||||
var/list/datum/modular_mob_segment/mob_modules = list()
|
||||
/// An assoc list of typepath/amount to spawn on completion. Not weighted - the value is the amount
|
||||
var/list/extra_loot
|
||||
/// Forces all mob modules to only load once
|
||||
var/modular_unique_mobs = FALSE
|
||||
// Name to show in the UI
|
||||
var/name = "Virtual Domain"
|
||||
/// Points to reward for completion. Used to purchase new domains and calculate ore rewards.
|
||||
@@ -34,8 +41,6 @@
|
||||
var/start_time
|
||||
/// This map is specifically for unit tests. Shouldn't display in game
|
||||
var/test_only = FALSE
|
||||
/// The safehouse to load into the map
|
||||
var/datum/map_template/safehouse/safehouse_path = /datum/map_template/safehouse/den
|
||||
|
||||
/// Sends a point to any loot signals on the map
|
||||
/datum/lazy_template/virtual_domain/proc/add_points(points_to_add)
|
||||
|
||||
Reference in New Issue
Block a user