Skip to content

Maverick - Improve consistency of displaynames#11310

Merged
PabstMirror merged 1 commit intoacemod:masterfrom
SpicyBagpipes:master
Mar 11, 2026
Merged

Maverick - Improve consistency of displaynames#11310
PabstMirror merged 1 commit intoacemod:masterfrom
SpicyBagpipes:master

Conversation

@SpicyBagpipes
Copy link
Contributor

When merged this pull request will:

  • title, 1x is standard

IMPORTANT

  • If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

@PabstMirror PabstMirror added this to the 3.21.0 milestone Mar 9, 2026
@PabstMirror PabstMirror added the kind/cleanup Release Notes: **CHANGED:** label Mar 9, 2026
@PabstMirror PabstMirror merged commit 2dd8ed4 into acemod:master Mar 11, 2026
3 checks passed
tbeswick96 added a commit to tbeswick96/ACE3 that referenced this pull request Mar 17, 2026
Serialize wound entries, medications, triage card, IV bags, occluded
medications, and log entries as named hashmaps instead of positional
arrays. Deserializer supports both formats via isEqualType guards.

- Wounds: [classComplex, amountOf, bleedingRate, woundDamage] → hashmap
- Medications: [med, timeOffset, ttme, mtis, hr, pain, flow, dose] → hashmap
- TriageCard: [item, count, timestamp] → hashmap
- IvBags: [volume, type, partIndex, treatment, rateCoef, item] → hashmap
- OccludedMedications: [partIndex, className] → hashmap
- Logs: [logType, entries] → hashmap with entry hashmaps

Also includes upstream merge (upstream/master → uksfcustom) which brings:
- Fix serializeState modifying unit medications array (acemod#11309)
- Add API to directly add wounds to units (acemod#11211)
- Markers: allow placing quick number markers (acemod#11019)
- Maverick displayname consistency (acemod#11310)
- arma-rs 1.12.1, extension bump

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/cleanup Release Notes: **CHANGED:**

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants