diff --git a/code/controllers/subsystem/migration.dm b/code/controllers/subsystem/migration.dm index 2b9a6af72f6..622522ada8e 100644 --- a/code/controllers/subsystem/migration.dm +++ b/code/controllers/subsystem/migration.dm @@ -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() diff --git a/code/datums/migrants/waves/advclass/advclass.dm b/code/datums/migrants/waves/advclass/advclass.dm index d4c7eef5528..89816e9c049 100644 --- a/code/datums/migrants/waves/advclass/advclass.dm +++ b/code/datums/migrants/waves/advclass/advclass.dm @@ -5,39 +5,12 @@ /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 @@ -45,39 +18,12 @@ /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 @@ -86,39 +32,12 @@ /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 @@ -126,31 +45,7 @@ /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, - ) diff --git a/code/datums/migrants/waves/cadwyn_wave.dm b/code/datums/migrants/waves/cadwyn_wave.dm index f39f49927d6..ac5bf1c103e 100644 --- a/code/datums/migrants/waves/cadwyn_wave.dm +++ b/code/datums/migrants/waves/cadwyn_wave.dm @@ -220,7 +220,6 @@ /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( @@ -228,23 +227,3 @@ /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" diff --git a/code/datums/migrants/waves/dwarven_company.dm b/code/datums/migrants/waves/dwarven_company.dm index 4358d95939a..fa4525ab828 100644 --- a/code/datums/migrants/waves/dwarven_company.dm +++ b/code/datums/migrants/waves/dwarven_company.dm @@ -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, @@ -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." - diff --git a/code/datums/migrants/waves/follower_of_the_tens.dm b/code/datums/migrants/waves/follower_of_the_tens.dm index 042ae544f43..61447f19509 100644 --- a/code/datums/migrants/waves/follower_of_the_tens.dm +++ b/code/datums/migrants/waves/follower_of_the_tens.dm @@ -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." diff --git a/code/datums/migrants/waves/grenzelhoft_wave.dm b/code/datums/migrants/waves/grenzelhoft_wave.dm index 5fac71fbe55..fea263b6912 100644 --- a/code/datums/migrants/waves/grenzelhoft_wave.dm +++ b/code/datums/migrants/waves/grenzelhoft_wave.dm @@ -270,7 +270,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/grenzelhoft_visit_down roles = list( /datum/migrant_role/grenzelhoft_count = 1, /datum/migrant_role/grenzelhoft_countess = 1, @@ -278,13 +277,3 @@ /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." diff --git a/code/datums/migrants/waves/heartfelt_wave.dm b/code/datums/migrants/waves/heartfelt_wave.dm index dd640e11c71..f2fbe2f9fda 100644 --- a/code/datums/migrants/waves/heartfelt_wave.dm +++ b/code/datums/migrants/waves/heartfelt_wave.dm @@ -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, @@ -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!" diff --git a/code/datums/migrants/waves/itinerant_knight_wave.dm b/code/datums/migrants/waves/itinerant_knight_wave.dm index b0ea4c3222b..80481ee5f8a 100644 --- a/code/datums/migrants/waves/itinerant_knight_wave.dm +++ b/code/datums/migrants/waves/itinerant_knight_wave.dm @@ -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." diff --git a/code/datums/migrants/waves/jestertroupe.dm b/code/datums/migrants/waves/jestertroupe.dm index 8f8c0cbd2c6..77931557507 100644 --- a/code/datums/migrants/waves/jestertroupe.dm +++ b/code/datums/migrants/waves/jestertroupe.dm @@ -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." diff --git a/code/datums/migrants/waves/magic_school_expedition.dm b/code/datums/migrants/waves/magic_school_expedition.dm index c999113713e..e6256d04692 100644 --- a/code/datums/migrants/waves/magic_school_expedition.dm +++ b/code/datums/migrants/waves/magic_school_expedition.dm @@ -147,31 +147,9 @@ name = "Magic School Expedition" max_spawns = 1 shared_wave_type = /datum/migrant_wave/magic_school_expedition - downgrade_wave = /datum/migrant_wave/magic_school_expedition_down weight = 5 roles = list( /datum/migrant_role/magic_teacher = 1, /datum/migrant_role/magic_student = 5 ) greet_text = "A teacher in travel-worn robes takes a seat, a cluster of young apprentices following close behind. Their satchels clink faintly with glass and metal, and the smell of old parchment drifts from their packs." - -/datum/migrant_wave/magic_school_expedition_down - name = "Magic School Expedition" - shared_wave_type = /datum/migrant_wave/magic_school_expedition - downgrade_wave = /datum/migrant_wave/magic_school_expedition_two - can_roll = FALSE - roles = list( - /datum/migrant_role/magic_teacher = 1, - /datum/migrant_role/magic_student = 3 - ) - greet_text = "The door opens to a weary teacher and a smaller band of pupils. Their robes are torn at the hems, and one student’s hands are wrapped in singed cloth." - -/datum/migrant_wave/magic_school_expedition_two - name = "Magic School Expedition" - shared_wave_type = /datum/migrant_wave/magic_school_expedition - can_roll = FALSE - roles = list( - /datum/migrant_role/magic_teacher = 1, - /datum/migrant_role/magic_student = 1 - ) - greet_text = "Only a single student remains beside the teacher. They sit quietly, eyes fixed on the table, as dark stains dry on the cuffs of their robes." diff --git a/code/datums/migrants/waves/nomad_migration.dm b/code/datums/migrants/waves/nomad_migration.dm index 5d75ddab600..b7dc6300f19 100644 --- a/code/datums/migrants/waves/nomad_migration.dm +++ b/code/datums/migrants/waves/nomad_migration.dm @@ -87,63 +87,9 @@ name = "The Khan's Migration" max_spawns = 2 shared_wave_type = /datum/migrant_wave/nomad_migration - downgrade_wave = /datum/migrant_wave/nomad_migration_down weight = 30 roles = list( /datum/migrant_role/khan = 1, /datum/migrant_role/nomadrider = 5, ) greet_text = "The khan rides at the head of a small horde of nomads, crossing into unfamiliar land in search of pasture and a place to set up your tents, finding solace from the frequent travel and danger of the steppes." - -/datum/migrant_wave/nomad_migration_down - name = "The Khan's Migration" - shared_wave_type = /datum/migrant_wave/nomad_migration - downgrade_wave = /datum/migrant_wave/nomad_migration_down_one - can_roll = FALSE - roles = list( - /datum/migrant_role/khan = 1, - /datum/migrant_role/nomadrider = 4, - ) - greet_text = "The khan rides at the head of a small horde of nomads, crossing into unfamiliar land in search of pasture and a place to set up tents, finding solace from the frequent travel and danger of the steppes." - -/datum/migrant_wave/nomad_migration_down_one - name = "The Khan's Migration" - shared_wave_type = /datum/migrant_wave/nomad_migration - downgrade_wave = /datum/migrant_wave/nomad_migration_down_two - can_roll = FALSE - roles = list( - /datum/migrant_role/khan = 1, - /datum/migrant_role/nomadrider = 3, - ) - greet_text = "The khan rides at the head of a small horde of nomads, crossing into unfamiliar land in search of pasture and a place to set up tents, finding solace from the frequent travel and danger of the steppes." - -/datum/migrant_wave/nomad_migration_down_two - name = "The Khan's Migration" - shared_wave_type = /datum/migrant_wave/nomad_migration - downgrade_wave = /datum/migrant_wave/nomad_migration_down_three - can_roll = FALSE - roles = list( - /datum/migrant_role/khan = 1, - /datum/migrant_role/nomadrider = 2, - ) - greet_text = "The khan rides at the head of a small horde of nomads, crossing into unfamiliar land in search of pasture and a place to set up tents, finding solace from the frequent travel and danger of the steppes." - -/datum/migrant_wave/nomad_migration_down_three - name = "The Khan's Migration" - shared_wave_type = /datum/migrant_wave/nomad_migration - downgrade_wave = /datum/migrant_wave/nomad_migration_down_four - can_roll = FALSE - roles = list( - /datum/migrant_role/khan = 1, - /datum/migrant_role/nomadrider = 1, - ) - greet_text = "The khan rides with his most trusted warrior, crossing into unfamiliar land in search of pasture and a place to set up tents, finding solace from the frequent travel and danger of the steppes." - -/datum/migrant_wave/nomad_migration_down_four - name = "The Khan's Migration" - shared_wave_type = /datum/migrant_wave/nomad_migration - can_roll = FALSE - roles = list( - /datum/migrant_role/khan = 1, - ) - greet_text = "The khan rides alone, crossing into unfamiliar land in search of pasture and a place to set up tents, finding solace from the frequent travel and danger of the steppes." diff --git a/code/datums/migrants/waves/prisoner_wave.dm b/code/datums/migrants/waves/prisoner_wave.dm index 6f1c2e1f20c..edcde792d8a 100644 --- a/code/datums/migrants/waves/prisoner_wave.dm +++ b/code/datums/migrants/waves/prisoner_wave.dm @@ -183,7 +183,6 @@ name = "The Prisoners' Convoy" max_spawns = 3 shared_wave_type = /datum/migrant_wave/prisoner_convoy - downgrade_wave = /datum/migrant_wave/prisoner_convoy_down weight = 45 roles = list( /datum/migrant_role/gaoler = 1, @@ -191,25 +190,3 @@ /datum/migrant_role/mig_prisoner = 4, ) greet_text = "Nobody escapes the rule of Vanderlin's monarchs. Some fled to another kingdom and got caught, they are now on their way back." - -/datum/migrant_wave/prisoner_convoy_down - name = "The Prisoners' Convoy" - shared_wave_type = /datum/migrant_wave/prisoner_convoy - downgrade_wave = /datum/migrant_wave/prisoner_convoy_down_two - can_roll = FALSE - roles = list( - /datum/migrant_role/gaoler = 1, - /datum/migrant_role/prisoner_guard = 1, - /datum/migrant_role/mig_prisoner = 3, - ) - greet_text = "Nobody escapes the rule of Vanderlin's monarchs. Some fled to another kingdom and got caught, they are now on their way back." - -/datum/migrant_wave/prisoner_convoy_down_two - name = "The Prisoner Convoy" - shared_wave_type = /datum/migrant_wave/prisoner_convoy - can_roll = FALSE - roles = list( - /datum/migrant_role/gaoler = 1, - /datum/migrant_role/mig_prisoner = 1, - ) - greet_text = "Nobody escapes the rule of Vanderlin's monarchs. Some fled to another kingdom and got caught, they are now on their way back." diff --git a/code/datums/migrants/waves/returning_bannermen.dm b/code/datums/migrants/waves/returning_bannermen.dm index e1bda675ec1..a1f5b1d23cf 100644 --- a/code/datums/migrants/waves/returning_bannermen.dm +++ b/code/datums/migrants/waves/returning_bannermen.dm @@ -349,7 +349,6 @@ name = "The Bannermen's Return" max_spawns = 2 shared_wave_type = /datum/migrant_wave/knight - downgrade_wave = /datum/migrant_wave/returning_bannermen_down weight = 40 roles = list( /datum/migrant_role/sergeant_at_arms = 1, @@ -359,63 +358,3 @@ /datum/migrant_role/crossbow_bannerman = 1 ) greet_text = "You were a part of an expedition sent by the Monarch to Kingsfield, as it is done, you now return." - -/datum/migrant_wave/returning_bannermen_down - name = "The Bannermen's Return" - shared_wave_type = /datum/migrant_wave/returning_bannermen - downgrade_wave = /datum/migrant_wave/returning_bannermen_down_one - can_roll = FALSE - roles = list( - /datum/migrant_role/sergeant_at_arms = 1, - /datum/migrant_role/footman_bannerman = 1, - /datum/migrant_role/pikeman_bannerman = 1, - /datum/migrant_role/archer_bannerman = 1, - /datum/migrant_role/crossbow_bannerman = 1 - ) - greet_text = "You were a part of an expedition sent by the Monarch to Kingsfield, as it is done, you now return." - -/datum/migrant_wave/returning_bannermen_down_one - name = "The Bannermen's Return" - shared_wave_type = /datum/migrant_wave/returning_bannermen - downgrade_wave = /datum/migrant_wave/returning_bannermen_down_two - can_roll = FALSE - roles = list( - /datum/migrant_role/sergeant_at_arms = 1, - /datum/migrant_role/footman_bannerman = 1, - /datum/migrant_role/pikeman_bannerman = 1, - /datum/migrant_role/archer_bannerman = 1, - ) - greet_text = "You were a part of an expedition sent by the Monarch to Kingsfield, as it is done, you now return." - -/datum/migrant_wave/returning_bannermen_down_two - name = "The Bannermen's Return" - shared_wave_type = /datum/migrant_wave/returning_bannermen - downgrade_wave = /datum/migrant_wave/returning_bannermen_down_three - can_roll = FALSE - roles = list( - /datum/migrant_role/sergeant_at_arms = 1, - /datum/migrant_role/footman_bannerman = 1, - /datum/migrant_role/pikeman_bannerman = 1, - ) - greet_text = "You were a part of an expedition sent by the Monarch to Kingsfield, as it is done, you now return." - -/datum/migrant_wave/returning_bannermen_down_three - name = "The Bannermen's Return" - shared_wave_type = /datum/migrant_wave/returning_bannermen - downgrade_wave = /datum/migrant_wave/returning_bannermen_down_four - can_roll = FALSE - roles = list( - /datum/migrant_role/sergeant_at_arms = 1, - /datum/migrant_role/footman_bannerman = 1, - ) - greet_text = "You were a part of an expedition sent by the Monarch to Kingsfield, as it is done, you now return." - -/datum/migrant_wave/returning_bannermen_down_four - name = "The Bannermen's Return" - shared_wave_type = /datum/migrant_wave/returning_bannermen - can_roll = FALSE - roles = list( - /datum/migrant_role/sergeant_at_arms = 1, - ) - greet_text = "You were a part of an expedition sent by the Monarch to Kingsfield, as it is done, you now return." - diff --git a/code/datums/migrants/waves/rockhill_wave.dm b/code/datums/migrants/waves/rockhill_wave.dm index 0013bed06bf..ebc1b267960 100644 --- a/code/datums/migrants/waves/rockhill_wave.dm +++ b/code/datums/migrants/waves/rockhill_wave.dm @@ -300,7 +300,6 @@ /datum/migrant_wave/rockhill_wave name = "The Mayor's Visit" shared_wave_type = list(/datum/migrant_wave/grenzelhoft_visit,/datum/migrant_wave/zalad_wave,/datum/migrant_wave/rockhill_wave,/datum/migrant_wave/heartfelt) - downgrade_wave = /datum/migrant_wave/rockhill_wave_down max_spawns = 1 weight = 30 roles = list( @@ -310,27 +309,3 @@ /datum/migrant_role/footman_guard = 4 ) greet_text = "The Mayor has it, something must be discussed with the rulers of Vanderlin which is why we're on our way over there." - -/datum/migrant_wave/rockhill_wave_down - name = "The Mayor's Visit" - shared_wave_type = list(/datum/migrant_wave/grenzelhoft_visit,/datum/migrant_wave/zalad_wave,/datum/migrant_wave/rockhill_wave,/datum/migrant_wave/heartfelt) - downgrade_wave = /datum/migrant_wave/rockhill_wave_down_one - can_roll = FALSE - roles = list( - /datum/migrant_role/rockhill/mayor = 1, - /datum/migrant_role/rockhill_knight = 1, - /datum/migrant_role/rockhill/sergeant_at_arms = 1, - /datum/migrant_role/footman_guard = 2 - ) - greet_text = "The Mayor has it, something must be discussed with the rulers of Vanderlin which is why we're on our way over there." - -/datum/migrant_wave/rockhill_wave_down_one - name = "The Mayor's visit" - 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/rockhill/mayor = 1, - /datum/migrant_role/rockhill_knight = 1, - /datum/migrant_role/footman_guard = 2 - ) - greet_text = "The Mayor has it, something must be discussed with the rulers of Vanderlin which is why we're on our way over there." diff --git a/code/datums/migrants/waves/rousman_cheese.dm b/code/datums/migrants/waves/rousman_cheese.dm index efb9a52ebae..22c218196a0 100644 --- a/code/datums/migrants/waves/rousman_cheese.dm +++ b/code/datums/migrants/waves/rousman_cheese.dm @@ -156,7 +156,6 @@ name = "Rousman Cheese Convoy" max_spawns = 4 shared_wave_type = /datum/migrant_wave/rousman_cheese - downgrade_wave = /datum/migrant_wave/rousman_cheese_down can_roll = FALSE // Admin activated only weight = 0 triumph_threshold = 50 @@ -167,27 +166,4 @@ ) greet_text = "A somewhat more intelligent group of rousmen, those who truly appreciate the value of cheese products and wish to spread them to all." -/datum/migrant_wave/rousman_cheese_down - name = "Rousman Expedition" - max_spawns = 4 - shared_wave_type = /datum/migrant_wave/rousman_cheese - downgrade_wave = /datum/migrant_wave/rousman_cheese_down_one - can_roll = FALSE - roles = list( - /datum/migrant_role/rousman_cheese/overseer = 1, - /datum/migrant_role/rousman_cheese/cheesemaker = 1, - /datum/migrant_role/rousman_cheese/cheesemonger = 1 - ) - greet_text = "A somewhat more intelligent group of rousmen, those who truly appreciate the value of cheese products and wish to spread them to all." - -/datum/migrant_wave/rousman_cheese_down_one - name = "Rousman Expedition" - max_spawns = 4 - shared_wave_type = /datum/migrant_wave/rousman_cheese - can_roll = FALSE - roles = list( - /datum/migrant_role/rousman_cheese/overseer = 1, - ) - greet_text = "A somewhat more intelligent group of rousmen, those who truly appreciate the value of cheese products and wish to spread them to all." - diff --git a/code/datums/migrants/waves/urchin_wave.dm b/code/datums/migrants/waves/urchin_wave.dm index 1474025d743..b09b0649ec6 100644 --- a/code/datums/migrants/waves/urchin_wave.dm +++ b/code/datums/migrants/waves/urchin_wave.dm @@ -99,30 +99,9 @@ name = "Urchin Gang" max_spawns = 1 shared_wave_type = /datum/migrant_wave/urchin_wave - downgrade_wave = /datum/migrant_wave/urchin_wave_down weight = 8 roles = list( /datum/migrant_role/urchinbrain = 1, /datum/migrant_role/urchinbrawn = 2, ) greet_text = "There's two rules - one, you give the Boss your coin. Two, you don't mess with the boss. Three, I can't count that good..." - -/datum/migrant_wave/urchin_wave_down - name = "Urchin Gang" - shared_wave_type = /datum/migrant_wave/urchin_wave - downgrade_wave = /datum/migrant_wave/urchin_wave_down_two - can_roll = FALSE - roles = list( - /datum/migrant_role/urchinbrain = 1, - /datum/migrant_role/urchinbrawn = 1, - ) - greet_text = "There's two rules - one, you give the Boss your coin. Two, you don't mess with the boss. Three, I can't count that good..." - -/datum/migrant_wave/urchin_wave_down_two - name = "The Urchin" - shared_wave_type = /datum/migrant_wave/urchin_wave - can_roll = FALSE - roles = list( - /datum/migrant_role/urchinbrain = 1, - ) - greet_text = "You're tired of eating gruel, time for something completely different." diff --git a/code/datums/migrants/waves/zalad_wave.dm b/code/datums/migrants/waves/zalad_wave.dm index 19d45fd9916..498dd8a500c 100644 --- a/code/datums/migrants/waves/zalad_wave.dm +++ b/code/datums/migrants/waves/zalad_wave.dm @@ -401,7 +401,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/zalad_wave_down roles = list( /datum/migrant_role/zalad/emir = 1, /datum/migrant_role/zalad/amirah = 1, @@ -410,16 +409,3 @@ /datum/migrant_role/zalad_guard = 2 ) greet_text = "The Mercator Guild sent you, respected Zaladins, to seek favorable business proposal within the Kingdom of Vanderlin." - -/datum/migrant_wave/zalad_wave_down - name = "The Deshret Expedition" - 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/zalad/emir = 1, - /datum/migrant_role/zalad/amirah = 1, - /datum/migrant_role/zalad/furusiyya = 1, - /datum/migrant_role/qatil = 1 - ) - greet_text = "The Mercator Guild sent you, respected Zaladins, to seek favorable business proposal within the Kingdom of Vanderlin. Unfortunately most of your guards died on the way here." diff --git a/code/modules/events/antagonist/migrant_waves/zizo_cult.dm b/code/modules/events/antagonist/migrant_waves/zizo_cult.dm index 47b7eeb572b..5914ec14db7 100644 --- a/code/modules/events/antagonist/migrant_waves/zizo_cult.dm +++ b/code/modules/events/antagonist/migrant_waves/zizo_cult.dm @@ -20,18 +20,8 @@ max_spawns = 1 can_roll = FALSE shared_wave_type = /datum/migrant_wave/zizo_cultist - downgrade_wave = /datum/migrant_wave/zizo_cultist_down roles = list( /datum/migrant_role/zizo_cultist = 1, /datum/migrant_role/zizo_cultist_lesser = 1, ) greet_text = "This is the land that will witness your ascension." - -/datum/migrant_wave/zizo_cultist_down - name = "The Path to Ascension" - shared_wave_type = /datum/migrant_wave/zizo_cultist - can_roll = FALSE - roles = list( - /datum/migrant_role/zizo_cultist = 1, - ) - greet_text = "This is the land that will witness your ascension."