Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BSA changes once again! #11558

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Conversation

Dejaku51
Copy link
Contributor

@Dejaku51 Dejaku51 commented Sep 23, 2024

About The Pull Request

  • Fixes shooting not hearable
  • Camera shake on fire
  • Can't rapid fire BSA
  • Improves charging logic
  • Better BSA UI
  • makes kW MW GW from bluespace tap defined globally

Why It's Good For The Game

It was intended for entire station to hear when BSA is being shoot ITS A BIG FUCKING CANNON
rapid firing this because of TEG? hell nah too OP
BSA shouldn't take charge 2 MW when 1 MW is available
New cooler UI without stinky tgui lists

Testing Photographs and Procedure

Screenshots&Videos

image

WIP

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: camera shake on fire
tweak: BSA tgui panel has been upgraded!
balance: removed ability to rapid fire BSA
balance: BSA now requires 20MW to shoot
fix: can hear BSA sounds once again!
fix: fixes charging making it charge the correct way
code: kW MW GW defines now added
/:cl:

@github-actions github-actions bot added the TGUI-Changes Contains changes to TGUI. Make sure its up to date with TGUI 4.0 label Sep 23, 2024
@MarkusLarsson421
Copy link
Contributor

Rapid BSA!!! ;-;

Copy link
Member

@EvilDragonfiend EvilDragonfiend left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some reference issue in the code, but looks alright except for it.

Comment on lines +1 to +3
#define kW *1000
#define MW kW *1000
#define GW MW *1000
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we should change these not be shortened. I mean, not kW. to KILOWATT?? Not sure.
This is not blocking review. Feel free to discuss about this. (and prolly not the point of this PR)

Comment on lines +271 to +276
playsound(get_turf(src), fire_sound, 100, 1, world.maxx, pressure_affected = FALSE, ignore_walls = TRUE)
for(var/mob/M in GLOB.mob_living_list)
if(M.get_virtual_z_level() != get_virtual_z_level())
continue
shake_camera(M, 15, 1)

Copy link
Member

@EvilDragonfiend EvilDragonfiend Sep 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this can only target station things.
There is compare_z proc in pinpointer code. Get a Z group level of its target first, then compare that with people's current z location.

My bad. My eyes blurry.(my eyes saw you were using is_station() lol but it wasn't)
well, still check compare_z() proc. This is made to support multi-z

@@ -341,8 +352,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/power/bsa/full)

var/datum/weakref/cannon_ref
var/notice
var/target
var/area_aim = FALSE //should also show areas for targeting
var/datum/target
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is better to use weak ref. hard del issue.

target = targets[victim]
var/datum/component/gps/log_target = target
log_game("[key_name(user)] has aimed the bluespace artillery strike (BSA) at [get_area_name(log_target.parent)].")
targets[REF(G)] = G.gpstag
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
targets[REF(G)] = G.gpstag
targets[FAST_REF(G)] = G.gpstag

We do not use REF. We use FAST_REF instead.

@Rukofamicom Rukofamicom added the Balance Approved The balance of this PR has been approved label Sep 28, 2024
@Rukofamicom
Copy link
Contributor

When Dragon's requests are resolved, this is good to go from a balance perspective.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Approved The balance of this PR has been approved Balance/Rebalance Code Improvement Feature Fix TGUI-Changes Contains changes to TGUI. Make sure its up to date with TGUI 4.0 Tweak
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants