Skip to content

Commit 37a8a11

Browse files
bobot-devbobot-dev
committed
Added that cool thing tony made
Redid the save system to no longer use umm Added a thing so weapon effects change colour to match the varient colour
1 parent 96e4949 commit 37a8a11

9 files changed

+1024
-140
lines changed

‎BetterWeaponColourMenu.cs

Lines changed: 377 additions & 86 deletions
Large diffs are not rendered by default.

‎BetterWeaponColourMenu.csproj

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,10 +301,26 @@
301301
<ItemGroup>
302302
<Compile Include="BetterWeaponColourMenu.cs" />
303303
<Compile Include="ButtonComponets.cs" />
304+
<Compile Include="SaveData.cs" />
304305
<Compile Include="Properties\AssemblyInfo.cs" />
306+
<Compile Include="Properties\Resources.Designer.cs">
307+
<AutoGen>True</AutoGen>
308+
<DesignTime>True</DesignTime>
309+
<DependentUpon>Resources.resx</DependentUpon>
310+
</Compile>
311+
<Compile Include="VariationColorHandler.cs" />
312+
</ItemGroup>
313+
<ItemGroup>
314+
<EmbeddedResource Include="Properties\Resources.resx">
315+
<Generator>ResXFileCodeGenerator</Generator>
316+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
317+
</EmbeddedResource>
318+
</ItemGroup>
319+
<ItemGroup>
320+
<None Include="Resources\colourmenu" />
305321
</ItemGroup>
306322
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
307323
<PropertyGroup>
308-
<PostBuildEvent>COPY "$(TargetPath)" "C:\Program Files (x86)\Steam\steamapps\common\ULTRAKILL\BepInEx\UMM Mods\BetterWeaponColourMenu"</PostBuildEvent>
324+
<PostBuildEvent>COPY "$(TargetPath)" "D:\SteamLibrary\steamapps\common\ULTRAKILL\BepInEx\UMM Mods\BetterWeaponColourMenu"</PostBuildEvent>
309325
</PropertyGroup>
310326
</Project>

‎ButtonComponets.cs

Lines changed: 193 additions & 53 deletions
Large diffs are not rendered by default.

‎Properties/Resources.Designer.cs

Lines changed: 73 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Properties/Resources.resx

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="colourmenu" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>..\Resources\colourmenu;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
123+
</data>
124+
</root>

‎Resources/colourmenu

6.18 KB
Binary file not shown.

‎SaveData.cs

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
using Newtonsoft.Json;
2+
using System;
3+
using System.Collections.Generic;
4+
using System.IO;
5+
using System.Linq;
6+
using System.Reflection;
7+
using System.Text;
8+
using System.Threading.Tasks;
9+
using UnityEngine;
10+
11+
namespace BetterWeaponColourMenu
12+
{
13+
class SaveData
14+
{
15+
16+
public static void LoadData()
17+
{
18+
path = Assembly.GetExecutingAssembly().Location;
19+
path = path.Substring(0, path.LastIndexOf("\\")) + "\\saveData.json";
20+
Debug.Log("Saving colour menu data to " + path);
21+
22+
if (!File.Exists(path))
23+
{
24+
File.Create(path).Close();
25+
}
26+
27+
FileInfo fInfo = new FileInfo(path);
28+
if (fInfo.Exists)
29+
{
30+
using (StreamReader jFile = fInfo.OpenText())
31+
{
32+
colourMenuBoolData = JsonConvert.DeserializeObject<Dictionary<string, Dictionary<string, string>>>(jFile.ReadToEnd());
33+
if (colourMenuBoolData == null)
34+
colourMenuBoolData = new Dictionary<string, Dictionary<string, string>>();
35+
jFile.Close();
36+
}
37+
}
38+
else
39+
{
40+
Debug.Log("Couldn't find a save file, making one now");
41+
fInfo.Create();
42+
}
43+
44+
//instance = UnityEngine.JsonUtility.FromJson<SaveData>(File.ReadAllText(path));
45+
}
46+
47+
48+
public static void SaveDataToFile()
49+
{
50+
path = Assembly.GetExecutingAssembly().Location;
51+
path = path.Substring(0, path.LastIndexOf("\\")) + "\\saveData.json";
52+
Debug.Log("Saving colour menu data to " + path);
53+
54+
55+
FileInfo fInfo = new FileInfo(path);
56+
File.WriteAllText(fInfo.FullName, JsonConvert.SerializeObject(colourMenuBoolData));
57+
//if (!File.Exists(path))
58+
//{
59+
// File.Create(path).Close();
60+
//}
61+
}
62+
63+
public static void SetSaveValue(string dataKey, string weapon, object value, bool forceNotSave = false)
64+
{
65+
if (colourMenuBoolData == null) LoadData();
66+
67+
68+
if (!colourMenuBoolData.ContainsKey(dataKey))
69+
{
70+
var dict = new Dictionary<string, string>();
71+
dict.Add(weapon, value.ToString());
72+
73+
colourMenuBoolData.Add(dataKey, dict);
74+
}
75+
else if (!colourMenuBoolData[dataKey].ContainsKey(weapon))
76+
{
77+
colourMenuBoolData[dataKey].Add(weapon, value.ToString());
78+
}
79+
else
80+
{
81+
colourMenuBoolData[dataKey][weapon] = value.ToString();
82+
}
83+
84+
if (!forceNotSave) SaveDataToFile();
85+
}
86+
87+
public static string RetriveSaveValue(string dataKey, string weapon, string fallback = "MISSING DATA")
88+
{
89+
if (colourMenuBoolData == null) LoadData();
90+
91+
if (!colourMenuBoolData.ContainsKey(dataKey))
92+
{
93+
var dict = new Dictionary<string, string>();
94+
dict.Add(weapon, fallback);
95+
96+
colourMenuBoolData.Add(dataKey, dict);
97+
SaveDataToFile();
98+
}
99+
else if (!colourMenuBoolData[dataKey].ContainsKey(weapon))
100+
{
101+
colourMenuBoolData[dataKey].Add(weapon, fallback);
102+
SaveDataToFile();
103+
}
104+
return colourMenuBoolData[dataKey][weapon];
105+
}
106+
107+
108+
//public static SaveData instance;
109+
110+
111+
static Dictionary<string, Dictionary<string, string>> colourMenuBoolData;
112+
113+
//Dictionary<string, Dictionary<string, Color>> colourMenuColourData;
114+
115+
static string path = "";
116+
}
117+
}

0 commit comments

Comments
 (0)