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

Fix Up Unused Laser Cannon Superweapon #967

Merged
merged 2 commits into from
Aug 25, 2022
Merged

Fix Up Unused Laser Cannon Superweapon #967

merged 2 commits into from
Aug 25, 2022

Conversation

commy2
Copy link
Collaborator

@commy2 commy2 commented Aug 23, 2022

I admit, this is stupid.

  • fixes the GUI:Lazr_LaserCannon text that appears in place of the Laser Cannon super weapon timer
  • fixes various other text references to the "Particle Cannon" as well as the timer of "4 minutes" being wrong (it's 2)
  • replaces all blue effects by red effects to distinguish it from the vanilla Particle Cannon
  • makes the Laser Cannon reveal itself like other super weapons.

@commy2 commy2 added the Minor Severity: Minor < Major < Critical < Blocker label Aug 23, 2022
@xezon
Copy link
Collaborator

xezon commented Aug 24, 2022

What is this Laser Cannon? I assume an optional entity not part of main factions?

@xezon xezon added the Enhancement Is new feature or request label Aug 24, 2022
@commy2
Copy link
Collaborator Author

commy2 commented Aug 24, 2022

Carbon copy of the Particle Cannon for Lasergen with some altered stats ($2000 instead of $5000, requires Airfield instead of Strat Center, longer time the beam is alive/different stats on how much and frequently it does damage, 2 min recharge time), but the same visuals.

@xezon xezon changed the title Laser Cannon Fix up unused Laser Particle Superweapon Aug 24, 2022
@commy2 commy2 changed the title Fix up unused Laser Particle Superweapon Fix Up Unused Laser Cannon Superweapon Aug 25, 2022
@commy2 commy2 merged commit 67d4c99 into main Aug 25, 2022
@commy2 commy2 deleted the fix-laser-cannon branch August 25, 2022 01:06
@xezon
Copy link
Collaborator

xezon commented Aug 26, 2022

@commy2
When you "Merge with Rebase" instead of "Merge and Squash", then you must give proper description to each commit. The way this was submitted now is as "comments" and "Laser Cannon"

@commy2
Copy link
Collaborator Author

commy2 commented Aug 26, 2022

Oof, sorry.

@xezon
Copy link
Collaborator

xezon commented Aug 26, 2022

No problem. I can try fix it later, merge them and rename and push main. Just don't merge anything else meanwhile.

@commy2
Copy link
Collaborator Author

commy2 commented Aug 26, 2022

Rebase master \o/

@xezon
Copy link
Collaborator

xezon commented Aug 26, 2022

YOLO

This was referenced Aug 26, 2022
@MTKing4
Copy link
Collaborator

MTKing4 commented Sep 5, 2022

Works.
this Looks Awesome 😄

image

tooltip is more broken now than ever, GUI name Unchanged

image

@commy2
Copy link
Collaborator Author

commy2 commented Sep 6, 2022

Hmm, strange that none of the text fixes apply to you. Do you use custom hotkeys? If so, you don't get any of the text changes of the patch, because your generals.csf/.str does contain only the old texts.

@MTKing4
Copy link
Collaborator

MTKing4 commented Sep 6, 2022

Ah, that's probably it then

@xezon xezon added the Text Is text, string, localization related label Mar 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement Is new feature or request Minor Severity: Minor < Major < Critical < Blocker Text Is text, string, localization related
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants