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: Super Weapon General Particle Cannon Uses Some Blue Effects #288

Merged
merged 3 commits into from
Sep 11, 2021

Conversation

commy2
Copy link
Collaborator

@commy2 commy2 commented Sep 11, 2021

ZH 1.04

  • The Super Weapon General's Particle Cannon has some blue colored effects mixed in with the pink effects when ready to fire and when getting destroyed, when they all should be pink instead. This looks disgustingly unfinished and rushed.

After patch:

  • Same effects are used, but they all are the correct color - the pink of the actual laser beam.

@commy2 commy2 added the Bug Something is not working right label Sep 11, 2021
Copy link
Collaborator

@xezon xezon left a comment

Choose a reason for hiding this comment

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

Are the W3D and dds files new or modified assets? If they modify original ones, please add the corresponding original files to GameFilesOriginal.

@@ -55134,6 +55252,65 @@ ParticleSystem ParticleDeathFlare
WindPingPongEndAngleMax = 0.000000
End

; Patch104p @bugfix commy2 11/09/2021 Recolored effect used when SWG's Particle Cannon is blowing up.

ParticleSystem SupW_ParticleDeathFlare
Copy link
Collaborator

Choose a reason for hiding this comment

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

Where is this used? It's not used in this change.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Copy link
Collaborator

Choose a reason for hiding this comment

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

Oh my mistake. Must have clicked the file away when reviewing.

@@ -11846,6 +11846,64 @@ ParticleSystem ParticleDeathImplode
WindPingPongEndAngleMax = 6.283185
End

; Patch104p @bugfix commy2 11/09/2021 Recolored effect used when SWG's Particle Cannon is blowing up.

ParticleSystem SupW_ParticleDeathImplode
Copy link
Collaborator

Choose a reason for hiding this comment

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

Where is this used? It's not referenced in this change.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Behavior = SlowDeathBehavior ModuleTag_18
; don't run this death if we are under construction...
ExemptStatus = UNDER_CONSTRUCTION
DestructionDelay = 2000
FX = INITIAL FX_ParticleUplinkDeathInitial
OCL = INITIAL OCL_SDILinkLasers
FX = INITIAL SupW_FX_ParticleUplinkDeathInitial
Copy link
Collaborator

Choose a reason for hiding this comment

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

This effect exists already? It's not added in this change.

Copy link
Collaborator Author

@commy2 commy2 Sep 11, 2021

Choose a reason for hiding this comment

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

@commy2
Copy link
Collaborator Author

commy2 commented Sep 11, 2021

Are the W3D and dds files new or modified assets?

Copy pasted from the original vanilla USA Particle Cannon, renamed and color edited.

@xezon
Copy link
Collaborator

xezon commented Sep 11, 2021

Copy pasted from the original vanilla USA Particle Cannon, renamed and color edited.

Ok in that case we can add the original ones too for reference.

@xezon xezon self-requested a review September 11, 2021 09:53
@commy2
Copy link
Collaborator Author

commy2 commented Sep 11, 2021

Added the original files. Note that they are from the Generals folder, not ZH. The game loads assets from both, which is why you need to install CCG to install and play ZH.

@xezon
Copy link
Collaborator

xezon commented Sep 11, 2021

That's fine.

@xezon
Copy link
Collaborator

xezon commented Sep 11, 2021

You added exlaser2.dds as original and exlaser3.dds as edited. Is this intentional?

@commy2
Copy link
Collaborator Author

commy2 commented Sep 11, 2021

The original is exlaser2.dds. That effect has to remain as it used for the non-Alex Particle Cannons. exlaser3.dds is an edited version that is pink instead of blue.

I cannot change the name too much, as it appears inside the model file. The model file uses animations, so it's very hard to import and export out of RenX correctly. Instead, I opted to hex editing the filenames of the textures in the W3D file.

@xezon
Copy link
Collaborator

xezon commented Sep 11, 2021

Sounds reasonable. Very resourceful.

@commy2 commy2 merged commit 57e8533 into main Sep 11, 2021
@commy2 commy2 deleted the fix-alex-particle-cannon branch September 11, 2021 12:41
@xezon xezon added Minor Severity: Minor < Major < Critical < Blocker Art Is art related USA Affects USA faction labels Mar 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Art Is art related Bug Something is not working right Minor Severity: Minor < Major < Critical < Blocker USA Affects USA faction
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants