From 920e03e18a7ae9425afe747bb23b3af1becee034 Mon Sep 17 00:00:00 2001 From: frothy-wifi Date: Mon, 8 Apr 2024 23:35:45 -0500 Subject: [PATCH] Stabilize v1.4.1 --- CHANGELOG.md | 13 ++++- .../.vs/CHBuild/DesignTimeBuild/.dtbcache.v2 | Bin 83831 -> 83831 bytes ...4f01ca2-3afe-483b-b5db-c182400d3301.vsidx} | Bin 16838 -> 16838 bytes CHBuild/.vs/CHBuild/v17/.futdcache.v2 | Bin 250 -> 250 bytes CHBuild/.vs/CHBuild/v17/.suo | Bin 18432 -> 17408 bytes CHBuild/.vs/CHBuild/v17/DocumentLayout.json | 2 +- .../ProjectEvaluation/chbuild.metadata.v7.bin | Bin 170944 -> 171561 bytes .../ProjectEvaluation/chbuild.projects.v7.bin | Bin 502413 -> 602805 bytes CHBuild/Program.cs | 2 +- manifest.json | 2 +- mods/FrothyWiFi.CYNHUD/mod.json | 8 +-- .../mod/scripts/vscripts/cynhud.nut | 49 ++++++++++++++---- 12 files changed, 59 insertions(+), 17 deletions(-) rename CHBuild/.vs/CHBuild/FileContentIndex/{6ead7d08-5b0f-4ff3-b9fc-0a781e09ba95.vsidx => c4f01ca2-3afe-483b-b5db-c182400d3301.vsidx} (79%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14db46c..503a1b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ -#

Changelog

-# v1.2.1 +# v1.4.1 *[Patch]* +- Fix settings not saving +- Update `help` command +- Add manual update check command - `ckupdate` +- Refactor some code +## v1.4 +- Added automatic update checking! +## v1.3 +- Added control messages to confirm that your changes have been noticed by the mod +- Commandds +## v1.2.1 - Added a new logo ## v1.2 - Added message on HUD message reload diff --git a/CHBuild/.vs/CHBuild/DesignTimeBuild/.dtbcache.v2 b/CHBuild/.vs/CHBuild/DesignTimeBuild/.dtbcache.v2 index c4a9fd6067fdf294ec314e3b727ccf33349fac67..7b09692fe22e92f5e123687296867d2e3649fcbb 100644 GIT binary patch delta 111 zcmey~$NIgGbwW^-Nuo)TSxTCrxn*LCQEHNzWlCylszp+wp`n36qCskMl98!tqGggr za*|^fmw=?c}j9>qLE>8nweo5gQ#<2az<)!WnOYdQGQ-#RceuQeo86>qviBK PWk&nP*IQpR_P7B68x19F delta 111 zcmey~$NIgGbwW^7im|b2lCimgfuXrcvSG53L0Vc$vPn`}ijlFYX=<{eX;N~ck$GyG zajKC;N>YlEfw2V;S|%H%8XFrLrx-JcIwvM)qy|^!C1(`n=Vex<7CGmqq%ts?O%GIN Nv~PU9^)+LU8vv>iBe?(o diff --git a/CHBuild/.vs/CHBuild/FileContentIndex/6ead7d08-5b0f-4ff3-b9fc-0a781e09ba95.vsidx b/CHBuild/.vs/CHBuild/FileContentIndex/c4f01ca2-3afe-483b-b5db-c182400d3301.vsidx similarity index 79% rename from CHBuild/.vs/CHBuild/FileContentIndex/6ead7d08-5b0f-4ff3-b9fc-0a781e09ba95.vsidx rename to CHBuild/.vs/CHBuild/FileContentIndex/c4f01ca2-3afe-483b-b5db-c182400d3301.vsidx index 4d8b1595af46f46e04e4d5a9ddb259b796d4d470..9f8f53235f1b5d554bd9da6a8a4c8f225f9bd582 100644 GIT binary patch delta 3383 zcmZXWzmHW#6vxk*2kRneHeg7!x(_>J@e<88H1|D-SvJ{ZSsFX>FQB2Z@s4h#6@-MA z)eu?>lWqNhL4w@|LxP2FR~L&ZNIne*FHM> z_?It6Pp^Oc;nL3+cK%-d{QB_jjo1C{;aT}|^z^gG{?7^1--u_i;#S>yhS@QPSYhfhK&I6a&2qbnMni z2L|jOQPA++*5p7?ykbwnuqoJRfOaxv<%-#g1x05=SX8s$i!Bwqi;kjvNH0L3go0F) z;uql`dScY(uY1%bib6LlWP5v*7+=>+fxPxB( zfl7*!35U397w(COQ_Uh0=m_k$K@o%k52X{OmpCXP&mB-SA1R>DZCC3X^d0^R7su^Z ztSegFQbv)&R#XsQ8JrLWuT&}%v+RSt(h3ySg=t;N0!s8i5d&v0N|xCLhyKR_byc`nvv*nZ58A;yF9opP z)`Z>$ao_B!*=mV^@V(=FfkY-ytY=S6i| z%RSoF?M=5OWr^xw9UaOpD5?Tj$+WFdI&747v~o0N$YtGazZHUffb&D*OJbZm)X@Ks zB^Ld{DqV^i2*84DCIfgN9JiFR5(yDv*CNN~g#ckH8hCMbaOX7w zmTo$UIXaFFSTh8NDccdf&H@~sxytOhy~3+(D0x>5e+1FB2+zB@m^ISRb3{GZT!(3%k ztwT>O4rQMzNz8wt@)?XTirdRAh=o{u5OH6ZZhW2F$)>|o7SH!o4jP+Ll>^MGMBozH zW-fdTKxTeMrwLiOcjUinJF|qq(~Ty8gh-w#6{b^_cGc_|w~7Md+@c-?I-Hy>K=F+} zC8MqO5YM9*G29FmEBz1Lj3Eok$p#@J7CsOWf%f?qOj;lCD?^jqieE$udQ+h35hKgiCrtv9iq; zHs5g>lsRl1E5(4zm|e96IRlyXfzHP#e|~X$W8^7TElL7d!Qc-~nE$0h!Z&M!d{nV! zjS~tHY0yEvX0Oe~<1HItjcb^mA&u_!Wwv)(4=3ze%q6P{0bB_TbR* zAtsW6nth@&<2D4UX8@Z}5)CG3(Q}3S$L#^2nP=%hdtF$l`*4n$(Vl8aSmEH9-PNxW z2r}IBI3^T#k;?IiEsKb;&qNX=T)d(lmdHQQcchm)1faCbG+q)t*+w!+OVvOy?*$4L z_E|W5DfYMeq7q!Eene}ggvmUG>R%Se0Fruu{Aer_=X6rurQwnih3+m$y0<5pMUcLIxza&)oF8}}l delta 3382 zcmZYB&8wYP6$bFN-{dw?L%sE*XzAdzqYMNSsv;=$SdLRIirQhsf5Cx;a?c^Tg)3A@ zX~7ITND)Me;8coWXq*WdO2O#FPNaW;`0-oMzHcgcdD(Zrd#&}XXFYrE{hs%3jrVSi z+b;i7sEeZx zo~qrb=SO{Mso^!_r>1Gt@u(}KosX-n+fkPV#%B{BAZ@h>Cr}NzKCF9TY$Ew}uuKUM z^LSPOS^QkaR|3IpWWqEBZHGiq{^K+xjwdSH0EAI@kRq;x@DFJ0K9uXCLu8r**CBTmMgs zwn7x0ac-afFxjnw!&DU?m^YGmvavoZ*)H{v2K!Xd3@FAm8utE;+S*YlnRl0=JnA2j z@xiDk1ZPp;r3pIf{VZM=6)I$C*odLMdpF}?rzo){$=KHylK{IJgEhmwQEv<8ot={& z>l>8F`cYUusCsSGyP*#Hlgad9QofV9e%u6Hvh(V#FRcfiPBP!mtjrhFM5_Eu^%m0L zG->VxO9G46vJTXFJIhW}?uana`L%EbHJjjfVRo1zWv+&uEJ?J@nL5`00zCXS$t2D1 zQ-mHicko`!I_pazWL-gjt@@zqkJL)+Pe(mCm$Y%@pv`HDp_XE9hVe5QZHkNnkLk~5 zwyhpTLVqD?cq}Q1LO0^mVaZJl=mI@Yr+=+HG3xfLb=1F?dbaBO>npeaL~Vdzy8+df zN%}trM(*3wrd>yUd(>4~M_ou(>Y%SL|Dejvw{UYc`p(~}ud(K4w zWtyDeI6J4Kp{zh=;?q`1=QWHGGqP+4aI<}~XRXz`bKjFMKDHc7QCqmH$cJ1(9H@9F z`A%|l)wWHA)7jXM@Mg2m^-`VQxmSeX=TS~g9XaJfHi>)JBNhL4hLTg@cDkMoa$!u0 z{MAY}li7Et{8P*<62ie}&{^7Xg`NpsEkHW|{it+E;=9Qz5-5Jpthki;O^Vx%a=T$e zExe)YK2+30>aQl5iaU2Y^d#$-wINsCCk<%c%u3mg`g$}F)BBV|F+cwxu;fX9&L2ht zS-ZG^zB;!r>)hr{$TY3ilaQy)YL(*36H{irI{MGGtjLcs3_nhs%nV@z?3o zmUnFe0$2wkWD;sg$cBye^)zwdw(XxGF?;W&Tv9X5Bg9QL53aYVx71fcLeVPg-yQPJ zuR|`6LnIX2Rc2e~-b*~o1I1@P8?pNTpE(|9@z}Oc)&TcAB5+(GzUueaLa;fgmUXE;S;T*OGMMQn*?cGoF!TK>op1j4Y@|9) zU6Hxh=rNgrv&R<#0@J*OoM@?jHVP9Brl|Mn@7#YZX?QzY!fs{d>5&SMosGGweVDiG z|J34^i$ZqG(SKUd+-yhXE~EiZJTA^qP_V@=TwQHU7sE(d)>_K(4H$5 zKz{AGS+O^VCGm?1d|1txC$;*bt=j4pAn{QomO}2vxj%z;+D}k?cL5T{?3*O!x#}=# zH+_`D8pI+;Kw)uvHzN|Sj(RMa%(rP__?Yogy}BWIC9`n{jsEnxns@;dRIq2>63F?S zGu_GI?HoG`Ju|mN5?ROvl$#ee&i8BtC diff --git a/CHBuild/.vs/CHBuild/v17/.futdcache.v2 b/CHBuild/.vs/CHBuild/v17/.futdcache.v2 index aea19c09cfc5771f08d812862c53be9f58eec681..8fce9a4dc4d67e96dfa679aeb3534378595d1256 100644 GIT binary patch delta 15 Wcmeyx_=|DECys<8Mv{IJcQ^n!at3+; delta 15 Xcmeyx_=|DECyrbG*KK}=-{AlNK}84g diff --git a/CHBuild/.vs/CHBuild/v17/.suo b/CHBuild/.vs/CHBuild/v17/.suo index 1b6cfd0efc844140de495ce16e0de7f613161365..50664fe4f51142bfd0ba1bae436d00402fbe14ef 100644 GIT binary patch delta 1136 zcmb7DO-vI}5Z7qdgiz z4B1IcJgAX)AcljmXa5q7o)n{3e@?`oYcCuWXP_G!^`O&ynZB9#X1@2m+0r5_U1JZ1 zcqTxUkJJ`E#vJ;*HN#(LtR9%)pKjndPC_&zw$OH?4^;lsn(PO{iLpk+E<_W;i;xkN z52CL{v>-wV7b1+Hb9>R#9zXikk;}~Fhmgx%zw9`@L#6fxyIPOQ@3@H$*yhFu&wL3xCw=R<0v8tehWF0o7MLjwy1DI)blu&OG!$A$&`7ADs8v_66h)^m=wbJ* z4+)zC6$D8Jm2c@h^b`~p2@(nR7erZs4?WC_4`t^pj!e=^2Y%eS=l|Fa3aIqvY@V(O>@oLEtA7( zIRMq$FHt&^35Iu7Y(fXjb_75XN(&2cIbxd{H6J!BfA!=;-2hMw3CkHgkbmF|8%8 za+`iFaZ!LTzSeE}Tu9Iwm+Z`sVxgKr zHpM2`BpYWJ7+z$PgX|zX!!AK*?6nq5N#<*zkplHVpBzLI4Yb)b-3ZFu>{>5}lp_qC zAyFDd4jC*&d-dMKK_0k0A8KDH{4oEdz*YP7`NrDp6#c Rxe;Sf;X6gssLr(se*k2&g~b2> diff --git a/CHBuild/.vs/CHBuild/v17/DocumentLayout.json b/CHBuild/.vs/CHBuild/v17/DocumentLayout.json index 2a8d1a9..eb55ed5 100644 --- a/CHBuild/.vs/CHBuild/v17/DocumentLayout.json +++ b/CHBuild/.vs/CHBuild/v17/DocumentLayout.json @@ -24,7 +24,7 @@ "RelativeDocumentMoniker": "Program.cs", "ToolTip": "C:\\Users\\froth\\OneDrive\\Desktop\\CYNHUD\\CHBuild\\Program.cs", "RelativeToolTip": "Program.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAA8AAAA5AQAA", + "ViewState": "AQIAAA0AAAAAAAAAAAAAAA8AAAAEAgAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-04-08T18:20:03.119Z", "EditorCaption": "" diff --git a/CHBuild/.vs/ProjectEvaluation/chbuild.metadata.v7.bin b/CHBuild/.vs/ProjectEvaluation/chbuild.metadata.v7.bin index 48ef0ae943a732adea56604ba3540c1d0118cd20..40d397694d72c79e8e0332721a23a663b3b09fea 100644 GIT binary patch delta 185 zcmX@GoonSDE=~qv9tJR&Za9_6Zu;-ZOoELOtr3h{Bbd&(2=fCaIb7YG<1LI0jRb(4 z4(7?xoR_r%it^Ko5_1*YGILUkV_fo+vr~&;R8eYierZuMP&_F!&w8>VxBBEDt`s3b zkWuE&hQ=Iq-BAqx0lOSBvQi%}m_eGhCUL_zCr{Vh1~n T4M<)-6;t9Hv0ZKo(;{{Nq&hbK delta 69 zcmZ3vhwH$0E-nUs9tJS5ojkF?w$Z)SopGx>(_I%v=jnm1OwQXcx-%{D6N*$~11n+% Sk~;;q3jGY<-ad_K5jy~&0TYG* diff --git a/CHBuild/.vs/ProjectEvaluation/chbuild.projects.v7.bin b/CHBuild/.vs/ProjectEvaluation/chbuild.projects.v7.bin index 351bf0bd5184508ea1e862671d39920b532ab7de..8cbbcb22bfa948cdae111b73b99ebb01c3bd837e 100644 GIT binary patch delta 321 zcmeCZD!28iN<#}{3sVbo3rh=Y3)>d<-c{52I~my~vPCj#ZA>`C$nx{|;)?1gIY%gzjP-ecz2xWJhvYqFIu&2k{vuQz@eF)}Wdp0$w z;s$-@W(g>}AcAd=2AdGbnL^wD{b2cJ3U$r)e|oI#C!yvz#51d<-c version[0]) { + CynHud_WriteChatMessage("New update available: \x1b[113mv" + response.body + "\x1b[0m. Get it from \x1b[111mThunderstore\x1b[0m or \x1b[111mGitHub\x1b[0m."); + } else if (webVersion[2] > version[2]) { + CynHud_WriteChatMessage("New update available: \x1b[113mv" + response.body + "\x1b[0m. Get it from \x1b[111mThunderstore\x1b[0m or \x1b[111mGitHub\x1b[0m."); + } else if (webVersion[4] > version[4]) { + CynHud_WriteChatMessage("New patch available: \x1b[113mv" + response.body + "\x1b[0m. Get it from \x1b[111mThunderstore\x1b[0m or \x1b[111mGitHub\x1b[0m."); + } else { + CynHud_WriteChatMessage("No updates found. Have a good day!") + } + } + void functionref(HttpRequestFailure) onFailure = void function(HttpRequestFailure failure) { + CynHud_WriteChatMessage("\x1b[112mUpdate check failed:\x1b[0m code \x1b[113" + failure.errorCode.tostring() + ": " + failure.errorMessage + "\x1b[0m."); + } + if (NSHttpGet("https://frothywifi.cc/r2ns-ckupdate/cynhud.txt", {}, onSuccess, onFailure)) { + CynHud_WriteChatMessage("Checking for updates."); + } else { + CynHud_WriteChatMessage("\x1b[112mUpdate check failed:\x1b[0m Couldn't start the HTTP request. Do you have HTTP requests disabled in your launch options?"); + } +} + ClClient_MessageStruct function CynHud_CommandFilter(ClClient_MessageStruct message) { if (message.message == "$ch.help") { message.shouldBlock = true; Chat_GameWriteLine("\x1b[33m--== CYNHUD commands ==--\x1b[0m"); - Chat_GameWriteLine("All CYNHUD commands \x1b[112mmust\x1b[0m be prefaced with \x1b[33m\"$ch.\"\x1b[0m."); - Chat_GameWriteLine("\x1b[33m$ch.help\x1b[0m - Show available commands."); - Chat_GameWriteLine("\x1b[33m$ch.reload\x1b[0m - Reload the HUD message manually.") - Chat_GameWriteLine("\x1b[33m$ch.uid\x1b[0m - Show your user ID. CYNHUD also uses this to greet you."); + Chat_GameWriteLine("All CYNHUD commands \x1b[112mmust\x1b[0m be prefaced with \x1b[33m\"$ch.\"\x1b[0m, for example \x1b[33m$ch.uid\x1b[0m."); + Chat_GameWriteLine("\x1b[33mhelp\x1b[0m - Show available commands."); + Chat_GameWriteLine("\x1b[33mreload\x1b[0m - Reload the HUD message manually.") + Chat_GameWriteLine("\x1b[33muid\x1b[0m - Show your user ID. CYNHUD also uses this to greet you."); + Chat_GameWriteLine("\x1b[33mckupdate\x1b[0m - Check for CYNHUD updates."); } else if (message.message == "$ch.reload") { message.shouldBlock = true; - shouldReload = true; + reloadRequest = true; } else if (message.message == "$ch.uid") { message.shouldBlock = true; CynHud_WriteChatMessage("You are Pilot \x1b[111m" + NSGetLocalPlayerUID() + "\x1b[0m."); + } else if (message.message == "$ch.ckupdate") { + message.shouldBlock = true; + CynHud_CheckForUpdates(); } return message; } @@ -60,11 +89,12 @@ void function CynHud_DoMessage() { while (mapName == GetMapName()) { WaitFrame(); if (!hasShownWelcomeTextAlready && mapName != "mp_lobby") { - CynHud_WriteChatMessage("Welcome back, \x1b[111m" + NSGetLocalPlayerUID() + "\x1b[0m. Run $ch.help for a list of commands."); + thread CynHud_CheckForUpdates(); + CynHud_WriteChatMessage("Welcome back, \x1b[111m" + NSGetLocalPlayerUID() + "\x1b[0m. Run \x1b[33m$ch.help\x1b[0m for a list of commands."); hasShownWelcomeTextAlready = true; } - if (shouldReload) { - shouldReload = false; + if (reloadRequest) { + reloadRequest = false; RuiDestroy(rui); CynHud_WriteChatMessage("Manual reload request recieved; reloading HUD message."); CynHud_DoMessage(); @@ -90,6 +120,7 @@ void function CynHud_WriteChatMessage(string message) { void function CynHud_Init() { AddCallback_OnReceivedSayTextMessage(CynHud_CommandFilter); + CynHud_CheckForUpdates(); thread CynHud_DoMessage(); } #endif \ No newline at end of file