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.

Sign up for GitHub

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

Jump to bottom

Fix: Infantry death modules #2074

Merged
merged 3 commits into from
Jul 9, 2023
Merged

Fix: Infantry death modules #2074

merged 3 commits into from
Jul 9, 2023

Conversation

xezon
Copy link
Collaborator

@xezon xezon commented Jul 8, 2023

Merge with Rebase

This change fixes and streamlines death modules of

  • (USA) AmericaInfantrySecretService
  • (China) ChinaInfantrySecretPolice
  • (China) ChinaAmbassador
  • (China) ChinaInfantryOfficer
  • (China) ChinaInfantryAgent
  • (Civilian) MogadishuMaleCivilian01
  • (Civilian) MogadishuMaleCivilian02
  • (Civilian) MogadishuFemaleCivilian02
  • (Civilian) MogadishuFemaleCivilian01
  • (Civilian) GenericFemale01
  • (Civilian) AmericanFarmer01
  • (Civilian) AsianFarmer01
  • (Civilian) HomelessGuy
  • (Civilian) AsianFarmer02
  • (Civilian) AsianFarmer3
  • (Civilian) GenericMale02
  • (Civilian) GenericFemale02
  • (Civilian) Partisan01
  • (Civilian) Partisan02
  • (Civilian) Partisan03

All infantry (except GLA Terrorist and CINE infantry) now have the same setup and will show burned, toxic and other special deaths properly.

The added setup already respects the modified LASERED setup of #2071.

@xezon xezon added Bug Something is not working right Design Is a matter of game design Minor Severity: Minor < Major < Critical < Blocker USA Affects USA faction China Affects China faction Civilian Affects Civilian faction labels Jul 8, 2023
@xezon
Copy link
Collaborator Author

xezon commented Jul 8, 2023 •
edited
Loading

I tested toxic and flame death on 152 different infantry units and they looked good.

@xezon xezon mentioned this pull request Jul 8, 2023
Closed
@xezon
Copy link
Collaborator Author

xezon commented Jul 8, 2023

This change is best reviewed in Split view, not Unified.

@commy2
Copy link
Collaborator

commy2 commented Jul 8, 2023

I tested toxic and flame death on 152 different infantry units and they looked good.

oof

@xezon xezon force-pushed the fix-infantry-death-modules branch from 6988373 to 3691b9f Compare July 8, 2023 19:36
@commy2 commy2 mentioned this pull request Jul 9, 2023
Merged
xezon added a commit that referenced this pull request Jul 9, 2023
@xezon
Fix: Add missing death modules to Civilian infantry (#2074)
937a537
xezon added a commit that referenced this pull request Jul 9, 2023
@xezon
Fix: Add missing death modules to ChinaInfantrySecretPolice, ChinaAmb…
68f0d7f 
…assador, ChinaInfantryOfficer, ChinaInfantryAgent (#2074)
xezon added a commit that referenced this pull request Jul 9, 2023
@xezon
Fix: Add missing death modules to AmericaInfantrySecretService (#2074)
d70c9d7
xezon added a commit that referenced this pull request Jul 9, 2023
@xezon
fixup! Fix: Add missing death modules to Civilian infantry (#2074)
48da88a
xezon added a commit that referenced this pull request Jul 9, 2023
@xezon
fixup! Fix: Add missing death modules to ChinaInfantrySecretPolice, C…
eb2ce6f 
…hinaAmbassador, ChinaInfantryOfficer, ChinaInfantryAgent (#2074)
xezon added a commit that referenced this pull request Jul 9, 2023
@xezon
fixup! Fix: Add missing death modules to AmericaInfantrySecretService (…
b29bc0c 
…#2074)
@xezon xezon force-pushed the fix-infantry-death-modules branch from 3691b9f to b29bc0c Compare July 9, 2023 07:11
@xezon xezon force-pushed the fix-infantry-death-modules branch from b29bc0c to 8c9d05f Compare July 9, 2023 07:12
@xezon
Copy link
Collaborator Author

xezon commented Jul 9, 2023

Tested lasered death on 152 different infantry units. Looks good.

Documentation added.

@xezon xezon merged commit 035662c into main Jul 9, 2023
xezon added a commit that referenced this pull request Jul 9, 2023
@xezon
Fix: Add missing death modules to Civilian infantry (#2074)
bb51221
xezon added a commit that referenced this pull request Jul 9, 2023
@xezon
Fix: Add missing death modules to ChinaInfantrySecretPolice, ChinaAmb…
8b6c8fe 
…assador, ChinaInfantryOfficer, ChinaInfantryAgent (#2074)
@xezon xezon deleted the fix-infantry-death-modules branch July 9, 2023 07:16
@commy2 commy2 mentioned this pull request Aug 13, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@commy2 commy2 commy2 approved these changes

Assignees
No one assigned
Labels
Bug Something is not working right China Affects China faction Civilian Affects Civilian faction Design Is a matter of game design Minor Severity: Minor < Major < Critical < Blocker USA Affects USA faction
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@xezon @commy2