From 52795e3c119b18c1eb6601bdb3172a2596790139 Mon Sep 17 00:00:00 2001 From: konushi <139562134+konushi@users.noreply.github.com> Date: Fri, 6 Oct 2023 00:02:11 +0300 Subject: [PATCH] Fix: Awaymissions gate_lizard, mechtransport_new (#318) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Пофиксил (надеюсь) пантер на карте gate_lizard, убавил количество спавнеров на ящеров, немного центрировал карту и увеличил каменную стену по краям, шоб не бегали. Привел к стандарту имена на mechtransport_new, засунул космосимплов за перегородки, что б не улетали ## Почему это хорошо для игры Небольшие фиксы ## Изображения изменений ## Тестирование На локалке все замечательно, как будет на сервере - поглядим. ## Changelog :cl: fix: понизил скорость симплов и их количество на картах gate_lizard и mechtransport_new; небольшие правки карты gate_lizard /:cl: --- .../SpaceRuins/mechtransport_new.dmm | 30 ++++---- .../RandomZLevels/gate_lizard.dmm | 71 +++++++------------ modular_ss220/maps220/code/mobs.dm | 46 ++++++------ 3 files changed, 62 insertions(+), 85 deletions(-) diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm index d4033cb54540..28b24dc23f0a 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm @@ -1768,9 +1768,13 @@ /turf/simulated/floor/carpet/blue, /area/ruin/space/powered) "KW" = ( -/mob/living/simple_animal/hostile/scavengers/meele/axe, -/turf/template_noop, -/area/template_noop) +/obj/effect/landmark/damageturf, +/obj/structure/railing{ + dir = 5 + }, +/mob/living/simple_animal/hostile/scavengers/laser/spacelaser, +/turf/simulated/floor/plating/airless, +/area/ruin/space/powered) "KY" = ( /obj/structure/closet/crate/secure/loot, /turf/simulated/floor/plating, @@ -1948,11 +1952,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/powered) -"Ov" = ( -/obj/structure/lattice, -/mob/living/simple_animal/hostile/scavengers/laser/spacelaser, -/turf/template_noop, -/area/template_noop) "OB" = ( /obj/structure/lattice/catwalk, /turf/template_noop, @@ -2503,6 +2502,7 @@ /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/powered) "ZF" = ( +/obj/structure/lattice/catwalk, /mob/living/simple_animal/hostile/scavengers/gun/spacegun, /turf/template_noop, /area/template_noop) @@ -2836,7 +2836,7 @@ yt qv zF qU -KW +qU qU qU qU @@ -2895,7 +2895,7 @@ qU qU qU kU -OB +ZF ys qU ce @@ -2947,7 +2947,7 @@ Kb Kb qU qU -ZF +qU qU Pi OB @@ -3663,7 +3663,7 @@ AT Eb Vo cd -KW +qU Vk CW vd @@ -3829,7 +3829,7 @@ cd qU Ah qU -Ov +Vk nx aH rU @@ -3882,7 +3882,7 @@ Kb Kb qU qU -ZF +qU Vk QD SH @@ -3994,7 +3994,7 @@ qU qU qU Vk -QD +KW il il bF diff --git a/_maps/map_files220/RandomZLevels/gate_lizard.dmm b/_maps/map_files220/RandomZLevels/gate_lizard.dmm index ae8b9e8d34f2..54cf78c5407a 100644 --- a/_maps/map_files220/RandomZLevels/gate_lizard.dmm +++ b/_maps/map_files220/RandomZLevels/gate_lizard.dmm @@ -2025,6 +2025,7 @@ pixel_y = -11 }, /obj/effect/spawner/random_spawners/dirt_frequent, +/obj/item/cautery, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "cBW" = ( @@ -6748,6 +6749,7 @@ /obj/item/stack/sheet/mineral/bananium{ amount = 30 }, +/obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkgrey" @@ -11558,15 +11560,6 @@ name = "ground" }, /area/awaymission/jungle_planet/outside) -"nUQ" = ( -/obj/structure/flora/junglebush/large{ - icon_state = "bush2" - }, -/obj/effect/landmark/awaymissions/gate_lizard/mob_spawn/ranged{ - id = "2post" - }, -/turf/simulated/floor/indestructible/grass, -/area/awaymission/jungle_planet/outside) "nWh" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate, @@ -11870,15 +11863,6 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) -"oqL" = ( -/obj/structure/flora/junglebush/large{ - icon_state = "bush2" - }, -/mob/living/simple_animal/hostile/jungle_lizard/spearman{ - wander = 0 - }, -/turf/simulated/floor/indestructible/grass, -/area/awaymission/jungle_planet/outside) "oqX" = ( /obj/structure/computerframe{ dir = 4; @@ -12210,9 +12194,6 @@ /area/awaymission/jungle_planet/outside) "oJx" = ( /obj/structure/closet/crate, -/obj/item/stack/ore/bluespace_crystal{ - amount = 30 - }, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; @@ -15306,9 +15287,6 @@ /area/awaymission/jungle_planet/outside/river) "syZ" = ( /obj/structure/flora/ausbushes/sparsegrass, -/obj/effect/landmark/awaymissions/gate_lizard/mob_spawn/melee_spear{ - id = "pathway2" - }, /obj/structure/flora/junglebush/large{ icon_state = "bush3" }, @@ -15562,14 +15540,12 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/river) "sOd" = ( -/obj/effect/landmark/awaymissions/gate_lizard/mob_spawn/ranged{ - id = "swamp3" - }, -/obj/structure/flora/junglebush/large{ - icon_state = "bush3" +/obj/item/stack/ore/glass, +/obj/structure/flora/rock/pile, +/turf/simulated/floor/plating/asteroid/ancient{ + name = "ground" }, -/turf/simulated/floor/indestructible/grass, -/area/awaymission/jungle_planet/outside) +/area/awaymission/jungle_planet/outside/cave) "sOV" = ( /obj/effect/landmark/awaymissions/gate_lizard/mob_spawn/melee_spear{ id = "pathway9" @@ -17210,6 +17186,7 @@ /area/awaymission/jungle_planet/inside/complex) "uIE" = ( /obj/item/pickaxe/mini, +/obj/item/stack/ore/glass, /turf/simulated/floor/plating/asteroid/ancient{ name = "ground" }, @@ -28114,7 +28091,7 @@ lWL iTk iTk iTk -nUQ +lJs sNa lWL lWL @@ -34100,7 +34077,7 @@ qGN nva lWL lWL -oqL +lJs lJs lJs lWL @@ -34471,7 +34448,7 @@ lWL lWL lWL lLF -eRs +lWL lWL lWL aHl @@ -35231,7 +35208,7 @@ qeW lWL mYK mYK -eRs +lWL lWL lWL lWL @@ -36922,7 +36899,7 @@ lWL sNa sNa lWL -fyJ +fMq lWL lWL hWY @@ -38980,7 +38957,7 @@ who lWL nGx nGx -der +fMq sNa sNa nGx @@ -38996,7 +38973,7 @@ qGN qGN jbn qGN -eUG +fMq qGN qGN xsI @@ -39364,7 +39341,7 @@ nGx nGx fMq qGN -jml +fMq qGN qGN qGN @@ -39926,7 +39903,7 @@ nGx myG lWL qGN -sOd +fMq fMq qGN qGN @@ -41819,7 +41796,7 @@ gZv gZv gZv lWL -frk +fMq eZk sNa sNa @@ -52434,7 +52411,7 @@ drq miM miM miM -nai +drq miM miM gZv @@ -52621,7 +52598,7 @@ miM miM miM miM -drq +sOd miM miM gZv @@ -52641,7 +52618,7 @@ sNa lWL nRb lWL -wHR +mTn sNa lWL sNa @@ -54848,9 +54825,9 @@ miM miM miM miM -nai -cqB -arp +miM +miM +miM cqB cIb miM diff --git a/modular_ss220/maps220/code/mobs.dm b/modular_ss220/maps220/code/mobs.dm index 7c78f8eb24bf..37afeff08f59 100644 --- a/modular_ss220/maps220/code/mobs.dm +++ b/modular_ss220/maps220/code/mobs.dm @@ -1,7 +1,7 @@ /* Scavengers */ /mob/living/simple_animal/hostile/scavengers - name = "Scavenger" - desc = "One of the many random looters or bandits of the frontiers." + name = "scavenger" + desc = "One of the many random bandits of the frontiers." icon = 'modular_ss220/maps220/icons/simple_human.dmi' icon_state = "scav" icon_living = "scav" @@ -29,8 +29,8 @@ footstep_type = FOOTSTEP_MOB_SHOE /mob/living/simple_animal/hostile/scavengers/meele - name = "Scrapper Scavenger" - desc = "One of the many random looters or bandits of the frontiers. This one is carrying a pipe." + name = "scrapper scavenger" + desc = "One of the many random bandits of the frontiers. This one is carrying a pipe." icon_state = "scavmeelepipe" icon_living = "scavmeelepipe" icon_dead = "scavdead" @@ -44,8 +44,8 @@ attacktext = "bashing" /mob/living/simple_animal/hostile/scavengers/meele/crusher - name = "Heavy Scavenger" - desc = "One of the many random looters or bandits of the frontiers. This one is carrying a KC." + name = "heavy scavenger" + desc = "One of the many random bandits of the frontiers. This one is carrying a KC." icon_state = "scavmeelecrush" icon_living = "scavmeelecrush" icon_dead = "scavdead" @@ -59,7 +59,7 @@ attacktext = "smashes" /mob/living/simple_animal/hostile/scavengers/meele/axe - name = "Shipbreaker Scavenger" + name = "shipbreaker scavenger" desc = "A shipbreaker scavenger. This one is carrying a axe." icon_state = "scavmeeleaxe" icon_living = "scavmeeleaxe" @@ -77,7 +77,7 @@ wander = FALSE /mob/living/simple_animal/hostile/scavengers/laser - name = " Scavenger Gunslinger" + name = "gunslinger scavenger " desc = "A bandit scum, who has learned to shoot accurately and quickly." icon_state = "scavpistol" icon_living = "scavpistol" @@ -94,7 +94,7 @@ projectilesound = 'sound/weapons/laser.ogg' /mob/living/simple_animal/hostile/scavengers/laser/spacelaser - name = "Spacetrooper Scavenger" + name = "spacetrooper scavenger" desc = "A shipbreaker scavenger. This one is carrying a laser gun." icon_state = "scavlaser" icon_living = "scavlaser" @@ -105,7 +105,7 @@ wander = FALSE /mob/living/simple_animal/hostile/scavengers/gun - name = "Scavenger Gunman" + name = "gunman scavenger" desc = "A bandit scum with a shotgun." icon_state = "scavshotgun" icon_living = "scavshotgun" @@ -122,7 +122,7 @@ projectilesound = 'sound/weapons/gunshots/gunshot_shotgun.ogg' /mob/living/simple_animal/hostile/scavengers/gun/spacegun - name = "Spacetrooper Scavenger" + name = "spacetrooper scavenger" desc = "A shipbreaker scavenger. This one is carrying a submachine gun." icon_state = "scavm90" icon_living = "scavm90" @@ -289,20 +289,20 @@ turns_per_move = 5 mob_biotypes = MOB_ORGANIC | MOB_HUMANOID sentience_type = SENTIENCE_OTHER - speed = -0.5 - move_to_delay = 2 + speed = 0 + move_to_delay = 2.8 stat_attack = UNCONSCIOUS robust_searching = TRUE maxHealth = 80 health = 80 harm_intent_damage = 8 melee_damage_lower = 5 - melee_damage_upper = 10 + melee_damage_upper = 8 attacktext = "рвёт" attack_sound = 'sound/weapons/punch1.ogg' a_intent = INTENT_HARM faction = list("junglemob") - check_friendly_fire = TRUE + check_friendly_fire = 1 status_flags = CANPUSH unsuitable_atmos_damage = 10 loot = list(/obj/effect/decal/cleanable/blood/gibs) @@ -322,8 +322,8 @@ icon_living = "lizardman_spear" maxHealth = 100 health = 100 - melee_damage_lower = 15 - melee_damage_upper = 15 + melee_damage_lower = 12 + melee_damage_upper = 12 rapid_melee = 2 attack_sound = 'sound/weapons/bladeslice.ogg' attacktext = "колет" @@ -344,7 +344,7 @@ name = "arrow" icon_state = "arrow" range = 10 - damage = 25 + damage = 20 damage_type = BRUTE /mob/living/simple_animal/hostile/jungle_lizard/axeman @@ -354,8 +354,8 @@ icon_living = "lizardman_axe" maxHealth = 160 health = 160 - melee_damage_lower = 25 - melee_damage_upper = 25 + melee_damage_lower = 20 + melee_damage_upper = 23 attack_sound = 'sound/weapons/bladeslice.ogg' attacktext = "рубит" @@ -379,10 +379,10 @@ health = 120 harm_intent_damage = 5 melee_damage_lower = 15 - melee_damage_upper = 18 + melee_damage_upper = 15 rapid_melee = 2 - move_to_delay = 2 - speed = -2 + move_to_delay = 2.8 + speed = -0.2 dodging = TRUE sidestep_per_cycle = 2 faction = list("junglemob")