Skip to content

Migrant wave time changes #7566

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

Open
ta3754859-max wants to merge 4 commits into
base: main
Choose a base branch
from
+3 −503
Open

Migrant wave time changes #7566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
945e3e8
rearrange migration wave numbers
ta3754859-max Aug 13, 2026
df5aae1
Removes down waves
ta3754859-max Aug 13, 2026
8878ae7
missed one
ta3754859-max Aug 13, 2026
05e3a5a
Merge branch 'main' into migrant-wave-changes
ta3754859-max Aug 13, 2026
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
6 changes: 3 additions & 3 deletions code/controllers/subsystem/migration.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ SUBSYSTEM_DEF(migrants)
var/wave_timer = 0

/// Time between successful waves
var/time_between_waves = 3 MINUTES
var/time_between_waves = 1 MINUTES
/// Time between failing waves
var/time_between_fail_wave = 90 SECONDS
var/time_between_fail_wave = 30 SECONDS
/// how long waves wait for players
var/wave_wait_time = 30 SECONDS
var/wave_wait_time = 1 MINUTES

/// Track waves that have happened
var/list/spawned_waves = list()
Expand Down
105 changes: 0 additions & 105 deletions code/datums/migrants/waves/advclass/advclass.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,79 +5,25 @@

/datum/migrant_wave/pilgrim
name = "Pilgrimage"
downgrade_wave = /datum/migrant_wave/pilgrim_down_one
roles = list(
/datum/migrant_role/advclass/pilgrim = 4,
)
weight = 20
greet_text = "Fleeing from misfortune and hardship, you and a handful of survivors get closer to Vanderlin, looking for refuge and work, finally almost being there, almost..."

/datum/migrant_wave/pilgrim_down_one
name = "Pilgrimage"
downgrade_wave = /datum/migrant_wave/pilgrim_down_two
can_roll = FALSE
roles = list(
/datum/migrant_role/advclass/pilgrim = 3,
)
greet_text = "Fleeing from misfortune and hardship, you and a handful of survivors get closer to Vanderlin, looking for refuge and work, finally almost being there, almost..."

/datum/migrant_wave/pilgrim_down_two
name = "Pilgrimage"
downgrade_wave = /datum/migrant_wave/pilgrim_down_three
can_roll = FALSE
roles = list(
/datum/migrant_role/advclass/pilgrim = 2,
)
greet_text = "Fleeing from misfortune and hardship, you and a handful of survivors get closer to Vanderlin, looking for refuge and work, finally almost being there, almost..."

/datum/migrant_wave/pilgrim_down_three
name = "Pilgrimage"
can_roll = FALSE
roles = list(
/datum/migrant_role/advclass/pilgrim = 1,
)
greet_text = "Fleeing from misfortune and hardship, you and a handful of survivors get closer to Vanderlin, looking for refuge and work, finally almost being there, almost..."

/datum/migrant_role/advclass/adventurer
name = JOB_ADVENTURER
migrant_job = /datum/job/adventurer
advclass_cat_rolls = list(CTAG_ADVENTURER = 5)

/datum/migrant_wave/adventurer
name = "Adventure Party"
downgrade_wave = /datum/migrant_wave/adventurer_down_one
weight = 20
roles = list(
/datum/migrant_role/advclass/adventurer = 4,
)
greet_text = "Together with a party of trusted friends we decided to venture out, seeking thrills, glory and treasure, ending up in the misty and damp bog underneath Vanderlin, perhaps getting ourselves into more than what we bargained for."

/datum/migrant_wave/adventurer_down_one
name = "Adventure Party"
downgrade_wave = /datum/migrant_wave/adventurer_down_two
can_roll = FALSE
roles = list(
/datum/migrant_role/advclass/adventurer = 3,
)
greet_text = "Together with a party of trusted friends we decided to venture out, seeking thrills, glory and treasure, ending up in the misty and damp bog underneath Vanderlin, perhaps getting ourselves into more than what we bargained for."

/datum/migrant_wave/adventurer_down_two
name = "Adventure Party"
downgrade_wave = /datum/migrant_wave/adventurer_down_three
can_roll = FALSE
roles = list(
/datum/migrant_role/advclass/adventurer = 2,
)
greet_text = "Together with a party of trusted friends we decided to venture out, seeking thrills, glory and treasure, ending up in the misty and damp bog underneath Vanderlin, perhaps getting ourselves into more than what we bargained for."

/datum/migrant_wave/adventurer_down_three
name = "Adventure Party"
can_roll = FALSE
roles = list(
/datum/migrant_role/advclass/adventurer = 1,
)
greet_text = "Together with a party of trusted friends we decided to venture out, seeking thrills, glory and treasure, ending up in the misty and damp bog underneath Vanderlin, perhaps getting ourselves into more than what we bargained for."

/datum/migrant_role/advclass/bandit
name = ROLE_BANDIT
migrant_job = /datum/job/bandit
Expand All @@ -86,71 +32,20 @@
/datum/migrant_wave/bandit
name = "Bandit Raid"
spawn_landmark = ROLE_BANDIT
downgrade_wave = /datum/migrant_wave/bandit_down_one
weight = 8
roles = list(
/datum/migrant_role/advclass/bandit = 4,
)
can_roll = FALSE

/datum/migrant_wave/bandit_down_one
name = "Bandit Raid"
spawn_landmark = ROLE_BANDIT
downgrade_wave = /datum/migrant_wave/bandit_down_two
can_roll = FALSE
roles = list(
/datum/migrant_role/advclass/bandit = 3,
)

/datum/migrant_wave/bandit_down_two
name = "Bandit Raid"
spawn_landmark = ROLE_BANDIT
downgrade_wave = /datum/migrant_wave/bandit_down_three
can_roll = FALSE
roles = list(
/datum/migrant_role/advclass/bandit = 2,
)

/datum/migrant_wave/bandit_down_three
name = "Bandit Raid"
spawn_landmark = ROLE_BANDIT
can_roll = FALSE
roles = list(
/datum/migrant_role/advclass/bandit = 1,
)

/datum/migrant_role/advclass/mercenary
name = JOB_MERCENARY
migrant_job = /datum/job/mercenary
advclass_cat_rolls = list(CTAG_MERCENARY = 20)

/datum/migrant_wave/merc
name = "Band of Mercenaries"
downgrade_wave = /datum/migrant_wave/merc_down_one
weight = 8
roles = list(
/datum/migrant_role/advclass/mercenary = 4,
)

/datum/migrant_wave/merc_down_one
name = "Band of Mercenaries"
downgrade_wave = /datum/migrant_wave/merc_down_two
can_roll = FALSE
roles = list(
/datum/migrant_role/advclass/mercenary = 3,
)

/datum/migrant_wave/merc_down_two
name = "Band of Mercenaries"
downgrade_wave = /datum/migrant_wave/merc_down_three
can_roll = FALSE
roles = list(
/datum/migrant_role/advclass/mercenary = 2,
)

/datum/migrant_wave/merc_down_three
name = "Band of Mercenaries"
can_roll = FALSE
roles = list(
/datum/migrant_role/advclass/mercenary = 1,
)
21 changes: 0 additions & 21 deletions code/datums/migrants/waves/cadwyn_wave.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,31 +220,10 @@
/datum/migrant_wave/cadwyncrusade
name = "The Cadwyn Order Crusade"
shared_wave_type = /datum/migrant_wave/cadwyncrusade
downgrade_wave = /datum/migrant_wave/cadwyncrusade_down_one
weight = 5
max_spawns = 1
roles = list(
/datum/migrant_role/cadwyncrusader = 1,
/datum/migrant_role/cadwynsentinel = 2
)
greet_text = "The influence of Z grows by the dae and more and more people fall victim to their foul deeds. The Cadwyn Order of Valoria has dispatched you and your brethren to quell these threats and recruit more members to the Order."

/datum/migrant_wave/cadwyncrusade_down_one
name = "The Cadwyn Order Crusade"
shared_wave_type = /datum/migrant_wave/cadwyncrusade
downgrade_wave = /datum/migrant_wave/cadwyncrusade_down_two
can_roll = FALSE
roles = list(
/datum/migrant_role/cadwyncrusader = 1,
/datum/migrant_role/cadwynsentinel = 1
)
greet_text = "The influence of Z grows by the dae and more and more people fall victim to their foul deeds. The Cadwyn Order of Valoria has dispatched you and one other to quell these threats and recruit more members to the Order."

/datum/migrant_wave/cadwyncrusade_down_two
name = "The Lone Cadwyn Order Crusader"
shared_wave_type = /datum/migrant_wave/cadwyncrusade
can_roll = FALSE
roles = list(
/datum/migrant_role/cadwyncrusader = 1
)
greet_text = "The influence of Z grows by the dae and more and more people fall victim to their foul deeds. The Cadwyn Order of Valoria cannot spare many members to assist in quelling the threat of Z outside of its own borders, so you have been sent alone to help the local clergy and perhaps recruit more able bodies to the Order"
24 changes: 0 additions & 24 deletions code/datums/migrants/waves/dwarven_company.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@
name = "Dwarven Expedition"
max_spawns = 4
shared_wave_type = /datum/migrant_wave/dwarven_company
downgrade_wave = /datum/migrant_wave/dwarven_company_down
weight = 15
roles = list(
/datum/migrant_role/dwarven_company/captain = 1,
Expand All @@ -247,27 +246,4 @@
)
greet_text = "The way to Matthios's tomb is opened. Malum has called for all dwarves bold enough to go in, and we shall answer."

/datum/migrant_wave/dwarven_company_down
name = "Dwarven Expedition"
max_spawns = 4
shared_wave_type = /datum/migrant_wave/dwarven_company
downgrade_wave = /datum/migrant_wave/dwarven_company_down_one
can_roll = FALSE
roles = list(
/datum/migrant_role/dwarven_company/captain = 1,
/datum/migrant_role/dwarven_company/armorsmith = 1,
/datum/migrant_role/dwarven_company/weaponsmith = 1
)
greet_text = "The way to Matthios's tomb is opened. Malum has called for all dwarves bold enough to go in, and we shall answer."

/datum/migrant_wave/dwarven_company_down_one
name = "Dwarven Expedition"
max_spawns = 4
shared_wave_type = /datum/migrant_wave/dwarven_company
can_roll = FALSE
roles = list(
/datum/migrant_role/dwarven_company/captain = 1,
)
greet_text = "The way to Matthios's tomb is opened. Malum has called for all dwarves bold enough to go in, and we shall answer."


30 changes: 0 additions & 30 deletions code/datums/migrants/waves/follower_of_the_tens.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,8 @@
/datum/migrant_wave/acolytes
name = "The Holy Voyage"
shared_wave_type = /datum/migrant_wave/acolytes
downgrade_wave = /datum/migrant_wave/acolytes_down
weight = 40
roles = list(
/datum/migrant_role/acolytes = 4,
)
greet_text = "The Tens have decreed that this land needs additional persons of faith, so here you are."

/datum/migrant_wave/acolytes_down
name = "The Holy Voyage"
shared_wave_type = /datum/migrant_wave/acolytes
downgrade_wave = /datum/migrant_wave/acolytes_down_one
can_roll = FALSE
roles = list(
/datum/migrant_role/acolytes = 3,
)
greet_text = "The Tens have decreed that this land needs additional persons of faith, so here you are."

/datum/migrant_wave/acolytes_down_one
name = "The Holy Voyage"
shared_wave_type = /datum/migrant_wave/acolytes
downgrade_wave = /datum/migrant_wave/acolytes_down_two
can_roll = FALSE
roles = list(
/datum/migrant_role/acolytes = 2,
)
greet_text = "The Tens have decreed that this land needs additional persons of faith, so here you are."

/datum/migrant_wave/acolytes_down_two
name = "The Holy Voyage"
shared_wave_type = /datum/migrant_wave/acolytes
can_roll = FALSE
roles = list(
/datum/migrant_role/acolytes = 1,
)
greet_text = "The Tens have decreed that this land needs additional persons of faith, so here you are."
11 changes: 0 additions & 11 deletions code/datums/migrants/waves/grenzelhoft_wave.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,21 +270,10 @@
max_spawns = 1
shared_wave_type = list(/datum/migrant_wave/grenzelhoft_visit,/datum/migrant_wave/zalad_wave,/datum/migrant_wave/rockhill_wave,/datum/migrant_wave/heartfelt)
weight = 25
downgrade_wave = /datum/migrant_wave/grenzelhoft_visit_down
roles = list(
/datum/migrant_role/grenzelhoft_count = 1,
/datum/migrant_role/grenzelhoft_countess = 1,
/datum/migrant_role/grenzelhoft_knight = 1,
/datum/migrant_role/grenzelhoft_man_at_arms = 2)
greet_text = "The council of the Grenzelhoft Imperiate has sent a diplomatic envoy to engage into diplomacy within the Kingdom of Vanderlin."

/datum/migrant_wave/grenzelhoft_visit_down
name = "The Grenzelhoft visit"
max_spawns = 1
shared_wave_type = list(/datum/migrant_wave/grenzelhoft_visit,/datum/migrant_wave/zalad_wave,/datum/migrant_wave/rockhill_wave,/datum/migrant_wave/heartfelt)
can_roll = FALSE
roles = list(
/datum/migrant_role/grenzelhoft_count = 1,
/datum/migrant_role/grenzelhoft_countess = 1,
/datum/migrant_role/grenzelhoft_knight = 1)
greet_text = "The council of the Grenzelhoft Imperiate has sent a diplomatic envoy to engage into diplomacy within the Kingdom of Vanderlin."
33 changes: 0 additions & 33 deletions code/datums/migrants/waves/heartfelt_wave.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,6 @@
max_spawns = 1
shared_wave_type = list(/datum/migrant_wave/grenzelhoft_visit,/datum/migrant_wave/zalad_wave,/datum/migrant_wave/rockhill_wave,/datum/migrant_wave/heartfelt)
weight = 25
downgrade_wave = /datum/migrant_wave/heartfelt_down
roles = list(
/datum/migrant_role/heartfelt_lord = 1,
/datum/migrant_role/heartfelt_lady = 1,
Expand All @@ -366,35 +365,3 @@
/datum/migrant_role/heartfelt_artificer = 1,
)
greet_text = "Fleeing disaster, you have come together as a court, united in a final effort to restore the former glory and promise of Heartfelt. Stay close and watch out for each other, for all of your sakes!"

/datum/migrant_wave/heartfelt_down
name = "The Court of Heartfelt"
shared_wave_type = list(/datum/migrant_wave/grenzelhoft_visit,/datum/migrant_wave/zalad_wave,/datum/migrant_wave/rockhill_wave,/datum/migrant_wave/heartfelt)
can_roll = FALSE
downgrade_wave = /datum/migrant_wave/heartfelt_down_one
roles = list(
/datum/migrant_role/heartfelt_lord = 1,
/datum/migrant_role/heartfelt_lady = 1,
/datum/migrant_role/heartfelt_hand = 1,
)
greet_text = "Fleeing disaster, you have come together as a court, united in a final effort to restore the former glory and promise of Heartfelt. Stay close and watch out for each other, for all of your sakes! Your Knight, Magos and Artificer did not make it..."

/datum/migrant_wave/heartfelt_down_one
name = "The Court of Heartfelt"
shared_wave_type = list(/datum/migrant_wave/grenzelhoft_visit,/datum/migrant_wave/zalad_wave,/datum/migrant_wave/rockhill_wave,/datum/migrant_wave/heartfelt)
can_roll = FALSE
downgrade_wave = /datum/migrant_wave/heartfelt_down_two
roles = list(
/datum/migrant_role/heartfelt_lord = 1,
/datum/migrant_role/heartfelt_hand = 1,
)
greet_text = "Fleeing disaster, you have come together as a court, united in a final effort to restore the former glory and promise of Heartfelt. Stay close and watch out for each other, for all of your sakes! The journey took its heavy toll. Only you two made it, the rest..."

/datum/migrant_wave/heartfelt_down_two
name = "The Court of Heartfelt"
shared_wave_type = list(/datum/migrant_wave/grenzelhoft_visit,/datum/migrant_wave/zalad_wave,/datum/migrant_wave/rockhill_wave,/datum/migrant_wave/heartfelt)
can_roll = FALSE
roles = list(
/datum/migrant_role/heartfelt_lord = 1,
)
greet_text = "Fleeing disaster, you have come together as a court, united in a final effort to restore the former glory and promise of Heartfelt. But disaster followed hot on your heels, from Heartfelt to this very place! You are the last one remaining, oh how tragic!"
11 changes: 0 additions & 11 deletions code/datums/migrants/waves/itinerant_knight_wave.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,20 +133,9 @@
name = "The Knightly Journey"
max_spawns = 1
shared_wave_type = /datum/migrant_wave/knight
downgrade_wave = /datum/migrant_wave/knight_down
weight = 10
roles = list(
/datum/migrant_role/itinerant_knight = 1,
/datum/migrant_role/itinerant_squire = 1,
)
greet_text = "The weight of Psydon's cross is heavy, the vows you have undertaken heavier, a Knight and their squire have taken to the road to fulfill them."

/datum/migrant_wave/knight_down
name = "The Knightly Journey"
max_spawns = 1
shared_wave_type = /datum/migrant_wave/knight
can_roll = FALSE
roles = list(
/datum/migrant_role/itinerant_knight = 1,
)
greet_text = "The weight of Psydon's cross is heavy, the vows you have undertaken heavier, a Knight has taken to the road to fulfill them."
11 changes: 0 additions & 11 deletions code/datums/migrants/waves/jestertroupe.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,8 @@
name = "The Circus"
max_spawns = 1
shared_wave_type = /datum/migrant_wave/jestertroupe
downgrade_wave = /datum/migrant_wave/jestertroupe_down
weight = 10
roles = list(
/datum/migrant_role/jestertroupe = 3
)
greet_text = "Bread and Circuses. That's how little it takes to entertain the peasantry. You aren't funny for money, you're funny by nature."

/datum/migrant_wave/jestertroupe_down
name = "The Comedian"
shared_wave_type = /datum/migrant_wave/jestertroupe
can_roll = FALSE
weight = 35
roles = list(
/datum/migrant_role/jestertroupe = 1,
)
greet_text = "Bread and Circuses. That's how little it takes to entertain the peasantry. You aren't funny for money, you're funny by nature."
Loading
Loading