Update

sefinek24 · Feb 25, 2024 · 9ee371b · 9ee371b
1 parent 48640d5
commit 9ee371b
Show file tree

Hide file tree

Showing 19 changed files with 97 additions and 60 deletions.
diff --git a/Stella.Launcher/1-1. Stella Mod Launcher.csproj b/Stella.Launcher/1-1. Stella Mod Launcher.csproj
@@ -596,6 +596,21 @@
  <None Update="data\reshade\ReShade Homepage.url">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  </None>
+ <None Update="data\sounds\other\click-button-app.wav">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Update="data\sounds\other\interface-welcome.wav">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Update="data\sounds\other\logo-corporate.wav">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Update="data\sounds\other\menu-button.wav">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Update="data\sounds\other\multi-pop.wav">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
  <None Update="data\unlocker\gen-fps-unlocker.deps.json">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  </None>

diff --git a/Stella.Launcher/Forms/Default.cs b/Stella.Launcher/Forms/Default.cs
@@ -67,6 +67,7 @@ private void Default_Load(object sender, EventArgs e)
  if (newBackground != null) BackgroundImage = newBackground;
 
  RoundedCorners.Form(this);
+ Music.LinkLabelSfx(this);
  }
 
  private async void Main_Shown(object sender, EventArgs e)
@@ -376,6 +377,8 @@ private async void Main_Shown(object sender, EventArgs e)
  // Music
  _ = Music.PlayBg();
 
+ if (Secret.IsStellaPlusSubscriber) Music.PlaySound("other", "interface-welcome", 0.11f);
+
 
  // 2024
  // status_Label.Text += @"[i] Happy New Year 2024! Thank you all for your trust ~~ Sefinek";
@@ -425,7 +428,7 @@ private void ChangeBg_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e
  Image? newBackground = Background.Change(toolTip1, changeBg_LinkLabel);
  if (newBackground != null) BackgroundImage = newBackground;
 
- Music.PlaySound("winxp", "menu_command");
+ Music.PlaySound("other", "multi-pop", 0.09f);
  }
 
 
@@ -485,12 +488,13 @@ private async void OpenGILauncher_LinkClicked(object sender, LinkLabelLinkClicke
  // ------- Footer -------
  private void Subscription_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
  {
- Utils.OpenUrl("https://sefinek.net/genshin-impact-reshade/subscription");
+ Utils.OpenUrl("https://sefinek.net/genshin-impact-reshade/subscription?referrer=launcher");
  }
 
  private void SupportMe_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
  {
- Utils.OpenUrl("https://sefinek.net/support-me");
+ if (Application.OpenForms.OfType<SupportMe>().Any()) return;
+ new SupportMe { DesktopLocation = DesktopLocation, Icon = Program.Ico }.Show();
  }
 
  private void DiscordServer_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)

diff --git a/Stella.Launcher/Forms/Gameplay.cs b/Stella.Launcher/Forms/Gameplay.cs
@@ -22,6 +22,7 @@ public Gameplay()
  private void Gameplay_Load(object sender, EventArgs e)
  {
  RoundedCorners.Form(this);
+ Music.LinkLabelSfx(this);
  }
 
  private async void Tutorial_Shown(object sender, EventArgs e)

diff --git a/Stella.Launcher/Forms/Links.cs b/Stella.Launcher/Forms/Links.cs
@@ -16,6 +16,12 @@ public Links()
  DoubleBuffered = true;
  }
 
+ private void Links_Load(object sender, EventArgs e)
+ {
+ RoundedCorners.Form(this);
+ Music.LinkLabelSfx(this);
+ }
+
  private void URLs_Shown(object sender, EventArgs e)
  {
  Discord.SetStatus(Resources.Links_DRPC_OnTheWindowWithLinks);
@@ -42,11 +48,6 @@ private void MouseUp_Event(object sender, MouseEventArgs e)
  _mouseDown = false;
  }
 
- private void Links_Load(object sender, EventArgs e)
- {
- RoundedCorners.Form(this);
- }
-
  private void Exit_Click(object sender, EventArgs e)
  {
  Program.Logger.Info(string.Format(Resources.Main_ClosedForm_, Text));

diff --git a/Stella.Launcher/Forms/Other/SupportMe.Designer.cs b/Stella.Launcher/Forms/Other/SupportMe.Designer.cs
diff --git a/Stella.Launcher/Forms/Other/SupportMe.cs b/Stella.Launcher/Forms/Other/SupportMe.cs
@@ -19,6 +19,8 @@ public SupportMe()
  private void SupportMe_Load(object sender, EventArgs e)
  {
  RoundedCorners.Form(this);
+
+ Music.PlaySound("other", "logo-corporate", 0.11f);
  }
 
  private void MouseDown_Event(object sender, MouseEventArgs e)

diff --git a/Stella.Launcher/Forms/Other/SupportMe.pl.resx b/Stella.Launcher/Forms/Other/SupportMe.pl.resx
@@ -121,10 +121,9 @@
  <value>Zamknij</value>
  </data>
  <data name="label2.Text" xml:space="preserve">
- <value>Będąc subskrybentem Stella Mod Plus,
-możesz uzyskać dostęp do różnych ulepszeń gry.
-Takich jak: używanie modów, nowe ustawienia wstępne, kolekcja shaderów i modów,
-i wiele więcej!</value>
+ <value>Będąc subskrybentem Stella Mod Plus, możesz uzyskać dostęp do różnych
+ulepszeń gry. Takich jak: używanie modów, nowe ustawienia wstępne,
+kolekcja shaderów i modów, i wiele więcej!</value>
  </data>
  <data name="linkLabel6.Text" xml:space="preserve">
  <value>🌌 Może później</value>
@@ -163,7 +162,7 @@ i wiele więcej!</value>
  <value>Zostaw swoją opinię na kanale Discord</value>
  </data>
  <data name="linkLabel2.Text" xml:space="preserve">
- <value>» Wyślij mi swoje bezużyteczne skiny w CS2, jeśli możesz</value>
+ <value>» Wyślij mi swoje skiny do CS2, jeśli możesz</value>
  </data>
  <data name="linkLabel2.ToolTip" xml:space="preserve">
  <value>Otwórz trade link</value>
@@ -181,7 +180,7 @@ i wiele więcej!</value>
  <value>Stella Mod Launcher Reviews | Przeczytaj recenzje obsługi klienta genshin.sefinek.net</value>
  </data>
  <data name="label3.Text" xml:space="preserve">
- <value>Wybierz poprawną odpowiedź:</value>
+ <value>&gt;&gt; Wybierz poprawną odpowiedź &lt;&lt;</value>
  </data>
  <data name="$this.Text" xml:space="preserve">
  <value>Wsparcie twórcy</value>

diff --git a/Stella.Launcher/Forms/Other/SupportMe.resx b/Stella.Launcher/Forms/Other/SupportMe.resx
@@ -190,19 +190,18 @@
  <value>Yu Gothic UI, 15.75pt, style=Bold</value>
  </data>
  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
- <value>19, 390</value>
+ <value>23, 413</value>
  </data>
  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
- <value>718, 120</value>
+ <value>718, 99</value>
  </data>
  <data name="label2.TabIndex" type="System.Int32, mscorlib">
  <value>17</value>
  </data>
  <data name="label2.Text" xml:space="preserve">
- <value>Being a subscriber to Stella Mod Plus,
-you can gain access to various game enhancements.
-Such as: using mods, new presets, a collection of shaders and mods,
-and much more!</value>
+ <value>Being a subscriber to Stella Mod Plus, you can gain access to various
+game enhancements. Such as: using mods, new presets, a collection
+of shaders and mods, and much more!</value>
  </data>
  <data name="label2.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
  <value>MiddleCenter</value>
@@ -229,7 +228,7 @@ and much more!</value>
  <value>Consolas, 24pt</value>
  </data>
  <data name="linkLabel6.Location" type="System.Drawing.Point, System.Drawing">
- <value>12, 644</value>
+ <value>17, 639</value>
  </data>
  <data name="linkLabel6.Size" type="System.Drawing.Size, System.Drawing">
  <value>270, 37</value>
@@ -262,7 +261,7 @@ and much more!</value>
  <value>Consolas, 24pt</value>
  </data>
  <data name="linkLabel5.Location" type="System.Drawing.Point, System.Drawing">
- <value>974, 644</value>
+ <value>969, 639</value>
  </data>
  <data name="linkLabel5.Size" type="System.Drawing.Size, System.Drawing">
  <value>252, 37</value>
@@ -298,7 +297,7 @@ and much more!</value>
  <value>Consolas, 23.25pt, style=Bold</value>
  </data>
  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
- <value>12, 77</value>
+ <value>23, 82</value>
  </data>
  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
  <value>629, 37</value>
@@ -334,16 +333,16 @@ and much more!</value>
  <value>Comic Sans MS, 15pt</value>
  </data>
  <data name="linkLabel1.Location" type="System.Drawing.Point, System.Drawing">
- <value>14, 139</value>
+ <value>25, 144</value>
  </data>
  <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
- <value>341, 28</value>
+ <value>375, 28</value>
  </data>
  <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
  <value>21</value>
  </data>
  <data name="linkLabel1.Text" xml:space="preserve">
- <value>» Support my work by clicking here</value>
+ <value>» Support this project by clicking here</value>
  </data>
  <data name="linkLabel1.ToolTip" xml:space="preserve">
  <value>Support my work - Sefinek</value>
@@ -370,7 +369,7 @@ and much more!</value>
  <value>Comic Sans MS, 15pt</value>
  </data>
  <data name="linkLabel3.Location" type="System.Drawing.Point, System.Drawing">
- <value>14, 195</value>
+ <value>25, 200</value>
  </data>
  <data name="linkLabel3.Size" type="System.Drawing.Size, System.Drawing">
  <value>317, 28</value>
@@ -406,7 +405,7 @@ and much more!</value>
  <value>Comic Sans MS, 15pt</value>
  </data>
  <data name="linkLabel4.Location" type="System.Drawing.Point, System.Drawing">
- <value>14, 307</value>
+ <value>25, 312</value>
  </data>
  <data name="linkLabel4.Size" type="System.Drawing.Size, System.Drawing">
  <value>311, 28</value>
@@ -442,7 +441,7 @@ and much more!</value>
  <value>Comic Sans MS, 15pt</value>
  </data>
  <data name="linkLabel7.Location" type="System.Drawing.Point, System.Drawing">
- <value>14, 279</value>
+ <value>25, 284</value>
  </data>
  <data name="linkLabel7.Size" type="System.Drawing.Size, System.Drawing">
  <value>254, 28</value>
@@ -478,7 +477,7 @@ and much more!</value>
  <value>Comic Sans MS, 15pt</value>
  </data>
  <data name="linkLabel8.Location" type="System.Drawing.Point, System.Drawing">
- <value>14, 251</value>
+ <value>25, 256</value>
  </data>
  <data name="linkLabel8.Size" type="System.Drawing.Size, System.Drawing">
  <value>282, 28</value>
@@ -517,16 +516,16 @@ and much more!</value>
  <value>NoControl</value>
  </data>
  <data name="linkLabel2.Location" type="System.Drawing.Point, System.Drawing">
- <value>14, 167</value>
+ <value>25, 172</value>
  </data>
  <data name="linkLabel2.Size" type="System.Drawing.Size, System.Drawing">
- <value>443, 28</value>
+ <value>338, 28</value>
  </data>
  <data name="linkLabel2.TabIndex" type="System.Int32, mscorlib">
  <value>26</value>
  </data>
  <data name="linkLabel2.Text" xml:space="preserve">
- <value>» Send me your useless skins in CS2 if you can</value>
+ <value>» Send me skins for CS2 if you can</value>
  </data>
  <data name="linkLabel2.ToolTip" xml:space="preserve">
  <value>Open trade url</value>
@@ -556,7 +555,7 @@ and much more!</value>
  <value>NoControl</value>
  </data>
  <data name="linkLabel9.Location" type="System.Drawing.Point, System.Drawing">
- <value>14, 335</value>
+ <value>25, 340</value>
  </data>
  <data name="linkLabel9.Size" type="System.Drawing.Size, System.Drawing">
  <value>362, 28</value>
@@ -595,7 +594,7 @@ and much more!</value>
  <value>NoControl</value>
  </data>
  <data name="linkLabel10.Location" type="System.Drawing.Point, System.Drawing">
- <value>14, 223</value>
+ <value>25, 228</value>
  </data>
  <data name="linkLabel10.Size" type="System.Drawing.Size, System.Drawing">
  <value>342, 28</value>
@@ -634,16 +633,16 @@ and much more!</value>
  <value>NoControl</value>
  </data>
  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
- <value>422, 579</value>
+ <value>397, 590</value>
  </data>
  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
- <value>396, 38</value>
+ <value>481, 38</value>
  </data>
  <data name="label3.TabIndex" type="System.Int32, mscorlib">
  <value>27</value>
  </data>
  <data name="label3.Text" xml:space="preserve">
- <value>Select the correct answer:</value>
+ <value>&gt;&gt; Select the correct answer &lt;&lt;</value>
  </data>
  <data name="label3.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
  <value>MiddleLeft</value>

diff --git a/Stella.Launcher/Forms/Settings.cs b/Stella.Launcher/Forms/Settings.cs
@@ -22,6 +22,7 @@ public Settings()
  private void Tools_Load(object sender, EventArgs e)
  {
  RoundedCorners.Form(this);
+ Music.LinkLabelSfx(this);
 
  release_Label.Text = string.Format(release_Label.Text, Program.AppVersionFull, Program.AppFileVersion, Program.AppVersion);
 

diff --git a/Stella.Launcher/Forms/Tools.cs b/Stella.Launcher/Forms/Tools.cs
@@ -22,6 +22,7 @@ public Tools()
  private void Tools_Load(object sender, EventArgs e)
  {
  RoundedCorners.Form(this);
+ Music.LinkLabelSfx(this);
  }
 
  private void Utils_Shown(object sender, EventArgs e)

diff --git a/Stella.Launcher/Program.cs b/Stella.Launcher/Program.cs
@@ -34,7 +34,7 @@ internal static class Program
 
  // Links
  private static readonly string AppWebsiteSub = "https://genshin.sefinek.net";
- public static readonly string? AppWebsiteFull = "https://sefinek.net/genshin-impact-reshade";
+ public static readonly string? AppWebsiteFull = "https://sefinek.net/genshin-impact-reshade?referrer=launcher";
 
  // HttpClient
  public static readonly Lazy<HttpClient> WbClient = new(() =>
@@ -130,7 +130,7 @@ private static void Main(string[] args)
  int value = (int)(key?.GetValue("AppIsConfigured") ?? 0);
  if (value == 0)
  {
- _ = Cmd.Execute(new Cmd.CliWrap { App = ConfigurationWindow });
+ _ = Cmd.Execute(new Cmd.CliWrap { App = ConfigurationWindow }, false);
  Environment.Exit(997890421);
  }
  }
@@ -140,7 +140,7 @@ private static void Main(string[] args)
  // int newUpdate = prepareIni.ReadInt("Launcher", "UserIsMyPatron", 0);
  // if (newUpdate == 1)
  // {
- // _ = Cmd.Execute(new Cmd.CliWrap { App = PrepareLauncher });
+ // _ = Cmd.Execute(new Cmd.CliWrap { App = PrepareLauncher }, false);
  // Environment.Exit(997890421);
  // }
 

diff --git a/Stella.Launcher/Scripts/Cmd.cs b/Stella.Launcher/Scripts/Cmd.cs
@@ -10,9 +10,9 @@ namespace StellaModLauncher.Scripts;
 
 internal static class Cmd
 {
- public static async Task<bool> Execute(CliWrap? cliWrapCommand)
+ public static async Task<bool> Execute(CliWrap? cliWrapCommand, bool? playSound = true)
  {
- Music.PlaySound("winxp", "information_bar");
+ if ((bool)playSound!) Music.PlaySound("other", "click-button-app", 0.29f);
 
  string commandArguments = cliWrapCommand?.Arguments != null ? cliWrapCommand.Arguments.Build() : string.Empty;