diff --git a/ModularTegustation/tegu_items/wcorp/enemies.dm b/ModularTegustation/tegu_items/wcorp/enemies.dm index a77ddbea64b7..b5d8933f3c5c 100644 --- a/ModularTegustation/tegu_items/wcorp/enemies.dm +++ b/ModularTegustation/tegu_items/wcorp/enemies.dm @@ -183,6 +183,65 @@ GLOBAL_VAR_INIT(wcorp_boss_spawn, FALSE) + + if("shrimp") + spawntype = mob/living/simple_animal/hostile/shrimp_rifleman + switch(GLOB.combat_counter) + + //10% Remnant / 90% Corporal + if(1 to 3) + if(prob(10)) + spawntype = /mob/living/simple_animal/hostile/shrimp + + + if(4 to 7) + switch(rand(1, 100)) + if(50 to 55) + spawntype = /mob/living/simple_animal/hostile/senior_shrimp + if(55 to 100) + spawntype = /mob/living/simple_animal/hostile/shrimp_rifleman + else + spawntype = /mob/living/simple_animal/hostile/shrimp + + + if(8 to 11) + switch(rand(1, 100)) + if(45 to 65) + spawntype = /mob/living/simple_animal/hostile/senior_shrimp + if(65 to 100) + spawntype = /mob/living/simple_animal/hostile/shrimp_rifleman + else + spawntype = /mob/living/simple_animal/hostile/shrimp + + + + if(11 to 13) + switch(rand(1, 100)) + if(45 to 55) + spawntype = /mob/living/simple_animal/hostile/senior_shrimp + if(55 to 75) + spawntype = /mob/living/simple_animal/hostile/shrimp_soldier + if(75 to 100) + spawntype = mob/living/simple_animal/hostile/shrimp_rifleman + else + spawntype = /mob/living/simple_animal/hostile/shrimp + + + + + + if(14 to INFINITY) + switch(rand(1, 100)) + if(35 to 55) + spawntype = /mob/living/simple_animal/hostile/senior_shrimp + if(55 to 90) + spawntype = mob/living/simple_animal/hostile/shrimp_rifleman + if(90 to 100) + spawntype = /mob/living/simple_animal/hostile/shrimp_soldier + else + spawntype = /mob/living/simple_animal/hostile/shrimp + + var/mob/living/simple_animal/hostile/H = new spawntype(get_turf(src)) H.can_patrol = TRUE H.patrol_cooldown_time = 10 SECONDS diff --git a/code/game/gamemodes/management/event/combat.dm b/code/game/gamemodes/management/event/combat.dm index 968218e7797d..6a401f9f441f 100644 --- a/code/game/gamemodes/management/event/combat.dm +++ b/code/game/gamemodes/management/event/combat.dm @@ -44,14 +44,15 @@ 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,3)) + switch(rand(1,4)) if(1) GLOB.wcorp_enemy_faction = "lovetown" if(2) GLOB.wcorp_enemy_faction = "gcorp" if(3) GLOB.wcorp_enemy_faction = "peccatulum" - + if(4) + GLOB.wcorp_enemy_faction = "shrimp" //Win cons /datum/game_mode/combat/proc/loseround() SSticker.force_ending = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/shrimps.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/shrimps.dm index 9cb70b3f4a5f..fbb1545062bf 100644 --- a/code/modules/mob/living/simple_animal/hostile/ordeal/shrimps.dm +++ b/code/modules/mob/living/simple_animal/hostile/ordeal/shrimps.dm @@ -38,6 +38,7 @@ mob/living/simple_animal/hostile/shrimp_rifleman melee_damage_type = RED_DAMAGE damage_coeff = list(RED_DAMAGE = 0.8, WHITE_DAMAGE = 1.5, BLACK_DAMAGE = 1, PALE_DAMAGE = 2) melee_damage_lower = 20 + move_to_delay = 4 melee_damage_upper = 24 robust_searching = TRUE stat_attack = HARD_CRIT