From 20e9301102936450b765cbc8ab3fb27d25cbe5a2 Mon Sep 17 00:00:00 2001
From: milimoe <mili@wrss.org>
Date: Fri, 1 Nov 2024 00:11:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=96=B0=E7=9A=84=E9=AD=94?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OshimaCore/Controllers/FunGameController.cs | 12 --------
 OshimaCore/Utils/FunGameUtil.cs             | 33 +++++++--------------
 OshimaModules/Modules/SkillModule.cs        |  7 +++++
 3 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/OshimaCore/Controllers/FunGameController.cs b/OshimaCore/Controllers/FunGameController.cs
index 440c090..5f48ce2 100644
--- a/OshimaCore/Controllers/FunGameController.cs
+++ b/OshimaCore/Controllers/FunGameController.cs
@@ -215,18 +215,6 @@ namespace Oshima.Core.Controllers
                 c.Level = General.GameplayEquilibriumConstant.MaxLevel;
                 c.NormalAttack.Level = General.GameplayEquilibriumConstant.MaxNormalAttackLevel;
 
-                Skill 冰霜攻击 = new 冰霜攻击(c)
-                {
-                    Level = General.GameplayEquilibriumConstant.MaxMagicLevel
-                };
-                c.Skills.Add(冰霜攻击);
-
-                Skill 疾风步 = new 疾风步(c)
-                {
-                    Level = General.GameplayEquilibriumConstant.MaxSkillLevel
-                };
-                c.Skills.Add(疾风步);
-
                 if (id == 1)
                 {
                     Skill META马 = new META马(c)
diff --git a/OshimaCore/Utils/FunGameUtil.cs b/OshimaCore/Utils/FunGameUtil.cs
index cb102bf..371fd39 100644
--- a/OshimaCore/Utils/FunGameUtil.cs
+++ b/OshimaCore/Utils/FunGameUtil.cs
@@ -11,24 +11,9 @@ namespace Oshima.Core.Utils
 {
     public class FunGameSimulation
     {
-        public FunGameSimulation()
-        {
-            InitCharacter();
-
-            bool printout = true;
-            List<string> strs = StartGame(printout);
-            if (printout == false)
-            {
-                foreach (string str in strs)
-                {
-                    Console.WriteLine(str);
-                }
-            }
-
-            Console.ReadKey();
-        }
-
         public static List<Character> Characters { get; } = [];
+        public static List<Skill> Skills { get; } = [];
+        public static List<Skill> Magics { get; } = [];
         public static List<Item> Items { get; } = [];
         public static Dictionary<Character, CharacterStatistics> CharacterStatistics { get; } = [];
         public static Dictionary<Character, CharacterStatistics> TeamCharacterStatistics { get; } = [];
@@ -100,11 +85,12 @@ namespace Oshima.Core.Utils
                         c.Level = clevel;
                         c.NormalAttack.Level = mlevel;
 
-                        Skill 鍐伴湝鏀诲嚮 = new 鍐伴湝鏀诲嚮(c)
+                        IEnumerable<Skill> magics = Magics.OrderBy(x => Random.Shared.Next()).Take(3);
+                        foreach (Skill magic in magics)
                         {
-                            Level = mlevel
-                        };
-                        c.Skills.Add(鍐伴湝鏀诲嚮);
+                            magic.Level = mlevel;
+                            c.Skills.Add(magic);
+                        }
 
                         Skill 鐤鹃姝� = new 鐤鹃姝�(c)
                         {
@@ -720,7 +706,7 @@ namespace Oshima.Core.Utils
             {
                 CharacterStatistics.Add(c, new());
             }
-
+            
             StatsConfig.LoadConfig();
             foreach (Character character in CharacterStatistics.Keys)
             {
@@ -747,6 +733,9 @@ namespace Oshima.Core.Utils
             Dictionary<string, Item> exItems = Factory.GetGameModuleInstances<Item>(OshimaGameModuleConstant.General, OshimaGameModuleConstant.Item);
             Items.AddRange(exItems.Values);
             Items.AddRange([new 鏀诲嚮涔嬬埅10(), new 鏀诲嚮涔嬬埅30(), new 鏀诲嚮涔嬬埅50()]);
+
+            Skills.AddRange([new 鐤鹃姝�()]);
+            Magics.AddRange([new 鍐伴湝鏀诲嚮(), new 鐏箣鐭�(), new 姘翠箣鐭�(), new 椋庝箣杞�(), new 鐭充箣閿�(), new 蹇冪伒涔嬬伀(), new 娆″厓涓婂崌(), new 鏆楃墿璐�()]);
         }
 
         public static void UpdateStatistics(CharacterStatistics totalStats, CharacterStatistics stats)
diff --git a/OshimaModules/Modules/SkillModule.cs b/OshimaModules/Modules/SkillModule.cs
index 06384f5..ed3bb49 100644
--- a/OshimaModules/Modules/SkillModule.cs
+++ b/OshimaModules/Modules/SkillModule.cs
@@ -28,6 +28,13 @@ namespace Oshima.FunGame.OshimaModules
                 Skill skill = id switch
                 {
                     (long)MagicID.鍐伴湝鏀诲嚮 => new 鍐伴湝鏀诲嚮(),
+                    (long)MagicID.鐏箣鐭� => new 鐏箣鐭�(),
+                    (long)MagicID.姘翠箣鐭� => new 姘翠箣鐭�(),
+                    (long)MagicID.鐭充箣閿� => new 鐭充箣閿�(),
+                    (long)MagicID.椋庝箣杞� => new 椋庝箣杞�(),
+                    (long)MagicID.蹇冪伒涔嬮湠 => new 蹇冪伒涔嬮湠(),
+                    (long)MagicID.娆″厓涓婂崌 => new 娆″厓涓婂崌(),
+                    (long)MagicID.鏆楃墿璐� => new 鏆楃墿璐�(),
                     (long)SkillID.鐤鹃姝� => new 鐤鹃姝�(),
                     (long)SuperSkillID.鍔涢噺鐖嗗彂 => new 鍔涢噺鐖嗗彂(),
                     (long)SuperSkillID.澶╄祼涔嬪姏 => new 澶╄祼涔嬪姏(),