diff --git a/mpq/arr/portdata.datex b/mpq/arr/portdata.datex index d160b039..84136898 100644 Binary files a/mpq/arr/portdata.datex and b/mpq/arr/portdata.datex differ diff --git a/mpq/arr/portdata.txt b/mpq/arr/portdata.txt index fc1cc019..65870897 100644 --- 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 \ No newline at end of file +Extended Portrait #890 +Extended Portrait #891 +Extended Portrait #892 +Extended Portrait #893 \ No newline at end of file diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 30c5f6d1..829d7187 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt index 822cd20b..c8d98cec 100644 --- 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 \ No newline at end of file +Extended Unit #2772 +Extended Unit #2773 +Extended Unit #2774 +Extended Unit #2775 \ No newline at end of file diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index bbb12fba..7a29b11d 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/arr/weapons.txt b/mpq/arr/weapons.txt index 8a38f4fc..3ad31653 100644 --- 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 \ No newline at end of file +Extended Weapon #870 +Extended Weapon #871 \ No newline at end of file diff --git a/mpq/glue/arrow.grp b/mpq/glue/arrow.grp new file mode 100644 index 00000000..db130067 Binary files /dev/null and b/mpq/glue/arrow.grp differ diff --git a/mpq/glue/backgrounds/crownlink.pcx b/mpq/glue/backgrounds/crownlink.pcx new file mode 100644 index 00000000..8faf4466 Binary files /dev/null and b/mpq/glue/backgrounds/crownlink.pcx differ diff --git a/mpq/glue/backgrounds/options.pcx b/mpq/glue/backgrounds/options.pcx new file mode 100644 index 00000000..8b390c44 Binary files /dev/null and b/mpq/glue/backgrounds/options.pcx differ diff --git a/mpq/glue/cl_status.pcx b/mpq/glue/cl_status.pcx new file mode 100644 index 00000000..0edf2a87 Binary files /dev/null and b/mpq/glue/cl_status.pcx differ diff --git a/mpq/glue/dlg.grp b/mpq/glue/dlg.grp new file mode 100644 index 00000000..a7cf88a3 Binary files /dev/null and b/mpq/glue/dlg.grp differ diff --git a/mpq/glue/dynamic/left_lower_button.pcx b/mpq/glue/dynamic/left_lower_button.pcx new file mode 100644 index 00000000..3bc8b380 Binary files /dev/null and b/mpq/glue/dynamic/left_lower_button.pcx differ diff --git a/mpq/glue/dynamic/left_upper_button.pcx b/mpq/glue/dynamic/left_upper_button.pcx new file mode 100644 index 00000000..bd05fb8e Binary files /dev/null and b/mpq/glue/dynamic/left_upper_button.pcx differ diff --git a/mpq/glue/dynamic/mission_select.pcx b/mpq/glue/dynamic/mission_select.pcx new file mode 100644 index 00000000..8aeceba6 Binary files /dev/null and b/mpq/glue/dynamic/mission_select.pcx differ diff --git a/mpq/glue/dynamic/mission_select_listbox.pcx b/mpq/glue/dynamic/mission_select_listbox.pcx new file mode 100644 index 00000000..1c1bb4f8 Binary files /dev/null and b/mpq/glue/dynamic/mission_select_listbox.pcx differ diff --git a/mpq/glue/dynamic/mission_select_listbox.xcf b/mpq/glue/dynamic/mission_select_listbox.xcf new file mode 100644 index 00000000..eda178dc Binary files /dev/null and b/mpq/glue/dynamic/mission_select_listbox.xcf differ diff --git a/mpq/glue/dynamic/pDPopup.pcx b/mpq/glue/dynamic/pDPopup.pcx new file mode 100644 index 00000000..c7e7a62b Binary files /dev/null and b/mpq/glue/dynamic/pDPopup.pcx differ diff --git a/mpq/glue/dynamic/pEPopup.pcx b/mpq/glue/dynamic/pEPopup.pcx new file mode 100644 index 00000000..f98a4eb5 Binary files /dev/null and b/mpq/glue/dynamic/pEPopup.pcx differ diff --git a/mpq/glue/dynamic/pjoin.pcx b/mpq/glue/dynamic/pjoin.pcx index d967a543..6ffbefb0 100644 Binary files a/mpq/glue/dynamic/pjoin.pcx and b/mpq/glue/dynamic/pjoin.pcx differ diff --git a/mpq/glue/dynamic/pjoin_reverse.pcx b/mpq/glue/dynamic/pjoin_reverse.pcx new file mode 100644 index 00000000..216b94a3 Binary files /dev/null and b/mpq/glue/dynamic/pjoin_reverse.pcx differ diff --git a/mpq/glue/dynamic/plist_left.pcx b/mpq/glue/dynamic/plist_left.pcx new file mode 100644 index 00000000..62ab1193 Binary files /dev/null and b/mpq/glue/dynamic/plist_left.pcx differ diff --git a/mpq/glue/dynamic/plistlrg_reverse.pcx b/mpq/glue/dynamic/plistlrg_reverse.pcx new file mode 100644 index 00000000..971dacd1 Binary files /dev/null and b/mpq/glue/dynamic/plistlrg_reverse.pcx differ diff --git a/mpq/glue/left_lower_button.pcx b/mpq/glue/left_lower_button.pcx new file mode 100644 index 00000000..3bc8b380 Binary files /dev/null and b/mpq/glue/left_lower_button.pcx differ diff --git a/mpq/glue/left_upper_button.pcx b/mpq/glue/left_upper_button.pcx new file mode 100644 index 00000000..bd05fb8e Binary files /dev/null and b/mpq/glue/left_upper_button.pcx differ diff --git a/mpq/glue/mission_select.pcx b/mpq/glue/mission_select.pcx new file mode 100644 index 00000000..8aeceba6 Binary files /dev/null and b/mpq/glue/mission_select.pcx differ diff --git a/mpq/glue/mission_select_listbox.pcx b/mpq/glue/mission_select_listbox.pcx new file mode 100644 index 00000000..1c1bb4f8 Binary files /dev/null and b/mpq/glue/mission_select_listbox.pcx differ diff --git a/mpq/glue/mission_select_listbox.xcf b/mpq/glue/mission_select_listbox.xcf new file mode 100644 index 00000000..eda178dc Binary files /dev/null and b/mpq/glue/mission_select_listbox.xcf differ diff --git a/mpq/glue/pDPopup.pcx b/mpq/glue/pDPopup.pcx new file mode 100644 index 00000000..c7e7a62b Binary files /dev/null and b/mpq/glue/pDPopup.pcx differ diff --git a/mpq/glue/pEPopup.pcx b/mpq/glue/pEPopup.pcx new file mode 100644 index 00000000..f98a4eb5 Binary files /dev/null and b/mpq/glue/pEPopup.pcx differ diff --git a/mpq/glue/pbotr.pcx b/mpq/glue/pbotr.pcx new file mode 100644 index 00000000..f8f76c6a Binary files /dev/null and b/mpq/glue/pbotr.pcx differ diff --git a/mpq/glue/pcancel.pcx b/mpq/glue/pcancel.pcx new file mode 100644 index 00000000..afc17b96 Binary files /dev/null and b/mpq/glue/pcancel.pcx differ diff --git a/mpq/glue/pjoin.pcx b/mpq/glue/pjoin.pcx new file mode 100644 index 00000000..6ffbefb0 Binary files /dev/null and b/mpq/glue/pjoin.pcx differ diff --git a/mpq/glue/pjoin_reverse.pcx b/mpq/glue/pjoin_reverse.pcx new file mode 100644 index 00000000..216b94a3 Binary files /dev/null and b/mpq/glue/pjoin_reverse.pcx differ diff --git a/mpq/glue/plist.pcx b/mpq/glue/plist.pcx new file mode 100644 index 00000000..c1f05406 Binary files /dev/null and b/mpq/glue/plist.pcx differ diff --git a/mpq/glue/plist_left.pcx b/mpq/glue/plist_left.pcx new file mode 100644 index 00000000..62ab1193 Binary files /dev/null and b/mpq/glue/plist_left.pcx differ diff --git a/mpq/glue/plistlrg.pcx b/mpq/glue/plistlrg.pcx new file mode 100644 index 00000000..199985d9 Binary files /dev/null and b/mpq/glue/plistlrg.pcx differ diff --git a/mpq/glue/plistlrg_crownlink.pcx b/mpq/glue/plistlrg_crownlink.pcx new file mode 100644 index 00000000..8e21af86 Binary files /dev/null and b/mpq/glue/plistlrg_crownlink.pcx differ diff --git a/mpq/glue/plistlrg_reverse.pcx b/mpq/glue/plistlrg_reverse.pcx new file mode 100644 index 00000000..971dacd1 Binary files /dev/null and b/mpq/glue/plistlrg_reverse.pcx differ diff --git a/mpq/glue/plistlrg_wide.pcx b/mpq/glue/plistlrg_wide.pcx new file mode 100644 index 00000000..1706a4cb Binary files /dev/null and b/mpq/glue/plistlrg_wide.pcx differ diff --git a/mpq/glue/pok.pcx b/mpq/glue/pok.pcx new file mode 100644 index 00000000..49b34fa4 Binary files /dev/null and b/mpq/glue/pok.pcx differ diff --git a/mpq/glue/tab_highlight.pcx b/mpq/glue/tab_highlight.pcx new file mode 100644 index 00000000..baec7bb0 Binary files /dev/null and b/mpq/glue/tab_highlight.pcx differ diff --git a/mpq/glue/tfont.pcx b/mpq/glue/tfont.pcx new file mode 100644 index 00000000..1d2db650 Binary files /dev/null and b/mpq/glue/tfont.pcx differ diff --git a/mpq/glue/tile.grp b/mpq/glue/tile.grp new file mode 100644 index 00000000..be54ebaa Binary files /dev/null and b/mpq/glue/tile.grp differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index b4ba7d61..0af3a8db 100644 --- 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> diff --git a/patchnotes.md b/patchnotes.md index 3414f9c0..58e452cb 100644 --- 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:** diff --git a/plugins/aise.qdp b/plugins/aise.qdp index 4f23a56a..f462d9f3 100644 Binary files a/plugins/aise.qdp and b/plugins/aise.qdp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 71791b26..66729f75 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ