-
Notifications
You must be signed in to change notification settings - Fork 256
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
List based ammo user #3317
base: Development
Are you sure you want to change the base?
List based ammo user #3317
Conversation
hide ammosets with completely identical ammo. Hovering mouse over a caliber shows contained ammo's label
You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-10162201173.zip |
You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-10590013587.zip |
You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-10590785338.zip |
} | ||
} | ||
|
||
AmmoSetDef currentlyHoveredOverAmmoSet = null; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Be explicit about things being private, rather than using default visibility.
Also, is there a reason to stick these fields down here, instead of at the top with the rest of the fields?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
changes done.
You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-11015805315.zip |
You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-11095509129.zip |
You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-11095633423.zip |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In testing, the autoloaders seem to be inheriting viable ammo from other sources. Do we know what's causing this?
In the above case, the autoloader had:
<li Class="CombatExtended.CompProperties_AmmoListUser">
<compClass>CombatExtended.CompAmmoListUserGeneric</compClass>
<magazineSize>400</magazineSize>
<reloadTime>7.8</reloadTime>
<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
<additionalAmmoSets>
<li>AmmoSet_44Magnum</li>
<li>AmmoSet_556x45mmNATO</li>
<li>AmmoSet_145x114mm</li>
</additionalAmmoSets>
</li>
```
a3d5d36
to
117f621
Compare
You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-12224764526.zip |
You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-12224770873.zip |
Additions
CompAmmoListUser and CompAmmoListUserGeneric, which accepts a list of ammosets
CompProperties_AmmoListUser with additionalAmmoSets storing a list of ammosets
Changes
Moved most code in CompAmmoUserGeneric to an abstract class CompVariableAmmoUser
Reasoning
-Allow more freedom in variable ammosets
Alternatives
-Autoloader(magnum pistol)
Testing
Check tests you have performed: