Achieve campaign UI; Refactor trigger system

2026-09-17 01:01:12 +00:00 · 2026-08-26 13:08:28 -04:00 · 2026-08-26 13:08:28 -04:00 · 9fb326c8bd
commit 9fb326c8bd
parent 2ab92ccd51
47 changed files with 17 additions and 4 deletions
--- a/mpq/arr/portdata.datex
+++ b/mpq/arr/portdata.datex
--- a/mpq/arr/portdata.txt
+++ b/mpq/arr/portdata.txt
@ -997,4 +997,7 @@ Extended Portrait #886
 Extended Portrait #887
 Extended Portrait #888
 Extended Portrait #889
-Extended Portrait #890
+Extended Portrait #890
+Extended Portrait #891
+Extended Portrait #892
+Extended Portrait #893
--- a/mpq/arr/units.datex
+++ b/mpq/arr/units.datex
--- a/mpq/arr/units.txt
+++ b/mpq/arr/units.txt
@ -2997,4 +2997,7 @@ Extended Unit #2768
 Extended Unit #2769
 Extended Unit #2770
 Extended Unit #2771
-Extended Unit #2772
+Extended Unit #2772
+Extended Unit #2773
+Extended Unit #2774
+Extended Unit #2775
--- a/mpq/arr/weapons.datex
+++ b/mpq/arr/weapons.datex
--- a/mpq/arr/weapons.txt
+++ b/mpq/arr/weapons.txt
@ -997,4 +997,5 @@ Extended Weapon #866
 Extended Weapon #867
 Extended Weapon #868
 Extended Weapon #869
-Extended Weapon #870
+Extended Weapon #870
+Extended Weapon #871
--- a/mpq/glue/arrow.grp
+++ b/mpq/glue/arrow.grp
--- a/mpq/glue/backgrounds/crownlink.pcx
+++ b/mpq/glue/backgrounds/crownlink.pcx
--- a/mpq/glue/backgrounds/options.pcx
+++ b/mpq/glue/backgrounds/options.pcx
--- a/mpq/glue/cl_status.pcx
+++ b/mpq/glue/cl_status.pcx
--- a/mpq/glue/dlg.grp
+++ b/mpq/glue/dlg.grp
--- a/mpq/glue/dynamic/left_lower_button.pcx
+++ b/mpq/glue/dynamic/left_lower_button.pcx
--- a/mpq/glue/dynamic/left_upper_button.pcx
+++ b/mpq/glue/dynamic/left_upper_button.pcx
--- a/mpq/glue/dynamic/mission_select.pcx
+++ b/mpq/glue/dynamic/mission_select.pcx
--- a/mpq/glue/dynamic/mission_select_listbox.pcx
+++ b/mpq/glue/dynamic/mission_select_listbox.pcx
--- a/mpq/glue/dynamic/mission_select_listbox.xcf
+++ b/mpq/glue/dynamic/mission_select_listbox.xcf
--- a/mpq/glue/dynamic/pDPopup.pcx
+++ b/mpq/glue/dynamic/pDPopup.pcx
--- a/mpq/glue/dynamic/pEPopup.pcx
+++ b/mpq/glue/dynamic/pEPopup.pcx
--- a/mpq/glue/dynamic/pjoin.pcx
+++ b/mpq/glue/dynamic/pjoin.pcx
--- a/mpq/glue/dynamic/pjoin_reverse.pcx
+++ b/mpq/glue/dynamic/pjoin_reverse.pcx
--- a/mpq/glue/dynamic/plist_left.pcx
+++ b/mpq/glue/dynamic/plist_left.pcx
--- a/mpq/glue/dynamic/plistlrg_reverse.pcx
+++ b/mpq/glue/dynamic/plistlrg_reverse.pcx
--- a/mpq/glue/left_lower_button.pcx
+++ b/mpq/glue/left_lower_button.pcx
--- a/mpq/glue/left_upper_button.pcx
+++ b/mpq/glue/left_upper_button.pcx
--- a/mpq/glue/mission_select.pcx
+++ b/mpq/glue/mission_select.pcx
--- a/mpq/glue/mission_select_listbox.pcx
+++ b/mpq/glue/mission_select_listbox.pcx
--- a/mpq/glue/mission_select_listbox.xcf
+++ b/mpq/glue/mission_select_listbox.xcf
--- a/mpq/glue/pDPopup.pcx
+++ b/mpq/glue/pDPopup.pcx
--- a/mpq/glue/pEPopup.pcx
+++ b/mpq/glue/pEPopup.pcx
--- a/mpq/glue/pbotr.pcx
+++ b/mpq/glue/pbotr.pcx
--- a/mpq/glue/pcancel.pcx
+++ b/mpq/glue/pcancel.pcx
--- a/mpq/glue/pjoin.pcx
+++ b/mpq/glue/pjoin.pcx
--- a/mpq/glue/pjoin_reverse.pcx
+++ b/mpq/glue/pjoin_reverse.pcx
--- a/mpq/glue/plist.pcx
+++ b/mpq/glue/plist.pcx
--- a/mpq/glue/plist_left.pcx
+++ b/mpq/glue/plist_left.pcx
--- a/mpq/glue/plistlrg.pcx
+++ b/mpq/glue/plistlrg.pcx
--- a/mpq/glue/plistlrg_crownlink.pcx
+++ b/mpq/glue/plistlrg_crownlink.pcx
--- a/mpq/glue/plistlrg_reverse.pcx
+++ b/mpq/glue/plistlrg_reverse.pcx
--- a/mpq/glue/plistlrg_wide.pcx
+++ b/mpq/glue/plistlrg_wide.pcx
--- a/mpq/glue/pok.pcx
+++ b/mpq/glue/pok.pcx
--- a/mpq/glue/tab_highlight.pcx
+++ b/mpq/glue/tab_highlight.pcx
--- a/mpq/glue/tfont.pcx
+++ b/mpq/glue/tfont.pcx
--- a/mpq/glue/tile.grp
+++ b/mpq/glue/tile.grp
--- a/mpq/rez/stat.txt
+++ b/mpq/rez/stat.txt
@ -2142,7 +2142,7 @@ Newtonian Shock Cannon<0>
 Energized Bioplasma<0>
 Gosvil Spines<0>
 Neutron Saber<0>
-Venemous Contagion<0>
+Venomous Contagion<0>
 Brutish Tendrils<0>
 Cerberus Railgun<0>
 Vapid Blaster<0>
--- a/patchnotes.md
+++ b/patchnotes.md
@ -16,6 +16,12 @@
 - **Immense improvements have been made to helper and hook wrappers!**
 	- For the less technically-inclined, this means... more stability! Less desyncs! Easier debugging!
 	- *Please report any newfound issues you encounter to us via discord/fluxer or email!*
+- **The custom trigger system has been deep-cleaned!** (c. Veeq7)
+	- This refactor makes the system easier to use, maintain, and improve upon in the future! But a huge refactor like this might have introduced new issues...
+	- *Please report any newfound issues in campaign and UMS maps to us via discord/fluxer or email!*
+	- **Known issues:** the `wait` crig action does not currently operate
+- **A new campaign menu has been achieved!** (c. Jesse)
+	- It's so epic... please enjoy!

 ## Bugfixes
 - **Audiovisual:**
--- a/plugins/aise.qdp
+++ b/plugins/aise.qdp
--- a/plugins/gptp.qdp
+++ b/plugins/gptp.qdp