diff --git a/README.md b/README.md
index c5eedc5..17b51d5 100644
--- a/README.md
+++ b/README.md
@@ -27,92 +27,12 @@ This is a server for Taiko no Tatsujin Nijiiro ver 08.18
1. Download [Apache](https://www.apachelounge.com/download/), extract anywhere
- 2. Modify conf/httpd.conf:
-
- ```htaccess
- # example: c:/Apache24
- Define SRVROOT "full:/path/to/Apache/folder"
-
- # In loadmodule section, find the following lines and uncomment (remove the # at the beginning), they are by default commented out
- LoadModule proxy_module modules/mod_proxy.so
- LoadModule proxy_http_module modules/mod_proxy_http.so
- LoadModule ssl_module modules/mod_ssl.so
- LoadModule headers_module modules/mod_headers.so
-
- # Scroll down to bottom, find this line and uncomment
- Include conf/extra/httpd-vhosts.conf
- ```
-
- 3. Modify conf/extra/httpd-vhosts.conf, add the following
-
- ```htaccess
-
- ProxyPreserveHost On
- ProxyPass / http://127.0.0.1:5000/
- ProxyPassReverse / http://127.0.0.1:5000/
- ServerName naominet.jp
- RequestHeader set "X-Forwarded-Proto" expr=%{REQUEST_SCHEME}
-
-
- Listen 10122
-
- Listen 54430
- Listen 54431
-
-
- ProxyPreserveHost On
- ProxyPass / http://127.0.0.1:5000/
- ProxyPassReverse / http://127.0.0.1:5000/
- SSLEngine on
- SSLProtocol all -SSLv3
- SSLCertificateFile certs/localhost.crt
- SSLCertificateKeyFile certs/localhost.key
- ServerName vsapi.taiko-p.jp
- RequestHeader set "X-Forwarded-Proto" expr=%{REQUEST_SCHEME}
-
- ```
-
- 4. Modify conf/openssl.cnf, change the start of file to
-
- ```
- #
- # OpenSSL example configuration file.
- # This is mostly being used for generation of certificate requests.
- #
-
- # Note that you can include other files from the main configuration
- # file using the .include directive.
- #.include filename
-
- # This definition stops the following lines choking if HOME isn't
- # defined.
- HOME = .
- openssl_conf = default_conf
- # Extra OBJECT IDENTIFIER info:
- #oid_file = $ENV::HOME/.oid
- oid_section = new_oids
-
- [default_conf]
- ssl_conf = ssl_sect
-
- [ssl_sect]
- system_default = system_default_sect
-
- [system_default_sect]
- CipherString = DEFAULT@SECLEVEL=1
-
- # To use this configuration file with the "-extfile" option of the
- # "openssl x509" utility, name here the section containing the
- # X.509v3 extensions to use:
- # extensions =
- # (Alternatively, use a configuration file that has only
- # X.509v3 extensions in its main [= default] section.)
- ```
-
- 5. Copy the cert folder from server release to Apache root folder, then click on the localhost.crt file and import it to trusted root store.
+ 2. Copy the content in Apache folder to Apache root folder (and replace)
+ 5. Open the certs folder Apache root folder, then click on the localhost.crt file and import it to trusted root store.
+
If everything is correct, run bin/httpd.exe, a command prompt will open (and stay open, if it shut down, probably something is not setup correctly)
-
+
4. Now run the server, if everything is setup correctly, visit http://localhost:5000, you should be able to see the web ui up and running without errors.
5. Go to game folder, copy the config files (AMConfig.ini and WritableConfig.ini) in the config folder from server release to AMCUS folder and replace the original ones.
diff --git a/TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs b/TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs
index d428a05..1693e5c 100644
--- a/TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs
+++ b/TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs
@@ -36,7 +36,7 @@ public class InitialDataCheckController : BaseController
@{
var danResultState = GetDanResultState(danId);
- string danClearStateString = GetDanClearStateString(danResultState);
+ var danClearStateString = GetDanClearStateString(danResultState);
}
- ![](@($"/images/dani_{danResultState.ToString()}.png"))
+
@danClearStateString
@@ -262,7 +262,7 @@
}
@{
- string conditionOperator = ">";
+ var conditionOperator = ">";
if ((DanConditionType)border.OdaiType is DanConditionType.BadCount)
{
conditionOperator = "<";
@@ -359,7 +359,7 @@
}
@{
- string conditionOperator = ">";
+ var conditionOperator = ">";
if ((DanConditionType)border.OdaiType is DanConditionType.BadCount)
{
conditionOperator = "<";
diff --git a/TaikoWebUI/Pages/DaniDojo.razor.cs b/TaikoWebUI/Pages/DaniDojo.razor.cs
index a99c3f0..3d80485 100644
--- a/TaikoWebUI/Pages/DaniDojo.razor.cs
+++ b/TaikoWebUI/Pages/DaniDojo.razor.cs
@@ -1,7 +1,4 @@
-using SharedProject.Enums;
-using System.Net.NetworkInformation;
-
-namespace TaikoWebUI.Pages;
+namespace TaikoWebUI.Pages;
public partial class DaniDojo
{
@@ -113,16 +110,14 @@ public partial class DaniDojo
_ => 0
};
}
- else
+
+ return songNumber switch
{
- return songNumber switch
- {
- 0 => data.GoldBorder1,
- 1 => data.GoldBorder2,
- 2 => data.GoldBorder3,
- _ => 0
- };
- }
+ 0 => data.GoldBorder1,
+ 1 => data.GoldBorder2,
+ 2 => data.GoldBorder3,
+ _ => 0
+ };
}
private static string GetDanTitle(string title)
@@ -155,8 +150,8 @@ public partial class DaniDojo
private string GetDanResultIcon(uint danId)
{
- var icon = "";
- var notClearIcon = "";
+ string icon;
+ const string notClearIcon = "";
if (!bestDataMap.ContainsKey(danId))
{
@@ -165,28 +160,14 @@ public partial class DaniDojo
var state = bestDataMap[danId].ClearState;
- if (state is DanClearState.NotClear)
- {
- icon = notClearIcon;
- }
- else
- {
- icon = $"";
- }
+ icon = state is DanClearState.NotClear ? notClearIcon : $"";
return icon;
}
private DanClearState GetDanResultState(uint danId)
{
- if (bestDataMap.ContainsKey(danId))
- {
- return bestDataMap[danId].ClearState;
- }
- else
- {
- return DanClearState.NotClear;
- }
+ return bestDataMap.ContainsKey(danId) ? bestDataMap[danId].ClearState : DanClearState.NotClear;
}
private static uint GetSoulGauge(DanData data, bool isGold)
@@ -196,11 +177,6 @@ public partial class DaniDojo
borders.FirstOrDefault(border => (DanConditionType)border.BorderType == DanConditionType.SoulGauge,
new DanData.OdaiBorder());
- if (isGold)
- {
- return soulBorder.GoldBorderTotal;
- }
-
- return soulBorder.RedBorderTotal;
+ return isGold ? soulBorder.GoldBorderTotal : soulBorder.RedBorderTotal;
}
}
\ No newline at end of file