Skip to content

Commit

Permalink
w-corp shrimping off
Browse files Browse the repository at this point in the history
  • Loading branch information
Litberries committed Dec 6, 2023
1 parent 11b8ce3 commit 1c92827
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 2 deletions.
59 changes: 59 additions & 0 deletions ModularTegustation/tegu_items/wcorp/enemies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,65 @@ GLOBAL_VAR_INIT(wcorp_boss_spawn, FALSE)




if("shrimp")
spawntype = mob/living/simple_animal/hostile/shrimp_rifleman

Check failure on line 188 in ModularTegustation/tegu_items/wcorp/enemies.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var: "mob"

Check failure on line 188 in ModularTegustation/tegu_items/wcorp/enemies.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var: "living"

Check failure on line 188 in ModularTegustation/tegu_items/wcorp/enemies.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var: "simple_animal"

Check failure on line 188 in ModularTegustation/tegu_items/wcorp/enemies.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var: "hostile"

Check failure on line 188 in ModularTegustation/tegu_items/wcorp/enemies.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var: "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

Check failure on line 200 in ModularTegustation/tegu_items/wcorp/enemies.dm

View workflow job for this annotation

GitHub Actions / Run Linters

failed to resolve path /mob/living/simple_animal/hostile/senior_shrimp
if(55 to 100)
spawntype = /mob/living/simple_animal/hostile/shrimp_rifleman

Check failure on line 202 in ModularTegustation/tegu_items/wcorp/enemies.dm

View workflow job for this annotation

GitHub Actions / Run Linters

failed to resolve path /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

Check failure on line 210 in ModularTegustation/tegu_items/wcorp/enemies.dm

View workflow job for this annotation

GitHub Actions / Run Linters

failed to resolve path /mob/living/simple_animal/hostile/senior_shrimp
if(65 to 100)
spawntype = /mob/living/simple_animal/hostile/shrimp_rifleman

Check failure on line 212 in ModularTegustation/tegu_items/wcorp/enemies.dm

View workflow job for this annotation

GitHub Actions / Run Linters

failed to resolve path /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

Check failure on line 221 in ModularTegustation/tegu_items/wcorp/enemies.dm

View workflow job for this annotation

GitHub Actions / Run Linters

failed to resolve path /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
Expand Down
5 changes: 3 additions & 2 deletions code/game/gamemodes/management/event/combat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1c92827

Please sign in to comment.