Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c724674b5a | ||
|
|
ee50214043 | ||
|
|
11f6384db6 |
@@ -46,19 +46,22 @@ namespace MxValheim.KillFeed
|
||||
}
|
||||
|
||||
// Message Format Variables
|
||||
string type1Separator = " a été tué par ";
|
||||
string type2Separator = " a tué ";
|
||||
string type1Separator = Localization.instance.Localize("$killfeed_format_type1");
|
||||
string type2Separator = Localization.instance.Localize("$killfeed_format_type2");
|
||||
string finalMsg = "";
|
||||
string attackerFormat = "";
|
||||
string victimFormat = "";
|
||||
string distanceFormat = "";
|
||||
string starFormat = "";
|
||||
string crossFormat = "";
|
||||
// Format Message in Divided Section
|
||||
starFormat = "<color=#fffb00>★</color>";
|
||||
crossFormat = "<color=#a0a3a1>✝</color>";
|
||||
attackerFormat = $"<color=#00ff06>{attacker.ToUpper()}</color>";
|
||||
if(type == 1)
|
||||
|
||||
if (type == 1)
|
||||
{
|
||||
victimFormat = $"<color=#00ff06>{victim.ToUpper()}</color>";
|
||||
victimFormat = $"{crossFormat} <color=#00ff06>{victim.ToUpper()}</color>";
|
||||
} else if(type == 2)
|
||||
{
|
||||
switch (level)
|
||||
@@ -75,18 +78,18 @@ namespace MxValheim.KillFeed
|
||||
case 4:
|
||||
victimFormat = $"{starFormat}{starFormat}{starFormat} <color=#00ff06>{victim.ToUpper()}</color>";
|
||||
break;
|
||||
case 5:
|
||||
victimFormat = $"{starFormat}{starFormat}{starFormat}{starFormat} <color=#00ff06>{victim.ToUpper()}</color>";
|
||||
break;
|
||||
}
|
||||
}
|
||||
distanceFormat = $" à <color=#9402f5>{distance:F1}m</color> de distance.";
|
||||
}
|
||||
|
||||
distanceFormat = $"{Localization.instance.Localize("$killfeed_format_distance_before")}<color=#9402f5>{distance:F1}m</color>{Localization.instance.Localize("$killfeed_format_distance_after")}";
|
||||
|
||||
finalMsg =
|
||||
(type == 1) ? $"{victimFormat}{type1Separator}{attackerFormat}{distanceFormat}":
|
||||
(type == 2) ? $"{attackerFormat}{type2Separator}{victimFormat}{distanceFormat}" :
|
||||
$"{attackerFormat}{type2Separator}{victimFormat}{distanceFormat}";
|
||||
|
||||
/*string finalMsg = (type == 1) ? $"<color=#FF3333>☠</color> <color=#00ff06>{victim.ToUpper()}</color> a été tué par <color=#ff0000>{attacker.ToUpper()}</color> à <color=#9402f5>{distance:F1}m</color> de distance." :
|
||||
(type == 2) ? $"<color=#00ff06>{attacker.ToUpper()}</color> a tué <color=#00c0ff>{victim.ToUpper()}</color> à <color=#9402f5>{distance:F1}m</color> de distance." :
|
||||
$"<color=#00ff06>{attacker.ToUpper()}</color> a tué <color=#00c0ff>{victim.ToUpper()}</color> à <color=#9402f5>{distance:F1}m</color> de distance.";*/
|
||||
(type == 1) ? $"{victimFormat}{type1Separator}{attackerFormat}{distanceFormat}": // Player Death
|
||||
(type == 2) ? $"{attackerFormat}{type2Separator}{victimFormat}{distanceFormat}": // Player Killed Something
|
||||
$"{attackerFormat}{type2Separator}{victimFormat}{distanceFormat}"; // Failsafe
|
||||
|
||||
Sprite weaponIcon = null;
|
||||
|
||||
@@ -417,72 +420,5 @@ namespace MxValheim.KillFeed
|
||||
|
||||
_hudRoot.SetActive(false);
|
||||
}
|
||||
|
||||
/*
|
||||
public void CreateCustomHud()
|
||||
{
|
||||
_hudRoot = new GameObject("MxKillFeed_Root");
|
||||
UnityEngine.Object.DontDestroyOnLoad(_hudRoot);
|
||||
|
||||
Canvas c = _hudRoot.AddComponent<Canvas>();
|
||||
c.renderMode = RenderMode.ScreenSpaceOverlay;
|
||||
c.sortingOrder = 10000;
|
||||
|
||||
// Add a Scaler to ensure it looks right on all resolutions
|
||||
CanvasScaler scaler = _hudRoot.AddComponent<CanvasScaler>();
|
||||
scaler.uiScaleMode = CanvasScaler.ScaleMode.ScaleWithScreenSize;
|
||||
scaler.referenceResolution = new Vector2(1920, 1080);
|
||||
|
||||
_canvasGroup = _hudRoot.AddComponent<CanvasGroup>();
|
||||
|
||||
GameObject panel = new GameObject("Background", typeof(RectTransform), typeof(Image));
|
||||
panel.transform.SetParent(_hudRoot.transform, false);
|
||||
_panelImage = panel.GetComponent<Image>();
|
||||
|
||||
// Fallback: Set a solid color first in case the sprite search fails
|
||||
_panelImage.color = new Color(0, 0, 0, 0.8f);
|
||||
|
||||
foreach (Sprite s in Resources.FindObjectsOfTypeAll<Sprite>())
|
||||
{
|
||||
if (s.name == "shout_field")
|
||||
{
|
||||
_panelImage.sprite = s;
|
||||
_panelImage.type = Image.Type.Sliced;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
RectTransform pRect = panel.GetComponent<RectTransform>();
|
||||
pRect.anchorMin = pRect.anchorMax = pRect.pivot = new Vector2(0.5f, 0.95f);
|
||||
pRect.anchoredPosition = Vector2.zero; // Center top
|
||||
pRect.sizeDelta = new Vector2(550, 40);
|
||||
pRect.localScale = Vector3.one; // FORCE SCALE TO 1
|
||||
|
||||
// Icon
|
||||
GameObject iconObj = new GameObject("Icon", typeof(RectTransform), typeof(Image));
|
||||
iconObj.transform.SetParent(panel.transform, false);
|
||||
_weaponIconSlot = iconObj.GetComponent<Image>();
|
||||
_weaponIconSlot.preserveAspect = true;
|
||||
RectTransform iRect = iconObj.GetComponent<RectTransform>();
|
||||
iRect.anchorMin = iRect.anchorMax = iRect.pivot = new Vector2(0, 0.5f);
|
||||
iRect.anchoredPosition = new Vector2(10, 0);
|
||||
iRect.sizeDelta = new Vector2(30, 30);
|
||||
|
||||
// Text
|
||||
GameObject textObj = new GameObject("Text", typeof(RectTransform), typeof(Text));
|
||||
textObj.transform.SetParent(panel.transform, false);
|
||||
_killText = textObj.GetComponent<Text>();
|
||||
_killText.font = Resources.GetBuiltinResource<Font>("Arial.ttf");
|
||||
_killText.fontSize = 18;
|
||||
_killText.alignment = TextAnchor.MiddleLeft;
|
||||
_killText.supportRichText = true;
|
||||
textObj.AddComponent<Outline>().effectColor = Color.black;
|
||||
|
||||
RectTransform tRect = textObj.GetComponent<RectTransform>();
|
||||
tRect.anchorMin = Vector2.zero; tRect.anchorMax = Vector2.one;
|
||||
tRect.offsetMin = new Vector2(50, 0); tRect.offsetMax = new Vector2(-10, 0);
|
||||
|
||||
_hudRoot.SetActive(false);
|
||||
}*/
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Threading;
|
||||
using System.Xml;
|
||||
using TMPro;
|
||||
@@ -21,7 +22,7 @@ public class MxValheimMod : BaseUnityPlugin
|
||||
|
||||
private const string ModGUID = "ovh.mxdev.mxvalheim";
|
||||
private const string ModName = "MxValheim";
|
||||
private const string ModVersion = "1.5.3";
|
||||
private const string ModVersion = "1.5.5";
|
||||
|
||||
public static ConfigEntry<bool> Config_Locked;
|
||||
public static ConfigEntry<int> Config_OreMultiplier;
|
||||
@@ -32,7 +33,9 @@ public class MxValheimMod : BaseUnityPlugin
|
||||
public static ConfigEntry<bool> Config_autoDoorCloseEnabled;
|
||||
public static ConfigEntry<float> Config_autoDoorClose;
|
||||
|
||||
private static string WeightConfigPath => Path.Combine(Paths.ConfigPath, "mxvalheim.custom_weights.json");
|
||||
public static string modPath = Path.Combine(Paths.PluginPath, "MxValheim");
|
||||
public static string internalConfigsPath = Path.Combine(modPath, "Configs");
|
||||
private static string WeightConfigPath => Path.Combine(internalConfigsPath, "items_weight.json");
|
||||
public static Dictionary<string, float> WeightSettings = new Dictionary<string, float>();
|
||||
|
||||
// Data structures
|
||||
@@ -73,12 +76,22 @@ public class MxValheimMod : BaseUnityPlugin
|
||||
Config_autoDoorCloseEnabled = Config.Bind("General", "AutoDoorCloseEnabled", true, "Your doors will auto close if enabled. See AutoDoorCloseTimer for the desired time.");
|
||||
Config_autoDoorClose = Config.Bind("General", "AutoDoorCloseTimer", 5.0f, "Your doors will auto close after the specified timer duration.");
|
||||
|
||||
LoadLocalization();
|
||||
LoadJsonConfig();
|
||||
|
||||
Harmony harmony = new Harmony(ModGUID);
|
||||
harmony.PatchAll();
|
||||
}
|
||||
|
||||
[HarmonyPatch(typeof(Localization), nameof(Localization.SetupLanguage))]
|
||||
public static class Localization_SetupLanguage_Patch
|
||||
{
|
||||
public static void Postfix()
|
||||
{
|
||||
LoadLocalization();
|
||||
}
|
||||
}
|
||||
|
||||
// --- TEST COMMAND: Type 'testkill' in F5 console ---
|
||||
[HarmonyPatch(typeof(Terminal), nameof(Terminal.InputText))]
|
||||
public static class ConsoleInputPatch
|
||||
@@ -86,21 +99,6 @@ public class MxValheimMod : BaseUnityPlugin
|
||||
static void Postfix(Terminal __instance)
|
||||
{
|
||||
string text = __instance.m_input.text;
|
||||
if (text.ToLower() == "listiconsstore")
|
||||
{
|
||||
var spriteAsset = Resources.FindObjectsOfTypeAll<TMP_SpriteAsset>().FirstOrDefault(x => x.name == "store_icons"); ;
|
||||
|
||||
if (spriteAsset != null)
|
||||
{
|
||||
Debug.Log($"--- Listing all sprites in {spriteAsset.name} ---");
|
||||
for (int i = 0; i < spriteAsset.spriteCharacterTable.Count; i++)
|
||||
{
|
||||
var sprite = spriteAsset.spriteCharacterTable[i];
|
||||
Debug.Log($"Index: {i} | Name: {sprite.name}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (text.ToLower() == "listicons")
|
||||
{
|
||||
var spriteAsset = Resources.FindObjectsOfTypeAll<TMP_SpriteAsset>().FirstOrDefault(x => x.name == "icons"); ;
|
||||
@@ -176,6 +174,52 @@ public class MxValheimMod : BaseUnityPlugin
|
||||
if (_displayTimer <= 0 && _hudRoot != null) _hudRoot.SetActive(false);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static void LoadLocalization()
|
||||
{
|
||||
if (Localization.instance == null) return;
|
||||
|
||||
string modPath = Path.Combine(Paths.PluginPath, "MxValheim");
|
||||
string translationsPath = Path.Combine(modPath, "Translations");
|
||||
string lang = Localization.instance.GetSelectedLanguage();
|
||||
string filePath = Path.Combine(translationsPath, $"{lang}.json");
|
||||
|
||||
if (!File.Exists(filePath))
|
||||
{
|
||||
filePath = Path.Combine(translationsPath, "English.json");
|
||||
}
|
||||
|
||||
if (File.Exists(filePath))
|
||||
{
|
||||
try
|
||||
{
|
||||
string json = File.ReadAllText(filePath);
|
||||
var dict = JsonConvert.DeserializeObject<Dictionary<string, string>>(json);
|
||||
|
||||
// Get the method via Reflection to bypass "Inaccessible" errors
|
||||
MethodInfo addWordMethod = typeof(Localization).GetMethod("AddWord",
|
||||
BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
|
||||
|
||||
if (addWordMethod != null)
|
||||
{
|
||||
foreach (var entry in dict)
|
||||
{
|
||||
// Parameters: (instance to run on, array of arguments)
|
||||
addWordMethod.Invoke(Localization.instance, new object[] { entry.Key, entry.Value });
|
||||
}
|
||||
Debug.Log($"[MxValheim] Successfully injected {dict.Count} strings for {lang}.");
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("[MxValheim] Critical Error: Could not find AddWord method in game code.");
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.LogError($"[MxValheim] Error loading JSON: {e.Message}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private bool LoadJsonConfig()
|
||||
|
||||
@@ -35,11 +35,11 @@
|
||||
<Reference Include="0Harmony">
|
||||
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\BepInEx\core\0Harmony.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Assembly-CSharp-publicized">
|
||||
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\Assembly-CSharp-publicized.dll</HintPath>
|
||||
<Reference Include="assembly_guiutils_publicized">
|
||||
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\publicized_assemblies\assembly_guiutils_publicized.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="assembly_valheim-publicized">
|
||||
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\assembly_valheim-publicized.dll</HintPath>
|
||||
<Reference Include="assembly_valheim_publicized">
|
||||
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\publicized_assemblies\assembly_valheim_publicized.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="BepInEx">
|
||||
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\BepInEx\core\BepInEx.dll</HintPath>
|
||||
@@ -48,6 +48,7 @@
|
||||
<Reference Include="Newtonsoft.Json">
|
||||
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\Newtonsoft.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="PresentationFramework" />
|
||||
<Reference Include="Splatform, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
@@ -62,6 +63,10 @@
|
||||
<Reference Include="UnityEngine">
|
||||
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\UnityEngine.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="UnityEngine.AssetBundleModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\UnityEngine.AssetBundleModule.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="UnityEngine.CoreModule">
|
||||
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
|
||||
</Reference>
|
||||
@@ -97,10 +102,12 @@
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>
|
||||
copy /Y "$(TargetDir)$(TargetName).dll" "E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\"
|
||||
copy /Y "$(TargetDir)$(TargetName).pdb" "E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\"
|
||||
copy /Y "$(TargetDir)$(TargetName).dll" "E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\MxValheim\"
|
||||
copy /Y "$(TargetDir)$(TargetName).pdb" "E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\MxValheim\"
|
||||
|
||||
copy /Y "$(TargetDir)$(TargetName).dll" "R:\Server\valdev\BepInEx\plugins\"
|
||||
copy /Y "$(TargetDir)$(TargetName).pdb" "R:\Server\valdev\BepInEx\plugins\"</PostBuildEvent>
|
||||
copy /Y "$(TargetDir)$(TargetName).dll" "R:\Server\valdev\BepInEx\plugins\MxValheim\"
|
||||
copy /Y "$(TargetDir)$(TargetName).pdb" "R:\Server\valdev\BepInEx\plugins\MxValheim\"
|
||||
if exist "E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\MxValheim.zip" del "E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\MxValheim.zip"
|
||||
"C:\Program Files\7-Zip\7z.exe" a -tzip "E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\MxValheim.zip" "E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\MxValheim\*"</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -1,9 +1,11 @@
|
||||

|
||||
|
||||
## MxValheim
|
||||
Official Mx Valheim Mod.
|
||||
Official **MxValheim Server** Mod.
|
||||
**This mod is created to be used Client/Server side. A lot of features are not working in solo mode.**
|
||||
|
||||
## Features
|
||||
- Use your client language with built-in localization.
|
||||
- Kill Feed with custom UI showing player kill and death.
|
||||
- Tweak individual item(s) weight in "BepInEx\config\mxvalheim.custom_weights.json".
|
||||
- Ore drop multiplier. (Value available in the generated config.)
|
||||
|
||||
Reference in New Issue
Block a user