From 23462a4d59b547a7b65e7e32b899823d1455c279 Mon Sep 17 00:00:00 2001 From: Lucca Faria Ferri Date: Wed, 13 Sep 2023 14:34:31 +0200 Subject: [PATCH] config.mods.json is now under solution + small changes --- src/DiIiS-NA/Blizzless.csproj | 3 + .../D3-GameServer/Core/Types/Math/Vector2F.cs | 20 +--- src/DiIiS-NA/D3-GameServer/GameModsConfig.cs | 78 +------------ src/DiIiS-NA/config.mods.json | 106 ++++++++++++++++++ 4 files changed, 116 insertions(+), 91 deletions(-) create mode 100644 src/DiIiS-NA/config.mods.json diff --git a/src/DiIiS-NA/Blizzless.csproj b/src/DiIiS-NA/Blizzless.csproj index fc13cc4..1a19163 100644 --- a/src/DiIiS-NA/Blizzless.csproj +++ b/src/DiIiS-NA/Blizzless.csproj @@ -118,6 +118,9 @@ Always + + PreserveNewest + diff --git a/src/DiIiS-NA/D3-GameServer/Core/Types/Math/Vector2F.cs b/src/DiIiS-NA/D3-GameServer/Core/Types/Math/Vector2F.cs index 1d39593..7dc6709 100644 --- a/src/DiIiS-NA/D3-GameServer/Core/Types/Math/Vector2F.cs +++ b/src/DiIiS-NA/D3-GameServer/Core/Types/Math/Vector2F.cs @@ -12,25 +12,13 @@ namespace DiIiS_NA.GameServer.Core.Types.Math private static Vector2F _unitX; private static Vector2F _unitY; - public static Vector2F Zero - { - get { return _zero; } - } + public static Vector2F Zero => _zero; - public static Vector2F One - { - get { return _one; } - } + public static Vector2F One => _one; - public static Vector2F UnitX - { - get { return _unitX; } - } + public static Vector2F UnitX => _unitX; - public static Vector2F UnitY - { - get { return _unitY; } - } + public static Vector2F UnitY => _unitY; public Vector2F(float x, float y) { diff --git a/src/DiIiS-NA/D3-GameServer/GameModsConfig.cs b/src/DiIiS-NA/D3-GameServer/GameModsConfig.cs index 14ef667..e66ffac 100644 --- a/src/DiIiS-NA/D3-GameServer/GameModsConfig.cs +++ b/src/DiIiS-NA/D3-GameServer/GameModsConfig.cs @@ -149,10 +149,8 @@ public class GameModsConfig if (content.TryFromJson(out GameModsConfig config, out Exception ex)) { Logger.Success("Game mods loaded successfully!"); - Logger.Info("$[italic]$Re-formatting$[/]$ $[white on red underline]$ config.mods.json $[/]$..."); var @new = config.ToJson(Formatting.Indented); File.WriteAllText(@"config.mods.json", @new); - Logger.Success("Game mods re-formatted!"); Instance = config; return; } @@ -166,79 +164,9 @@ public class GameModsConfig private static GameModsConfig CreateDefaultFile() { var migration = GameServerConfig.Instance; - Logger.Info("$[blue]$Migrating mods configuration file...$[/]$"); - GameModsConfig content = new() - { -#pragma warning disable CS0618 - - Rate = - { - Experience = migration.RateExp, - Gold = migration.RateMoney, - ChangeDrop = migration.RateChangeDrop, - Drop = migration.RateDrop - }, - Health = - { - ResurrectionCharges = migration.ResurrectionCharges, - PotionCooldown = migration.HealthPotionCooldown, - PotionRestorePercentage = migration.HealthPotionRestorePercentage - }, - Monster = - { - HealthMultiplier = migration.RateMonsterHP, - DamageMultiplier = migration.RateMonsterDMG - }, - Boss = - { - HealthMultiplier = migration.BossHealthMultiplier, - DamageMultiplier = migration.BossDamageMultiplier - }, - Quest = - { - AutoSave = migration.AutoSaveQuests, - UnlockAllWaypoints = migration.UnlockAllWaypoints - }, - Player = - { - Multipliers = - { - Strength = new(migration.StrengthMultiplier, migration.StrengthParagonMultiplier), - Dexterity = new(migration.DexterityMultiplier, migration.DexterityParagonMultiplier), - Intelligence = new(migration.IntelligenceMultiplier, migration.IntelligenceParagonMultiplier), - Vitality = new(migration.VitalityMultiplier, migration.VitalityParagonMultiplier) - } - }, - Items = - { - UnidentifiedDropChances = - { - HighQuality = migration.ChanceHighQualityUnidentified, - NormalQuality = migration.ChanceNormalUnidentified - } - }, - Minimap = - { - ForceVisibility = migration.ForceMinimapVisibility - }, - NephalemRift = - { - AutoFinish = migration.NephalemRiftAutoFinish, - AutoFinishThreshold = migration.NephalemRiftAutoFinishThreshold, - OrbsChance = migration.NephalemRiftAutoFinishThreshold, - ProgressMultiplier = migration.NephalemRiftProgressMultiplier - } -#pragma warning restore CS0618 - }; - File.WriteAllText("config.mods.json", content.ToJson()); - - if (Program.Build == 30 && Program.Stage < 6) - { - Logger.Success( - "$[underline]$Migration is complete!$[/]$ - All game mods migrated from $[white]$config.ini$[/]$ to $[white]$config.mods.json$[/]$."); - } - - return content; + File.WriteAllText("config.mods.json", new GameModsConfig().ToJson()); + Logger.Success("Game mods file created successfully!"); + return new GameModsConfig(); } } diff --git a/src/DiIiS-NA/config.mods.json b/src/DiIiS-NA/config.mods.json new file mode 100644 index 0000000..3c6436e --- /dev/null +++ b/src/DiIiS-NA/config.mods.json @@ -0,0 +1,106 @@ +{ + "Rate": { + "HealthByDifficulty": { + "0": 1.0, + "1": 1.0, + "2": 1.0, + "3": 1.0, + "4": 1.0, + "5": 1.0, + "6": 1.0, + "7": 1.0, + "8": 1.0, + "9": 1.0, + "10": 1.0, + "11": 1.0, + "12": 1.0, + "13": 1.0, + "14": 1.0, + "15": 1.0, + "16": 1.0, + "17": 1.0, + "18": 1.0, + "19": 1.0 + }, + "DamageByDifficulty": { + "0": 1.0, + "1": 1.0, + "2": 1.0, + "3": 1.0, + "4": 1.0, + "5": 1.0, + "6": 1.0, + "7": 1.0, + "8": 1.0, + "9": 1.0, + "10": 1.0, + "11": 1.0, + "12": 1.0, + "13": 1.0, + "14": 1.0, + "15": 1.0, + "16": 1.0, + "17": 1.0, + "18": 1.0, + "19": 1.0 + }, + "Experience": 1.0, + "Gold": 1.0, + "Drop": 1.0, + "ChangeDrop": 1.0 + }, + "Health": { + "PotionRestorePercentage": 60.0, + "PotionCooldown": 30.0, + "ResurrectionCharges": 5 + }, + "Monster": { + "AttacksPerSecond": 1.2, + "HealthMultiplier": 1.0, + "DamageMultiplier": 1.0, + "LookupRange": 100.0 + }, + "Boss": { + "HealthMultiplier": 2.0, + "DamageMultiplier": 1.0 + }, + "Quest": { + "AutoSave": true, + "UnlockAllWaypoints": false + }, + "Player": { + "Multipliers": { + "Strength": { + "Normal": 1.0, + "Paragon": 1.0 + }, + "Dexterity": { + "Normal": 1.0, + "Paragon": 1.0 + }, + "Intelligence": { + "Normal": 1.0, + "Paragon": 1.0 + }, + "Vitality": { + "Normal": 1.0, + "Paragon": 1.0 + } + } + }, + "Items": { + "UnidentifiedDropChances": { + "HighQuality": 80.0, + "NormalQuality": 5.0 + } + }, + "Minimap": { + "ForceVisibility": false + }, + "NephalemRift": { + "ProgressMultiplier": 1.0, + "AutoFinish": false, + "AutoFinishThreshold": 2, + "OrbsChance": 2.0 + } +} \ No newline at end of file