diff --git a/ModularTegustation/tegu_items/wcorp/enemies.dm b/ModularTegustation/tegu_items/wcorp/enemies.dm index 959796c1d817..a77ddbea64b7 100644 --- a/ModularTegustation/tegu_items/wcorp/enemies.dm +++ b/ModularTegustation/tegu_items/wcorp/enemies.dm @@ -116,6 +116,73 @@ GLOBAL_VAR_INIT(wcorp_boss_spawn, FALSE) else spawntype = /mob/living/simple_animal/hostile/lovetown/slumberer + if("peccatulum") + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_gluttony + switch(GLOB.combat_counter) + + //Mostly gluttony, with a lil sloth + if(1 to 2) + switch(rand(1,100)) + + if(85 to 100) + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_sloth + else + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_gluttony + + //i dont know what the fuck im doing + if(3 to 5) + switch(rand(1,100)) + if(10 to 55) + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_sloth + if(55 to 100) + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_gloom + else + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_gluttony + + + //25% Slasher / 25% Stabber / 20% Slammer / 15% Shambler / 15% Slumberer but for peccs I guess??? + if(6 to 12) + switch(rand(1, 100)) + if(40 to 65) + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_sloth + if(65 to 85) + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_gloom + if(85 to 100) + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_pride + else + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_gluttony + + + //100% one Abomination, rest 20% Slashers / 20% Stabbers / 60% Suicidals + if(13 to 14) + if(!GLOB.wcorp_boss_spawn) + GLOB.wcorp_boss_spawn = TRUE + spawntype = /mob/living/simple_animal/hostile/ordeal/white_lake_corrosion + else + switch(rand(1,100)) + if(60 to 80) + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_pride + if(80 to 100) + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_gloom + else + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_gluttony + + //20% Slasher / 20% Stabber / 20% Slammer / 20% Shambler / 20% Slumberer + if(15 to INFINITY) + switch(rand(1, 100)) + if(20 to 30) + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_lust + if(30 to 60) + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_gloom + if(60 to 80) + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_wrath + if(80 to 100) + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_pride + else + spawntype = /mob/living/simple_animal/hostile/ordeal/sin_gluttony + + + var/mob/living/simple_animal/hostile/H = new spawntype(get_turf(src)) H.can_patrol = TRUE H.patrol_cooldown_time = 10 SECONDS @@ -126,5 +193,5 @@ GLOBAL_VAR_INIT(wcorp_boss_spawn, FALSE) if(L.stat != DEAD) return SSticker.force_ending = 1 - to_chat(world, span_userdanger("All W-Corp staff is dead! Round automatically ending.")) + to_chat(world, "All W-Corp staff is dead! Round automatically ending.") diff --git a/code/game/gamemodes/management/event/combat.dm b/code/game/gamemodes/management/event/combat.dm index e0d3b219d9e2..968218e7797d 100644 --- a/code/game/gamemodes/management/event/combat.dm +++ b/code/game/gamemodes/management/event/combat.dm @@ -44,11 +44,13 @@ GLOBAL_VAR_INIT(wcorp_enemy_faction, "") //decides which faction WCorp will be u addtimer(CALLBACK(src, .proc/counterincrease), 3 MINUTES) to_chat(world, span_userdanger("Players will be victorius 20 minutes.")) - switch(rand(1,2)) + switch(rand(1,3)) if(1) GLOB.wcorp_enemy_faction = "lovetown" if(2) GLOB.wcorp_enemy_faction = "gcorp" + if(3) + GLOB.wcorp_enemy_faction = "peccatulum" //Win cons /datum/game_mode/combat/proc/loseround()