cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7023 from Mechoid/FixAndTweakRoiling

Browse Source 
Roiling Mold Blob Fix/Tweak
This commit is contained in:
Atermonera
2020-04-22 12:53:41 -07:00
committed by VirgoBot
parent 3239a8e172
commit 2411a19038
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/blob2/overmind/types/roiling_mold.dm
View File

@@ -21,6 +21,7 @@
attack_message_synth = ", and your shell buckles" attack_message_synth = ", and your shell buckles"
attack_verb = "lashes" attack_verb = "lashes"
spore_projectile = /obj/item/projectile/arc/spore spore_projectile = /obj/item/projectile/arc/spore
factory_type = /obj/structure/blob/factory/turret
/datum/blob_type/roiling_mold/proc/find_target(var/obj/structure/blob/B, var/tries = 0, var/list/previous_targets = null) /datum/blob_type/roiling_mold/proc/find_target(var/obj/structure/blob/B, var/tries = 0, var/list/previous_targets = null)
if(tries > 3) if(tries > 3)
@@ -33,7 +34,7 @@
previous_targets |= L previous_targets |= L
L = find_target(B, tries + 1, previous_targets) return find_target(B, tries + 1, previous_targets)
return L return L

4
code/modules/projectiles/projectile/arc.dm
View File

@@ -16,6 +16,7 @@
var/visual_y_offset = -16 // Adjusts how high the projectile and its shadow start, visually. This is so the projectile and shadow align with the center of the tile. var/visual_y_offset = -16 // Adjusts how high the projectile and its shadow start, visually. This is so the projectile and shadow align with the center of the tile.
var/projectile_speed_modifier = 0.5 // Slows it down to make the arcing more noticable, and improve pixel calculation accuracy. var/projectile_speed_modifier = 0.5 // Slows it down to make the arcing more noticable, and improve pixel calculation accuracy.
var/obj/effect/projectile_shadow/shadow = null // Visual indicator for the projectile's 'true' position. Needed due to being bound to two dimensions in reality. var/obj/effect/projectile_shadow/shadow = null // Visual indicator for the projectile's 'true' position. Needed due to being bound to two dimensions in reality.
var/arc_height_multiplier = 1 // Modifies how 'high' the projectile flies.
/obj/item/projectile/arc/Bump() /obj/item/projectile/arc/Bump()
return return
@@ -88,7 +89,7 @@
// Now for the fake height. // Now for the fake height.
var/arc_max_pixel_height = distance_to_fly / 2 var/arc_max_pixel_height = distance_to_fly / 2
var/sine_position = arc_progress * 180 var/sine_position = arc_progress * 180
var/pixel_z_position = (arc_max_pixel_height * sin(sine_position)) + visual_y_offset var/pixel_z_position = (arc_max_pixel_height * sin(sine_position) * arc_height_multiplier) + visual_y_offset
animate(src, pixel_z = pixel_z_position, time = 1, flags = ANIMATION_END_NOW) animate(src, pixel_z = pixel_z_position, time = 1, flags = ANIMATION_END_NOW)
// Update our shadow. // Update our shadow.
@@ -176,6 +177,7 @@
damage_type = BIOACID damage_type = BIOACID
armor_penetration = 30 armor_penetration = 30
fire_sound = 'sound/effects/slime_squish.ogg' fire_sound = 'sound/effects/slime_squish.ogg'
arc_height_multiplier = 0.5
/obj/item/projectile/arc/spore/on_impact(turf/T) /obj/item/projectile/arc/spore/on_impact(turf/T)
for(var/mob/living/L in T) for(var/mob/living/L in T)