Skip to content

New Enums for Special Powers and Eva events#21

Merged
pWn3d1337 merged 217 commits into
mainfrom
new_enums
May 31, 2025
Merged

New Enums for Special Powers and Eva events#21
pWn3d1337 merged 217 commits into
mainfrom
new_enums

Conversation

@pWn3d1337

Copy link
Copy Markdown
Collaborator

Change code to support new Special Power enums and eva events in parser.

Adds Special Power enums:
"SPECIAL_ION_CANNON",
"SPECIAL_CLUSTER_MISSILE",
"SPECIAL_SUNSTORM_MISSILE",
"SPECIAL_METEOR_STRIKE",
"SPECIAL_PUNISHER_CANNON",
"SPECIAL_CHEMICAL_MISSILE",
"SPECIAL_CHRONOSPHERE",

Adds Eva events:

"SUPERWEAPONDETECTED_OWN_ION_CANNON",
"SUPERWEAPONDETECTED_ALLY_ION_CANNON",
"SUPERWEAPONDETECTED_ENEMY_ION_CANNON",
"SUPERWEAPONLAUNCHED_OWN_ION_CANNON",
"SUPERWEAPONLAUNCHED_ALLY_ION_CANNON",
"SUPERWEAPONLAUNCHED_ENEMY_ION_CANNON",
"SUPERWEAPONREADY_OWN_ION_CANNON",
"SUPERWEAPONREADY_ALLY_ION_CANNON",
"SUPERWEAPONREADY_ENEMY_ION_CANNON",

"SUPERWEAPONDETECTED_OWN_CLUSTER_MISSILE",
"SUPERWEAPONDETECTED_ALLY_CLUSTER_MISSILE",
"SUPERWEAPONDETECTED_ENEMY_CLUSTER_MISSILE",
"SUPERWEAPONLAUNCHED_OWN_CLUSTER_MISSILE",
"SUPERWEAPONLAUNCHED_ALLY_CLUSTER_MISSILE",
"SUPERWEAPONLAUNCHED_ENEMY_CLUSTER_MISSILE",
"SUPERWEAPONREADY_OWN_CLUSTER_MISSILE",
"SUPERWEAPONREADY_ALLY_CLUSTER_MISSILE",
"SUPERWEAPONREADY_ENEMY_CLUSTER_MISSILE",

"SUPERWEAPONDETECTED_OWN_SUNSTORM_MISSILE",
"SUPERWEAPONDETECTED_ALLY_SUNSTORM_MISSILE",
"SUPERWEAPONDETECTED_ENEMY_SUNSTORM_MISSILE",
"SUPERWEAPONLAUNCHED_OWN_SUNSTORM_MISSILE",
"SUPERWEAPONLAUNCHED_ALLY_SUNSTORM_MISSILE",
"SUPERWEAPONLAUNCHED_ENEMY_SUNSTORM_MISSILE",
"SUPERWEAPONREADY_OWN_SUNSTORM_MISSILE",
"SUPERWEAPONREADY_ALLY_SUNSTORM_MISSILE",
"SUPERWEAPONREADY_ENEMY_SUNSTORM_MISSILE",

"SUPERWEAPONDETECTED_OWN_METEOR_STRIKE",
"SUPERWEAPONDETECTED_ALLY_METEOR_STRIKE",
"SUPERWEAPONDETECTED_ENEMY_METEOR_STRIKE",
"SUPERWEAPONLAUNCHED_OWN_METEOR_STRIKE",
"SUPERWEAPONLAUNCHED_ALLY_METEOR_STRIKE",
"SUPERWEAPONLAUNCHED_ENEMY_METEOR_STRIKE",
"SUPERWEAPONREADY_OWN_METEOR_STRIKE",
"SUPERWEAPONREADY_ALLY_METEOR_STRIKE",
"SUPERWEAPONREADY_ENEMY_METEOR_STRIKE",

"SUPERWEAPONDETECTED_OWN_PUNISHER_CANNON",
"SUPERWEAPONDETECTED_ALLY_PUNISHER_CANNON",
"SUPERWEAPONDETECTED_ENEMY_PUNISHER_CANNON",
"SUPERWEAPONLAUNCHED_OWN_PUNISHER_CANNON",
"SUPERWEAPONLAUNCHED_ALLY_PUNISHER_CANNON",
"SUPERWEAPONLAUNCHED_ENEMY_PUNISHER_CANNON",
"SUPERWEAPONREADY_OWN_PUNISHER_CANNON",
"SUPERWEAPONREADY_ALLY_PUNISHER_CANNON",
"SUPERWEAPONREADY_ENEMY_PUNISHER_CANNON",

"SUPERWEAPONDETECTED_OWN_CHEMICAL_MISSILE",
"SUPERWEAPONDETECTED_ALLY_CHEMICAL_MISSILE",
"SUPERWEAPONDETECTED_ENEMY_CHEMICAL_MISSILE",
"SUPERWEAPONLAUNCHED_OWN_CHEMICAL_MISSILE",
"SUPERWEAPONLAUNCHED_ALLY_CHEMICAL_MISSILE",
"SUPERWEAPONLAUNCHED_ENEMY_CHEMICAL_MISSILE",
"SUPERWEAPONREADY_OWN_CHEMICAL_MISSILE",
"SUPERWEAPONREADY_ALLY_CHEMICAL_MISSILE",
"SUPERWEAPONREADY_ENEMY_CHEMICAL_MISSILE",

"SUPERWEAPONDETECTED_OWN_CHRONOSPHERE",
"SUPERWEAPONDETECTED_ALLY_CHRONOSPHERE",
"SUPERWEAPONDETECTED_ENEMY_CHRONOSPHERE",
"SUPERWEAPONLAUNCHED_OWN_CHRONOSPHERE",
"SUPERWEAPONLAUNCHED_ALLY_CHRONOSPHERE",
"SUPERWEAPONLAUNCHED_ENEMY_CHRONOSPHERE",
"SUPERWEAPONREADY_OWN_CHRONOSPHERE",
"SUPERWEAPONREADY_ALLY_CHRONOSPHERE",
"SUPERWEAPONREADY_ENEMY_CHRONOSPHERE",

tomsons26 and others added 30 commits April 15, 2025 19:28
- non-random order
- random angle
- shooter aligned angle
- range based scaling
Implement Scatter Target Improvements
…odding into PreAttackFX

# Conflicts:
#	GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
Restore Firebones for Helixcontain
Co-authored-by: Patrick Zacharias <1475802+Fighter19@users.noreply.github.com>
Andreas-W and others added 29 commits May 12, 2025 17:21
Ammo pips variants and Spectre Select bug
Add XPValue scalar for ExperienceScalarUpgrade
…odding into LimitsAndFixes

# Conflicts:
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
…eralsGameCode_Modding into TintStatus

# Conflicts:
#	GeneralsMD/Code/GameEngine/CMakeLists.txt
#	GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
Tint status & Object extend
basic preferredAttack angle support
@pWn3d1337 pWn3d1337 merged commit 511f1a9 into main May 31, 2025
7 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.