Shrike primo rework - Psychic Vortex #13123
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tgstation-server
added
Balance
|
Do you have a vid of it in action? Just wanna see it |
|
TiviPlus
requested changes
Jun 3, 2023
| if(livingtarget.stat == DEAD) | ||
| addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, update_icons)), 1 SECONDS) | ||
| var/mob/living/carbon/xenomorph/xeno = owner | ||
| owner.icon_state = "[xeno.xeno_caste.caste_name][xeno.is_a_rouny ? " rouny" : ""] Screeching" |
There was a problem hiding this comment.
you should be doing this on the mob instead iirc, taake a look at how queen charge and so works
| playsound(owner, 'sound/effects/seedling_chargeup.ogg', 60) | ||
| ADD_TRAIT(owner, TRAIT_IMMOBILE, VORTEX_ABILITY_TRAIT) | ||
| if(!do_after(owner, VORTEX_PULL_WINDUP_TIME, FALSE, owner, BUSY_ICON_DANGER)) | ||
| for(var/atom/movable/victim in view(VORTEX_RANGE, owner.loc)) |
Comment on lines
392
to
393
| for(var/turf/affected_tile in range(VORTEX_RANGE, owner.loc)) | ||
| affected_tile.Shake(3, 3, 1 SECONDS) |
Comment on lines
394
to
395
| for(var/i in affected_tile) | ||
| var/atom/movable/affected = i |
Comment on lines
396
to
400
| if(!ishuman(affected) && !istype(affected, /obj/item) && !isdroid(affected)) | ||
| affected.Shake(3, 3, 10) | ||
| continue | ||
| victim.throw_at(src, 5, 1, null, TRUE) | ||
| qdel(src) | ||
| if(ishuman(affected)) | ||
| var/mob/living/carbon/human/H = affected |
There was a problem hiding this comment.
Why not check
if(human)
stuf()
continue
if(isitem), isdroid)
continue
stuf()
Comment on lines
413
to
423
| if(do_after(owner, VORTEX_PUSH_WINDUP_TIME, FALSE, owner, BUSY_ICON_DANGER)) | ||
| for(var/atom/movable/victim in range(VORTEX_RANGE, owner.loc)) | ||
| if(victim == owner) | ||
| continue | ||
| if(victim.anchored) | ||
| continue | ||
| if(isliving(victim)) | ||
| var/mob/living_target = victim | ||
| if(living_target.stat == DEAD) | ||
| continue | ||
| victim.throw_at(targetturf, 3, 1, owner, FALSE) |
There was a problem hiding this comment.
Are you copy pasting the same code here 3 times?
Why not just use a while loop?
TiviPlus
requested changes
Jun 4, 2023
Comment on lines
419
to
420
|
|
||
| /datum/action/xeno_action/activable/psychic_vortex/proc/vortex_push() |
Comment on lines
433
to
434
|
|
||
| /datum/action/xeno_action/activable/psychic_vortex/proc/finish_charging() |
Comment on lines
387
to
388
|
|
||
| /datum/action/xeno_action/activable/psychic_vortex/proc/vortex_pull() |
| if(livingtarget.stat == DEAD) | ||
| addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, update_icons)), 1 SECONDS) | ||
| var/mob/living/carbon/xenomorph/xeno = owner | ||
| owner.icon_state = "[xeno.xeno_caste.caste_name][xeno.is_a_rouny ? " rouny" : ""] Screeching" |
TiviPlus
added
the
Test Merge Candidate
comfyorange
added a commit
that referenced
this pull request
Jun 5, 2023
tgstation-server
removed
the
Test Merge Candidate
Lumipharon
requested changes
Jun 5, 2023
Comment on lines
388
to
414
| /datum/action/xeno_action/activable/psychic_vortex/proc/vortex_pull() | ||
| playsound(owner, 'sound/effects/seedling_chargeup.ogg', 60) | ||
| for(var/atom/movable/victim in range(VORTEX_RANGE, owner.loc)) | ||
| if(victim.anchored) | ||
| continue | ||
| if(isliving(victim)) | ||
| var/mob/living_target = victim | ||
| if(living_target.stat == DEAD) | ||
| continue | ||
| victim.throw_at(owner, 3, 1, owner, FALSE) | ||
|
|
||
| /obj/item/explosive/grenade/gravity | ||
| name = "gravity grenade" | ||
| desc = "A fleshy mass that seems way too heavy for its size. It seems to be vibrating." | ||
| arm_sound = 'sound/voice/predalien_roar.ogg' | ||
| greyscale_colors = "#3aaacc" | ||
| greyscale_config = /datum/greyscale_config/xenogrenade | ||
| det_time = 20 | ||
| for(var/turf/affected_tile AS in RANGE_TURFS(VORTEX_RANGE, owner.loc)) | ||
| affected_tile.Shake(3, 3, 1 SECONDS) | ||
| for(var/atom/movable/affected AS in affected_tile) | ||
| if(ishuman(affected)) | ||
| var/mob/living/carbon/human/H = affected | ||
| if(H.stat == DEAD) | ||
| continue | ||
| H.apply_effects(1,1) | ||
| H.adjust_stagger(2) | ||
| shake_camera(H, 2, 1) | ||
| H.Shake(3, 3, 10) | ||
| affected.Shake(3, 3, 10) | ||
| continue | ||
| if(isitem(affected) && isdroid(affected)) | ||
| affected.Shake(3, 3, 10) | ||
| continue |
There was a problem hiding this comment.
This is super wack with the 3 for loops.
Do a single loop and check for everything there.
comfyorange
added a commit
that referenced
this pull request
Jul 14, 2023
comfyorange
added a commit
that referenced
this pull request
Jul 14, 2023
comfyorange
added a commit
that referenced
this pull request
Jul 14, 2023
comfyorange
added a commit
that referenced
this pull request
Jul 15, 2023
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 3 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
github-actions
bot
added
the
Stale
Lumipharon
removed
the
Stale
github-actions
bot
added
the
Merge Conflict
tgstation-server
removed
the
Test Merge Candidate
tgstation-server
removed
the
Merge Conflict
Lumipharon
requested changes
Jul 27, 2023
| vortex_pull() | ||
| QDEL_NULL(particle_holder) | ||
| REMOVE_TRAIT(owner, TRAIT_IMMOBILE, VORTEX_ABILITY_TRAIT) | ||
| return fail_activate() |
There was a problem hiding this comment.
Why is this triggering fail, after successfully casting
Lumipharon
added
Test Merge Candidate
comfyorange
added a commit
that referenced
this pull request
Jul 27, 2023
tgstation-server
removed
the
Test Merge Candidate
comfyorange
added a commit
that referenced
this pull request
Jul 28, 2023
comfyorange
added a commit
that referenced
this pull request
Jul 29, 2023
TiviPlus
added
the
Test Merge Candidate
comfyorange
added a commit
that referenced
this pull request
Jul 30, 2023
comfyorange
added a commit
that referenced
this pull request
Jul 30, 2023
comfyorange
added a commit
that referenced
this pull request
Jul 30, 2023
Lumipharon
approved these changes
Jul 30, 2023
ghost
mentioned this pull request
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
Reworks primo ability entirely into an AOE pull and throw that is separated into three phases.
Why It's Good For The Game
Shrike primo was always underpowered, and for being a t4 it feels wrong! it is one of the most useless out there, this should hopefully make it a more competitive choice and give more thought into buying the t4 primo sooner rather then usually at the end of rounds and such.
Changelog
🆑
add: Replaces gravity greande with Psychic Vortex, a 3 stage channel ability to pull in objects and people.
balance: Rework Shrike primo into Psychic Vortex
sprites: Adds ability icon for Vortex
/:cl: