Skip to content

Commit

Permalink
Gold midnight disable and new ordeal SFX (#2391)
Browse files Browse the repository at this point in the history
Gold midnight disable
  • Loading branch information
Coxswain-Navigator authored Aug 16, 2024
1 parent 60c1eba commit cecb90b
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 12 deletions.
28 changes: 16 additions & 12 deletions code/modules/ordeals/gold_ordeals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@
end_sound = 'sound/effects/ordeals/gold_end.ogg'
color = "#FFD700"

//Sort of a combination of specific commanders and random spawns
// Sort of a combination of specific commanders and random spawns
var/list/boss_type = list(/mob/living/simple_animal/hostile/ordeal/fallen_amurdad_corrosion)
//Randomly picked from these.
// Randomly picked from these.
var/list/grunt_type = list(/mob/living/simple_animal/hostile/ordeal/beanstalk_corrosion)
var/list/roamer_type = list(/mob/living/simple_animal/hostile/ordeal/beanstalk_corrosion) //Randomly spawned around the map
var/list/roamer_type = list(/mob/living/simple_animal/hostile/ordeal/beanstalk_corrosion) // Randomly spawned around the map
var/boss_amount = 2
var/grunt_amount = 3
var/roamer_amount = 3
var/boss_player_multiplicator = 0.05
var/grunt_player_multiplicator = 0.1

/datum/ordeal/gold_dawn/Run() //We want our own variant that spawns both groups of mobs and roamers
/datum/ordeal/gold_dawn/Run() // We want our own variant that spawns both groups of mobs and roamers
..()
if(!LAZYLEN(GLOB.xeno_spawn))
message_admins("No xeno spawns found when spawning in ordeal!")
Expand All @@ -30,7 +30,7 @@
var/grunt_player_mod = round(GLOB.clients.len * grunt_player_multiplicator)
var/list/available_locs = GLOB.xeno_spawn.Copy()

for(var/i = 1 to round(boss_amount + boss_player_mod)) //Run the usual simplecommander code
for(var/i = 1 to round(boss_amount + boss_player_mod)) // Run the usual simplecommander code
var/turf/T = pick(available_locs)
if(available_locs.len > 1)
available_locs -= T
Expand All @@ -40,7 +40,7 @@
C.ordeal_reference = src
spawngrunts(T, grunt_type, (grunt_amount + grunt_player_mod))

for(var/i = 1 to round(roamer_amount + boss_player_mod)) //we spawn groups of roamers using boss slots as a base
for(var/i = 1 to round(roamer_amount + boss_player_mod)) // we spawn groups of roamers using boss slots as a base
var/turf/T = pick(available_locs)
if(available_locs.len > 1)
available_locs -= T
Expand All @@ -66,15 +66,15 @@
var/boss_player_multiplicator = 0.05
var/grunt_player_multiplicator = 0.1

/datum/ordeal/boss/gold_noon/Run() //We need to spawn roamers, still.
/datum/ordeal/boss/gold_noon/Run() // We need to spawn roamers, still.
..()
if(!LAZYLEN(GLOB.xeno_spawn))
message_admins("No xeno spawns found when spawning in ordeal!")
return
var/boss_player_mod = round(GLOB.clients.len * boss_player_multiplicator)
var/grunt_player_mod = round(GLOB.clients.len * grunt_player_multiplicator)
var/list/available_locs = GLOB.xeno_spawn.Copy()
for(var/i = 1 to round(roamer_amount + boss_player_mod)) //we spawn single roamers using boss slots as a base
for(var/i = 1 to round(roamer_amount + boss_player_mod)) // we spawn single roamers using boss slots as a base
var/turf/T = pick(available_locs)
if(available_locs.len > 1)
available_locs -= T
Expand Down Expand Up @@ -104,10 +104,14 @@
end_announce_text = "I try calling each star something beautiful."
level = 4
reward_percent = 0.25
//3 different simplespawns in one ordeal. Similar to simplecommanders but each commander has its own set of grunts
end_sound = 'sound/effects/ordeals/gold_end_special.ogg' // I had 3 sound effects so I guess i'll use one here.

can_run = FALSE // Currently reworking this

// 3 different simplespawns in one ordeal. Similar to simplecommanders but each commander has its own set of grunts
boss_type = /mob/living/simple_animal/hostile/ordeal/NT_corrosion
grunt_type = list(/mob/living/simple_animal/hostile/ordeal/NT_corrosion)
//2 other pools of simplespawns.
// 2 other pools of simplespawns.
var/boss_2 = /mob/living/simple_animal/hostile/ordeal/snake_corrosion/strong
var/list/group_2_grunts = list(/mob/living/simple_animal/hostile/ordeal/snake_corrosion)
var/boss_3 = /mob/living/simple_animal/hostile/ordeal/dog_corrosion/strong
Expand All @@ -119,7 +123,7 @@
boss_player_multiplicator = 0.025
grunt_player_multiplicator = 0.05

/datum/ordeal/gold_dawn/gold_midnight/Run() //Icky copypaste code but the important part is it works
/datum/ordeal/gold_dawn/gold_midnight/Run() // Icky copypaste code but the important part is it works
..()
if(!LAZYLEN(GLOB.xeno_spawn))
message_admins("No xeno spawns found when spawning in ordeal!")
Expand Down Expand Up @@ -153,7 +157,7 @@
C.ordeal_reference = src
spawngrunts(T, group_3_grunts, (grunt_amount + grunt_player_mod))

for(var/i = 1 to round(roamer_amount + boss_player_mod)) //we spawn groups of roamers using boss slots as a base
for(var/i = 1 to round(roamer_amount + boss_player_mod)) // we spawn groups of roamers using boss slots as a base
var/turf/T = pick(available_locs)
if(available_locs.len > 1)
available_locs -= T
Expand Down
Binary file modified sound/effects/ordeals/gold_end.ogg
Binary file not shown.
Binary file added sound/effects/ordeals/gold_end_special.ogg
Binary file not shown.
Binary file modified sound/effects/ordeals/gold_start.ogg
Binary file not shown.

0 comments on commit cecb90b

Please sign in to comment.