From 81eb5720fcac39954ebb0df0e20211a360ca27ea Mon Sep 17 00:00:00 2001 From: VDH Date: Wed, 7 Jan 2026 14:45:32 +0700 Subject: [PATCH 1/3] skill ui progressing --- .../PerfectWorld/Scripts/Common/EC_Configs.cs | 2 +- .../Scripts/Managers/CECManager.cs | 1 + .../PerfectWorld/Scripts/Managers/EC_Skill.cs | 1 - .../Scripts/ModelFiles/CECTaoistRank.cs | 3 +- .../Scripts/Skills/SkillStubs1.cs | 446 +++++++++--------- Assets/PerfectWorld/Scripts/Skills/skill.cs | 25 +- Assets/PerfectWorld/Scripts/Skills/skill1.cs | 24 +- Assets/PerfectWorld/Scripts/Skills/skill7.cs | 1 + Assets/PerfectWorld/Scripts/Skills/skill8.cs | 1 + Assets/PerfectWorld/Scripts/Skills/skill9.cs | 1 + .../Scripts/UI/Dialogs/CDlgSkillSubList.cs | 12 +- Assets/PerfectWorld/Scripts/skill2.cs | 171 +++++++ Assets/Prefabs/UI/SkillUI.prefab | 57 +-- Assets/Scripts/CECHostPlayer.cs | 1 - 14 files changed, 468 insertions(+), 278 deletions(-) create mode 100644 Assets/PerfectWorld/Scripts/skill2.cs diff --git a/Assets/PerfectWorld/Scripts/Common/EC_Configs.cs b/Assets/PerfectWorld/Scripts/Common/EC_Configs.cs index eceb653481..51a94a36d9 100644 --- a/Assets/PerfectWorld/Scripts/Common/EC_Configs.cs +++ b/Assets/PerfectWorld/Scripts/Common/EC_Configs.cs @@ -1083,7 +1083,7 @@ namespace BrewMonster } else if (dwVer > EC_ConfigConstants.EC_CONFIG_VERSION) { - throw new Exception("CECConfigs::LoadUserConfigData, version mismatch"); + throw new Exception("CECConfigs::LoadUserConfigData, version mismatch dwVer="+ dwVer); } m_vs.Read(reader, dwVer); m_gs.Read(reader, dwVer); diff --git a/Assets/PerfectWorld/Scripts/Managers/CECManager.cs b/Assets/PerfectWorld/Scripts/Managers/CECManager.cs index df56adc1af..e51446f972 100644 --- a/Assets/PerfectWorld/Scripts/Managers/CECManager.cs +++ b/Assets/PerfectWorld/Scripts/Managers/CECManager.cs @@ -156,5 +156,6 @@ namespace BrewMonster.Managers + diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_Skill.cs b/Assets/PerfectWorld/Scripts/Managers/EC_Skill.cs index f37a48d445..e737f4f1f7 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_Skill.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_Skill.cs @@ -148,7 +148,6 @@ namespace BrewMonster if (m_bCooling) { - BMLogger.LogError($"CECSkill Tick m_bCooling: = {m_bCooling}, m_iCoolCnt={m_iCoolCnt}"); // In cooling state m_iCoolCnt -= tickTime; if (m_iCoolCnt <= 0) diff --git a/Assets/PerfectWorld/Scripts/ModelFiles/CECTaoistRank.cs b/Assets/PerfectWorld/Scripts/ModelFiles/CECTaoistRank.cs index 5156504fe2..b26e6487e4 100644 --- a/Assets/PerfectWorld/Scripts/ModelFiles/CECTaoistRank.cs +++ b/Assets/PerfectWorld/Scripts/ModelFiles/CECTaoistRank.cs @@ -17,6 +17,7 @@ namespace BrewMonster [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)] private static void OnPlay() { + BMLogger.Log("CECTaoistRank OnPlay Reset"); initComplete = false; CECTaoistRank[] s_allTaoistRanks = new CECTaoistRank[(int)ToaistRank.TotalRankCount]; } @@ -131,7 +132,7 @@ namespace BrewMonster { return; } - for (int i = 0; i < (int)ToaistRank.TotalRankCount; i++) + for (int i = (int)ToaistRank.TotalRankCount - 1; i >= 0; i--) { if (s_allTaoistRanks[i] == null) { diff --git a/Assets/PerfectWorld/Scripts/Skills/SkillStubs1.cs b/Assets/PerfectWorld/Scripts/Skills/SkillStubs1.cs index 50f0cf2b66..80f9dab211 100644 --- a/Assets/PerfectWorld/Scripts/Skills/SkillStubs1.cs +++ b/Assets/PerfectWorld/Scripts/Skills/SkillStubs1.cs @@ -40,229 +40,229 @@ namespace BrewMonster public static Skill78Stub __stub_Skill78Stub = new Skill78Stub(); public static Skill79Stub __stub_Skill79Stub = new Skill79Stub(); public static Skill80Stub __stub_Skill80Stub = new Skill80Stub(); - //public static Skill176Stub __stub_Skill176Stub = new Skill176Stub(); - //public static Skill177Stub __stub_Skill177Stub = new Skill177Stub(); - //public static Skill178Stub __stub_Skill178Stub = new Skill178Stub(); - //public static Skill179Stub __stub_Skill179Stub = new Skill179Stub(); - //public static Skill187Stub __stub_Skill187Stub = new Skill187Stub(); - //public static Skill226Stub __stub_Skill226Stub = new Skill226Stub(); - //public static Skill227Stub __stub_Skill227Stub = new Skill227Stub(); - //public static Skill362Stub __stub_Skill362Stub = new Skill362Stub(); - //public static Skill363Stub __stub_Skill363Stub = new Skill363Stub(); - //public static Skill374Stub __stub_Skill374Stub = new Skill374Stub(); - //public static Skill375Stub __stub_Skill375Stub = new Skill375Stub(); - //public static Skill376Stub __stub_Skill376Stub = new Skill376Stub(); - //public static Skill377Stub __stub_Skill377Stub = new Skill377Stub(); - //public static Skill378Stub __stub_Skill378Stub = new Skill378Stub(); - //public static Skill379Stub __stub_Skill379Stub = new Skill379Stub(); - //public static Skill380Stub __stub_Skill380Stub = new Skill380Stub(); - //public static Skill381Stub __stub_Skill381Stub = new Skill381Stub(); - //public static Skill382Stub __stub_Skill382Stub = new Skill382Stub(); - //public static Skill383Stub __stub_Skill383Stub = new Skill383Stub(); - //public static Skill384Stub __stub_Skill384Stub = new Skill384Stub(); - //public static Skill385Stub __stub_Skill385Stub = new Skill385Stub(); - //public static Skill386Stub __stub_Skill386Stub = new Skill386Stub(); - //public static Skill387Stub __stub_Skill387Stub = new Skill387Stub(); - //public static Skill388Stub __stub_Skill388Stub = new Skill388Stub(); - //public static Skill389Stub __stub_Skill389Stub = new Skill389Stub(); - //public static Skill390Stub __stub_Skill390Stub = new Skill390Stub(); - //public static Skill391Stub __stub_Skill391Stub = new Skill391Stub(); - //public static Skill392Stub __stub_Skill392Stub = new Skill392Stub(); - //public static Skill393Stub __stub_Skill393Stub = new Skill393Stub(); - //public static Skill394Stub __stub_Skill394Stub = new Skill394Stub(); - //public static Skill395Stub __stub_Skill395Stub = new Skill395Stub(); - //public static Skill396Stub __stub_Skill396Stub = new Skill396Stub(); - //public static Skill397Stub __stub_Skill397Stub = new Skill397Stub(); - //public static Skill398Stub __stub_Skill398Stub = new Skill398Stub(); - //public static Skill399Stub __stub_Skill399Stub = new Skill399Stub(); - //public static Skill400Stub __stub_Skill400Stub = new Skill400Stub(); - //public static Skill401Stub __stub_Skill401Stub = new Skill401Stub(); - //public static Skill402Stub __stub_Skill402Stub = new Skill402Stub(); - //public static Skill403Stub __stub_Skill403Stub = new Skill403Stub(); - //public static Skill404Stub __stub_Skill404Stub = new Skill404Stub(); - //public static Skill405Stub __stub_Skill405Stub = new Skill405Stub(); - //public static Skill406Stub __stub_Skill406Stub = new Skill406Stub(); - //public static Skill407Stub __stub_Skill407Stub = new Skill407Stub(); - //public static Skill408Stub __stub_Skill408Stub = new Skill408Stub(); - //public static Skill409Stub __stub_Skill409Stub = new Skill409Stub(); - //public static Skill410Stub __stub_Skill410Stub = new Skill410Stub(); - //public static Skill411Stub __stub_Skill411Stub = new Skill411Stub(); - //public static Skill412Stub __stub_Skill412Stub = new Skill412Stub(); - //public static Skill413Stub __stub_Skill413Stub = new Skill413Stub(); - //public static Skill414Stub __stub_Skill414Stub = new Skill414Stub(); - //public static Skill415Stub __stub_Skill415Stub = new Skill415Stub(); - //public static Skill416Stub __stub_Skill416Stub = new Skill416Stub(); - //public static Skill417Stub __stub_Skill417Stub = new Skill417Stub(); - //public static Skill418Stub __stub_Skill418Stub = new Skill418Stub(); - //public static Skill419Stub __stub_Skill419Stub = new Skill419Stub(); - //public static Skill420Stub __stub_Skill420Stub = new Skill420Stub(); - //public static Skill421Stub __stub_Skill421Stub = new Skill421Stub(); - //public static Skill422Stub __stub_Skill422Stub = new Skill422Stub(); - //public static Skill423Stub __stub_Skill423Stub = new Skill423Stub(); - //public static Skill424Stub __stub_Skill424Stub = new Skill424Stub(); - //public static Skill425Stub __stub_Skill425Stub = new Skill425Stub(); - //public static Skill426Stub __stub_Skill426Stub = new Skill426Stub(); - //public static Skill427Stub __stub_Skill427Stub = new Skill427Stub(); - //public static Skill428Stub __stub_Skill428Stub = new Skill428Stub(); - //public static Skill429Stub __stub_Skill429Stub = new Skill429Stub(); - //public static Skill430Stub __stub_Skill430Stub = new Skill430Stub(); - //public static Skill431Stub __stub_Skill431Stub = new Skill431Stub(); - //public static Skill432Stub __stub_Skill432Stub = new Skill432Stub(); - //public static Skill433Stub __stub_Skill433Stub = new Skill433Stub(); - //public static Skill434Stub __stub_Skill434Stub = new Skill434Stub(); - //public static Skill435Stub __stub_Skill435Stub = new Skill435Stub(); - //public static Skill436Stub __stub_Skill436Stub = new Skill436Stub(); - //public static Skill437Stub __stub_Skill437Stub = new Skill437Stub(); - //public static Skill438Stub __stub_Skill438Stub = new Skill438Stub(); - //public static Skill439Stub __stub_Skill439Stub = new Skill439Stub(); - //public static Skill896Stub __stub_Skill896Stub = new Skill896Stub(); - //public static Skill897Stub __stub_Skill897Stub = new Skill897Stub(); - //public static Skill898Stub __stub_Skill898Stub = new Skill898Stub(); - //public static Skill899Stub __stub_Skill899Stub = new Skill899Stub(); - //public static Skill900Stub __stub_Skill900Stub = new Skill900Stub(); - //public static Skill923Stub __stub_Skill923Stub = new Skill923Stub(); - //public static Skill924Stub __stub_Skill924Stub = new Skill924Stub(); - //public static Skill1195Stub __stub_Skill1195Stub = new Skill1195Stub(); - //public static Skill1815Stub __stub_Skill1815Stub = new Skill1815Stub(); - //public static Skill1816Stub __stub_Skill1816Stub = new Skill1816Stub(); - //public static Skill1817Stub __stub_Skill1817Stub = new Skill1817Stub(); - //public static Skill1818Stub __stub_Skill1818Stub = new Skill1818Stub(); - //public static Skill1819Stub __stub_Skill1819Stub = new Skill1819Stub(); - //public static Skill1868Stub __stub_Skill1868Stub = new Skill1868Stub(); - //public static Skill1871Stub __stub_Skill1871Stub = new Skill1871Stub(); - //public static Skill1872Stub __stub_Skill1872Stub = new Skill1872Stub(); - //public static Skill2206Stub __stub_Skill2206Stub = new Skill2206Stub(); - //public static Skill2207Stub __stub_Skill2207Stub = new Skill2207Stub(); - //public static Skill2208Stub __stub_Skill2208Stub = new Skill2208Stub(); - //public static Skill2209Stub __stub_Skill2209Stub = new Skill2209Stub(); - //public static Skill2210Stub __stub_Skill2210Stub = new Skill2210Stub(); - //public static Skill2211Stub __stub_Skill2211Stub = new Skill2211Stub(); - //public static Skill2352Stub __stub_Skill2352Stub = new Skill2352Stub(); - //public static Skill2367Stub __stub_Skill2367Stub = new Skill2367Stub(); - //public static Skill2368Stub __stub_Skill2368Stub = new Skill2368Stub(); - //public static Skill2369Stub __stub_Skill2369Stub = new Skill2369Stub(); - //public static Skill2370Stub __stub_Skill2370Stub = new Skill2370Stub(); - //public static Skill2371Stub __stub_Skill2371Stub = new Skill2371Stub(); - //public static Skill2372Stub __stub_Skill2372Stub = new Skill2372Stub(); - //public static Skill2373Stub __stub_Skill2373Stub = new Skill2373Stub(); - //public static Skill2374Stub __stub_Skill2374Stub = new Skill2374Stub(); - //public static Skill2375Stub __stub_Skill2375Stub = new Skill2375Stub(); - //public static Skill7Stub __stub_Skill7Stub = new Skill7Stub(); - //public static Skill8Stub __stub_Skill8Stub = new Skill8Stub(); - //public static Skill9Stub __stub_Skill9Stub = new Skill9Stub(); - //public static Skill10Stub __stub_Skill10Stub = new Skill10Stub(); - //public static Skill53Stub __stub_Skill53Stub = new Skill53Stub(); - //public static Skill81Stub __stub_Skill81Stub = new Skill81Stub(); - //public static Skill84Stub __stub_Skill84Stub = new Skill84Stub(); - //public static Skill85Stub __stub_Skill85Stub = new Skill85Stub(); - //public static Skill86Stub __stub_Skill86Stub = new Skill86Stub(); - //public static Skill87Stub __stub_Skill87Stub = new Skill87Stub(); - //public static Skill88Stub __stub_Skill88Stub = new Skill88Stub(); - //public static Skill89Stub __stub_Skill89Stub = new Skill89Stub(); - //public static Skill90Stub __stub_Skill90Stub = new Skill90Stub(); - //public static Skill91Stub __stub_Skill91Stub = new Skill91Stub(); - //public static Skill92Stub __stub_Skill92Stub = new Skill92Stub(); - //public static Skill93Stub __stub_Skill93Stub = new Skill93Stub(); - //public static Skill94Stub __stub_Skill94Stub = new Skill94Stub(); - //public static Skill95Stub __stub_Skill95Stub = new Skill95Stub(); - //public static Skill96Stub __stub_Skill96Stub = new Skill96Stub(); - //public static Skill97Stub __stub_Skill97Stub = new Skill97Stub(); - //public static Skill98Stub __stub_Skill98Stub = new Skill98Stub(); - //public static Skill99Stub __stub_Skill99Stub = new Skill99Stub(); - //public static Skill100Stub __stub_Skill100Stub = new Skill100Stub(); - //public static Skill101Stub __stub_Skill101Stub = new Skill101Stub(); - //public static Skill180Stub __stub_Skill180Stub = new Skill180Stub(); - //public static Skill181Stub __stub_Skill181Stub = new Skill181Stub(); - //public static Skill182Stub __stub_Skill182Stub = new Skill182Stub(); - //public static Skill183Stub __stub_Skill183Stub = new Skill183Stub(); - //public static Skill184Stub __stub_Skill184Stub = new Skill184Stub(); - //public static Skill228Stub __stub_Skill228Stub = new Skill228Stub(); - //public static Skill229Stub __stub_Skill229Stub = new Skill229Stub(); - //public static Skill364Stub __stub_Skill364Stub = new Skill364Stub(); - //public static Skill365Stub __stub_Skill365Stub = new Skill365Stub(); - //public static Skill440Stub __stub_Skill440Stub = new Skill440Stub(); - //public static Skill441Stub __stub_Skill441Stub = new Skill441Stub(); - //public static Skill442Stub __stub_Skill442Stub = new Skill442Stub(); - //public static Skill443Stub __stub_Skill443Stub = new Skill443Stub(); - //public static Skill444Stub __stub_Skill444Stub = new Skill444Stub(); - //public static Skill445Stub __stub_Skill445Stub = new Skill445Stub(); - //public static Skill446Stub __stub_Skill446Stub = new Skill446Stub(); - //public static Skill447Stub __stub_Skill447Stub = new Skill447Stub(); - //public static Skill448Stub __stub_Skill448Stub = new Skill448Stub(); - //public static Skill449Stub __stub_Skill449Stub = new Skill449Stub(); - //public static Skill450Stub __stub_Skill450Stub = new Skill450Stub(); - //public static Skill451Stub __stub_Skill451Stub = new Skill451Stub(); - //public static Skill452Stub __stub_Skill452Stub = new Skill452Stub(); - //public static Skill453Stub __stub_Skill453Stub = new Skill453Stub(); - //public static Skill454Stub __stub_Skill454Stub = new Skill454Stub(); - //public static Skill455Stub __stub_Skill455Stub = new Skill455Stub(); - //public static Skill456Stub __stub_Skill456Stub = new Skill456Stub(); - //public static Skill457Stub __stub_Skill457Stub = new Skill457Stub(); - //public static Skill458Stub __stub_Skill458Stub = new Skill458Stub(); - //public static Skill459Stub __stub_Skill459Stub = new Skill459Stub(); - //public static Skill460Stub __stub_Skill460Stub = new Skill460Stub(); - //public static Skill461Stub __stub_Skill461Stub = new Skill461Stub(); - //public static Skill462Stub __stub_Skill462Stub = new Skill462Stub(); - //public static Skill463Stub __stub_Skill463Stub = new Skill463Stub(); - //public static Skill464Stub __stub_Skill464Stub = new Skill464Stub(); - //public static Skill465Stub __stub_Skill465Stub = new Skill465Stub(); - //public static Skill466Stub __stub_Skill466Stub = new Skill466Stub(); - //public static Skill467Stub __stub_Skill467Stub = new Skill467Stub(); - //public static Skill468Stub __stub_Skill468Stub = new Skill468Stub(); - //public static Skill469Stub __stub_Skill469Stub = new Skill469Stub(); - //public static Skill470Stub __stub_Skill470Stub = new Skill470Stub(); - //public static Skill471Stub __stub_Skill471Stub = new Skill471Stub(); - //public static Skill472Stub __stub_Skill472Stub = new Skill472Stub(); - //public static Skill473Stub __stub_Skill473Stub = new Skill473Stub(); - //public static Skill474Stub __stub_Skill474Stub = new Skill474Stub(); - //public static Skill475Stub __stub_Skill475Stub = new Skill475Stub(); - //public static Skill476Stub __stub_Skill476Stub = new Skill476Stub(); - //public static Skill477Stub __stub_Skill477Stub = new Skill477Stub(); - //public static Skill478Stub __stub_Skill478Stub = new Skill478Stub(); - //public static Skill479Stub __stub_Skill479Stub = new Skill479Stub(); - //public static Skill480Stub __stub_Skill480Stub = new Skill480Stub(); - //public static Skill481Stub __stub_Skill481Stub = new Skill481Stub(); - //public static Skill482Stub __stub_Skill482Stub = new Skill482Stub(); - //public static Skill483Stub __stub_Skill483Stub = new Skill483Stub(); - //public static Skill484Stub __stub_Skill484Stub = new Skill484Stub(); - //public static Skill485Stub __stub_Skill485Stub = new Skill485Stub(); - //public static Skill486Stub __stub_Skill486Stub = new Skill486Stub(); - //public static Skill487Stub __stub_Skill487Stub = new Skill487Stub(); - //public static Skill488Stub __stub_Skill488Stub = new Skill488Stub(); - //public static Skill489Stub __stub_Skill489Stub = new Skill489Stub(); - //public static Skill490Stub __stub_Skill490Stub = new Skill490Stub(); - //public static Skill491Stub __stub_Skill491Stub = new Skill491Stub(); - //public static Skill901Stub __stub_Skill901Stub = new Skill901Stub(); - //public static Skill902Stub __stub_Skill902Stub = new Skill902Stub(); - //public static Skill903Stub __stub_Skill903Stub = new Skill903Stub(); - //public static Skill904Stub __stub_Skill904Stub = new Skill904Stub(); - //public static Skill905Stub __stub_Skill905Stub = new Skill905Stub(); - //public static Skill925Stub __stub_Skill925Stub = new Skill925Stub(); - //public static Skill926Stub __stub_Skill926Stub = new Skill926Stub(); - //public static Skill1805Stub __stub_Skill1805Stub = new Skill1805Stub(); - //public static Skill1806Stub __stub_Skill1806Stub = new Skill1806Stub(); - //public static Skill1807Stub __stub_Skill1807Stub = new Skill1807Stub(); - //public static Skill1808Stub __stub_Skill1808Stub = new Skill1808Stub(); - //public static Skill1809Stub __stub_Skill1809Stub = new Skill1809Stub(); - //public static Skill1864Stub __stub_Skill1864Stub = new Skill1864Stub(); - //public static Skill1865Stub __stub_Skill1865Stub = new Skill1865Stub(); - //public static Skill1873Stub __stub_Skill1873Stub = new Skill1873Stub(); - //public static Skill1874Stub __stub_Skill1874Stub = new Skill1874Stub(); - //public static Skill1951Stub __stub_Skill1951Stub = new Skill1951Stub(); - //public static Skill2254Stub __stub_Skill2254Stub = new Skill2254Stub(); - //public static Skill2255Stub __stub_Skill2255Stub = new Skill2255Stub(); - //public static Skill2256Stub __stub_Skill2256Stub = new Skill2256Stub(); - //public static Skill2257Stub __stub_Skill2257Stub = new Skill2257Stub(); - //public static Skill2258Stub __stub_Skill2258Stub = new Skill2258Stub(); - //public static Skill2259Stub __stub_Skill2259Stub = new Skill2259Stub(); - //public static Skill2260Stub __stub_Skill2260Stub = new Skill2260Stub(); - //public static Skill2261Stub __stub_Skill2261Stub = new Skill2261Stub(); - //public static Skill2262Stub __stub_Skill2262Stub = new Skill2262Stub(); - //public static Skill2263Stub __stub_Skill2263Stub = new Skill2263Stub(); - //public static Skill2264Stub __stub_Skill2264Stub = new Skill2264Stub(); - //public static Skill2265Stub __stub_Skill2265Stub = new Skill2265Stub(); - //public static Skill2452Stub __stub_Skill2452Stub = new Skill2452Stub(); - //public static Skill2453Stub __stub_Skill2453Stub = new Skill2453Stub(); + public static Skill176Stub __stub_Skill176Stub = new Skill176Stub(); + public static Skill177Stub __stub_Skill177Stub = new Skill177Stub(); + public static Skill178Stub __stub_Skill178Stub = new Skill178Stub(); + public static Skill179Stub __stub_Skill179Stub = new Skill179Stub(); + public static Skill187Stub __stub_Skill187Stub = new Skill187Stub(); + public static Skill226Stub __stub_Skill226Stub = new Skill226Stub(); + public static Skill227Stub __stub_Skill227Stub = new Skill227Stub(); + public static Skill362Stub __stub_Skill362Stub = new Skill362Stub(); + public static Skill363Stub __stub_Skill363Stub = new Skill363Stub(); + public static Skill374Stub __stub_Skill374Stub = new Skill374Stub(); + public static Skill375Stub __stub_Skill375Stub = new Skill375Stub(); + public static Skill376Stub __stub_Skill376Stub = new Skill376Stub(); + public static Skill377Stub __stub_Skill377Stub = new Skill377Stub(); + public static Skill378Stub __stub_Skill378Stub = new Skill378Stub(); + public static Skill379Stub __stub_Skill379Stub = new Skill379Stub(); + public static Skill380Stub __stub_Skill380Stub = new Skill380Stub(); + public static Skill381Stub __stub_Skill381Stub = new Skill381Stub(); + public static Skill382Stub __stub_Skill382Stub = new Skill382Stub(); + public static Skill383Stub __stub_Skill383Stub = new Skill383Stub(); + public static Skill384Stub __stub_Skill384Stub = new Skill384Stub(); + public static Skill385Stub __stub_Skill385Stub = new Skill385Stub(); + public static Skill386Stub __stub_Skill386Stub = new Skill386Stub(); + public static Skill387Stub __stub_Skill387Stub = new Skill387Stub(); + public static Skill388Stub __stub_Skill388Stub = new Skill388Stub(); + public static Skill389Stub __stub_Skill389Stub = new Skill389Stub(); + public static Skill390Stub __stub_Skill390Stub = new Skill390Stub(); + public static Skill391Stub __stub_Skill391Stub = new Skill391Stub(); + public static Skill392Stub __stub_Skill392Stub = new Skill392Stub(); + public static Skill393Stub __stub_Skill393Stub = new Skill393Stub(); + public static Skill394Stub __stub_Skill394Stub = new Skill394Stub(); + public static Skill395Stub __stub_Skill395Stub = new Skill395Stub(); + public static Skill396Stub __stub_Skill396Stub = new Skill396Stub(); + public static Skill397Stub __stub_Skill397Stub = new Skill397Stub(); + public static Skill398Stub __stub_Skill398Stub = new Skill398Stub(); + public static Skill399Stub __stub_Skill399Stub = new Skill399Stub(); + public static Skill400Stub __stub_Skill400Stub = new Skill400Stub(); + public static Skill401Stub __stub_Skill401Stub = new Skill401Stub(); + public static Skill402Stub __stub_Skill402Stub = new Skill402Stub(); + public static Skill403Stub __stub_Skill403Stub = new Skill403Stub(); + public static Skill404Stub __stub_Skill404Stub = new Skill404Stub(); + public static Skill405Stub __stub_Skill405Stub = new Skill405Stub(); + public static Skill406Stub __stub_Skill406Stub = new Skill406Stub(); + public static Skill407Stub __stub_Skill407Stub = new Skill407Stub(); + public static Skill408Stub __stub_Skill408Stub = new Skill408Stub(); + public static Skill409Stub __stub_Skill409Stub = new Skill409Stub(); + public static Skill410Stub __stub_Skill410Stub = new Skill410Stub(); + public static Skill411Stub __stub_Skill411Stub = new Skill411Stub(); + public static Skill412Stub __stub_Skill412Stub = new Skill412Stub(); + public static Skill413Stub __stub_Skill413Stub = new Skill413Stub(); + public static Skill414Stub __stub_Skill414Stub = new Skill414Stub(); + public static Skill415Stub __stub_Skill415Stub = new Skill415Stub(); + public static Skill416Stub __stub_Skill416Stub = new Skill416Stub(); + public static Skill417Stub __stub_Skill417Stub = new Skill417Stub(); + public static Skill418Stub __stub_Skill418Stub = new Skill418Stub(); + public static Skill419Stub __stub_Skill419Stub = new Skill419Stub(); + public static Skill420Stub __stub_Skill420Stub = new Skill420Stub(); + public static Skill421Stub __stub_Skill421Stub = new Skill421Stub(); + public static Skill422Stub __stub_Skill422Stub = new Skill422Stub(); + public static Skill423Stub __stub_Skill423Stub = new Skill423Stub(); + public static Skill424Stub __stub_Skill424Stub = new Skill424Stub(); + public static Skill425Stub __stub_Skill425Stub = new Skill425Stub(); + public static Skill426Stub __stub_Skill426Stub = new Skill426Stub(); + public static Skill427Stub __stub_Skill427Stub = new Skill427Stub(); + public static Skill428Stub __stub_Skill428Stub = new Skill428Stub(); + public static Skill429Stub __stub_Skill429Stub = new Skill429Stub(); + public static Skill430Stub __stub_Skill430Stub = new Skill430Stub(); + public static Skill431Stub __stub_Skill431Stub = new Skill431Stub(); + public static Skill432Stub __stub_Skill432Stub = new Skill432Stub(); + public static Skill433Stub __stub_Skill433Stub = new Skill433Stub(); + public static Skill434Stub __stub_Skill434Stub = new Skill434Stub(); + public static Skill435Stub __stub_Skill435Stub = new Skill435Stub(); + public static Skill436Stub __stub_Skill436Stub = new Skill436Stub(); + public static Skill437Stub __stub_Skill437Stub = new Skill437Stub(); + public static Skill438Stub __stub_Skill438Stub = new Skill438Stub(); + public static Skill439Stub __stub_Skill439Stub = new Skill439Stub(); + public static Skill896Stub __stub_Skill896Stub = new Skill896Stub(); + public static Skill897Stub __stub_Skill897Stub = new Skill897Stub(); + public static Skill898Stub __stub_Skill898Stub = new Skill898Stub(); + public static Skill899Stub __stub_Skill899Stub = new Skill899Stub(); + public static Skill900Stub __stub_Skill900Stub = new Skill900Stub(); + public static Skill923Stub __stub_Skill923Stub = new Skill923Stub(); + public static Skill924Stub __stub_Skill924Stub = new Skill924Stub(); + public static Skill1195Stub __stub_Skill1195Stub = new Skill1195Stub(); + public static Skill1815Stub __stub_Skill1815Stub = new Skill1815Stub(); + public static Skill1816Stub __stub_Skill1816Stub = new Skill1816Stub(); + public static Skill1817Stub __stub_Skill1817Stub = new Skill1817Stub(); + public static Skill1818Stub __stub_Skill1818Stub = new Skill1818Stub(); + public static Skill1819Stub __stub_Skill1819Stub = new Skill1819Stub(); + public static Skill1868Stub __stub_Skill1868Stub = new Skill1868Stub(); + public static Skill1871Stub __stub_Skill1871Stub = new Skill1871Stub(); + public static Skill1872Stub __stub_Skill1872Stub = new Skill1872Stub(); + public static Skill2206Stub __stub_Skill2206Stub = new Skill2206Stub(); + public static Skill2207Stub __stub_Skill2207Stub = new Skill2207Stub(); + public static Skill2208Stub __stub_Skill2208Stub = new Skill2208Stub(); + public static Skill2209Stub __stub_Skill2209Stub = new Skill2209Stub(); + public static Skill2210Stub __stub_Skill2210Stub = new Skill2210Stub(); + public static Skill2211Stub __stub_Skill2211Stub = new Skill2211Stub(); + public static Skill2352Stub __stub_Skill2352Stub = new Skill2352Stub(); + public static Skill2367Stub __stub_Skill2367Stub = new Skill2367Stub(); + public static Skill2368Stub __stub_Skill2368Stub = new Skill2368Stub(); + public static Skill2369Stub __stub_Skill2369Stub = new Skill2369Stub(); + public static Skill2370Stub __stub_Skill2370Stub = new Skill2370Stub(); + public static Skill2371Stub __stub_Skill2371Stub = new Skill2371Stub(); + public static Skill2372Stub __stub_Skill2372Stub = new Skill2372Stub(); + public static Skill2373Stub __stub_Skill2373Stub = new Skill2373Stub(); + public static Skill2374Stub __stub_Skill2374Stub = new Skill2374Stub(); + public static Skill2375Stub __stub_Skill2375Stub = new Skill2375Stub(); + public static Skill7Stub __stub_Skill7Stub = new Skill7Stub(); + public static Skill8Stub __stub_Skill8Stub = new Skill8Stub(); + public static Skill9Stub __stub_Skill9Stub = new Skill9Stub(); + public static Skill10Stub __stub_Skill10Stub = new Skill10Stub(); + public static Skill53Stub __stub_Skill53Stub = new Skill53Stub(); + public static Skill81Stub __stub_Skill81Stub = new Skill81Stub(); + public static Skill84Stub __stub_Skill84Stub = new Skill84Stub(); + public static Skill85Stub __stub_Skill85Stub = new Skill85Stub(); + public static Skill86Stub __stub_Skill86Stub = new Skill86Stub(); + public static Skill87Stub __stub_Skill87Stub = new Skill87Stub(); + public static Skill88Stub __stub_Skill88Stub = new Skill88Stub(); + public static Skill89Stub __stub_Skill89Stub = new Skill89Stub(); + public static Skill90Stub __stub_Skill90Stub = new Skill90Stub(); + public static Skill91Stub __stub_Skill91Stub = new Skill91Stub(); + public static Skill92Stub __stub_Skill92Stub = new Skill92Stub(); + public static Skill93Stub __stub_Skill93Stub = new Skill93Stub(); + public static Skill94Stub __stub_Skill94Stub = new Skill94Stub(); + public static Skill95Stub __stub_Skill95Stub = new Skill95Stub(); + public static Skill96Stub __stub_Skill96Stub = new Skill96Stub(); + public static Skill97Stub __stub_Skill97Stub = new Skill97Stub(); + public static Skill98Stub __stub_Skill98Stub = new Skill98Stub(); + public static Skill99Stub __stub_Skill99Stub = new Skill99Stub(); + public static Skill100Stub __stub_Skill100Stub = new Skill100Stub(); + public static Skill101Stub __stub_Skill101Stub = new Skill101Stub(); + public static Skill180Stub __stub_Skill180Stub = new Skill180Stub(); + public static Skill181Stub __stub_Skill181Stub = new Skill181Stub(); + public static Skill182Stub __stub_Skill182Stub = new Skill182Stub(); + public static Skill183Stub __stub_Skill183Stub = new Skill183Stub(); + public static Skill184Stub __stub_Skill184Stub = new Skill184Stub(); + public static Skill228Stub __stub_Skill228Stub = new Skill228Stub(); + public static Skill229Stub __stub_Skill229Stub = new Skill229Stub(); + public static Skill364Stub __stub_Skill364Stub = new Skill364Stub(); + public static Skill365Stub __stub_Skill365Stub = new Skill365Stub(); + public static Skill440Stub __stub_Skill440Stub = new Skill440Stub(); + public static Skill441Stub __stub_Skill441Stub = new Skill441Stub(); + public static Skill442Stub __stub_Skill442Stub = new Skill442Stub(); + public static Skill443Stub __stub_Skill443Stub = new Skill443Stub(); + public static Skill444Stub __stub_Skill444Stub = new Skill444Stub(); + public static Skill445Stub __stub_Skill445Stub = new Skill445Stub(); + public static Skill446Stub __stub_Skill446Stub = new Skill446Stub(); + public static Skill447Stub __stub_Skill447Stub = new Skill447Stub(); + public static Skill448Stub __stub_Skill448Stub = new Skill448Stub(); + public static Skill449Stub __stub_Skill449Stub = new Skill449Stub(); + public static Skill450Stub __stub_Skill450Stub = new Skill450Stub(); + public static Skill451Stub __stub_Skill451Stub = new Skill451Stub(); + public static Skill452Stub __stub_Skill452Stub = new Skill452Stub(); + public static Skill453Stub __stub_Skill453Stub = new Skill453Stub(); + public static Skill454Stub __stub_Skill454Stub = new Skill454Stub(); + public static Skill455Stub __stub_Skill455Stub = new Skill455Stub(); + public static Skill456Stub __stub_Skill456Stub = new Skill456Stub(); + public static Skill457Stub __stub_Skill457Stub = new Skill457Stub(); + public static Skill458Stub __stub_Skill458Stub = new Skill458Stub(); + public static Skill459Stub __stub_Skill459Stub = new Skill459Stub(); + public static Skill460Stub __stub_Skill460Stub = new Skill460Stub(); + public static Skill461Stub __stub_Skill461Stub = new Skill461Stub(); + public static Skill462Stub __stub_Skill462Stub = new Skill462Stub(); + public static Skill463Stub __stub_Skill463Stub = new Skill463Stub(); + public static Skill464Stub __stub_Skill464Stub = new Skill464Stub(); + public static Skill465Stub __stub_Skill465Stub = new Skill465Stub(); + public static Skill466Stub __stub_Skill466Stub = new Skill466Stub(); + public static Skill467Stub __stub_Skill467Stub = new Skill467Stub(); + public static Skill468Stub __stub_Skill468Stub = new Skill468Stub(); + public static Skill469Stub __stub_Skill469Stub = new Skill469Stub(); + public static Skill470Stub __stub_Skill470Stub = new Skill470Stub(); + public static Skill471Stub __stub_Skill471Stub = new Skill471Stub(); + public static Skill472Stub __stub_Skill472Stub = new Skill472Stub(); + public static Skill473Stub __stub_Skill473Stub = new Skill473Stub(); + public static Skill474Stub __stub_Skill474Stub = new Skill474Stub(); + public static Skill475Stub __stub_Skill475Stub = new Skill475Stub(); + public static Skill476Stub __stub_Skill476Stub = new Skill476Stub(); + public static Skill477Stub __stub_Skill477Stub = new Skill477Stub(); + public static Skill478Stub __stub_Skill478Stub = new Skill478Stub(); + public static Skill479Stub __stub_Skill479Stub = new Skill479Stub(); + public static Skill480Stub __stub_Skill480Stub = new Skill480Stub(); + public static Skill481Stub __stub_Skill481Stub = new Skill481Stub(); + public static Skill482Stub __stub_Skill482Stub = new Skill482Stub(); + public static Skill483Stub __stub_Skill483Stub = new Skill483Stub(); + public static Skill484Stub __stub_Skill484Stub = new Skill484Stub(); + public static Skill485Stub __stub_Skill485Stub = new Skill485Stub(); + public static Skill486Stub __stub_Skill486Stub = new Skill486Stub(); + public static Skill487Stub __stub_Skill487Stub = new Skill487Stub(); + public static Skill488Stub __stub_Skill488Stub = new Skill488Stub(); + public static Skill489Stub __stub_Skill489Stub = new Skill489Stub(); + public static Skill490Stub __stub_Skill490Stub = new Skill490Stub(); + public static Skill491Stub __stub_Skill491Stub = new Skill491Stub(); + public static Skill901Stub __stub_Skill901Stub = new Skill901Stub(); + public static Skill902Stub __stub_Skill902Stub = new Skill902Stub(); + public static Skill903Stub __stub_Skill903Stub = new Skill903Stub(); + public static Skill904Stub __stub_Skill904Stub = new Skill904Stub(); + public static Skill905Stub __stub_Skill905Stub = new Skill905Stub(); + public static Skill925Stub __stub_Skill925Stub = new Skill925Stub(); + public static Skill926Stub __stub_Skill926Stub = new Skill926Stub(); + public static Skill1805Stub __stub_Skill1805Stub = new Skill1805Stub(); + public static Skill1806Stub __stub_Skill1806Stub = new Skill1806Stub(); + public static Skill1807Stub __stub_Skill1807Stub = new Skill1807Stub(); + public static Skill1808Stub __stub_Skill1808Stub = new Skill1808Stub(); + public static Skill1809Stub __stub_Skill1809Stub = new Skill1809Stub(); + public static Skill1864Stub __stub_Skill1864Stub = new Skill1864Stub(); + public static Skill1865Stub __stub_Skill1865Stub = new Skill1865Stub(); + public static Skill1873Stub __stub_Skill1873Stub = new Skill1873Stub(); + public static Skill1874Stub __stub_Skill1874Stub = new Skill1874Stub(); + public static Skill1951Stub __stub_Skill1951Stub = new Skill1951Stub(); + public static Skill2254Stub __stub_Skill2254Stub = new Skill2254Stub(); + public static Skill2255Stub __stub_Skill2255Stub = new Skill2255Stub(); + public static Skill2256Stub __stub_Skill2256Stub = new Skill2256Stub(); + public static Skill2257Stub __stub_Skill2257Stub = new Skill2257Stub(); + public static Skill2258Stub __stub_Skill2258Stub = new Skill2258Stub(); + public static Skill2259Stub __stub_Skill2259Stub = new Skill2259Stub(); + public static Skill2260Stub __stub_Skill2260Stub = new Skill2260Stub(); + public static Skill2261Stub __stub_Skill2261Stub = new Skill2261Stub(); + public static Skill2262Stub __stub_Skill2262Stub = new Skill2262Stub(); + public static Skill2263Stub __stub_Skill2263Stub = new Skill2263Stub(); + public static Skill2264Stub __stub_Skill2264Stub = new Skill2264Stub(); + public static Skill2265Stub __stub_Skill2265Stub = new Skill2265Stub(); + public static Skill2452Stub __stub_Skill2452Stub = new Skill2452Stub(); + public static Skill2453Stub __stub_Skill2453Stub = new Skill2453Stub(); #if SKILL_SERVER public static Skill1 __stub_Skill1 = new Skill1(); diff --git a/Assets/PerfectWorld/Scripts/Skills/skill.cs b/Assets/PerfectWorld/Scripts/Skills/skill.cs index f22b7908d2..206330d216 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using UnityEngine; namespace BrewMonster.Scripts.Skills { @@ -119,6 +120,8 @@ namespace BrewMonster.Scripts.Skills else return stub.GetPraydistance(this); } + public override int GetCoolingTime() { return stub.GetCoolingtime(this); } + } @@ -188,8 +191,21 @@ namespace BrewMonster.Scripts.Skills public List restrict_weapons = new List(); public static Dictionary map = new Dictionary(); public static Dictionary GetMap() => map; + public static Dictionary> comboSkillMap = new Dictionary>(); + public static Dictionary> GetComboSkMap() => comboSkillMap; - public static Dictionary> inheritSkillMap = new(); + public static Dictionary> inheritSkillMap = new Dictionary>(); + +#if UNITY_EDITOR + [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)] + private static void OnPlay() + { + BMLogger.LogError("SkillStub OnPlay Reset"); + map = new Dictionary(); + comboSkillMap = new Dictionary>(); + inheritSkillMap = new Dictionary>(); + } +#endif public SkillStub(uint i) { id = i; @@ -209,9 +225,6 @@ namespace BrewMonster.Scripts.Skills return inheritSkillMap[cls]; } - public static Dictionary> comboSkillMap; - public static Dictionary> GetComboSkMap() => comboSkillMap; - public static SkillStub GetStub(uint i) { return GetMap().TryGetValue(i, out var stub) ? stub : null; @@ -243,10 +256,10 @@ namespace BrewMonster.Scripts.Skills public int GetMaxLevel() { return max_level; } public Range GetRange() { return range; } public bool IsMovingSkill() { return is_movingcast; } - public byte GetType() { return type; } // ����System.Object.GetType // Hide System.Object.GetType + public byte GetType() { return type; } // ����System.Object.GetType // Hide System.Object.GetType // ����ʱ����麯�� // Runtime-related virtual functions - public virtual int GetCoolingtime(Skill skill) { return 0; } + public virtual int GetCoolingtime(Skill skill) { return 5000; } public virtual int GetRequiredSp(Skill skill) { return 0; } public virtual int GetRequiredLevel(Skill skill) { return 0; } public virtual int GetMaxAbility(Skill skill) { return 0; } diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1.cs b/Assets/PerfectWorld/Scripts/Skills/skill1.cs index 1c740b64ec..7fd3898b69 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1.cs @@ -84,9 +84,9 @@ namespace BrewMonster public Skill1Stub() : base(1) { cls = 0; - name = "虎击"; - nativename = "虎击"; - icon = "虎击.dds"; + name = ""; + nativename = ""; + icon = ".dds"; max_level = 10; type = 1; apcost = 0; @@ -107,17 +107,12 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "虎击.sgc"; + effect = ""; doenchant = 0; dobless = 0; commoncooldown = 0; commoncooldowntime = 0; restrict_weapons.Add(0); - restrict_weapons.Add(1); - restrict_weapons.Add(182); - restrict_weapons.Add(5); - restrict_weapons.Add(292); - restrict_weapons.Add(9); range = new Range(); range.type = 0; #if SKILL_SERVER @@ -132,9 +127,9 @@ namespace BrewMonster public override float GetMpcost(Skill skill) => (float)(-5 + 7 * skill.GetLevel()); public override int GetExecutetime(Skill skill) => 700; public override int GetCoolingtime(Skill skill) => 3000; - public float GetRadius(Skill skill) => 0f; - public float GetAttackdistance(Skill skill) => 0f; - public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); + public float GetRadius(Skill skill) => 0f; + public float GetAttackdistance(Skill skill) => 0f; + public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; @@ -143,10 +138,7 @@ namespace BrewMonster #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, - skill.GetLevel(), - -5 + 7 * skill.GetLevel(), - 1.9 * skill.GetLevel() * skill.GetLevel() + 64 * skill.GetLevel() + 36.7); + string result = string.Format(format, skill.GetLevel(), -5 + 7 * skill.GetLevel(), 1.9 * skill.GetLevel() * skill.GetLevel() + 64 * skill.GetLevel() + 36.7); if (result.Length < length) { buffer.Append(result); diff --git a/Assets/PerfectWorld/Scripts/Skills/skill7.cs b/Assets/PerfectWorld/Scripts/Skills/skill7.cs index a099524133..76d8a1cfcc 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill7.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill7.cs @@ -185,5 +185,6 @@ namespace BrewMonster + diff --git a/Assets/PerfectWorld/Scripts/Skills/skill8.cs b/Assets/PerfectWorld/Scripts/Skills/skill8.cs index a8600ecfd4..3d50c8f131 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill8.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill8.cs @@ -183,5 +183,6 @@ namespace BrewMonster + diff --git a/Assets/PerfectWorld/Scripts/Skills/skill9.cs b/Assets/PerfectWorld/Scripts/Skills/skill9.cs index 03f7b9b796..63da17c8f6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill9.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill9.cs @@ -122,5 +122,6 @@ namespace BrewMonster + diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs index f8261cb92e..88e7ee2c7a 100644 --- a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs +++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs @@ -102,7 +102,7 @@ namespace BrewMonster.UI } } - // 初始化所有阶位子对话框 / Initialize all rank sub dialogs + // 初始化所有阶位子对话框 / Initialize all rank sub dialogs/// private void InitRankDlgs() { if (m_bAllocRankDlgs || m_pSubRank == null || m_contentRoot == null) @@ -115,6 +115,7 @@ namespace BrewMonster.UI taoistRank != CECTaoistRank.GetBaseRankEnd(); taoistRank = taoistRank.GetNext()) { + BMLogger.LogError("CDlgSkillSubList::InitRankDlgs: Creating GetBaseRankBegin rank " + taoistRank.GetID()); CreateOneRankDlg(taoistRank); } @@ -122,6 +123,7 @@ namespace BrewMonster.UI taoistRank != CECTaoistRank.GetGodRankEnd(); taoistRank = taoistRank.GetNext()) { + BMLogger.LogError("CDlgSkillSubList::InitRankDlgs: Creating GetGodRankBegin rank " + taoistRank.GetID()); CreateOneRankDlg(taoistRank); } @@ -129,6 +131,7 @@ namespace BrewMonster.UI taoistRank != CECTaoistRank.GetEvilRankEnd(); taoistRank = taoistRank.GetNext()) { + BMLogger.LogError("CDlgSkillSubList::InitRankDlgs: Creating GetEvilRankBegin rank " + taoistRank.GetID()); CreateOneRankDlg(taoistRank); } } @@ -225,6 +228,7 @@ namespace BrewMonster.UI // ����һ�����漶��Ի��� / Show a rank sub dialog private void AddRankSubDig(int rankID) { + BMLogger.LogError("HoangDev: AddRankSubDig"); if (!m_rankSubDialogs.TryGetValue(rankID, out var pSub)) { return; @@ -233,6 +237,7 @@ namespace BrewMonster.UI pSub.Show(true); //pSub.SetPos(0f, m_curBottom); //m_curBottom += m_rankHeight * m_windowScale; + BMLogger.LogError("HoangDev: AddRankSubDig Done: " + CECTaoistRank.GetTaoistRank(rankID).GetName()); pSub.SetLabel(CECTaoistRank.GetTaoistRank(rankID).GetName()); } @@ -276,20 +281,24 @@ namespace BrewMonster.UI if (allRankProfSkills == null) { + BMLogger.LogError("HoangDev: AddDlgsOfOneRank allRankProfSkills is null"); return; } if (IsEvil() && taoistRank.IsGodRank()) { + BMLogger.LogError("HoangDev: AddDlgsOfOneRank IsEvil() && taoistRank.IsGodRank()"); return; } else if (!IsEvil() && taoistRank.IsEvilRank()) { + BMLogger.LogError("HoangDev: AddDlgsOfOneRank !IsEvil() && taoistRank.IsEvilRank()"); return; } if (!allRankProfSkills.TryGetValue(rankID, out var rankItr) || rankItr == null || rankItr.Count == 0) { + BMLogger.LogError("HoangDev: AddDlgsOfOneRank !allRankProfSkills.TryGetValue(rankID, out var rankItr) || rankItr == null || rankItr.Count == 0"); return; } @@ -318,6 +327,7 @@ namespace BrewMonster.UI } if (rankSkills.Count == 0) { + BMLogger.LogError("HoangDev: AddDlgsOfOneRank rankSkills.Count == 0"); return; } diff --git a/Assets/PerfectWorld/Scripts/skill2.cs b/Assets/PerfectWorld/Scripts/skill2.cs new file mode 100644 index 0000000000..3fa0993399 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/skill2.cs @@ -0,0 +1,171 @@ +#define SKILL_CLIENT +using BrewMonster.Scripts.Skills; +using System.Collections.Generic; +using System.Text; +using UnityEngine; +using static BrewMonster.PET_EVOLVE_CONFIG; + +namespace BrewMonster +{ + +#if SKILL_SERVER + public class Skill2 : Skill + { + public const int SKILL_ID = 2; + + public Skill2() : base(SKILL_ID) + { + } + } +#endif + + public class Skill2Stub : SkillStub + { + private static readonly int[] RequiredLevelArray = { 3, 8, 13, 18, 23, 28, 33, 38, 43, 48 }; + private static readonly int[] RequiredSpArray = { 100, 800, 2100, 4100, 7000, 10900, 16100, 23000, 32000, 44100 }; + private static readonly int[] RequiredMoneyArray = { 10, 90, 220, 400, 630, 1000, 1450, 1900, 2380, 2880 }; + + +#if SKILL_SERVER + public class State1 : SkillStub.State + { + public int GetTime(Skill skill) => 200; + public bool Quit(Skill skill) => false; + public bool Loop(Skill skill) => false; + public bool Bypass(Skill skill) => false; + public void Calculate(Skill skill) + { + skill.GetPlayer().SetDecmp(0.2f *(-2.2f + 5.6f * skill.GetLevel())); + skill.GetPlayer().SetPray(1); + } + public bool Interrupt(Skill skill) => false; + public bool Cancel(Skill skill) => true; + public bool Skip(Skill skill) => false; + } +#endif + +#if SKILL_SERVER + public class State2 : SkillStub.State + { + public int GetTime(Skill skill) => 700; + public bool Quit(Skill skill) => false; + public bool Loop(Skill skill) => false; + public bool Bypass(Skill skill) => false; + public void Calculate(Skill skill) + { + skill.GetPlayer().SetDecmp(0.8f *(-2.2f + 5.6f * skill.GetLevel())); + skill.SetPlus(0); + skill.SetRatio(0); + skill.SetDamage(skill.GetAttack()); + skill.GetPlayer().SetPerform(1); + } + public bool Interrupt(Skill skill) => false; + public bool Cancel(Skill skill) => false; + public bool Skip(Skill skill) => false; + } +#endif + +#if SKILL_SERVER + public class State3 : SkillStub.State + { + public int GetTime(Skill skill) => 0; + public bool Quit(Skill skill) => false; + public bool Loop(Skill skill) => false; + public bool Bypass(Skill skill) => false; + public void Calculate(Skill skill) + { + } + public bool Interrupt(Skill skill) => false; + public bool Cancel(Skill skill) => false; + public bool Skip(Skill skill) => false; + } +#endif + + public Skill2Stub() : base(2) + { + cls = 0; + name = "寸力"; + nativename = "寸力"; + icon = "寸力.dds"; + max_level = 10; + type = 1; + apcost = 0; + arrowcost = 0; + apgain = 5; + attr = 1; + rank = 0; + eventflag = 0; + posdouble = 0; + clslimit = 0; + time_type = 0; + showorder = 1102; + allow_land = true; + allow_air = true; + allow_water = true; + allow_ride = false; + auto_attack = true; + long_range = 0; + restrict_corpse = 0; + allow_forms = 1; + effect = "寸力.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; + restrict_weapons.Add(0); + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(9); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + range = new Range(); + range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(1, 1); +#if SKILL_SERVER + statestub.Add(new State1()); + statestub.Add(new State2()); + statestub.Add(new State3()); +#endif + } + + ~Skill2Stub() { } + + public override float GetMpcost(Skill skill) => (float)(-2.2 + 5.6 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 8000; + public float GetRadius(Skill skill) => 0f; + public float GetAttackdistance(Skill skill) => 0f; + public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + +#if SKILL_CLIENT + public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) + { + string result = string.Format(format, + skill.GetLevel(), + -2.2 + 5.6 * skill.GetLevel(), + 5.9 * skill.GetLevel() * skill.GetLevel() + 126.7 * skill.GetLevel() + 40.5); + if (result.Length < length) + { + buffer.Append(result); + return result.Length; + } + return 0; + } +#endif + +#if SKILL_SERVER + public int GetEnmity(Skill skill) => 0; + public bool StateAttack(Skill skill) => true; + public bool TakeEffect(Skill skill) => true; + public float GetEffectdistance(Skill skill) => 11.7f; + public int GetAttackspeed(Skill skill) => 3; + public float GetHitrate(Skill skill) => 1.2f + 0.05f * skill.GetLevel(); +#endif + } +} + diff --git a/Assets/Prefabs/UI/SkillUI.prefab b/Assets/Prefabs/UI/SkillUI.prefab index 27642c3a16..f1042766fb 100644 --- a/Assets/Prefabs/UI/SkillUI.prefab +++ b/Assets/Prefabs/UI/SkillUI.prefab @@ -2079,9 +2079,9 @@ RectTransform: - {fileID: 4504331075840543341} m_Father: {fileID: 1361524257611413148} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 108.9562, y: -31.05} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 179.9124, y: 68.0217} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8804506040386004496 @@ -5904,9 +5904,9 @@ RectTransform: - {fileID: 2027606699309904338} m_Father: {fileID: 1361524257611413148} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 468.781, y: -31.05} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 179.9124, y: 68.0217} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6741821173640675138 @@ -7867,9 +7867,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 3016923604946316301} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 83.16, y: -48.51895} m_SizeDelta: {x: 166.32, y: 97.0379} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &821733676846102905 @@ -7943,9 +7943,9 @@ RectTransform: - {fileID: 4351609655079222131} m_Father: {fileID: 2825516843822704547} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 126.06315, y: -22.62375} m_SizeDelta: {x: 252.1263, y: 45.2475} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5645061043433811765 @@ -10151,9 +10151,9 @@ RectTransform: - {fileID: 3703262150164293383} m_Father: {fileID: 3016923604946316301} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 83.16, y: -292.4765} m_SizeDelta: {x: 166.32, y: 130.2924} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5150156580756960231 @@ -11400,9 +11400,9 @@ RectTransform: - {fileID: 131742873718785436} m_Father: {fileID: 3016923604946316301} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 83.16, y: -162.18411} m_SizeDelta: {x: 166.32, y: 130.2924} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5468634806808161123 @@ -11481,7 +11481,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2825516843822704547 RectTransform: m_ObjectHideFlags: 0 @@ -11501,7 +11501,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 358.8119, y: -105.62375} - m_SizeDelta: {x: 685.6238, y: 0} + m_SizeDelta: {x: 685.6238, y: 155.2475} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4552529476466259825 CanvasRenderer: @@ -11596,6 +11596,7 @@ MonoBehaviour: m_subDialog: {fileID: 0} m_rectTransform: {fileID: 2825516843822704547} levelName: {fileID: 0} + label: {fileID: 708823501721075410} --- !u!1 &5403634742995450233 GameObject: m_ObjectHideFlags: 0 @@ -13569,7 +13570,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &627631504828013321 RectTransform: m_ObjectHideFlags: 0 @@ -17556,7 +17557,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -361.27, y: 365.44547} - m_SizeDelta: {x: 722.5344, y: 0} + m_SizeDelta: {x: 722.5344, y: 28} m_Pivot: {x: 0, y: 1} --- !u!222 &7853130943468561016 CanvasRenderer: @@ -17812,9 +17813,9 @@ RectTransform: - {fileID: 187116969457634403} m_Father: {fileID: 2825516843822704547} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 342.81, y: -105.2475} m_SizeDelta: {x: 685.62, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &114056069577405476 @@ -18839,9 +18840,9 @@ RectTransform: - {fileID: 911293677621153352} m_Father: {fileID: 1361524257611413148} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 288.8686, y: -31.05} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 179.9124, y: 68.0217} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5623009994815814977 diff --git a/Assets/Scripts/CECHostPlayer.cs b/Assets/Scripts/CECHostPlayer.cs index b3f6bfea31..a0f10b220a 100644 --- a/Assets/Scripts/CECHostPlayer.cs +++ b/Assets/Scripts/CECHostPlayer.cs @@ -619,7 +619,6 @@ namespace BrewMonster private void OnMsgHstCoolTimeData(ECMSG Msg) { - BMLogger.LogError("HoangDev : OnMsgHstCoolTimeData "); cmd_cooltime_data pCmd = default; var data = (byte[])Msg.dwParam1; pCmd.count = GPDataTypeHelper.FromBytes(data, 0); From 0884ae338f837242f2d12d06275171799f11c5e1 Mon Sep 17 00:00:00 2001 From: VDH Date: Wed, 7 Jan 2026 18:30:57 +0700 Subject: [PATCH 2/3] convert skill --- .../Prefab/UI/Canvas_Skill.prefab | 288 +++++++++++++++++- .../Scripts/Managers/CECManager.cs | 1 + Assets/PerfectWorld/Scripts/Skills/skill.cs | 2 + Assets/PerfectWorld/Scripts/Skills/skill1.cs | 18 +- Assets/PerfectWorld/Scripts/Skills/skill10.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill100.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill101.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill1195.cs | 10 +- .../PerfectWorld/Scripts/Skills/skill176.cs | 34 ++- .../PerfectWorld/Scripts/Skills/skill177.cs | 39 ++- .../PerfectWorld/Scripts/Skills/skill178.cs | 39 ++- .../PerfectWorld/Scripts/Skills/skill179.cs | 39 ++- .../PerfectWorld/Scripts/Skills/skill180.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill1805.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1806.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1807.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1808.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1809.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill181.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill1815.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1816.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1817.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1818.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1819.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill182.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill183.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill184.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill1864.cs | 8 +- .../PerfectWorld/Scripts/Skills/skill1865.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1868.cs | 8 +- .../PerfectWorld/Scripts/Skills/skill187.cs | 13 +- .../PerfectWorld/Scripts/Skills/skill1871.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1872.cs | 8 +- .../PerfectWorld/Scripts/Skills/skill1873.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1874.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1951.cs | 12 +- Assets/PerfectWorld/Scripts/Skills/skill2.cs | 37 ++- .../PerfectWorld/Scripts/Skills/skill2206.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2207.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2208.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2209.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2210.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2211.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2254.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2255.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2256.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2257.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2258.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2259.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill226.cs | 36 ++- .../PerfectWorld/Scripts/Skills/skill2260.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2261.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2262.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2263.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2264.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2265.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill227.cs | 36 ++- .../PerfectWorld/Scripts/Skills/skill228.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill229.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill2352.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2367.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2368.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2369.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2370.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2371.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2372.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2373.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2374.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2375.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2452.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2453.cs | 16 +- Assets/PerfectWorld/Scripts/Skills/skill3.cs | 32 +- .../PerfectWorld/Scripts/Skills/skill362.cs | 36 ++- .../PerfectWorld/Scripts/Skills/skill363.cs | 36 ++- .../PerfectWorld/Scripts/Skills/skill364.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill365.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill374.cs | 38 ++- .../PerfectWorld/Scripts/Skills/skill375.cs | 33 +- .../PerfectWorld/Scripts/Skills/skill376.cs | 40 ++- .../PerfectWorld/Scripts/Skills/skill377.cs | 40 ++- .../PerfectWorld/Scripts/Skills/skill378.cs | 33 +- .../PerfectWorld/Scripts/Skills/skill379.cs | 38 ++- .../PerfectWorld/Scripts/Skills/skill380.cs | 38 ++- .../PerfectWorld/Scripts/Skills/skill381.cs | 38 ++- .../PerfectWorld/Scripts/Skills/skill382.cs | 33 +- .../PerfectWorld/Scripts/Skills/skill383.cs | 33 +- .../PerfectWorld/Scripts/Skills/skill384.cs | 38 ++- .../PerfectWorld/Scripts/Skills/skill385.cs | 38 ++- .../PerfectWorld/Scripts/Skills/skill386.cs | 35 ++- .../PerfectWorld/Scripts/Skills/skill387.cs | 35 ++- .../PerfectWorld/Scripts/Skills/skill388.cs | 35 ++- .../PerfectWorld/Scripts/Skills/skill389.cs | 40 ++- .../PerfectWorld/Scripts/Skills/skill390.cs | 39 +-- .../PerfectWorld/Scripts/Skills/skill391.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill392.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill393.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill394.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill395.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill396.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill397.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill398.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill399.cs | 16 +- Assets/PerfectWorld/Scripts/Skills/skill4.cs | 34 ++- .../PerfectWorld/Scripts/Skills/skill400.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill401.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill402.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill403.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill404.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill405.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill406.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill407.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill408.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill409.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill410.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill411.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill412.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill413.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill414.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill415.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill416.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill417.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill418.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill419.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill420.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill421.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill422.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill423.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill424.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill425.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill426.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill427.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill428.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill429.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill430.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill431.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill432.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill433.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill434.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill435.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill436.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill437.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill438.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill439.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill440.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill441.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill442.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill443.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill444.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill445.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill446.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill447.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill448.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill449.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill450.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill451.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill452.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill453.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill454.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill455.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill456.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill457.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill458.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill459.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill460.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill461.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill462.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill463.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill464.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill465.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill466.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill467.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill468.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill469.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill470.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill471.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill472.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill473.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill474.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill475.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill476.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill477.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill478.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill479.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill480.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill481.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill482.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill483.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill484.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill485.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill486.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill487.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill488.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill489.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill490.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill491.cs | 16 +- Assets/PerfectWorld/Scripts/Skills/skill5.cs | 27 +- Assets/PerfectWorld/Scripts/Skills/skill53.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill54.cs | 34 ++- Assets/PerfectWorld/Scripts/Skills/skill55.cs | 34 ++- Assets/PerfectWorld/Scripts/Skills/skill56.cs | 34 ++- Assets/PerfectWorld/Scripts/Skills/skill57.cs | 32 +- Assets/PerfectWorld/Scripts/Skills/skill58.cs | 39 ++- Assets/PerfectWorld/Scripts/Skills/skill59.cs | 39 ++- Assets/PerfectWorld/Scripts/Skills/skill6.cs | 15 +- Assets/PerfectWorld/Scripts/Skills/skill60.cs | 28 +- Assets/PerfectWorld/Scripts/Skills/skill61.cs | 33 +- Assets/PerfectWorld/Scripts/Skills/skill62.cs | 30 +- Assets/PerfectWorld/Scripts/Skills/skill63.cs | 30 +- Assets/PerfectWorld/Scripts/Skills/skill64.cs | 29 +- Assets/PerfectWorld/Scripts/Skills/skill65.cs | 22 +- Assets/PerfectWorld/Scripts/Skills/skill66.cs | 29 +- Assets/PerfectWorld/Scripts/Skills/skill67.cs | 29 +- Assets/PerfectWorld/Scripts/Skills/skill68.cs | 27 +- Assets/PerfectWorld/Scripts/Skills/skill69.cs | 29 +- Assets/PerfectWorld/Scripts/Skills/skill7.cs | 53 +--- Assets/PerfectWorld/Scripts/Skills/skill70.cs | 24 +- Assets/PerfectWorld/Scripts/Skills/skill71.cs | 29 +- Assets/PerfectWorld/Scripts/Skills/skill72.cs | 27 +- Assets/PerfectWorld/Scripts/Skills/skill73.cs | 22 +- Assets/PerfectWorld/Scripts/Skills/skill74.cs | 27 +- Assets/PerfectWorld/Scripts/Skills/skill75.cs | 29 +- Assets/PerfectWorld/Scripts/Skills/skill76.cs | 39 ++- Assets/PerfectWorld/Scripts/Skills/skill77.cs | 39 ++- Assets/PerfectWorld/Scripts/Skills/skill78.cs | 15 +- Assets/PerfectWorld/Scripts/Skills/skill79.cs | 15 +- Assets/PerfectWorld/Scripts/Skills/skill8.cs | 50 +-- Assets/PerfectWorld/Scripts/Skills/skill80.cs | 15 +- Assets/PerfectWorld/Scripts/Skills/skill81.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill84.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill85.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill86.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill87.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill88.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill89.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill896.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill897.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill898.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill899.cs | 16 +- Assets/PerfectWorld/Scripts/Skills/skill9.cs | 40 +-- Assets/PerfectWorld/Scripts/Skills/skill90.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill900.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill901.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill902.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill903.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill904.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill905.cs | 16 +- Assets/PerfectWorld/Scripts/Skills/skill91.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill92.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill923.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill924.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill925.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill926.cs | 16 +- Assets/PerfectWorld/Scripts/Skills/skill93.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill94.cs | 8 +- Assets/PerfectWorld/Scripts/Skills/skill95.cs | 8 +- Assets/PerfectWorld/Scripts/Skills/skill96.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill97.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill98.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill99.cs | 14 +- .../Scripts/UI/Dialogs/CDlgSkillSubList.cs | 8 +- .../UI/GamePlay/SkillUI/AUISubDialog.cs | 8 +- Assets/PerfectWorld/Scripts/skill2.cs | 171 ----------- Assets/Prefabs/BoostrapForTest.prefab | 4 +- Assets/Prefabs/UI/SkillUI.prefab | 143 ++++++++- Assets/Scenes/a61.unity | 4 +- 265 files changed, 3121 insertions(+), 2523 deletions(-) delete mode 100644 Assets/PerfectWorld/Scripts/skill2.cs diff --git a/Assets/PerfectWorld/Prefab/UI/Canvas_Skill.prefab b/Assets/PerfectWorld/Prefab/UI/Canvas_Skill.prefab index 36cabbf633..5172617c54 100644 --- a/Assets/PerfectWorld/Prefab/UI/Canvas_Skill.prefab +++ b/Assets/PerfectWorld/Prefab/UI/Canvas_Skill.prefab @@ -55,6 +55,139 @@ MonoBehaviour: - {fileID: 473551792621656190} - {fileID: 386805116814525131} - {fileID: 6898229972725535650} +--- !u!1 &965564150175367737 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2946975800764706429} + - component: {fileID: 4171085597288328847} + - component: {fileID: 6695258280477469512} + - component: {fileID: 8319868490910887608} + m_Layer: 5 + m_Name: ButtonToggleSkill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2946975800764706429 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965564150175367737} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1848604417580262094} + m_Father: {fileID: 8078455359151753464} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -151.79999, y: 309.8} + m_SizeDelta: {x: 81.9939, y: 49.1664} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4171085597288328847 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965564150175367737} + m_CullTransparentMesh: 1 +--- !u!114 &6695258280477469512 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965564150175367737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8319868490910887608 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965564150175367737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6695258280477469512} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 --- !u!1 &5713000252331107611 GameObject: m_ObjectHideFlags: 0 @@ -87,6 +220,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1608209508545832950} + - {fileID: 2946975800764706429} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -157,6 +291,144 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &6124355795601613977 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1848604417580262094} + - component: {fileID: 5504953265477448813} + - component: {fileID: 3464888604336739725} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1848604417580262094 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6124355795601613977} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2946975800764706429} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5504953265477448813 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6124355795601613977} + m_CullTransparentMesh: 1 +--- !u!114 &3464888604336739725 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6124355795601613977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Skill + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1001 &2685853672127006524 PrefabInstance: m_ObjectHideFlags: 0 @@ -169,6 +441,10 @@ PrefabInstance: propertyPath: m_Name value: ButtonSkill1 objectReference: {fileID: 0} + - target: {fileID: 4284393271722921544, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -288,7 +564,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4284393271722921544, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_Pivot.x @@ -352,11 +628,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_AnchoredPosition.x - value: 390 + value: 269 objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_AnchoredPosition.y - value: -232 + value: -156 objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -409,7 +685,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4284393271722921544, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_Pivot.x @@ -473,11 +749,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_AnchoredPosition.x - value: 613 + value: 485 objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_AnchoredPosition.y - value: -134 + value: -12 objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/PerfectWorld/Scripts/Managers/CECManager.cs b/Assets/PerfectWorld/Scripts/Managers/CECManager.cs index e51446f972..541c4adc79 100644 --- a/Assets/PerfectWorld/Scripts/Managers/CECManager.cs +++ b/Assets/PerfectWorld/Scripts/Managers/CECManager.cs @@ -157,5 +157,6 @@ namespace BrewMonster.Managers + diff --git a/Assets/PerfectWorld/Scripts/Skills/skill.cs b/Assets/PerfectWorld/Scripts/Skills/skill.cs index 206330d216..a43e03158a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill.cs @@ -208,6 +208,7 @@ namespace BrewMonster.Scripts.Skills #endif public SkillStub(uint i) { + BMLogger.LogError("SkillStub Constructor id=" + i); id = i; is_inherent = (false); is_movingcast = (false); @@ -217,6 +218,7 @@ namespace BrewMonster.Scripts.Skills combosk_nobreak = (0); if (GetStub(id) == null) { + BMLogger.LogError("SkillStub Add to Map id=" + id); GetMap().Add(id, this); } } diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1.cs b/Assets/PerfectWorld/Scripts/Skills/skill1.cs index 7fd3898b69..e3bd2beea0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1.cs @@ -84,9 +84,9 @@ namespace BrewMonster public Skill1Stub() : base(1) { cls = 0; - name = ""; - nativename = ""; - icon = ".dds"; + name = "虎击"; + nativename = "虎击"; + icon = "虎击.dds"; max_level = 10; type = 1; apcost = 0; @@ -107,12 +107,17 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = ""; + effect = "虎击.sgc"; doenchant = 0; dobless = 0; commoncooldown = 0; commoncooldowntime = 0; restrict_weapons.Add(0); + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; #if SKILL_SERVER @@ -138,7 +143,10 @@ namespace BrewMonster #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), -5 + 7 * skill.GetLevel(), 1.9 * skill.GetLevel() * skill.GetLevel() + 64 * skill.GetLevel() + 36.7); + string result = string.Format(format, + skill.GetLevel(), + -5 + 7 * skill.GetLevel(), + 1.9 * skill.GetLevel() * skill.GetLevel() + 64 * skill.GetLevel() + 36.7); if (result.Length < length) { buffer.Append(result); diff --git a/Assets/PerfectWorld/Scripts/Skills/skill10.cs b/Assets/PerfectWorld/Scripts/Skills/skill10.cs index d147146427..b73cde784a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill10.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill10.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill10Stub() { } - public float GetMpcost(Skill skill) => (float)(50.4 + 18 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(50.4 + 18 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill100.cs b/Assets/PerfectWorld/Scripts/Skills/skill100.cs index 2b0626c598..42ca306b50 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill100.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill100.cs @@ -122,16 +122,16 @@ namespace BrewMonster ~Skill100Stub() { } - public float GetMpcost(Skill skill) => 50f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 20000 - 1000 * skill.GetLevel(); + public override float GetMpcost(Skill skill) => 50f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 20000 - 1000 * skill.GetLevel(); public float GetRadius(Skill skill) => (float)(2 + 0.3 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(15 + skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(15 + skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill101.cs b/Assets/PerfectWorld/Scripts/Skills/skill101.cs index e4bc30c93d..f463ba283b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill101.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill101.cs @@ -65,16 +65,16 @@ namespace BrewMonster ~Skill101Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1195.cs b/Assets/PerfectWorld/Scripts/Skills/skill1195.cs index 2db2d23116..f586c4425c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1195.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1195.cs @@ -124,14 +124,14 @@ namespace BrewMonster ~Skill1195Stub() { } - public float GetMpcost(Skill skill) => (float)(10 + 5 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(10 + 5 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill176.cs b/Assets/PerfectWorld/Scripts/Skills/skill176.cs index a90f0a5133..fd26966e0b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill176.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill176.cs @@ -70,10 +70,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "凌波微步.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(76, 10); #if SKILL_SERVER statestub.Add(new State1()); #endif @@ -81,23 +92,20 @@ namespace BrewMonster ~Skill176Stub() { } - public float GetMpcost(Skill skill) => 100f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 60000; + public override float GetMpcost(Skill skill) => 100f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 60000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 5f; public float GetHitrate(Skill skill) => 0f; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill177.cs b/Assets/PerfectWorld/Scripts/Skills/skill177.cs index 6d02351c53..37b8e169cd 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill177.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill177.cs @@ -70,10 +70,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "易筋经.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); #endif @@ -81,21 +92,24 @@ namespace BrewMonster ~Skill177Stub() { } - public float GetMpcost(Skill skill) => 20f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 20f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 20 + 10 * skill.GetLevel(), 20 + 10 * skill.GetLevel()); + string result = string.Format(format, + skill.GetLevel(), + 20 + 10 * skill.GetLevel(), + 20 + 10 * skill.GetLevel()); if (result.Length < length) { buffer.Append(result); @@ -107,10 +121,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 5f; public float GetHitrate(Skill skill) => 0f; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill178.cs b/Assets/PerfectWorld/Scripts/Skills/skill178.cs index c8f1c668b8..e24ff4fee5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill178.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill178.cs @@ -70,10 +70,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "易髓经.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(177, 1); #if SKILL_SERVER statestub.Add(new State1()); #endif @@ -81,21 +92,24 @@ namespace BrewMonster ~Skill178Stub() { } - public float GetMpcost(Skill skill) => 20f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 20f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 20 + 10 * skill.GetLevel(), 20 + 10 * skill.GetLevel()); + string result = string.Format(format, + skill.GetLevel(), + 20 + 10 * skill.GetLevel(), + 20 + 10 * skill.GetLevel()); if (result.Length < length) { buffer.Append(result); @@ -107,10 +121,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 5f; public float GetHitrate(Skill skill) => 0f; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill179.cs b/Assets/PerfectWorld/Scripts/Skills/skill179.cs index 933bc50113..462e4ec119 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill179.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill179.cs @@ -70,10 +70,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "金刚经.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); #endif @@ -81,21 +92,24 @@ namespace BrewMonster ~Skill179Stub() { } - public float GetMpcost(Skill skill) => (float)(20 + 30 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => (float)(20 + 30 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 20 + 30 * skill.GetLevel(), skill.GetLevel() * 150 + 100); + string result = string.Format(format, + skill.GetLevel(), + 20 + 30 * skill.GetLevel(), + skill.GetLevel() * 150 + 100); if (result.Length < length) { buffer.Append(result); @@ -107,10 +121,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 5f; public float GetHitrate(Skill skill) => 0f; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill180.cs b/Assets/PerfectWorld/Scripts/Skills/skill180.cs index 472756781b..00dc073b4a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill180.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill180.cs @@ -124,16 +124,16 @@ namespace BrewMonster ~Skill180Stub() { } - public float GetMpcost(Skill skill) => (float)(-6 + 15 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(-6 + 15 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1805.cs b/Assets/PerfectWorld/Scripts/Skills/skill1805.cs index 640bdbe0f6..ce7a647fa9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1805.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1805.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill1805Stub() { } - public float GetMpcost(Skill skill) => 1363f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 60000; + public override float GetMpcost(Skill skill) => 1363f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 60000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1806.cs b/Assets/PerfectWorld/Scripts/Skills/skill1806.cs index ef6f997037..68466532cc 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1806.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1806.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill1806Stub() { } - public float GetMpcost(Skill skill) => 1818f; - public int GetExecutetime(Skill skill) => 1300; - public int GetCoolingtime(Skill skill) => 120000; + public override float GetMpcost(Skill skill) => 1818f; + public override int GetExecutetime(Skill skill) => 1300; + public override int GetCoolingtime(Skill skill) => 120000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1807.cs b/Assets/PerfectWorld/Scripts/Skills/skill1807.cs index 73cc6a5e68..a2c64be715 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1807.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1807.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill1807Stub() { } - public float GetMpcost(Skill skill) => 545f; - public int GetExecutetime(Skill skill) => 600; - public int GetCoolingtime(Skill skill) => 45000; + public override float GetMpcost(Skill skill) => 545f; + public override int GetExecutetime(Skill skill) => 600; + public override int GetCoolingtime(Skill skill) => 45000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1808.cs b/Assets/PerfectWorld/Scripts/Skills/skill1808.cs index 29f3270e8c..7e0990f464 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1808.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1808.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill1808Stub() { } - public float GetMpcost(Skill skill) => 909f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 90000; + public override float GetMpcost(Skill skill) => 909f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 90000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1809.cs b/Assets/PerfectWorld/Scripts/Skills/skill1809.cs index 4caf33ca7c..b16b053041 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1809.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1809.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill1809Stub() { } - public float GetMpcost(Skill skill) => 606f; - public int GetExecutetime(Skill skill) => 1900; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 606f; + public override int GetExecutetime(Skill skill) => 1900; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 15f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 10f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 10f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill181.cs b/Assets/PerfectWorld/Scripts/Skills/skill181.cs index cbef6bbdbb..847f9fc6a7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill181.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill181.cs @@ -124,16 +124,16 @@ namespace BrewMonster ~Skill181Stub() { } - public float GetMpcost(Skill skill) => (float)(12 + 15 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(12 + 15 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1815.cs b/Assets/PerfectWorld/Scripts/Skills/skill1815.cs index 3d9fe5cd90..0ddf0d3353 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1815.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1815.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill1815Stub() { } - public float GetMpcost(Skill skill) => 141f; - public int GetExecutetime(Skill skill) => 600; - public int GetCoolingtime(Skill skill) => 90000; + public override float GetMpcost(Skill skill) => 141f; + public override int GetExecutetime(Skill skill) => 600; + public override int GetCoolingtime(Skill skill) => 90000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 15f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 15f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1816.cs b/Assets/PerfectWorld/Scripts/Skills/skill1816.cs index a14ebd5dd9..9a928fe613 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1816.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1816.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill1816Stub() { } - public float GetMpcost(Skill skill) => 495f; - public int GetExecutetime(Skill skill) => 1700; - public int GetCoolingtime(Skill skill) => 180000; + public override float GetMpcost(Skill skill) => 495f; + public override int GetExecutetime(Skill skill) => 1700; + public override int GetCoolingtime(Skill skill) => 180000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1817.cs b/Assets/PerfectWorld/Scripts/Skills/skill1817.cs index 097624308f..29b6dca10c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1817.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1817.cs @@ -131,17 +131,17 @@ namespace BrewMonster ~Skill1817Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 850; - public int GetCoolingtime(Skill skill) => 120000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 850; + public override int GetCoolingtime(Skill skill) => 120000; public float GetRadius(Skill skill) => 3f; public float GetAttackdistance(Skill skill) => 12f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 10f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 10f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1818.cs b/Assets/PerfectWorld/Scripts/Skills/skill1818.cs index a5fbffe346..ed352d36a2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1818.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1818.cs @@ -130,17 +130,17 @@ namespace BrewMonster ~Skill1818Stub() { } - public float GetMpcost(Skill skill) => 353f; - public int GetExecutetime(Skill skill) => 900; - public int GetCoolingtime(Skill skill) => 60000; + public override float GetMpcost(Skill skill) => 353f; + public override int GetExecutetime(Skill skill) => 900; + public override int GetCoolingtime(Skill skill) => 60000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 15f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 25f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 25f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1819.cs b/Assets/PerfectWorld/Scripts/Skills/skill1819.cs index e7a5eb0b77..6bf9dcc506 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1819.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1819.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill1819Stub() { } - public float GetMpcost(Skill skill) => 212f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 120000; + public override float GetMpcost(Skill skill) => 212f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 120000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 15f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 25f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 25f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill182.cs b/Assets/PerfectWorld/Scripts/Skills/skill182.cs index a1b673b324..a2b3a8a215 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill182.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill182.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill182Stub() { } - public float GetMpcost(Skill skill) => (float)(39.6 + 18 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 12000; + public override float GetMpcost(Skill skill) => (float)(39.6 + 18 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 12000; public float GetRadius(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill183.cs b/Assets/PerfectWorld/Scripts/Skills/skill183.cs index 926e5de726..e303556109 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill183.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill183.cs @@ -87,16 +87,16 @@ namespace BrewMonster ~Skill183Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 60000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 60000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill184.cs b/Assets/PerfectWorld/Scripts/Skills/skill184.cs index dba1974a92..f2491f29fd 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill184.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill184.cs @@ -124,16 +124,16 @@ namespace BrewMonster ~Skill184Stub() { } - public float GetMpcost(Skill skill) => (float)(135 + 12 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 31000 - 1000 * skill.GetLevel(); + public override float GetMpcost(Skill skill) => (float)(135 + 12 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 31000 - 1000 * skill.GetLevel(); public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1864.cs b/Assets/PerfectWorld/Scripts/Skills/skill1864.cs index f8e28289ee..b96541edb8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1864.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1864.cs @@ -63,13 +63,13 @@ namespace BrewMonster ~Skill1864Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; + public override float GetPraydistance(Skill skill) => 0f; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1865.cs b/Assets/PerfectWorld/Scripts/Skills/skill1865.cs index 2d2eb9a144..3a0f8d4fb5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1865.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1865.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill1865Stub() { } - public float GetMpcost(Skill skill) => 545f; - public int GetExecutetime(Skill skill) => 600; - public int GetCoolingtime(Skill skill) => 45000; + public override float GetMpcost(Skill skill) => 545f; + public override int GetExecutetime(Skill skill) => 600; + public override int GetCoolingtime(Skill skill) => 45000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1868.cs b/Assets/PerfectWorld/Scripts/Skills/skill1868.cs index ddd8c6d726..622592ba12 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1868.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1868.cs @@ -63,13 +63,13 @@ namespace BrewMonster ~Skill1868Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; + public override float GetPraydistance(Skill skill) => 0f; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill187.cs b/Assets/PerfectWorld/Scripts/Skills/skill187.cs index 40599a96b6..15b4b42267 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill187.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill187.cs @@ -57,7 +57,6 @@ namespace BrewMonster dobless = 0; commoncooldown = 0; commoncooldowntime = 0; - effect = "3233"; range = new Range(); range.type = 0; pre_skills = new Dictionary(); @@ -67,15 +66,15 @@ namespace BrewMonster ~Skill187Stub() { } - public float GetMpcost(Skill skill) => 1033f; - public int GetExecutetime(Skill skill) => 1000333; - public int GetCoolingtime(Skill skill) => 30002; + public override float GetMpcost(Skill skill) => 1033f; + public override int GetExecutetime(Skill skill) => 1000333; + public override int GetCoolingtime(Skill skill) => 30002; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 1533f; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 1533f; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 33344; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1871.cs b/Assets/PerfectWorld/Scripts/Skills/skill1871.cs index 3396c92d2c..9fe3c2fa1b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1871.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1871.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill1871Stub() { } - public float GetMpcost(Skill skill) => 392f; - public int GetExecutetime(Skill skill) => 1700; - public int GetCoolingtime(Skill skill) => 300000; + public override float GetMpcost(Skill skill) => 392f; + public override int GetExecutetime(Skill skill) => 1700; + public override int GetCoolingtime(Skill skill) => 300000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1872.cs b/Assets/PerfectWorld/Scripts/Skills/skill1872.cs index 2a68452ac1..2fb237bb32 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1872.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1872.cs @@ -63,13 +63,13 @@ namespace BrewMonster ~Skill1872Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; + public override float GetPraydistance(Skill skill) => 0f; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1873.cs b/Assets/PerfectWorld/Scripts/Skills/skill1873.cs index e295e598d2..f2cc022ba4 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1873.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1873.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill1873Stub() { } - public float GetMpcost(Skill skill) => 432f; - public int GetExecutetime(Skill skill) => 600; - public int GetCoolingtime(Skill skill) => 60000; + public override float GetMpcost(Skill skill) => 432f; + public override int GetExecutetime(Skill skill) => 600; + public override int GetCoolingtime(Skill skill) => 60000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1874.cs b/Assets/PerfectWorld/Scripts/Skills/skill1874.cs index 496da3b258..7c964cdf58 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1874.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1874.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill1874Stub() { } - public float GetMpcost(Skill skill) => 432f; - public int GetExecutetime(Skill skill) => 600; - public int GetCoolingtime(Skill skill) => 60000; + public override float GetMpcost(Skill skill) => 432f; + public override int GetExecutetime(Skill skill) => 600; + public override int GetCoolingtime(Skill skill) => 60000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1951.cs b/Assets/PerfectWorld/Scripts/Skills/skill1951.cs index 131d8c6c58..015337e03f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1951.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1951.cs @@ -119,15 +119,15 @@ namespace BrewMonster ~Skill1951Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2.cs b/Assets/PerfectWorld/Scripts/Skills/skill2.cs index 9105e9d7b1..3fa0993399 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2.cs @@ -107,10 +107,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "寸力.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(9); + restrict_weapons.Add(5); + restrict_weapons.Add(292); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(1, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,21 +131,24 @@ namespace BrewMonster ~Skill2Stub() { } - public float GetMpcost(Skill skill) => (float)(-2.2 + 5.6 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(-2.2 + 5.6 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), -2.2 + 5.6 * skill.GetLevel(), 5.9 * skill.GetLevel() * skill.GetLevel() + 126.7 * skill.GetLevel() + 40.5); + string result = string.Format(format, + skill.GetLevel(), + -2.2 + 5.6 * skill.GetLevel(), + 5.9 * skill.GetLevel() * skill.GetLevel() + 126.7 * skill.GetLevel() + 40.5); if (result.Length < length) { buffer.Append(result); @@ -146,10 +160,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 11.7f; public int GetAttackspeed(Skill skill) => 3; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2206.cs b/Assets/PerfectWorld/Scripts/Skills/skill2206.cs index ad37401d61..594ed4e4dd 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2206.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2206.cs @@ -134,17 +134,17 @@ namespace BrewMonster ~Skill2206Stub() { } - public float GetMpcost(Skill skill) => 125f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 125f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2207.cs b/Assets/PerfectWorld/Scripts/Skills/skill2207.cs index 9273b49382..b02f5db98c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2207.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2207.cs @@ -134,17 +134,17 @@ namespace BrewMonster ~Skill2207Stub() { } - public float GetMpcost(Skill skill) => 125f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 125f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2208.cs b/Assets/PerfectWorld/Scripts/Skills/skill2208.cs index fb731f2597..98d85f0cbb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2208.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2208.cs @@ -134,17 +134,17 @@ namespace BrewMonster ~Skill2208Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2209.cs b/Assets/PerfectWorld/Scripts/Skills/skill2209.cs index a544a932bf..e9937f0690 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2209.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2209.cs @@ -134,17 +134,17 @@ namespace BrewMonster ~Skill2209Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2210.cs b/Assets/PerfectWorld/Scripts/Skills/skill2210.cs index b9ffa6dac0..c2cbe6713d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2210.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2210.cs @@ -134,17 +134,17 @@ namespace BrewMonster ~Skill2210Stub() { } - public float GetMpcost(Skill skill) => 150f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 150f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2211.cs b/Assets/PerfectWorld/Scripts/Skills/skill2211.cs index b060532d54..d5b73e1567 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2211.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2211.cs @@ -134,17 +134,17 @@ namespace BrewMonster ~Skill2211Stub() { } - public float GetMpcost(Skill skill) => 150f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 150f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2254.cs b/Assets/PerfectWorld/Scripts/Skills/skill2254.cs index 2fd6527514..3324845cf5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2254.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2254.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill2254Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 300; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 300; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2255.cs b/Assets/PerfectWorld/Scripts/Skills/skill2255.cs index a4698aeae9..47e883d4a5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2255.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2255.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill2255Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 300; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 300; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2256.cs b/Assets/PerfectWorld/Scripts/Skills/skill2256.cs index 9b697445a1..88ab29002e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2256.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2256.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill2256Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 300; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 300; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2257.cs b/Assets/PerfectWorld/Scripts/Skills/skill2257.cs index e7bd53849e..2e39a0aa93 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2257.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2257.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill2257Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 300; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 300; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2258.cs b/Assets/PerfectWorld/Scripts/Skills/skill2258.cs index e1d6379480..91f711db60 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2258.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2258.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill2258Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 300; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 300; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2259.cs b/Assets/PerfectWorld/Scripts/Skills/skill2259.cs index f17ebfec71..473a3642d3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2259.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2259.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill2259Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 300; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 300; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill226.cs b/Assets/PerfectWorld/Scripts/Skills/skill226.cs index 82b121621b..da79367a05 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill226.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill226.cs @@ -101,10 +101,23 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - restrict_weapons.Add(0); effect = ""; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; + restrict_weapons.Add(0); + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); + restrict_weapons.Add(13); + restrict_weapons.Add(291); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -114,23 +127,20 @@ namespace BrewMonster ~Skill226Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 8.5f; public float GetHitrate(Skill skill) => 1.0f; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2260.cs b/Assets/PerfectWorld/Scripts/Skills/skill2260.cs index fa3da241ad..84f91754a8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2260.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2260.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill2260Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2261.cs b/Assets/PerfectWorld/Scripts/Skills/skill2261.cs index 73db1f28c4..e3ae1197b0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2261.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2261.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill2261Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2262.cs b/Assets/PerfectWorld/Scripts/Skills/skill2262.cs index 7def91282e..4af503383b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2262.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2262.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill2262Stub() { } - public float GetMpcost(Skill skill) => 600f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 600f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 15f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 5f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 5f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2263.cs b/Assets/PerfectWorld/Scripts/Skills/skill2263.cs index d608f2600d..412c5546d5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2263.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2263.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill2263Stub() { } - public float GetMpcost(Skill skill) => 600f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 600f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 15f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 5f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 5f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2264.cs b/Assets/PerfectWorld/Scripts/Skills/skill2264.cs index e988768861..3830037fbc 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2264.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2264.cs @@ -130,17 +130,17 @@ namespace BrewMonster ~Skill2264Stub() { } - public float GetMpcost(Skill skill) => 320f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 320f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2265.cs b/Assets/PerfectWorld/Scripts/Skills/skill2265.cs index ebc50dd266..3e05a45334 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2265.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2265.cs @@ -130,17 +130,17 @@ namespace BrewMonster ~Skill2265Stub() { } - public float GetMpcost(Skill skill) => 320f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 320f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill227.cs b/Assets/PerfectWorld/Scripts/Skills/skill227.cs index 99ad3975cc..91211919ff 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill227.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill227.cs @@ -101,10 +101,23 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - restrict_weapons.Add(0); effect = ""; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; + restrict_weapons.Add(0); + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); + restrict_weapons.Add(291); + restrict_weapons.Add(13); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -114,23 +127,20 @@ namespace BrewMonster ~Skill227Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 8.5f; public float GetHitrate(Skill skill) => 1.0f; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill228.cs b/Assets/PerfectWorld/Scripts/Skills/skill228.cs index 2023fafe31..92236debc2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill228.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill228.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill228Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill229.cs b/Assets/PerfectWorld/Scripts/Skills/skill229.cs index 23fc0dfa85..70d611b60a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill229.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill229.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill229Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2352.cs b/Assets/PerfectWorld/Scripts/Skills/skill2352.cs index 0834b30cfe..4ac6f493f3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2352.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2352.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill2352Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 20f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 20f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2367.cs b/Assets/PerfectWorld/Scripts/Skills/skill2367.cs index 356706ac23..1dadc1fd61 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2367.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2367.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill2367Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 20f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 20f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2368.cs b/Assets/PerfectWorld/Scripts/Skills/skill2368.cs index 68a3127f29..fe419f1b8e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2368.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2368.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill2368Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 20f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 20f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2369.cs b/Assets/PerfectWorld/Scripts/Skills/skill2369.cs index a2b6fb1f2f..c4790866cc 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2369.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2369.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill2369Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 900; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 900; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 20f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 20f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2370.cs b/Assets/PerfectWorld/Scripts/Skills/skill2370.cs index ea379cf739..de74f6e52f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2370.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2370.cs @@ -130,17 +130,17 @@ namespace BrewMonster ~Skill2370Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 3.5f; public float GetAttackdistance(Skill skill) => 15f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 8f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 8f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2371.cs b/Assets/PerfectWorld/Scripts/Skills/skill2371.cs index 0656f6c8fb..a5e9807ff3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2371.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2371.cs @@ -130,17 +130,17 @@ namespace BrewMonster ~Skill2371Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 3.5f; public float GetAttackdistance(Skill skill) => 15f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 8f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 8f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2372.cs b/Assets/PerfectWorld/Scripts/Skills/skill2372.cs index fcdcb90108..cffeff5edb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2372.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2372.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill2372Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2373.cs b/Assets/PerfectWorld/Scripts/Skills/skill2373.cs index 807d616fd8..83270bda2a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2373.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2373.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill2373Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2374.cs b/Assets/PerfectWorld/Scripts/Skills/skill2374.cs index a82039ae6c..9abff2d05b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2374.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2374.cs @@ -133,17 +133,17 @@ namespace BrewMonster ~Skill2374Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 3000; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2375.cs b/Assets/PerfectWorld/Scripts/Skills/skill2375.cs index 65b89640ed..9b0bc50a81 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2375.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2375.cs @@ -133,17 +133,17 @@ namespace BrewMonster ~Skill2375Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 3000; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2452.cs b/Assets/PerfectWorld/Scripts/Skills/skill2452.cs index dc118e058d..0f52f2fa99 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2452.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2452.cs @@ -171,17 +171,17 @@ namespace BrewMonster ~Skill2452Stub() { } - public float GetMpcost(Skill skill) => 445f; - public int GetExecutetime(Skill skill) => -1; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 445f; + public override int GetExecutetime(Skill skill) => -1; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2453.cs b/Assets/PerfectWorld/Scripts/Skills/skill2453.cs index 719c9ce047..6d11b92622 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2453.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2453.cs @@ -171,17 +171,17 @@ namespace BrewMonster ~Skill2453Stub() { } - public float GetMpcost(Skill skill) => 445f; - public int GetExecutetime(Skill skill) => -1; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 445f; + public override int GetExecutetime(Skill skill) => -1; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill3.cs b/Assets/PerfectWorld/Scripts/Skills/skill3.cs index 9d73f94190..38dae95b38 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill3.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill3.cs @@ -107,10 +107,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "凌风.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(1); - effect = ""; + restrict_weapons.Add(5); + restrict_weapons.Add(9); + restrict_weapons.Add(182); + restrict_weapons.Add(292); + restrict_weapons.Add(0); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(54, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +131,16 @@ namespace BrewMonster ~Skill3Stub() { } - public float GetMpcost(Skill skill) => (float)(23.5 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => (float)(23.5 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -151,10 +162,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 22.1f; public int GetAttackspeed(Skill skill) => 15; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill362.cs b/Assets/PerfectWorld/Scripts/Skills/skill362.cs index a6884bdbb7..9fac60b92f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill362.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill362.cs @@ -101,10 +101,23 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - restrict_weapons.Add(0); effect = ""; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; + restrict_weapons.Add(0); + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); + restrict_weapons.Add(291); + restrict_weapons.Add(13); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -114,23 +127,20 @@ namespace BrewMonster ~Skill362Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 3000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 3000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 8.5f; public float GetHitrate(Skill skill) => 1.0f; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill363.cs b/Assets/PerfectWorld/Scripts/Skills/skill363.cs index 7d2681e863..5c3c98016d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill363.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill363.cs @@ -101,10 +101,23 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - restrict_weapons.Add(0); effect = ""; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; + restrict_weapons.Add(0); + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); + restrict_weapons.Add(291); + restrict_weapons.Add(13); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -114,23 +127,20 @@ namespace BrewMonster ~Skill363Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 3000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 3000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 8.5f; public float GetHitrate(Skill skill) => 1.0f; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill364.cs b/Assets/PerfectWorld/Scripts/Skills/skill364.cs index 126c618770..5e1d1d2c4a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill364.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill364.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill364Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 3000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 3000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill365.cs b/Assets/PerfectWorld/Scripts/Skills/skill365.cs index 937d7b5d9e..a726f8bd53 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill365.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill365.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill365Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 3000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 3000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill374.cs b/Assets/PerfectWorld/Scripts/Skills/skill374.cs index ed7d309639..d9eb548dbb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill374.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill374.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill374Stub() : base(374) { cls = 0; - name = "真・虎击"; - nativename = "真・虎击"; + name = "真·虎击"; + nativename = "真·虎击"; icon = "虎击1.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1虎击.sgc"; + doenchant = 0; + dobless = 1; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(1, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill374Stub() { } - public float GetMpcost(Skill skill) => 125f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 125f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -148,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool BlessMe(Skill skill) - { - return true; - } + public bool BlessMe(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 13.3f; public int GetAttackspeed(Skill skill) => 2; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill375.cs b/Assets/PerfectWorld/Scripts/Skills/skill375.cs index 913595162d..13ad42231e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill375.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill375.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill375Stub() : base(375) { cls = 0; - name = "狂・虎击"; - nativename = "狂・虎击"; + name = "狂·虎击"; + nativename = "狂·虎击"; icon = "虎击2.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "2虎击.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(1, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill375Stub() { } - public float GetMpcost(Skill skill) => 125f; - public int GetExecutetime(Skill skill) => 600; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 125f; + public override int GetExecutetime(Skill skill) => 600; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill376.cs b/Assets/PerfectWorld/Scripts/Skills/skill376.cs index b375d44f32..11d1b66490 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill376.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill376.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill376Stub() : base(376) { cls = 0; - name = "真・寸力"; - nativename = "真・寸力"; + name = "真·寸力"; + nativename = "真·寸力"; icon = "寸力1.dds"; max_level = 1; type = 1; @@ -109,10 +109,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1寸力.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(9); + restrict_weapons.Add(5); + restrict_weapons.Add(292); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(2, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -122,17 +133,17 @@ namespace BrewMonster ~Skill376Stub() { } - public float GetMpcost(Skill skill) => 100f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 100f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -149,16 +160,13 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 11.7f; public int GetAttackspeed(Skill skill) => 3; public float GetHitrate(Skill skill) => 1.8f; public float GetTalent0(Skill skill) => 6079f; - public float GetTalent1(PlayerWrapper player) => player.GetAttackdegree (; + public float GetTalent1(Skill skill) => player.GetAttackdegree (; #endif } } diff --git a/Assets/PerfectWorld/Scripts/Skills/skill377.cs b/Assets/PerfectWorld/Scripts/Skills/skill377.cs index cabee5a643..052209184e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill377.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill377.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill377Stub() : base(377) { cls = 0; - name = "狂・寸力"; - nativename = "狂・寸力"; + name = "狂·寸力"; + nativename = "狂·寸力"; icon = "寸力2.dds"; max_level = 1; type = 1; @@ -109,10 +109,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "2寸力.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(9); + restrict_weapons.Add(5); + restrict_weapons.Add(292); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(2, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -122,17 +133,17 @@ namespace BrewMonster ~Skill377Stub() { } - public float GetMpcost(Skill skill) => 100f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 100f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -149,16 +160,13 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 11.7f; public int GetAttackspeed(Skill skill) => 3; public float GetHitrate(Skill skill) => 1.8f; public float GetTalent0(Skill skill) => 4676f; - public float GetTalent1(PlayerWrapper player) => player.GetAttackdegree (; + public float GetTalent1(Skill skill) => player.GetAttackdegree (; #endif } } diff --git a/Assets/PerfectWorld/Scripts/Skills/skill378.cs b/Assets/PerfectWorld/Scripts/Skills/skill378.cs index 75fa01826a..0b4de6dddf 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill378.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill378.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill378Stub() : base(378) { cls = 0; - name = "真・流水"; - nativename = "真・流水"; + name = "真·流水"; + nativename = "真·流水"; icon = "流水1.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1流水.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(54, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill378Stub() { } - public float GetMpcost(Skill skill) => 125f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 125f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill379.cs b/Assets/PerfectWorld/Scripts/Skills/skill379.cs index 826b390209..abb4a11b08 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill379.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill379.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill379Stub() : base(379) { cls = 0; - name = "狂・流水"; - nativename = "狂・流水"; + name = "狂·流水"; + nativename = "狂·流水"; icon = "流水2.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "2流水.sgc"; + doenchant = 0; + dobless = 1; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(54, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill379Stub() { } - public float GetMpcost(Skill skill) => 125f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 125f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -148,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 4500; - public bool BlessMe(Skill skill) - { - return true; - } + public bool BlessMe(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 14.1f; public int GetAttackspeed(Skill skill) => 12; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill380.cs b/Assets/PerfectWorld/Scripts/Skills/skill380.cs index 52eb551917..1205cf8499 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill380.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill380.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill380Stub() : base(380) { cls = 0; - name = "真・凌风"; - nativename = "真・凌风"; + name = "真·凌风"; + nativename = "真·凌风"; icon = "凌风1.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1凌风.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(1); - effect = ""; + restrict_weapons.Add(5); + restrict_weapons.Add(9); + restrict_weapons.Add(182); + restrict_weapons.Add(292); + restrict_weapons.Add(0); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(3, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill380Stub() { } - public float GetMpcost(Skill skill) => 150f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 150f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -148,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 22.1f; public int GetAttackspeed(Skill skill) => 15; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill381.cs b/Assets/PerfectWorld/Scripts/Skills/skill381.cs index 9eacf576a9..0d39acc87d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill381.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill381.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill381Stub() : base(381) { cls = 0; - name = "狂・凌风"; - nativename = "狂・凌风"; + name = "狂·凌风"; + nativename = "狂·凌风"; icon = "凌风2.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "2凌风.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(1); - effect = ""; + restrict_weapons.Add(5); + restrict_weapons.Add(9); + restrict_weapons.Add(182); + restrict_weapons.Add(292); + restrict_weapons.Add(0); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(3, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill381Stub() { } - public float GetMpcost(Skill skill) => 150f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 150f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -148,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 22.1f; public int GetAttackspeed(Skill skill) => 15; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill382.cs b/Assets/PerfectWorld/Scripts/Skills/skill382.cs index b137850d2e..fd9c4d81ca 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill382.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill382.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill382Stub() : base(382) { cls = 0; - name = "真・龙现"; - nativename = "真・龙现"; + name = "真·龙现"; + nativename = "真·龙现"; icon = "龙现1.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1龙现.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(5, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill382Stub() { } - public float GetMpcost(Skill skill) => 150f; - public int GetExecutetime(Skill skill) => 500; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 150f; + public override int GetExecutetime(Skill skill) => 500; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 10f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 10f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill383.cs b/Assets/PerfectWorld/Scripts/Skills/skill383.cs index 8ac40d5465..b803317cdb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill383.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill383.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill383Stub() : base(383) { cls = 0; - name = "狂・龙现"; - nativename = "狂・龙现"; + name = "狂·龙现"; + nativename = "狂·龙现"; icon = "龙现2.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "2龙现.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(5, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill383Stub() { } - public float GetMpcost(Skill skill) => 150f; - public int GetExecutetime(Skill skill) => 500; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 150f; + public override int GetExecutetime(Skill skill) => 500; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 12f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 12f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill384.cs b/Assets/PerfectWorld/Scripts/Skills/skill384.cs index 59fd7200b8..5af03f498e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill384.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill384.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill384Stub() : base(384) { cls = 0; - name = "真・断岩斩"; - nativename = "真・断岩斩"; + name = "真·断岩斩"; + nativename = "真·断岩斩"; icon = "断岩斩1.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1断岩斩.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(57, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill384Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -148,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 14.9f; public int GetAttackspeed(Skill skill) => 6; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill385.cs b/Assets/PerfectWorld/Scripts/Skills/skill385.cs index 17b5fbac10..4adfdb9bb0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill385.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill385.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill385Stub() : base(385) { cls = 0; - name = "狂・断岩斩"; - nativename = "狂・断岩斩"; + name = "狂·断岩斩"; + nativename = "狂·断岩斩"; icon = "断岩斩2.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "2断岩斩.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(57, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill385Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -148,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 14.9f; public int GetAttackspeed(Skill skill) => 6; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill386.cs b/Assets/PerfectWorld/Scripts/Skills/skill386.cs index 5329eefc4b..b38e77e201 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill386.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill386.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill386Stub() : base(386) { cls = 0; - name = "真・狂龙斩"; - nativename = "真・狂龙斩"; + name = "真·狂龙斩"; + nativename = "真·狂龙斩"; icon = "狂龙斩1.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1狂龙斩.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 4; + pre_skills = new Dictionary(); + pre_skills.Add(55, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill386Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 120); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill387.cs b/Assets/PerfectWorld/Scripts/Skills/skill387.cs index d9191dd1e0..b07591f401 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill387.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill387.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill387Stub() : base(387) { cls = 0; - name = "狂・狂龙斩"; - nativename = "狂・狂龙斩"; + name = "狂·狂龙斩"; + nativename = "狂·狂龙斩"; icon = "狂龙斩2.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "2狂龙斩.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 4; + pre_skills = new Dictionary(); + pre_skills.Add(55, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill387Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 120); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill388.cs b/Assets/PerfectWorld/Scripts/Skills/skill388.cs index e5b7d7b501..a1c96e6811 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill388.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill388.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill388Stub() : base(388) { cls = 0; - name = "真・横扫千军"; - nativename = "真・横扫千军"; + name = "真·横扫千军"; + nativename = "真·横扫千军"; icon = "横扫千军1.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1横扫千军.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(56, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill388Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 900; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 900; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill389.cs b/Assets/PerfectWorld/Scripts/Skills/skill389.cs index 836c60bd30..cafae4b052 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill389.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill389.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill389Stub() : base(389) { cls = 0; - name = "狂・横扫千军"; - nativename = "狂・横扫千军"; + name = "狂·横扫千军"; + nativename = "狂·横扫千军"; icon = "横扫千军2.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "2横扫千军.sgc"; + doenchant = 0; + dobless = 1; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(56, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill389Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 900; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 900; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -148,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool BlessMe(Skill skill) - { - return true; - } + public bool BlessMe(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 5f; public int GetAttackspeed(Skill skill) => 6; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill390.cs b/Assets/PerfectWorld/Scripts/Skills/skill390.cs index 35ff872dfc..6626b60838 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill390.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill390.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill390Stub() : base(390) { cls = 0; - name = "真・劈空掌"; - nativename = "真・劈空掌"; + name = "真·劈空掌"; + nativename = "真·劈空掌"; icon = "劈空掌1.dds"; max_level = 1; type = 1; @@ -108,10 +108,17 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1劈空掌.sgc"; + doenchant = 1; + dobless = 1; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(182); - effect = ""; + restrict_weapons.Add(0); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(60, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +128,17 @@ namespace BrewMonster ~Skill390Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -148,14 +155,8 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 3000; - public bool StateAttack(Skill skill) - { - return true; - } - public bool BlessMe(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; + public bool BlessMe(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 12.5f; public int GetAttackspeed(Skill skill) => 10; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill391.cs b/Assets/PerfectWorld/Scripts/Skills/skill391.cs index 57cc157cc4..1265f85ec1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill391.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill391.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill391Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill392.cs b/Assets/PerfectWorld/Scripts/Skills/skill392.cs index 5e74c64140..44a6051064 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill392.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill392.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill392Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill393.cs b/Assets/PerfectWorld/Scripts/Skills/skill393.cs index 38bb5269a5..c03e0cdd06 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill393.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill393.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill393Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 12000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 12000; public float GetRadius(Skill skill) => 3f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill394.cs b/Assets/PerfectWorld/Scripts/Skills/skill394.cs index 1a4b21f041..0ad29e0718 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill394.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill394.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill394Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill395.cs b/Assets/PerfectWorld/Scripts/Skills/skill395.cs index 107f1de007..95ccca7de2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill395.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill395.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill395Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill396.cs b/Assets/PerfectWorld/Scripts/Skills/skill396.cs index d0ccb59ec6..07ccedbad9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill396.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill396.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill396Stub() { } - public float GetMpcost(Skill skill) => 305f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 305f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 4f; public float GetAttackdistance(Skill skill) => 12f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill397.cs b/Assets/PerfectWorld/Scripts/Skills/skill397.cs index 62c1a279be..dd6ca4cde3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill397.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill397.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill397Stub() { } - public float GetMpcost(Skill skill) => 305f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 305f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 4f; public float GetAttackdistance(Skill skill) => 12f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill398.cs b/Assets/PerfectWorld/Scripts/Skills/skill398.cs index d8b626ed19..a016f15605 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill398.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill398.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill398Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 3.5f; public float GetAttackdistance(Skill skill) => 12f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill399.cs b/Assets/PerfectWorld/Scripts/Skills/skill399.cs index 5f9370b935..8a2874b0c6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill399.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill399.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill399Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 5f; public float GetAttackdistance(Skill skill) => 15f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill4.cs b/Assets/PerfectWorld/Scripts/Skills/skill4.cs index 2a3a5ddb04..5156d599e4 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill4.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill4.cs @@ -104,10 +104,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "狮子吼.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -117,16 +128,16 @@ namespace BrewMonster ~Skill4Stub() { } - public float GetMpcost(Skill skill) => (float)(35.3 + 9.8 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 25000 - 1000 * skill.GetLevel(); + public override float GetMpcost(Skill skill) => (float)(35.3 + 9.8 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 25000 - 1000 * skill.GetLevel(); public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 5f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 5f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -147,10 +158,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 600; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 20f; public int GetAttackspeed(Skill skill) => 9; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill400.cs b/Assets/PerfectWorld/Scripts/Skills/skill400.cs index 9495b8af48..c744caa8b8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill400.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill400.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill400Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(16 + skill.GetPlayer().GetRange() - 4.5); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(16 + skill.GetPlayer().GetRange() - 4.5); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill401.cs b/Assets/PerfectWorld/Scripts/Skills/skill401.cs index 0e185c93d4..1f0ceccca2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill401.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill401.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill401Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(18 + skill.GetPlayer().GetRange() - 4.5); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(18 + skill.GetPlayer().GetRange() - 4.5); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill402.cs b/Assets/PerfectWorld/Scripts/Skills/skill402.cs index 277eca1435..ca6e8ea598 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill402.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill402.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill402Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 3.5f; public float GetAttackdistance(Skill skill) => 15f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill403.cs b/Assets/PerfectWorld/Scripts/Skills/skill403.cs index 4cbcb84d46..44cf5278a1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill403.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill403.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill403Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 3.5f; public float GetAttackdistance(Skill skill) => 15f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill404.cs b/Assets/PerfectWorld/Scripts/Skills/skill404.cs index d442027fd8..9bc7c03bbe 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill404.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill404.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill404Stub() { } - public float GetMpcost(Skill skill) => 305f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 305f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill405.cs b/Assets/PerfectWorld/Scripts/Skills/skill405.cs index 4e4421d827..863bef8fe7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill405.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill405.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill405Stub() { } - public float GetMpcost(Skill skill) => 305f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 305f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill406.cs b/Assets/PerfectWorld/Scripts/Skills/skill406.cs index 7488f5e1ad..d0a571ba54 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill406.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill406.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill406Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill407.cs b/Assets/PerfectWorld/Scripts/Skills/skill407.cs index dbcd8181b6..d434518d0a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill407.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill407.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill407Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill408.cs b/Assets/PerfectWorld/Scripts/Skills/skill408.cs index 1b6edfc2f6..b641a04c1b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill408.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill408.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill408Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(20 + 3 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill409.cs b/Assets/PerfectWorld/Scripts/Skills/skill409.cs index 73e89f3799..52374b87ba 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill409.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill409.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill409Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(20 + 3 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill410.cs b/Assets/PerfectWorld/Scripts/Skills/skill410.cs index 334879ea70..d42c81a88d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill410.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill410.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill410Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(20 + 3 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill411.cs b/Assets/PerfectWorld/Scripts/Skills/skill411.cs index da7f251cfe..a4dbe51b55 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill411.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill411.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill411Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(20 + 3 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill412.cs b/Assets/PerfectWorld/Scripts/Skills/skill412.cs index c674031719..13f16c7a2a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill412.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill412.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill412Stub() { } - public float GetMpcost(Skill skill) => 305f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 305f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(60 + 2.5 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => 8f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 8f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill413.cs b/Assets/PerfectWorld/Scripts/Skills/skill413.cs index 1382b20e93..7db3c5f3bc 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill413.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill413.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill413Stub() { } - public float GetMpcost(Skill skill) => 304f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 304f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(60 + 2.5 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => 8f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 8f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill414.cs b/Assets/PerfectWorld/Scripts/Skills/skill414.cs index caa214ae2d..e8bb4b572e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill414.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill414.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill414Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill415.cs b/Assets/PerfectWorld/Scripts/Skills/skill415.cs index 0ebd532ea5..5fd834799c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill415.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill415.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill415Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 3f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill416.cs b/Assets/PerfectWorld/Scripts/Skills/skill416.cs index 441fd4cef7..fd037961b7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill416.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill416.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill416Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(12 + skill.GetPlayer().GetRange() - 3); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(12 + skill.GetPlayer().GetRange() - 3); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill417.cs b/Assets/PerfectWorld/Scripts/Skills/skill417.cs index 5e4d124b0d..a37bb695ab 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill417.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill417.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill417Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 900; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 900; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(12 + skill.GetPlayer().GetRange() - 3); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(12 + skill.GetPlayer().GetRange() - 3); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill418.cs b/Assets/PerfectWorld/Scripts/Skills/skill418.cs index 75207415c7..d0d8235475 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill418.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill418.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill418Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 1700; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 1700; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill419.cs b/Assets/PerfectWorld/Scripts/Skills/skill419.cs index 475f81654f..12d6f63f98 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill419.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill419.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill419Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 1700; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 1700; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill420.cs b/Assets/PerfectWorld/Scripts/Skills/skill420.cs index ec506a8031..0e298682a3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill420.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill420.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill420Stub() { } - public float GetMpcost(Skill skill) => 305f; - public int GetExecutetime(Skill skill) => 3000; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 305f; + public override int GetExecutetime(Skill skill) => 3000; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(10 + skill.GetPlayer().GetRange() - 3); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(10 + skill.GetPlayer().GetRange() - 3); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill421.cs b/Assets/PerfectWorld/Scripts/Skills/skill421.cs index 8bc3c8ba57..5d076c368b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill421.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill421.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill421Stub() { } - public float GetMpcost(Skill skill) => 305f; - public int GetExecutetime(Skill skill) => 3000; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 305f; + public override int GetExecutetime(Skill skill) => 3000; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(10 + skill.GetPlayer().GetRange() - 3); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(10 + skill.GetPlayer().GetRange() - 3); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill422.cs b/Assets/PerfectWorld/Scripts/Skills/skill422.cs index 00ff545d24..d0231fad31 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill422.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill422.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill422Stub() { } - public float GetMpcost(Skill skill) => 625f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 625f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 16f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill423.cs b/Assets/PerfectWorld/Scripts/Skills/skill423.cs index 9f4173201f..d817cc4531 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill423.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill423.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill423Stub() { } - public float GetMpcost(Skill skill) => 625f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 625f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 16f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill424.cs b/Assets/PerfectWorld/Scripts/Skills/skill424.cs index fca877e5b5..3913d82ec7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill424.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill424.cs @@ -130,17 +130,17 @@ namespace BrewMonster ~Skill424Stub() { } - public float GetMpcost(Skill skill) => 175f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 175f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 5f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 5f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill425.cs b/Assets/PerfectWorld/Scripts/Skills/skill425.cs index 3417f593b2..f311afe5cf 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill425.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill425.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill425Stub() { } - public float GetMpcost(Skill skill) => 175f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 14000; + public override float GetMpcost(Skill skill) => 175f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 14000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 5f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 5f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill426.cs b/Assets/PerfectWorld/Scripts/Skills/skill426.cs index e2e6966bdb..fd7d9af9a4 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill426.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill426.cs @@ -93,17 +93,17 @@ namespace BrewMonster ~Skill426Stub() { } - public float GetMpcost(Skill skill) => 20f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 20f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill427.cs b/Assets/PerfectWorld/Scripts/Skills/skill427.cs index 7023eb1025..7025899a14 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill427.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill427.cs @@ -93,17 +93,17 @@ namespace BrewMonster ~Skill427Stub() { } - public float GetMpcost(Skill skill) => 20f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 20f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill428.cs b/Assets/PerfectWorld/Scripts/Skills/skill428.cs index b4efc045a0..b56faddf10 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill428.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill428.cs @@ -93,17 +93,17 @@ namespace BrewMonster ~Skill428Stub() { } - public float GetMpcost(Skill skill) => 20f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 20f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill429.cs b/Assets/PerfectWorld/Scripts/Skills/skill429.cs index daf5dde250..28f7491cb1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill429.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill429.cs @@ -93,17 +93,17 @@ namespace BrewMonster ~Skill429Stub() { } - public float GetMpcost(Skill skill) => 20f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 20f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill430.cs b/Assets/PerfectWorld/Scripts/Skills/skill430.cs index 2fffc4156c..412a9ca995 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill430.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill430.cs @@ -93,17 +93,17 @@ namespace BrewMonster ~Skill430Stub() { } - public float GetMpcost(Skill skill) => 375f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 375f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill431.cs b/Assets/PerfectWorld/Scripts/Skills/skill431.cs index e99e301e24..65d4f24362 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill431.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill431.cs @@ -93,17 +93,17 @@ namespace BrewMonster ~Skill431Stub() { } - public float GetMpcost(Skill skill) => 375f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 375f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill432.cs b/Assets/PerfectWorld/Scripts/Skills/skill432.cs index 520368386b..98971e856d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill432.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill432.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill432Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill433.cs b/Assets/PerfectWorld/Scripts/Skills/skill433.cs index 9264ce84af..003aa93efb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill433.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill433.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill433Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill434.cs b/Assets/PerfectWorld/Scripts/Skills/skill434.cs index d36c7881d1..1ab5d387b3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill434.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill434.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill434Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill435.cs b/Assets/PerfectWorld/Scripts/Skills/skill435.cs index fcf157a76b..7de551ec65 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill435.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill435.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill435Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill436.cs b/Assets/PerfectWorld/Scripts/Skills/skill436.cs index 1cdf60b3a4..dbe07b67c9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill436.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill436.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill436Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill437.cs b/Assets/PerfectWorld/Scripts/Skills/skill437.cs index 5f1345c65a..fc71eeee8c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill437.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill437.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill437Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill438.cs b/Assets/PerfectWorld/Scripts/Skills/skill438.cs index 2a8d1551f2..5b39f4f20e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill438.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill438.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill438Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill439.cs b/Assets/PerfectWorld/Scripts/Skills/skill439.cs index 3401aa07d8..6f6038ed73 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill439.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill439.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill439Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill440.cs b/Assets/PerfectWorld/Scripts/Skills/skill440.cs index ffbfb8344e..d635b94063 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill440.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill440.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill440Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill441.cs b/Assets/PerfectWorld/Scripts/Skills/skill441.cs index 99abe0aaae..baf95f8808 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill441.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill441.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill441Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill442.cs b/Assets/PerfectWorld/Scripts/Skills/skill442.cs index 6e3e63c12f..faee174a4f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill442.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill442.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill442Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill443.cs b/Assets/PerfectWorld/Scripts/Skills/skill443.cs index 3a0ab12257..fdfca10008 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill443.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill443.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill443Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill444.cs b/Assets/PerfectWorld/Scripts/Skills/skill444.cs index c86e51da33..49037c2e3a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill444.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill444.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill444Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill445.cs b/Assets/PerfectWorld/Scripts/Skills/skill445.cs index cecdf26ece..4bdf56b2c2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill445.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill445.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill445Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill446.cs b/Assets/PerfectWorld/Scripts/Skills/skill446.cs index dddb4ad7d9..ef61dc30be 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill446.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill446.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill446Stub() { } - public float GetMpcost(Skill skill) => 450f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 450f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => (float)(7 + 0.5 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill447.cs b/Assets/PerfectWorld/Scripts/Skills/skill447.cs index cf0855f52b..bd4bc877ae 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill447.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill447.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill447Stub() { } - public float GetMpcost(Skill skill) => 450f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 450f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => (float)(7 + 0.5 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill448.cs b/Assets/PerfectWorld/Scripts/Skills/skill448.cs index 9bccd76de3..d1e9e07767 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill448.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill448.cs @@ -146,17 +146,17 @@ namespace BrewMonster ~Skill448Stub() { } - public float GetMpcost(Skill skill) => 350f; - public int GetExecutetime(Skill skill) => -1; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 350f; + public override int GetExecutetime(Skill skill) => -1; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 6f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 6f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill449.cs b/Assets/PerfectWorld/Scripts/Skills/skill449.cs index 5705210790..2b324aa871 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill449.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill449.cs @@ -146,17 +146,17 @@ namespace BrewMonster ~Skill449Stub() { } - public float GetMpcost(Skill skill) => 350f; - public int GetExecutetime(Skill skill) => -1; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 350f; + public override int GetExecutetime(Skill skill) => -1; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 6f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 6f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill450.cs b/Assets/PerfectWorld/Scripts/Skills/skill450.cs index e981508d97..4b6e589c11 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill450.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill450.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill450Stub() { } - public float GetMpcost(Skill skill) => 445f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 7000; + public override float GetMpcost(Skill skill) => 445f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 7000; public float GetRadius(Skill skill) => 5f; public float GetAttackdistance(Skill skill) => 18f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 10f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 10f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill451.cs b/Assets/PerfectWorld/Scripts/Skills/skill451.cs index 1aefef0d73..c0fd134015 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill451.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill451.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill451Stub() { } - public float GetMpcost(Skill skill) => 445f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 445f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 18f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 10f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 10f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill452.cs b/Assets/PerfectWorld/Scripts/Skills/skill452.cs index 54ce8f1601..4f89ad0993 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill452.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill452.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill452Stub() { } - public float GetMpcost(Skill skill) => 295f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 295f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 6f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 6f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill453.cs b/Assets/PerfectWorld/Scripts/Skills/skill453.cs index 39d6e54d96..c1e3c9c9f7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill453.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill453.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill453Stub() { } - public float GetMpcost(Skill skill) => 295f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 295f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 6f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 6f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill454.cs b/Assets/PerfectWorld/Scripts/Skills/skill454.cs index b40aa4d30f..65789bd297 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill454.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill454.cs @@ -131,17 +131,17 @@ namespace BrewMonster ~Skill454Stub() { } - public float GetMpcost(Skill skill) => 655f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 655f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill455.cs b/Assets/PerfectWorld/Scripts/Skills/skill455.cs index 054e8939ea..70148f9edd 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill455.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill455.cs @@ -131,17 +131,17 @@ namespace BrewMonster ~Skill455Stub() { } - public float GetMpcost(Skill skill) => 655f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 655f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill456.cs b/Assets/PerfectWorld/Scripts/Skills/skill456.cs index fd48e07454..ecb5f226b0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill456.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill456.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill456Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill457.cs b/Assets/PerfectWorld/Scripts/Skills/skill457.cs index d66b14c512..466ca28d0d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill457.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill457.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill457Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill458.cs b/Assets/PerfectWorld/Scripts/Skills/skill458.cs index 4852dcd706..8bcc99d23b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill458.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill458.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill458Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill459.cs b/Assets/PerfectWorld/Scripts/Skills/skill459.cs index e96d514fa6..e0fbf395e3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill459.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill459.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill459Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill460.cs b/Assets/PerfectWorld/Scripts/Skills/skill460.cs index 80023d1708..d666778f24 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill460.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill460.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill460Stub() { } - public float GetMpcost(Skill skill) => 320f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 12000; + public override float GetMpcost(Skill skill) => 320f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 12000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill461.cs b/Assets/PerfectWorld/Scripts/Skills/skill461.cs index 0aac9dcdc5..cb077f3592 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill461.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill461.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill461Stub() { } - public float GetMpcost(Skill skill) => 320f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 12000; + public override float GetMpcost(Skill skill) => 320f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 12000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill462.cs b/Assets/PerfectWorld/Scripts/Skills/skill462.cs index 53c97e04c7..aa477b6d69 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill462.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill462.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill462Stub() { } - public float GetMpcost(Skill skill) => 595f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 1000; + public override float GetMpcost(Skill skill) => 595f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 1000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill463.cs b/Assets/PerfectWorld/Scripts/Skills/skill463.cs index dbb98d7246..76324db4c6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill463.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill463.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill463Stub() { } - public float GetMpcost(Skill skill) => 595f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 1000; + public override float GetMpcost(Skill skill) => 595f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 1000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill464.cs b/Assets/PerfectWorld/Scripts/Skills/skill464.cs index e5f0cd1968..5e9b3149dd 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill464.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill464.cs @@ -89,17 +89,17 @@ namespace BrewMonster ~Skill464Stub() { } - public float GetMpcost(Skill skill) => 300f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 300f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill465.cs b/Assets/PerfectWorld/Scripts/Skills/skill465.cs index 069f7c5423..2733f55e14 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill465.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill465.cs @@ -89,17 +89,17 @@ namespace BrewMonster ~Skill465Stub() { } - public float GetMpcost(Skill skill) => 300f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 300f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill466.cs b/Assets/PerfectWorld/Scripts/Skills/skill466.cs index b27bc785ee..6c1e860e67 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill466.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill466.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill466Stub() { } - public float GetMpcost(Skill skill) => 600f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 600f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill467.cs b/Assets/PerfectWorld/Scripts/Skills/skill467.cs index 1b8b4abbd4..c768d423b5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill467.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill467.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill467Stub() { } - public float GetMpcost(Skill skill) => 600f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 600f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill468.cs b/Assets/PerfectWorld/Scripts/Skills/skill468.cs index 3979caa70c..348c48f9c0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill468.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill468.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill468Stub() { } - public float GetMpcost(Skill skill) => 445f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 445f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill469.cs b/Assets/PerfectWorld/Scripts/Skills/skill469.cs index a77062596b..eec1d00f57 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill469.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill469.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill469Stub() { } - public float GetMpcost(Skill skill) => 445f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 445f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill470.cs b/Assets/PerfectWorld/Scripts/Skills/skill470.cs index d7ee527393..81e15bbce8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill470.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill470.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill470Stub() { } - public float GetMpcost(Skill skill) => 655f; - public int GetExecutetime(Skill skill) => 1600; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 655f; + public override int GetExecutetime(Skill skill) => 1600; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill471.cs b/Assets/PerfectWorld/Scripts/Skills/skill471.cs index aa507ba800..91fa93a5e5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill471.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill471.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill471Stub() { } - public float GetMpcost(Skill skill) => 655f; - public int GetExecutetime(Skill skill) => 1600; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 655f; + public override int GetExecutetime(Skill skill) => 1600; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill472.cs b/Assets/PerfectWorld/Scripts/Skills/skill472.cs index 462c0f9495..62a746ba90 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill472.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill472.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill472Stub() { } - public float GetMpcost(Skill skill) => 375f; - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 375f; + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill473.cs b/Assets/PerfectWorld/Scripts/Skills/skill473.cs index 8fac0b879a..1364177daa 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill473.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill473.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill473Stub() { } - public float GetMpcost(Skill skill) => 375f; - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 375f; + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill474.cs b/Assets/PerfectWorld/Scripts/Skills/skill474.cs index b1ed9dc2cd..14c4b0fb46 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill474.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill474.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill474Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill475.cs b/Assets/PerfectWorld/Scripts/Skills/skill475.cs index 961ed77434..a64a1d29fe 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill475.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill475.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill475Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill476.cs b/Assets/PerfectWorld/Scripts/Skills/skill476.cs index 9c5a4e9277..62ef9ea53b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill476.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill476.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill476Stub() { } - public float GetMpcost(Skill skill) => 320f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 320f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill477.cs b/Assets/PerfectWorld/Scripts/Skills/skill477.cs index e2edcddb92..7634a3257b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill477.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill477.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill477Stub() { } - public float GetMpcost(Skill skill) => 320f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 320f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill478.cs b/Assets/PerfectWorld/Scripts/Skills/skill478.cs index dad165e9d1..0ac0a64f5c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill478.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill478.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill478Stub() { } - public float GetMpcost(Skill skill) => 60f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 60f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => (float)(2 + 0.3 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 25f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 25f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill479.cs b/Assets/PerfectWorld/Scripts/Skills/skill479.cs index 5fc44af247..e8f8a0a57e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill479.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill479.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill479Stub() { } - public float GetMpcost(Skill skill) => 60f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 60f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => (float)(2 + 0.3 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill480.cs b/Assets/PerfectWorld/Scripts/Skills/skill480.cs index e7f0b8a081..c1d4133340 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill480.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill480.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill480Stub() { } - public float GetMpcost(Skill skill) => 445f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 445f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(15 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill481.cs b/Assets/PerfectWorld/Scripts/Skills/skill481.cs index 4c0855e1bd..74a8af8dc3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill481.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill481.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill481Stub() { } - public float GetMpcost(Skill skill) => 445f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 445f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(15 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill482.cs b/Assets/PerfectWorld/Scripts/Skills/skill482.cs index cccf5ea347..a3f9a2d08e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill482.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill482.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill482Stub() { } - public float GetMpcost(Skill skill) => 295f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 20000; + public override float GetMpcost(Skill skill) => 295f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 20000; public float GetRadius(Skill skill) => 3f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill483.cs b/Assets/PerfectWorld/Scripts/Skills/skill483.cs index c1b97430cb..aa1981dfa0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill483.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill483.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill483Stub() { } - public float GetMpcost(Skill skill) => 295f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 18000; + public override float GetMpcost(Skill skill) => 295f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 18000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill484.cs b/Assets/PerfectWorld/Scripts/Skills/skill484.cs index 32c3dc61e5..be32f5f12a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill484.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill484.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill484Stub() { } - public float GetMpcost(Skill skill) => 655f; - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 655f; + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill485.cs b/Assets/PerfectWorld/Scripts/Skills/skill485.cs index 433f3f7b6e..d148a42cb5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill485.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill485.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill485Stub() { } - public float GetMpcost(Skill skill) => 655f; - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 655f; + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 35f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 35f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill486.cs b/Assets/PerfectWorld/Scripts/Skills/skill486.cs index 20c76c00aa..1c794b1726 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill486.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill486.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill486Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill487.cs b/Assets/PerfectWorld/Scripts/Skills/skill487.cs index a1b9edf412..ddf1e1e5ad 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill487.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill487.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill487Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill488.cs b/Assets/PerfectWorld/Scripts/Skills/skill488.cs index f744a8739c..3c951ba512 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill488.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill488.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill488Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill489.cs b/Assets/PerfectWorld/Scripts/Skills/skill489.cs index 8215aa2927..9a712f3171 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill489.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill489.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill489Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill490.cs b/Assets/PerfectWorld/Scripts/Skills/skill490.cs index a3834d2da7..0c201ae473 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill490.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill490.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill490Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill491.cs b/Assets/PerfectWorld/Scripts/Skills/skill491.cs index b39fecbdd4..42a28ced0e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill491.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill491.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill491Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill5.cs b/Assets/PerfectWorld/Scripts/Skills/skill5.cs index ee1f7ed2fa..bc6ced6403 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill5.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill5.cs @@ -107,10 +107,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "龙现.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +131,16 @@ namespace BrewMonster ~Skill5Stub() { } - public float GetMpcost(Skill skill) => (float)(1.7 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 500; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => (float)(1.7 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 500; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(7 + skill.GetLevel() * 0.3); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(7 + skill.GetLevel() * 0.3); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill53.cs b/Assets/PerfectWorld/Scripts/Skills/skill53.cs index 0754e68778..1f0702aa70 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill53.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill53.cs @@ -65,16 +65,16 @@ namespace BrewMonster ~Skill53Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill54.cs b/Assets/PerfectWorld/Scripts/Skills/skill54.cs index 889380ef7c..2b6ebbb065 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill54.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill54.cs @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "流水.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(2, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,22 +132,25 @@ namespace BrewMonster ~Skill54Stub() { } - public float GetMpcost(Skill skill) => (float)(5.6 + 7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(5.6 + 7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 5.6 + 7 * skill.GetLevel(), 2.9 * skill.GetLevel() * skill.GetLevel() + 89.9 * skill.GetLevel() + 174.6); + string result = string.Format(format, + skill.GetLevel(), + 5.6 + 7 * skill.GetLevel(), + 2.9 * skill.GetLevel() * skill.GetLevel() + 89.9 * skill.GetLevel() + 174.6); if (result.Length < length) { buffer.Append(result); diff --git a/Assets/PerfectWorld/Scripts/Skills/skill55.cs b/Assets/PerfectWorld/Scripts/Skills/skill55.cs index 4f1f00d532..e8cf526dff 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill55.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill55.cs @@ -107,10 +107,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "狂龙斩.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 4; + pre_skills = new Dictionary(); + pre_skills.Add(57, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,21 +131,24 @@ namespace BrewMonster ~Skill55Stub() { } - public float GetMpcost(Skill skill) => (float)(60.9 + 10.5 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(60.9 + 10.5 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 120); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 60.9 + 10.5 * skill.GetLevel(), 2.2 * skill.GetLevel() * skill.GetLevel() + 106.7 * skill.GetLevel() + 522.4); + string result = string.Format(format, + skill.GetLevel(), + 60.9 + 10.5 * skill.GetLevel(), + 2.2 * skill.GetLevel() * skill.GetLevel() + 106.7 * skill.GetLevel() + 522.4); if (result.Length < length) { buffer.Append(result); diff --git a/Assets/PerfectWorld/Scripts/Skills/skill56.cs b/Assets/PerfectWorld/Scripts/Skills/skill56.cs index e516c302f8..f230566b6e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill56.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill56.cs @@ -107,10 +107,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "横扫千军.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(55, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,21 +131,24 @@ namespace BrewMonster ~Skill56Stub() { } - public float GetMpcost(Skill skill) => (float)(84 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 900; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(84 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 900; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 84 + 8.4 * skill.GetLevel(), 1.1 * skill.GetLevel() * skill.GetLevel() + 107.6 * skill.GetLevel() + 850.8); + string result = string.Format(format, + skill.GetLevel(), + 84 + 8.4 * skill.GetLevel(), + 1.1 * skill.GetLevel() * skill.GetLevel() + 107.6 * skill.GetLevel() + 850.8); if (result.Length < length) { buffer.Append(result); diff --git a/Assets/PerfectWorld/Scripts/Skills/skill57.cs b/Assets/PerfectWorld/Scripts/Skills/skill57.cs index 8adf2fdb38..e626a1befc 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill57.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill57.cs @@ -107,10 +107,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "断岩斩.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(5, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +131,16 @@ namespace BrewMonster ~Skill57Stub() { } - public float GetMpcost(Skill skill) => (float)(29.4 + 7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(29.4 + 7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -151,10 +162,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 14.9f; public int GetAttackspeed(Skill skill) => 6; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill58.cs b/Assets/PerfectWorld/Scripts/Skills/skill58.cs index 10753e8455..18ab441fcf 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill58.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill58.cs @@ -102,10 +102,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "龙腾.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -115,21 +126,24 @@ namespace BrewMonster ~Skill58Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 16000 - 1000 * skill.GetLevel(); + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 16000 - 1000 * skill.GetLevel(); public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(-10 - 0.6 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(-10 - 0.6 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 16 - skill.GetLevel(), 10 + 0.6 * skill.GetLevel()); + string result = string.Format(format, + skill.GetLevel(), + 16 - skill.GetLevel(), + 10 + 0.6 * skill.GetLevel()); if (result.Length < length) { buffer.Append(result); @@ -141,10 +155,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 20f; public int GetAttackspeed(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill59.cs b/Assets/PerfectWorld/Scripts/Skills/skill59.cs index ddfd9cccf9..4fc01ea830 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill59.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill59.cs @@ -102,10 +102,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "虎跃.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -115,21 +126,24 @@ namespace BrewMonster ~Skill59Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 16000 - 1000 * skill.GetLevel(); + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 16000 - 1000 * skill.GetLevel(); public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(10 + 0.6 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(10 + 0.6 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 16 - skill.GetLevel(), 10 + 0.6 * skill.GetLevel()); + string result = string.Format(format, + skill.GetLevel(), + 16 - skill.GetLevel(), + 10 + 0.6 * skill.GetLevel()); if (result.Length < length) { buffer.Append(result); @@ -141,10 +155,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 25f; public int GetAttackspeed(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill6.cs b/Assets/PerfectWorld/Scripts/Skills/skill6.cs index 90fbc27e83..b324b78039 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill6.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill6.cs @@ -57,7 +57,6 @@ namespace BrewMonster dobless = 0; commoncooldown = 0; commoncooldowntime = 0; - effect = ""; range = new Range(); range.type = 0; pre_skills = new Dictionary(); @@ -67,16 +66,16 @@ namespace BrewMonster ~Skill6Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill60.cs b/Assets/PerfectWorld/Scripts/Skills/skill60.cs index a5f125f447..ce2f72eeed 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill60.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill60.cs @@ -107,10 +107,17 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "劈空掌.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(182); - effect = ""; + restrict_weapons.Add(0); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(3, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +127,16 @@ namespace BrewMonster ~Skill60Stub() { } - public float GetMpcost(Skill skill) => (float)(33.6 + 7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => (float)(33.6 + 7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -150,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 300; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 12.5f; public int GetAttackspeed(Skill skill) => 10; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill61.cs b/Assets/PerfectWorld/Scripts/Skills/skill61.cs index 4b60367297..797f6fd683 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill61.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill61.cs @@ -107,10 +107,17 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "无影脚.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(182); - effect = ""; + restrict_weapons.Add(0); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(60, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,21 +127,24 @@ namespace BrewMonster ~Skill61Stub() { } - public float GetMpcost(Skill skill) => (float)(58.8 + 6.7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 12000; + public override float GetMpcost(Skill skill) => (float)(58.8 + 6.7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 12000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 58.8 + 6.7 * skill.GetLevel(), 1.9 * skill.GetLevel() * skill.GetLevel() + 135.2 * skill.GetLevel() + 931.4); + string result = string.Format(format, + skill.GetLevel(), + 58.8 + 6.7 * skill.GetLevel(), + 1.9 * skill.GetLevel() * skill.GetLevel() + 135.2 * skill.GetLevel() + 931.4); if (result.Length < length) { buffer.Append(result); @@ -146,10 +156,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 15.7f; public int GetAttackspeed(Skill skill) => 10; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill62.cs b/Assets/PerfectWorld/Scripts/Skills/skill62.cs index 8331e487ee..0ac870a19d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill62.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill62.cs @@ -107,10 +107,17 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "风卷残云.sgc"; + doenchant = 0; + dobless = 1; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(182); - effect = ""; + restrict_weapons.Add(0); range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(61, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +127,16 @@ namespace BrewMonster ~Skill62Stub() { } - public float GetMpcost(Skill skill) => (float)(94.5 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => (float)(94.5 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -152,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool BlessMe(Skill skill) - { - return true; - } + public bool BlessMe(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 8f; public int GetAttackspeed(Skill skill) => 16; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill63.cs b/Assets/PerfectWorld/Scripts/Skills/skill63.cs index 8ecf4cafd1..b1a8e6c0a7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill63.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill63.cs @@ -107,10 +107,17 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "云龙九现.sgc"; + doenchant = 0; + dobless = 1; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(182); - effect = ""; + restrict_weapons.Add(0); range = new Range(); - range.type = 0; + range.type = 1; + pre_skills = new Dictionary(); + pre_skills.Add(62, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +127,16 @@ namespace BrewMonster ~Skill63Stub() { } - public float GetMpcost(Skill skill) => (float)(156.8 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => (float)(156.8 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 4f; public float GetAttackdistance(Skill skill) => (float)(8 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -152,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 1000; - public bool BlessMe(Skill skill) - { - return true; - } + public bool BlessMe(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 20f; public int GetAttackspeed(Skill skill) => 11; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill64.cs b/Assets/PerfectWorld/Scripts/Skills/skill64.cs index ad60ac8fb5..eac915f1e1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill64.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill64.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "疾风霹雳.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(5); - effect = ""; range = new Range(); - range.type = 0; + range.type = 1; + pre_skills = new Dictionary(); + pre_skills.Add(3, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill64Stub() { } - public float GetMpcost(Skill skill) => (float)(33.6 + 7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => (float)(33.6 + 7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 3.5f; public float GetAttackdistance(Skill skill) => (float)(8 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -151,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 300; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 6f; public int GetAttackspeed(Skill skill) => 4; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill65.cs b/Assets/PerfectWorld/Scripts/Skills/skill65.cs index 470a8474d7..609263830e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill65.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill65.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "回马枪.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(5); - effect = ""; range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(64, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill65Stub() { } - public float GetMpcost(Skill skill) => (float)(58.8 + 6.7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => (float)(58.8 + 6.7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(10 + 0.5 * skill.GetLevel() + skill.GetPlayer().GetRange() - 4.5); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(10 + 0.5 * skill.GetLevel() + skill.GetPlayer().GetRange() - 4.5); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill66.cs b/Assets/PerfectWorld/Scripts/Skills/skill66.cs index f087a7a317..49a6a4747f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill66.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill66.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "流星赶月.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(5); - effect = ""; range = new Range(); - range.type = 0; + range.type = 1; + pre_skills = new Dictionary(); + pre_skills.Add(65, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill66Stub() { } - public float GetMpcost(Skill skill) => (float)(75.6 + 6.7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => (float)(75.6 + 6.7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 3f; public float GetAttackdistance(Skill skill) => (float)(9 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -151,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 8f; public int GetAttackspeed(Skill skill) => 6; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill67.cs b/Assets/PerfectWorld/Scripts/Skills/skill67.cs index b48faba6a9..c698316e41 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill67.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill67.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "刃域.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(5); - effect = ""; range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(66, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill67Stub() { } - public float GetMpcost(Skill skill) => (float)(156.8 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => (float)(156.8 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -151,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 1000; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 8f; public int GetAttackspeed(Skill skill) => 16; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill68.cs b/Assets/PerfectWorld/Scripts/Skills/skill68.cs index 8b0e1db396..76111fd021 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill68.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill68.cs @@ -108,10 +108,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "霸王龙飞.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(9); - effect = ""; range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(3, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,16 +127,16 @@ namespace BrewMonster ~Skill68Stub() { } - public float GetMpcost(Skill skill) => (float)(33.6 + 7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => (float)(33.6 + 7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -152,10 +158,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 300; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 19.7f; public int GetAttackspeed(Skill skill) => 13; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill69.cs b/Assets/PerfectWorld/Scripts/Skills/skill69.cs index d5d56fc16e..44fde88c0a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill69.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill69.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "霸王献鼎.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(9); - effect = ""; range = new Range(); - range.type = 0; + range.type = 3; + pre_skills = new Dictionary(); + pre_skills.Add(71, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill69Stub() { } - public float GetMpcost(Skill skill) => (float)(156.8 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => (float)(156.8 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(60 + 2.5 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => 8f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 8f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -151,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 1000; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 19.7f; public int GetAttackspeed(Skill skill) => 14; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill7.cs b/Assets/PerfectWorld/Scripts/Skills/skill7.cs index 76d8a1cfcc..7778aeb749 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill7.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill7.cs @@ -107,10 +107,17 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "火煞天灯.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(292); - effect = ""; + restrict_weapons.Add(0); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(96, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +127,16 @@ namespace BrewMonster ~Skill7Stub() { } - public float GetMpcost(Skill skill) => (float)(24 + 15 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(24 + 15 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -150,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 25 + skill.GetLevel(); public int GetAttackspeed(Skill skill) => 9; @@ -163,28 +167,3 @@ namespace BrewMonster } - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Assets/PerfectWorld/Scripts/Skills/skill70.cs b/Assets/PerfectWorld/Scripts/Skills/skill70.cs index e884880182..db1753443a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill70.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill70.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "霸王断岳.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(9); - effect = ""; range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(68, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill70Stub() { } - public float GetMpcost(Skill skill) => (float)(73.5 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => (float)(73.5 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(20 + 3 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill71.cs b/Assets/PerfectWorld/Scripts/Skills/skill71.cs index b62d3ccf50..de7344883b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill71.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill71.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "霸王暴怒.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(9); - effect = ""; range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(70, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill71Stub() { } - public float GetMpcost(Skill skill) => (float)(94.5 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(94.5 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(20 + 3 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -151,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 0f; public int GetAttackspeed(Skill skill) => 11; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill72.cs b/Assets/PerfectWorld/Scripts/Skills/skill72.cs index d32dbd9f36..2403c04e9f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill72.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill72.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "忘情式.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(1); - effect = ""; range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(3, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill72Stub() { } - public float GetMpcost(Skill skill) => (float)(33.6 + 7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => (float)(33.6 + 7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -150,10 +156,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 300; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 13.3f; public int GetAttackspeed(Skill skill) => 2; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill73.cs b/Assets/PerfectWorld/Scripts/Skills/skill73.cs index 44d776027f..a28f8af1bf 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill73.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill73.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "追魂诀.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(1); - effect = ""; range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(72, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill73Stub() { } - public float GetMpcost(Skill skill) => (float)(49 + 5.6 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 900; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => (float)(49 + 5.6 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 900; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(9 + 0.3 * skill.GetLevel() + skill.GetPlayer().GetRange() - 3); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(9 + 0.3 * skill.GetLevel() + skill.GetPlayer().GetRange() - 3); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill74.cs b/Assets/PerfectWorld/Scripts/Skills/skill74.cs index ca8593d9e3..46da916cd3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill74.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill74.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "剑气纵横.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(1); - effect = ""; range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(73, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill74Stub() { } - public float GetMpcost(Skill skill) => (float)(63 + 5.6 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1700; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(63 + 5.6 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1700; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -151,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 19.7f; public int GetAttackspeed(Skill skill) => 3; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill75.cs b/Assets/PerfectWorld/Scripts/Skills/skill75.cs index d370a3aa2a..549ddce60a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill75.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill75.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "万剑诀.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(1); - effect = ""; range = new Range(); - range.type = 0; + range.type = 3; + pre_skills = new Dictionary(); + pre_skills.Add(74, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill75Stub() { } - public float GetMpcost(Skill skill) => (float)(156.8 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 3000; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => (float)(156.8 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 3000; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => (float)(8 + 0.4 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(8 + skill.GetPlayer().GetRange() - 3); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(8 + skill.GetPlayer().GetRange() - 3); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -152,10 +158,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 1000; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 20.5f + skill.GetPlayer().GetRange() - 3; public int GetAttackspeed(Skill skill) => 15; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill76.cs b/Assets/PerfectWorld/Scripts/Skills/skill76.cs index 2728e04603..78da0519c6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill76.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill76.cs @@ -70,10 +70,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "疾云步.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); #endif @@ -81,21 +92,24 @@ namespace BrewMonster ~Skill76Stub() { } - public float GetMpcost(Skill skill) => (float)(10 + 5 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 60000; + public override float GetMpcost(Skill skill) => (float)(10 + 5 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 60000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 10 + 5 * skill.GetLevel(), 40 + 5 * skill.GetLevel()); + string result = string.Format(format, + skill.GetLevel(), + 10 + 5 * skill.GetLevel(), + 40 + 5 * skill.GetLevel()); if (result.Length < length) { buffer.Append(result); @@ -107,10 +121,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 5f; public int GetAttackspeed(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill77.cs b/Assets/PerfectWorld/Scripts/Skills/skill77.cs index 37f40188b4..db15bf608d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill77.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill77.cs @@ -104,10 +104,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "金钟罩.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -117,21 +128,24 @@ namespace BrewMonster ~Skill77Stub() { } - public float GetMpcost(Skill skill) => (float)(56 + 35 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(56 + 35 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 16f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 56 + 35 * skill.GetLevel(), 10 + 5 * skill.GetLevel()); + string result = string.Format(format, + skill.GetLevel(), + 56 + 35 * skill.GetLevel(), + 10 + 5 * skill.GetLevel()); if (result.Length < length) { buffer.Append(result); @@ -143,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 5f; public int GetAttackspeed(Skill skill) => 9; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill78.cs b/Assets/PerfectWorld/Scripts/Skills/skill78.cs index cba3d793c1..bd76bb8ca0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill78.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill78.cs @@ -57,7 +57,6 @@ namespace BrewMonster dobless = 0; commoncooldown = 0; commoncooldowntime = 0; - effect = ""; range = new Range(); range.type = 0; pre_skills = new Dictionary(); @@ -67,16 +66,16 @@ namespace BrewMonster ~Skill78Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill79.cs b/Assets/PerfectWorld/Scripts/Skills/skill79.cs index be49fda34b..e05beaf9f3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill79.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill79.cs @@ -57,7 +57,6 @@ namespace BrewMonster dobless = 0; commoncooldown = 0; commoncooldowntime = 0; - effect = ""; range = new Range(); range.type = 0; pre_skills = new Dictionary(); @@ -67,16 +66,16 @@ namespace BrewMonster ~Skill79Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill8.cs b/Assets/PerfectWorld/Scripts/Skills/skill8.cs index 3d50c8f131..8ed493b4ca 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill8.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill8.cs @@ -108,10 +108,17 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "血祭炎爆.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(292); range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(84, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,16 +128,16 @@ namespace BrewMonster ~Skill8Stub() { } - public float GetMpcost(Skill skill) => (float)(135 + 12 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => (float)(135 + 12 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 6f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 6f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -161,28 +168,3 @@ namespace BrewMonster } - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Assets/PerfectWorld/Scripts/Skills/skill80.cs b/Assets/PerfectWorld/Scripts/Skills/skill80.cs index 826138a71d..721c0bfb5f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill80.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill80.cs @@ -57,7 +57,6 @@ namespace BrewMonster dobless = 0; commoncooldown = 0; commoncooldowntime = 0; - effect = ""; range = new Range(); range.type = 0; pre_skills = new Dictionary(); @@ -67,16 +66,16 @@ namespace BrewMonster ~Skill80Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill81.cs b/Assets/PerfectWorld/Scripts/Skills/skill81.cs index e0ecd06546..5d666fe5df 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill81.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill81.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill81Stub() { } - public float GetMpcost(Skill skill) => (float)(-9 + 15 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(-9 + 15 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill84.cs b/Assets/PerfectWorld/Scripts/Skills/skill84.cs index a76fae0181..8a7602315d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill84.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill84.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill84Stub() { } - public float GetMpcost(Skill skill) => (float)(157.5 + 18 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(157.5 + 18 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => (float)(3 + 0.2 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(13 + 0.5 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 10f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 10f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill85.cs b/Assets/PerfectWorld/Scripts/Skills/skill85.cs index 1249c4a80e..a6757f8b5c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill85.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill85.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill85Stub() { } - public float GetMpcost(Skill skill) => (float)(50.4 + 25 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(50.4 + 25 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => (float)(7 + 0.5 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill86.cs b/Assets/PerfectWorld/Scripts/Skills/skill86.cs index 3b4981b9fc..8c818b5863 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill86.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill86.cs @@ -145,16 +145,16 @@ namespace BrewMonster ~Skill86Stub() { } - public float GetMpcost(Skill skill) => (float)(100 + 20 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => -1; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => (float)(100 + 20 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => -1; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 6f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 6f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill87.cs b/Assets/PerfectWorld/Scripts/Skills/skill87.cs index 2a40ceaa74..e40b2d1e35 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill87.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill87.cs @@ -130,16 +130,16 @@ namespace BrewMonster ~Skill87Stub() { } - public float GetMpcost(Skill skill) => (float)(336 + 18 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => (float)(336 + 18 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => (float)(8 + 0.4 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill88.cs b/Assets/PerfectWorld/Scripts/Skills/skill88.cs index 8fae35c5f4..ddd4cd2814 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill88.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill88.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill88Stub() { } - public float GetMpcost(Skill skill) => (float)(-6 + 15 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(-6 + 15 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill89.cs b/Assets/PerfectWorld/Scripts/Skills/skill89.cs index 6b91169e27..f358353ecb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill89.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill89.cs @@ -88,16 +88,16 @@ namespace BrewMonster ~Skill89Stub() { } - public float GetMpcost(Skill skill) => 100f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 100f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill896.cs b/Assets/PerfectWorld/Scripts/Skills/skill896.cs index f0923ebce7..cd69542989 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill896.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill896.cs @@ -94,17 +94,17 @@ namespace BrewMonster ~Skill896Stub() { } - public float GetMpcost(Skill skill) => 200f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 300000; + public override float GetMpcost(Skill skill) => 200f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 300000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill897.cs b/Assets/PerfectWorld/Scripts/Skills/skill897.cs index 0f890e5de6..4c2d1b9ae8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill897.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill897.cs @@ -124,17 +124,17 @@ namespace BrewMonster ~Skill897Stub() { } - public float GetMpcost(Skill skill) => 200f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 120000; + public override float GetMpcost(Skill skill) => 200f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 120000; public float GetRadius(Skill skill) => 15f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 12f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 12f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill898.cs b/Assets/PerfectWorld/Scripts/Skills/skill898.cs index 68b6166261..03166af860 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill898.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill898.cs @@ -134,17 +134,17 @@ namespace BrewMonster ~Skill898Stub() { } - public float GetMpcost(Skill skill) => 200f; - public int GetExecutetime(Skill skill) => 1700; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 200f; + public override int GetExecutetime(Skill skill) => 1700; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 18f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 18f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill899.cs b/Assets/PerfectWorld/Scripts/Skills/skill899.cs index ee6eb080de..e8ec35c665 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill899.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill899.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill899Stub() { } - public float GetMpcost(Skill skill) => 500f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 120000; + public override float GetMpcost(Skill skill) => 500f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 120000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(60 + 2.5 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => 5f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 5f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill9.cs b/Assets/PerfectWorld/Scripts/Skills/skill9.cs index 63da17c8f6..bf45e4d398 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill9.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill9.cs @@ -56,7 +56,6 @@ namespace BrewMonster dobless = 0; commoncooldown = 0; commoncooldowntime = 0; - effect = ""; range = new Range(); range.type = 0; pre_skills = new Dictionary(); @@ -66,16 +65,16 @@ namespace BrewMonster ~Skill9Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -100,28 +99,3 @@ namespace BrewMonster } - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Assets/PerfectWorld/Scripts/Skills/skill90.cs b/Assets/PerfectWorld/Scripts/Skills/skill90.cs index 12fe2f12b7..b072de8295 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill90.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill90.cs @@ -124,16 +124,16 @@ namespace BrewMonster ~Skill90Stub() { } - public float GetMpcost(Skill skill) => (float)(142.5 + 37.5 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 1000; + public override float GetMpcost(Skill skill) => (float)(142.5 + 37.5 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 1000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill900.cs b/Assets/PerfectWorld/Scripts/Skills/skill900.cs index 0f11be0a9c..efe9edbefa 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill900.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill900.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill900Stub() { } - public float GetMpcost(Skill skill) => 400f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 600000; + public override float GetMpcost(Skill skill) => 400f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 600000; public float GetRadius(Skill skill) => 16f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill901.cs b/Assets/PerfectWorld/Scripts/Skills/skill901.cs index d2014f1ddc..e1006b43ec 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill901.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill901.cs @@ -123,17 +123,17 @@ namespace BrewMonster ~Skill901Stub() { } - public float GetMpcost(Skill skill) => 1000f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 300000; + public override float GetMpcost(Skill skill) => 1000f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 300000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill902.cs b/Assets/PerfectWorld/Scripts/Skills/skill902.cs index c5b63f980d..b28c880491 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill902.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill902.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill902Stub() { } - public float GetMpcost(Skill skill) => 600f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 1000; + public override float GetMpcost(Skill skill) => 600f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 1000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 27f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 27f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill903.cs b/Assets/PerfectWorld/Scripts/Skills/skill903.cs index 6aeeff974a..9875a9471b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill903.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill903.cs @@ -88,17 +88,17 @@ namespace BrewMonster ~Skill903Stub() { } - public float GetMpcost(Skill skill) => 600f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 120000; + public override float GetMpcost(Skill skill) => 600f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 120000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 20f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 20f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill904.cs b/Assets/PerfectWorld/Scripts/Skills/skill904.cs index 2c41416dfb..6c0cbe5232 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill904.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill904.cs @@ -88,17 +88,17 @@ namespace BrewMonster ~Skill904Stub() { } - public float GetMpcost(Skill skill) => 200f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 200f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill905.cs b/Assets/PerfectWorld/Scripts/Skills/skill905.cs index 75c623eb08..737fbfa282 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill905.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill905.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill905Stub() { } - public float GetMpcost(Skill skill) => 1000f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 300000; + public override float GetMpcost(Skill skill) => 1000f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 300000; public float GetRadius(Skill skill) => (float)(8 + 0.4 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill91.cs b/Assets/PerfectWorld/Scripts/Skills/skill91.cs index fdc7474347..755e0801ba 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill91.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill91.cs @@ -124,16 +124,16 @@ namespace BrewMonster ~Skill91Stub() { } - public float GetMpcost(Skill skill) => (float)(200 + 25 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(200 + 25 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill92.cs b/Assets/PerfectWorld/Scripts/Skills/skill92.cs index fa4e511784..fdd1cdb682 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill92.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill92.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill92Stub() { } - public float GetMpcost(Skill skill) => (float)(202.5 + 18 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => (float)(202.5 + 18 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill923.cs b/Assets/PerfectWorld/Scripts/Skills/skill923.cs index 463b2cb3bc..67f8f4533f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill923.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill923.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill923Stub() { } - public float GetMpcost(Skill skill) => 500f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 120000; + public override float GetMpcost(Skill skill) => 500f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 120000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(60 + 2.5 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => 5f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 5f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill924.cs b/Assets/PerfectWorld/Scripts/Skills/skill924.cs index 7efd5787d9..76e91422ee 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill924.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill924.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill924Stub() { } - public float GetMpcost(Skill skill) => 400f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 600000; + public override float GetMpcost(Skill skill) => 400f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 600000; public float GetRadius(Skill skill) => 16f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill925.cs b/Assets/PerfectWorld/Scripts/Skills/skill925.cs index f3b035c35e..d520526d59 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill925.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill925.cs @@ -123,17 +123,17 @@ namespace BrewMonster ~Skill925Stub() { } - public float GetMpcost(Skill skill) => 1000f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 300000; + public override float GetMpcost(Skill skill) => 1000f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 300000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill926.cs b/Assets/PerfectWorld/Scripts/Skills/skill926.cs index bdc4a50dd9..578ee9d726 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill926.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill926.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill926Stub() { } - public float GetMpcost(Skill skill) => 1000f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 300000; + public override float GetMpcost(Skill skill) => 1000f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 300000; public float GetRadius(Skill skill) => (float)(8 + 0.4 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill93.cs b/Assets/PerfectWorld/Scripts/Skills/skill93.cs index 0ed7ffa416..4bff32e88d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill93.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill93.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill93Stub() { } - public float GetMpcost(Skill skill) => (float)(336 + 18 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1600; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => (float)(336 + 18 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1600; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => (float)(8 + 0.4 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill94.cs b/Assets/PerfectWorld/Scripts/Skills/skill94.cs index 5447f92c64..600cc9fc88 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill94.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill94.cs @@ -138,13 +138,13 @@ namespace BrewMonster ~Skill94Stub() { } - public float GetMpcost(Skill skill) => (float)(20 + 3 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => (float)(20 + 3 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => (float)(7 + 0.3 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(18 + 0.5 * skill.GetLevel()); + public override float GetPraydistance(Skill skill) => (float)(18 + 0.5 * skill.GetLevel()); #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill95.cs b/Assets/PerfectWorld/Scripts/Skills/skill95.cs index adb798991e..7588a99437 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill95.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill95.cs @@ -120,13 +120,13 @@ namespace BrewMonster ~Skill95Stub() { } - public float GetMpcost(Skill skill) => (float)(50 + 3 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => (float)(50 + 3 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => (float)(9 + 0.4 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(18 + 0.5 * skill.GetLevel()); + public override float GetPraydistance(Skill skill) => (float)(18 + 0.5 * skill.GetLevel()); #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill96.cs b/Assets/PerfectWorld/Scripts/Skills/skill96.cs index f428adf4e9..a5f17ef7a5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill96.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill96.cs @@ -124,16 +124,16 @@ namespace BrewMonster ~Skill96Stub() { } - public float GetMpcost(Skill skill) => (float)(12 + 15 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(12 + 15 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill97.cs b/Assets/PerfectWorld/Scripts/Skills/skill97.cs index 109b944508..6ef11481f5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill97.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill97.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill97Stub() { } - public float GetMpcost(Skill skill) => (float)(4.2 + 21 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(4.2 + 21 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill98.cs b/Assets/PerfectWorld/Scripts/Skills/skill98.cs index 019799d8cc..a3f61511f2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill98.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill98.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill98Stub() { } - public float GetMpcost(Skill skill) => (float)(157.5 + 18 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => (float)(157.5 + 18 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(15 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill99.cs b/Assets/PerfectWorld/Scripts/Skills/skill99.cs index 832cf457c5..db67b6e087 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill99.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill99.cs @@ -126,16 +126,16 @@ namespace BrewMonster ~Skill99Stub() { } - public float GetMpcost(Skill skill) => (float)(336 + 18 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => (float)(336 + 18 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => (float)(8 + 0.4 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs index 88e7ee2c7a..7ecbf9ea50 100644 --- a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs +++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs @@ -216,7 +216,7 @@ namespace BrewMonster.UI return; } - CDlgSkillSubListItem subListItem = pSub.GetComponent(); + CDlgSkillSubListItem subListItem = (CDlgSkillSubListItem)pSub.GetSubDialog(); subListItem?.UpdateSkill(skillID); if (GetSelectedSkillID() == skillID) @@ -253,7 +253,11 @@ namespace BrewMonster.UI if (m_skillSubCount >= m_skillSubDialogs.Count) { AUISubDialog pSubSkill = Instantiate(m_pSubSkill, m_contentRoot); - pSubSkill.SetName($"{m_pSubSkill.GetName()}{m_skillSubDialogs.Count}"); + //CDlgSkillSubListItem pDlg = Instantiate(cDlgSkillSubListItem, cDlgSkillSubListItemRoot); + string dlgName = $"{m_pSubSkill.GetName()}{m_skillSubDialogs.Count}"; + pSubSkill.SetName(dlgName); + //pSubSkill.SetDialog(pDlg); + m_skillSubDialogs.Add(pSubSkill); } diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUISubDialog.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUISubDialog.cs index 9e10b27db7..71b7311adc 100644 --- a/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUISubDialog.cs +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUISubDialog.cs @@ -7,7 +7,7 @@ namespace BrewMonster [DisallowMultipleComponent] public class AUISubDialog : MonoBehaviour { - [SerializeField] private AUIDialog m_subDialog; + [SerializeField] private CDlgSkillSubListItem m_subDialog; [SerializeField] private RectTransform m_rectTransform; [SerializeField] private TextMeshProUGUI levelName; [SerializeField] private TextMeshProUGUI label; @@ -22,16 +22,16 @@ namespace BrewMonster } if (m_subDialog == null) { - m_subDialog = GetComponent(); + m_subDialog = GetComponent(); } } - public void SetDialog(AUIDialog dialog) + public void SetDialog(CDlgSkillSubListItem dialog) { m_subDialog = dialog; } - public AUIDialog GetSubDialog() + public CDlgSkillSubListItem GetSubDialog() { return m_subDialog; } diff --git a/Assets/PerfectWorld/Scripts/skill2.cs b/Assets/PerfectWorld/Scripts/skill2.cs deleted file mode 100644 index 3fa0993399..0000000000 --- a/Assets/PerfectWorld/Scripts/skill2.cs +++ /dev/null @@ -1,171 +0,0 @@ -#define SKILL_CLIENT -using BrewMonster.Scripts.Skills; -using System.Collections.Generic; -using System.Text; -using UnityEngine; -using static BrewMonster.PET_EVOLVE_CONFIG; - -namespace BrewMonster -{ - -#if SKILL_SERVER - public class Skill2 : Skill - { - public const int SKILL_ID = 2; - - public Skill2() : base(SKILL_ID) - { - } - } -#endif - - public class Skill2Stub : SkillStub - { - private static readonly int[] RequiredLevelArray = { 3, 8, 13, 18, 23, 28, 33, 38, 43, 48 }; - private static readonly int[] RequiredSpArray = { 100, 800, 2100, 4100, 7000, 10900, 16100, 23000, 32000, 44100 }; - private static readonly int[] RequiredMoneyArray = { 10, 90, 220, 400, 630, 1000, 1450, 1900, 2380, 2880 }; - - -#if SKILL_SERVER - public class State1 : SkillStub.State - { - public int GetTime(Skill skill) => 200; - public bool Quit(Skill skill) => false; - public bool Loop(Skill skill) => false; - public bool Bypass(Skill skill) => false; - public void Calculate(Skill skill) - { - skill.GetPlayer().SetDecmp(0.2f *(-2.2f + 5.6f * skill.GetLevel())); - skill.GetPlayer().SetPray(1); - } - public bool Interrupt(Skill skill) => false; - public bool Cancel(Skill skill) => true; - public bool Skip(Skill skill) => false; - } -#endif - -#if SKILL_SERVER - public class State2 : SkillStub.State - { - public int GetTime(Skill skill) => 700; - public bool Quit(Skill skill) => false; - public bool Loop(Skill skill) => false; - public bool Bypass(Skill skill) => false; - public void Calculate(Skill skill) - { - skill.GetPlayer().SetDecmp(0.8f *(-2.2f + 5.6f * skill.GetLevel())); - skill.SetPlus(0); - skill.SetRatio(0); - skill.SetDamage(skill.GetAttack()); - skill.GetPlayer().SetPerform(1); - } - public bool Interrupt(Skill skill) => false; - public bool Cancel(Skill skill) => false; - public bool Skip(Skill skill) => false; - } -#endif - -#if SKILL_SERVER - public class State3 : SkillStub.State - { - public int GetTime(Skill skill) => 0; - public bool Quit(Skill skill) => false; - public bool Loop(Skill skill) => false; - public bool Bypass(Skill skill) => false; - public void Calculate(Skill skill) - { - } - public bool Interrupt(Skill skill) => false; - public bool Cancel(Skill skill) => false; - public bool Skip(Skill skill) => false; - } -#endif - - public Skill2Stub() : base(2) - { - cls = 0; - name = "寸力"; - nativename = "寸力"; - icon = "寸力.dds"; - max_level = 10; - type = 1; - apcost = 0; - arrowcost = 0; - apgain = 5; - attr = 1; - rank = 0; - eventflag = 0; - posdouble = 0; - clslimit = 0; - time_type = 0; - showorder = 1102; - allow_land = true; - allow_air = true; - allow_water = true; - allow_ride = false; - auto_attack = true; - long_range = 0; - restrict_corpse = 0; - allow_forms = 1; - effect = "寸力.sgc"; - doenchant = 1; - dobless = 0; - commoncooldown = 0; - commoncooldowntime = 0; - restrict_weapons.Add(0); - restrict_weapons.Add(1); - restrict_weapons.Add(182); - restrict_weapons.Add(9); - restrict_weapons.Add(5); - restrict_weapons.Add(292); - range = new Range(); - range.type = 0; - pre_skills = new Dictionary(); - pre_skills.Add(1, 1); -#if SKILL_SERVER - statestub.Add(new State1()); - statestub.Add(new State2()); - statestub.Add(new State3()); -#endif - } - - ~Skill2Stub() { } - - public override float GetMpcost(Skill skill) => (float)(-2.2 + 5.6 * skill.GetLevel()); - public override int GetExecutetime(Skill skill) => 700; - public override int GetCoolingtime(Skill skill) => 8000; - public float GetRadius(Skill skill) => 0f; - public float GetAttackdistance(Skill skill) => 0f; - public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; - -#if SKILL_CLIENT - public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) - { - string result = string.Format(format, - skill.GetLevel(), - -2.2 + 5.6 * skill.GetLevel(), - 5.9 * skill.GetLevel() * skill.GetLevel() + 126.7 * skill.GetLevel() + 40.5); - if (result.Length < length) - { - buffer.Append(result); - return result.Length; - } - return 0; - } -#endif - -#if SKILL_SERVER - public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) => true; - public bool TakeEffect(Skill skill) => true; - public float GetEffectdistance(Skill skill) => 11.7f; - public int GetAttackspeed(Skill skill) => 3; - public float GetHitrate(Skill skill) => 1.2f + 0.05f * skill.GetLevel(); -#endif - } -} - diff --git a/Assets/Prefabs/BoostrapForTest.prefab b/Assets/Prefabs/BoostrapForTest.prefab index a200cbab00..7bfd004f27 100644 --- a/Assets/Prefabs/BoostrapForTest.prefab +++ b/Assets/Prefabs/BoostrapForTest.prefab @@ -202,7 +202,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11414302, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_Value - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 11490438, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_IgnoreReversedGraphics @@ -210,7 +210,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22400762, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000061035156 + value: -0.000061035156 objectReference: {fileID: 0} - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMax.x diff --git a/Assets/Prefabs/UI/SkillUI.prefab b/Assets/Prefabs/UI/SkillUI.prefab index f1042766fb..db7540b523 100644 --- a/Assets/Prefabs/UI/SkillUI.prefab +++ b/Assets/Prefabs/UI/SkillUI.prefab @@ -7867,9 +7867,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 3016923604946316301} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 83.16, y: -48.51895} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 166.32, y: 97.0379} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &821733676846102905 @@ -9012,6 +9012,126 @@ MonoBehaviour: m_Spacing: {x: 10, y: 5} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!1 &4086447501152143536 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 182876207066636261} + - component: {fileID: 1721371819749400968} + - component: {fileID: 965717648012013995} + - component: {fileID: 1740850918655432579} + m_Layer: 5 + m_Name: ButtonClose + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &182876207066636261 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4086447501152143536} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 627631504828013321} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -283.59998, y: -228.4} + m_SizeDelta: {x: 82.401245, y: 82.401306} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1721371819749400968 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4086447501152143536} + m_CullTransparentMesh: 1 +--- !u!114 &965717648012013995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4086447501152143536} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: fb2f2f58be45f6e4890e85cc00b0bcc9, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1740850918655432579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4086447501152143536} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 965717648012013995} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &4149346552991504611 GameObject: m_ObjectHideFlags: 0 @@ -10151,9 +10271,9 @@ RectTransform: - {fileID: 3703262150164293383} m_Father: {fileID: 3016923604946316301} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 83.16, y: -292.4765} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 166.32, y: 130.2924} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5150156580756960231 @@ -11400,9 +11520,9 @@ RectTransform: - {fileID: 131742873718785436} m_Father: {fileID: 3016923604946316301} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 83.16, y: -162.18411} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 166.32, y: 130.2924} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5468634806808161123 @@ -13570,7 +13690,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &627631504828013321 RectTransform: m_ObjectHideFlags: 0 @@ -13589,6 +13709,7 @@ RectTransform: - {fileID: 6723345811351538777} - {fileID: 2387395177775218455} - {fileID: 4958559450723387948} + - {fileID: 182876207066636261} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -17557,7 +17678,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -361.27, y: 365.44547} - m_SizeDelta: {x: 722.5344, y: 28} + m_SizeDelta: {x: 722.5344, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &7853130943468561016 CanvasRenderer: diff --git a/Assets/Scenes/a61.unity b/Assets/Scenes/a61.unity index f92af2af40..a30fbb6772 100644 --- a/Assets/Scenes/a61.unity +++ b/Assets/Scenes/a61.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e48c9be3ea9d07ee5f5073f5d0759c66181647b3d57a2d2358cd50ae5502408 -size 200782987 +oid sha256:4e07d8bd1042cf37912023a990cfa999d63ac5606ba77995ae43b7342eaa9912 +size 200776882 From 892b273ea52af91e37e0c6ebbe2758db20fb6bbb Mon Sep 17 00:00:00 2001 From: VDH Date: Thu, 8 Jan 2026 18:43:10 +0700 Subject: [PATCH 3/3] done ui load name and icon --- .../PerfectWorld/Scripts/MainFiles/EC_Game.cs | 4 - .../Scripts/Managers/CECManager.cs | 2 + .../Scripts/Skills/EC_HostSkillModel.cs | 9 +- .../Scripts/Skills/SkillStubs1.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill.cs | 6 +- Assets/PerfectWorld/Scripts/Skills/skill1.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill10.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill100.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill101.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill1195.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill176.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill177.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill178.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill179.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill180.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill1805.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1806.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill1807.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1808.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1809.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill181.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill1815.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1816.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1817.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1818.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1819.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill182.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill183.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill184.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1864.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill1865.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1868.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill187.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill1871.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1872.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill1873.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1874.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill2.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2206.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2207.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2208.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2209.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2210.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2211.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2254.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2255.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2256.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2257.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2258.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2259.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill226.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill2260.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2261.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2262.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2263.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2264.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2265.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill227.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill228.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill229.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill2352.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2367.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2368.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2369.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2370.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2371.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2372.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2373.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2374.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2375.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2452.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2453.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill3.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill362.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill363.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill364.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill365.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill374.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill375.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill376.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill377.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill378.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill379.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill380.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill381.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill382.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill383.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill384.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill385.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill386.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill387.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill388.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill389.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill390.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill391.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill392.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill393.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill394.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill395.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill396.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill397.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill398.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill399.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill4.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill400.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill401.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill402.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill403.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill404.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill405.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill406.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill407.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill408.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill409.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill410.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill411.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill412.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill413.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill414.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill415.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill416.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill417.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill418.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill419.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill420.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill421.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill422.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill423.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill424.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill425.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill426.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill427.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill428.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill429.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill430.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill431.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill432.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill433.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill434.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill435.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill436.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill437.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill438.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill439.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill440.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill441.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill442.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill443.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill444.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill445.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill446.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill447.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill448.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill449.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill450.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill451.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill452.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill453.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill454.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill455.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill456.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill457.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill458.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill459.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill460.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill461.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill462.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill463.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill464.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill465.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill466.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill467.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill468.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill469.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill470.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill471.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill472.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill473.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill474.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill475.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill476.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill477.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill478.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill479.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill480.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill481.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill482.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill483.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill484.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill485.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill486.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill487.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill488.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill489.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill490.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill491.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill5.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill53.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill54.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill55.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill56.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill57.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill58.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill59.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill6.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill60.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill61.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill62.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill63.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill64.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill65.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill66.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill67.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill68.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill69.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill7.cs | 5 +- Assets/PerfectWorld/Scripts/Skills/skill70.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill71.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill72.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill73.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill74.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill75.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill76.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill77.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill78.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill79.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill8.cs | 5 +- Assets/PerfectWorld/Scripts/Skills/skill80.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill81.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill84.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill85.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill86.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill87.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill88.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill89.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill896.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill897.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill898.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill899.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill9.cs | 3 +- Assets/PerfectWorld/Scripts/Skills/skill90.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill900.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill901.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill902.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill903.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill904.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill905.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill91.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill92.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill923.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill924.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill925.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill926.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill93.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill94.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill95.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill96.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill97.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill98.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill99.cs | 4 +- .../Scripts/UI/Dialogs/CDlgSkillSubList.cs | 66 +- .../UI/GamePlay/SkillUI/AUISubDialog.cs | 1 - .../GamePlay/SkillUI/CDlgSkillSubListItem.cs | 38 +- Assets/Prefabs/UI/SkillUI.prefab | 100 +- Assets/Scenes/a61.unity | 4 +- Assets/Scripts/CECStringTab.cs | 8 +- .../LiberationSans SDF - Fallback.asset | 890 +++++++++++++++++- 267 files changed, 1491 insertions(+), 574 deletions(-) diff --git a/Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs b/Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs index f767b92d35..adcbc3d2d3 100644 --- a/Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs +++ b/Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs @@ -110,10 +110,6 @@ namespace BrewMonster.Network { m_pGFXCaster = new CECGFXCaster(); // return false; - } - if (!m_SkillDesc.Init("skillstr", true)) - { - } GetGameRun().Init(); InitializeStringTables(); diff --git a/Assets/PerfectWorld/Scripts/Managers/CECManager.cs b/Assets/PerfectWorld/Scripts/Managers/CECManager.cs index 541c4adc79..82cec3e0fc 100644 --- a/Assets/PerfectWorld/Scripts/Managers/CECManager.cs +++ b/Assets/PerfectWorld/Scripts/Managers/CECManager.cs @@ -157,6 +157,8 @@ namespace BrewMonster.Managers + + diff --git a/Assets/PerfectWorld/Scripts/Skills/EC_HostSkillModel.cs b/Assets/PerfectWorld/Scripts/Skills/EC_HostSkillModel.cs index 233dd99e62..f8f39a97aa 100644 --- a/Assets/PerfectWorld/Scripts/Skills/EC_HostSkillModel.cs +++ b/Assets/PerfectWorld/Scripts/Skills/EC_HostSkillModel.cs @@ -1,3 +1,4 @@ +using Animancer; using CSNetwork; using CSNetwork.GPDataType; using ModelRenderer.Scripts.GameData; @@ -117,7 +118,11 @@ namespace BrewMonster.Scripts.Skills } } private readonly HashSet m_curServiceSkills = new HashSet(); - + public string GetSkillIcon(int skillID) + { + CECSkill skill = new CECSkill(skillID, 1); + return (skill.GetIconFile()); + } public void SetCurServiceSkills(int tid) { m_curServiceSkills.Clear(); @@ -340,7 +345,7 @@ namespace BrewMonster.Scripts.Skills m_allRankProfSkills[pSkill.GetRank()].Add((int)curID); } } - + BMLogger.LogError("CECHostSkillModel::InitAllSkillsOfCurProf: total prof skills = " + m_allRankProfSkills.Count); // --- B3: Sắp xếp skill trong từng rank theo thứ tự hiển thị --- foreach (var kvp in m_allRankProfSkills) { diff --git a/Assets/PerfectWorld/Scripts/Skills/SkillStubs1.cs b/Assets/PerfectWorld/Scripts/Skills/SkillStubs1.cs index 80f9dab211..5df50bc02b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/SkillStubs1.cs +++ b/Assets/PerfectWorld/Scripts/Skills/SkillStubs1.cs @@ -5,7 +5,7 @@ namespace BrewMonster { public static class SkillStubs { - public static void Init() { int i = 0; } + public static void Init() { int i = 0; } // Skill stub declarations public static Skill1Stub __stub_Skill1Stub = new Skill1Stub(); public static Skill2Stub __stub_Skill2Stub = new Skill2Stub(); diff --git a/Assets/PerfectWorld/Scripts/Skills/skill.cs b/Assets/PerfectWorld/Scripts/Skills/skill.cs index a43e03158a..059647e429 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill.cs @@ -196,7 +196,7 @@ namespace BrewMonster.Scripts.Skills public static Dictionary> inheritSkillMap = new Dictionary>(); -#if UNITY_EDITOR +/*#if UNITY_EDITOR [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)] private static void OnPlay() { @@ -205,10 +205,9 @@ namespace BrewMonster.Scripts.Skills comboSkillMap = new Dictionary>(); inheritSkillMap = new Dictionary>(); } -#endif +#endif*/ public SkillStub(uint i) { - BMLogger.LogError("SkillStub Constructor id=" + i); id = i; is_inherent = (false); is_movingcast = (false); @@ -218,7 +217,6 @@ namespace BrewMonster.Scripts.Skills combosk_nobreak = (0); if (GetStub(id) == null) { - BMLogger.LogError("SkillStub Add to Map id=" + id); GetMap().Add(id, this); } } diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1.cs b/Assets/PerfectWorld/Scripts/Skills/skill1.cs index e3bd2beea0..2b672757f4 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "虎击"; nativename = "虎击"; - icon = "虎击.dds"; + icon = "虎击"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "虎击.sgc"; + effect = "虎击"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill10.cs b/Assets/PerfectWorld/Scripts/Skills/skill10.cs index b73cde784a..af0b575f24 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill10.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill10.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "沙陷"; nativename = "沙陷"; - icon = "沙陷.dds"; + icon = "沙陷"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "沙陷.sgc"; + effect = "沙陷"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill100.cs b/Assets/PerfectWorld/Scripts/Skills/skill100.cs index 42ca306b50..8dd1443aa7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill100.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill100.cs @@ -82,7 +82,7 @@ namespace BrewMonster cls = 1; name = "缩地术"; nativename = "缩地术"; - icon = "缩地术.dds"; + icon = "缩地术"; max_level = 10; type = 8; apcost = 20; @@ -102,7 +102,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "缩地术.sgc"; + effect = "缩地术"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill101.cs b/Assets/PerfectWorld/Scripts/Skills/skill101.cs index f463ba283b..7d98a097b8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill101.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill101.cs @@ -31,7 +31,7 @@ namespace BrewMonster cls = 1; name = "土精通"; nativename = "土精通"; - icon = "土精通.dds"; + icon = "土精通"; max_level = 10; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1195.cs b/Assets/PerfectWorld/Scripts/Skills/skill1195.cs index f586c4425c..5b7aadfb32 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1195.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1195.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "致盲（废弃）"; nativename = "致盲（废弃）"; - icon = "致盲.dds"; + icon = "致盲"; max_level = 10; type = 1; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "疾风霹雳.sgc"; + effect = "疾风霹雳"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill176.cs b/Assets/PerfectWorld/Scripts/Skills/skill176.cs index fd26966e0b..a48248d547 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill176.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill176.cs @@ -49,7 +49,7 @@ namespace BrewMonster cls = 0; name = "凌波微步"; nativename = "凌波微步"; - icon = "凌波微步.dds"; + icon = "凌波微步"; max_level = 1; type = 2; apcost = 100; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "凌波微步.sgc"; + effect = "凌波微步"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill177.cs b/Assets/PerfectWorld/Scripts/Skills/skill177.cs index 37b8e169cd..e2d0f5dbb4 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill177.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill177.cs @@ -49,7 +49,7 @@ namespace BrewMonster cls = 0; name = "易筋经"; nativename = "易筋经"; - icon = "易筋经.dds"; + icon = "易筋经"; max_level = 10; type = 2; apcost = 0; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "易筋经.sgc"; + effect = "易筋经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill178.cs b/Assets/PerfectWorld/Scripts/Skills/skill178.cs index e24ff4fee5..94266adb0c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill178.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill178.cs @@ -49,7 +49,7 @@ namespace BrewMonster cls = 0; name = "易髓经"; nativename = "易髓经"; - icon = "易髓经.dds"; + icon = "易髓经"; max_level = 10; type = 2; apcost = 0; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "易髓经.sgc"; + effect = "易髓经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill179.cs b/Assets/PerfectWorld/Scripts/Skills/skill179.cs index 462e4ec119..807b71d7ff 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill179.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill179.cs @@ -49,7 +49,7 @@ namespace BrewMonster cls = 0; name = "金刚经"; nativename = "金刚经"; - icon = "金刚经.dds"; + icon = "金刚经"; max_level = 10; type = 2; apcost = 100; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "金刚经.sgc"; + effect = "金刚经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill180.cs b/Assets/PerfectWorld/Scripts/Skills/skill180.cs index 00dc073b4a..d0465305b0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill180.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill180.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "寒冰护甲"; nativename = "寒冰护甲"; - icon = "寒冰护甲.dds"; + icon = "寒冰护甲"; max_level = 10; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1805.cs b/Assets/PerfectWorld/Scripts/Skills/skill1805.cs index ce7a647fa9..d0b73d4544 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1805.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1805.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "秘法之光"; nativename = "秘法之光"; - icon = "法之奥义.dds"; + icon = "法之奥义"; max_level = 1; type = 2; apcost = 30; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_法之奥义.sgc"; + effect = "法师_法之奥义"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1806.cs b/Assets/PerfectWorld/Scripts/Skills/skill1806.cs index 68466532cc..98d058d6e3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1806.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1806.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "冰晶世界"; nativename = "冰晶世界"; - icon = "冰晶世界.dds"; + icon = "冰晶世界"; max_level = 1; type = 2; apcost = 200; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1807.cs b/Assets/PerfectWorld/Scripts/Skills/skill1807.cs index a2c64be715..9331980ce7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1807.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1807.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "太虚·逆空诀"; nativename = "太虚·逆空诀"; - icon = "静谧之术.dds"; + icon = "静谧之术"; max_level = 1; type = 3; apcost = 20; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_静谧之术.sgc"; + effect = "法师_静谧之术"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1808.cs b/Assets/PerfectWorld/Scripts/Skills/skill1808.cs index 7e0990f464..489ca14dc9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1808.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1808.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "煌黑之焰"; nativename = "煌黑之焰"; - icon = "炙焰.dds"; + icon = "炙焰"; max_level = 1; type = 3; apcost = 100; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_灸焰.sgc"; + effect = "法师_灸焰"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1809.cs b/Assets/PerfectWorld/Scripts/Skills/skill1809.cs index b16b053041..62498a6b47 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1809.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1809.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "沙之守护"; nativename = "沙之守护"; - icon = "沙暴.dds"; + icon = "沙暴"; max_level = 1; type = 2; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_沙暴.sgc"; + effect = "法师_沙暴"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill181.cs b/Assets/PerfectWorld/Scripts/Skills/skill181.cs index 847f9fc6a7..fd797a5ee7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill181.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill181.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "磐石护甲"; nativename = "磐石护甲"; - icon = "奇门护甲.dds"; + icon = "奇门护甲"; max_level = 10; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1815.cs b/Assets/PerfectWorld/Scripts/Skills/skill1815.cs index 0ddf0d3353..35f8c847e1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1815.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1815.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "一骑紫尘"; nativename = "一骑紫尘"; - icon = "霸气.dds"; + icon = "霸气"; max_level = 1; type = 8; apcost = 50; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "巫师_复仇雷霆.sgc"; + effect = "巫师_复仇雷霆"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1816.cs b/Assets/PerfectWorld/Scripts/Skills/skill1816.cs index 9a928fe613..6505b61b16 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1816.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1816.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "太虚·诛神诀"; nativename = "太虚·诛神诀"; - icon = "狂风.dds"; + icon = "狂风"; max_level = 1; type = 2; apcost = 300; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_狂风.sgc"; + effect = "武侠_狂风"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1817.cs b/Assets/PerfectWorld/Scripts/Skills/skill1817.cs index 29b6dca10c..7c2a186dd0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1817.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1817.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "天元逆转"; nativename = "天元逆转"; - icon = "碎颅.dds"; + icon = "碎颅"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_碎颅.sgc"; + effect = "武侠_碎颅"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1818.cs b/Assets/PerfectWorld/Scripts/Skills/skill1818.cs index ed352d36a2..9d7d98f8f7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1818.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1818.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "一掷乾坤"; nativename = "一掷乾坤"; - icon = "回旋击.dds"; + icon = "回旋击"; max_level = 1; type = 1; apcost = 35; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_回旋击.sgc"; + effect = "武侠_回旋击"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1819.cs b/Assets/PerfectWorld/Scripts/Skills/skill1819.cs index 6bf9dcc506..3bf714c9b7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1819.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1819.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "赤龙索"; nativename = "赤龙索"; - icon = "龙依.dds"; + icon = "龙依"; max_level = 1; type = 3; apcost = 50; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_龙爪手.sgc"; + effect = "武侠_龙爪手"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill182.cs b/Assets/PerfectWorld/Scripts/Skills/skill182.cs index a2b3a8a215..f1bbb8245f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill182.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill182.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "冰雹"; nativename = "冰雹"; - icon = "冰雹.dds"; + icon = "冰雹"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 3; - effect = "冰雹.sgc"; + effect = "冰雹"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill183.cs b/Assets/PerfectWorld/Scripts/Skills/skill183.cs index e303556109..ce37d13381 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill183.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill183.cs @@ -48,7 +48,7 @@ namespace BrewMonster cls = 1; name = "般若心经"; nativename = "般若心经"; - icon = "般若心经.dds"; + icon = "般若心经"; max_level = 1; type = 2; apcost = 200; @@ -69,7 +69,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "般若心经.sgc"; + effect = "般若心经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill184.cs b/Assets/PerfectWorld/Scripts/Skills/skill184.cs index f2491f29fd..a9a267564c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill184.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill184.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "石破天惊"; nativename = "石破天惊"; - icon = "石破天惊.dds"; + icon = "石破天惊"; max_level = 10; type = 3; apcost = 0; @@ -104,7 +104,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "石破天惊.sgc"; + effect = "石破天惊"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1864.cs b/Assets/PerfectWorld/Scripts/Skills/skill1864.cs index b96541edb8..9193573459 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1864.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1864.cs @@ -49,7 +49,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 0; - effect = "法师_冰晶世界.sgc"; + effect = "法师_冰晶世界"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1865.cs b/Assets/PerfectWorld/Scripts/Skills/skill1865.cs index 3a0f8d4fb5..c979436877 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1865.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1865.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "太虚·逆流诀"; nativename = "太虚·逆流诀"; - icon = "静谧之术2.dds"; + icon = "静谧之术2"; max_level = 1; type = 3; apcost = 20; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "静谧之术2_击中.sgc"; + effect = "静谧之术2_击中"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1868.cs b/Assets/PerfectWorld/Scripts/Skills/skill1868.cs index 622592ba12..01fac4990c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1868.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1868.cs @@ -49,7 +49,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 0; - effect = "武侠_狂风.sgc"; + effect = "武侠_狂风"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill187.cs b/Assets/PerfectWorld/Scripts/Skills/skill187.cs index 15b4b42267..7f7b89f6b3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill187.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill187.cs @@ -30,7 +30,7 @@ namespace BrewMonster cls = 0; name = "2233"; nativename = "2233"; - icon = "无效.ddsdd"; + icon = "无效"; max_level = 12; type = 10; apcost = 2233; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1871.cs b/Assets/PerfectWorld/Scripts/Skills/skill1871.cs index 9fe3c2fa1b..b44293639d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1871.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1871.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "诛神诀"; nativename = "诛神诀"; - icon = "狂风.dds"; + icon = "狂风"; max_level = 1; type = 2; apcost = 299; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_狂风.sgc"; + effect = "武侠_狂风"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1872.cs b/Assets/PerfectWorld/Scripts/Skills/skill1872.cs index 2fb237bb32..a076d47f92 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1872.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1872.cs @@ -49,7 +49,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 0; - effect = "武侠_狂风.sgc"; + effect = "武侠_狂风"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1873.cs b/Assets/PerfectWorld/Scripts/Skills/skill1873.cs index f2cc022ba4..ff498c6d7c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1873.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1873.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "逆空诀"; nativename = "逆空诀"; - icon = "静谧之术.dds"; + icon = "静谧之术"; max_level = 1; type = 3; apcost = 50; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_静谧之术.sgc"; + effect = "法师_静谧之术"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1874.cs b/Assets/PerfectWorld/Scripts/Skills/skill1874.cs index 7c964cdf58..3b56e23091 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1874.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1874.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "逆流诀"; nativename = "逆流诀"; - icon = "静谧之术2.dds"; + icon = "静谧之术2"; max_level = 1; type = 3; apcost = 50; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "静谧之术2_击中.sgc"; + effect = "静谧之术2_击中"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2.cs b/Assets/PerfectWorld/Scripts/Skills/skill2.cs index 3fa0993399..be1f2e3e32 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "寸力"; nativename = "寸力"; - icon = "寸力.dds"; + icon = "寸力"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "寸力.sgc"; + effect = "寸力"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2206.cs b/Assets/PerfectWorld/Scripts/Skills/skill2206.cs index 594ed4e4dd..f30291db0f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2206.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2206.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "玄·虎崩"; nativename = "玄·虎崩"; - icon = "玄·虎崩.dds"; + icon = "玄·虎崩"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_虎击改.sgc"; + effect = "武侠_虎击改"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2207.cs b/Assets/PerfectWorld/Scripts/Skills/skill2207.cs index b02f5db98c..2466a5634f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2207.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2207.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "荒·虎崩"; nativename = "荒·虎崩"; - icon = "荒·虎崩.dds"; + icon = "荒·虎崩"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_虎击改.sgc"; + effect = "武侠_虎击改"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2208.cs b/Assets/PerfectWorld/Scripts/Skills/skill2208.cs index 98d85f0cbb..29cd07e7e5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2208.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2208.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "玄·千军辟易"; nativename = "玄·千军辟易"; - icon = "玄·千军辟易.dds"; + icon = "玄·千军辟易"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_横扫千军改.sgc"; + effect = "武侠_横扫千军改"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2209.cs b/Assets/PerfectWorld/Scripts/Skills/skill2209.cs index e9937f0690..34ef590b00 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2209.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2209.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "荒·千军辟易"; nativename = "荒·千军辟易"; - icon = "荒·千军辟易.dds"; + icon = "荒·千军辟易"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_横扫千军改.sgc"; + effect = "武侠_横扫千军改"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2210.cs b/Assets/PerfectWorld/Scripts/Skills/skill2210.cs index c2cbe6713d..c4c3b3fcfa 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2210.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2210.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "玄·断水凌风"; nativename = "玄·断水凌风"; - icon = "玄·断水凌风.dds"; + icon = "玄·断水凌风"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_凌风改.sgc"; + effect = "武侠_凌风改"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2211.cs b/Assets/PerfectWorld/Scripts/Skills/skill2211.cs index d5b73e1567..ceef6d52c8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2211.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2211.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "荒·断水凌风"; nativename = "荒·断水凌风"; - icon = "荒·断水凌风.dds"; + icon = "荒·断水凌风"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_凌风改.sgc"; + effect = "武侠_凌风改"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2254.cs b/Assets/PerfectWorld/Scripts/Skills/skill2254.cs index 3324845cf5..57d1d98daf 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2254.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2254.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "玄·磐石护甲"; nativename = "玄·磐石护甲"; - icon = "奇门护甲1.dds"; + icon = "奇门护甲1"; max_level = 1; type = 2; apcost = 10; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_磐石护甲.sgc"; + effect = "法师_磐石护甲"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2255.cs b/Assets/PerfectWorld/Scripts/Skills/skill2255.cs index 47e883d4a5..055960c6fe 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2255.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2255.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "荒·磐石护甲"; nativename = "荒·磐石护甲"; - icon = "奇门护甲2.dds"; + icon = "奇门护甲2"; max_level = 1; type = 2; apcost = 10; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_磐石护甲.sgc"; + effect = "法师_磐石护甲"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2256.cs b/Assets/PerfectWorld/Scripts/Skills/skill2256.cs index 88ab29002e..2d49478f50 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2256.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2256.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "玄·烈焰护甲"; nativename = "玄·烈焰护甲"; - icon = "烈焰护甲1.dds"; + icon = "烈焰护甲1"; max_level = 1; type = 2; apcost = 0; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_烈焰护甲.sgc"; + effect = "法师_烈焰护甲"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2257.cs b/Assets/PerfectWorld/Scripts/Skills/skill2257.cs index 2e39a0aa93..07325fd278 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2257.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2257.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "荒·烈焰护甲"; nativename = "荒·烈焰护甲"; - icon = "烈焰护甲2.dds"; + icon = "烈焰护甲2"; max_level = 1; type = 2; apcost = 0; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_烈焰护甲.sgc"; + effect = "法师_烈焰护甲"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2258.cs b/Assets/PerfectWorld/Scripts/Skills/skill2258.cs index 91f711db60..14735dbcbe 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2258.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2258.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "玄·寒冰护甲"; nativename = "玄·寒冰护甲"; - icon = "寒冰护甲1.dds"; + icon = "寒冰护甲1"; max_level = 1; type = 2; apcost = 0; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_寒冰护甲.sgc"; + effect = "法师_寒冰护甲"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2259.cs b/Assets/PerfectWorld/Scripts/Skills/skill2259.cs index 473a3642d3..fb1f98b1ab 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2259.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2259.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "荒·寒冰护甲"; nativename = "荒·寒冰护甲"; - icon = "寒冰护甲2.dds"; + icon = "寒冰护甲2"; max_level = 1; type = 2; apcost = 0; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_寒冰护甲.sgc"; + effect = "法师_寒冰护甲"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill226.cs b/Assets/PerfectWorld/Scripts/Skills/skill226.cs index da79367a05..eeb5818775 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill226.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill226.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 0; name = "真元爆发"; nativename = "真元爆发"; - icon = "爆气1.dds"; + icon = "爆气1"; max_level = 1; type = 2; apcost = 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2260.cs b/Assets/PerfectWorld/Scripts/Skills/skill2260.cs index 84f91754a8..5ba59fb60c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2260.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2260.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "废弃"; nativename = "废弃"; - icon = "玄·业火符.dds"; + icon = "玄·业火符"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_业火符.sgc"; + effect = "法师_业火符"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2261.cs b/Assets/PerfectWorld/Scripts/Skills/skill2261.cs index e3ae1197b0..f74cb586e7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2261.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2261.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "废弃"; nativename = "废弃"; - icon = "荒·业火符.dds"; + icon = "荒·业火符"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_业火符.sgc"; + effect = "法师_业火符"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2262.cs b/Assets/PerfectWorld/Scripts/Skills/skill2262.cs index 4af503383b..e9ed2628eb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2262.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2262.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "玄·霜刃"; nativename = "玄·霜刃"; - icon = "玄·霜天之刃.dds"; + icon = "玄·霜天之刃"; max_level = 1; type = 2; apcost = 0; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_寒霜.sgc"; + effect = "法师_寒霜"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2263.cs b/Assets/PerfectWorld/Scripts/Skills/skill2263.cs index 412c5546d5..10b7cc2940 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2263.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2263.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "荒·霜刃"; nativename = "荒·霜刃"; - icon = "荒·霜天之刃.dds"; + icon = "荒·霜天之刃"; max_level = 1; type = 2; apcost = 0; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_寒霜.sgc"; + effect = "法师_寒霜"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2264.cs b/Assets/PerfectWorld/Scripts/Skills/skill2264.cs index 3830037fbc..b08811b154 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2264.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2264.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "玄·沙瀑"; nativename = "玄·沙瀑"; - icon = "玄·沙瀑.dds"; + icon = "玄·沙瀑"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_沙石咒.sgc"; + effect = "法师_沙石咒"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2265.cs b/Assets/PerfectWorld/Scripts/Skills/skill2265.cs index 3e05a45334..99cb279b1c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2265.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2265.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "荒·沙瀑"; nativename = "荒·沙瀑"; - icon = "荒·沙瀑.dds"; + icon = "荒·沙瀑"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_沙石咒.sgc"; + effect = "法师_沙石咒"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill227.cs b/Assets/PerfectWorld/Scripts/Skills/skill227.cs index 91211919ff..18f7c35cdc 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill227.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill227.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 0; name = "高级真元爆发"; nativename = "高级真元爆发"; - icon = "爆气2.dds"; + icon = "爆气2"; max_level = 1; type = 2; apcost = 200; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill228.cs b/Assets/PerfectWorld/Scripts/Skills/skill228.cs index 92236debc2..36681c16fa 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill228.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill228.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 1; name = "真元爆发"; nativename = "真元爆发"; - icon = "爆气1.dds"; + icon = "爆气1"; max_level = 1; type = 2; apcost = 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill229.cs b/Assets/PerfectWorld/Scripts/Skills/skill229.cs index 70d611b60a..c4830d2de4 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill229.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill229.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 1; name = "高级真元爆发"; nativename = "高级真元爆发"; - icon = "爆气2.dds"; + icon = "爆气2"; max_level = 1; type = 2; apcost = 200; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2352.cs b/Assets/PerfectWorld/Scripts/Skills/skill2352.cs index 4ac6f493f3..6dd079d3c3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2352.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2352.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "玄·回马枪"; nativename = "玄·回马枪"; - icon = "回马枪1.dds"; + icon = "回马枪1"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1回马枪.sgc"; + effect = "1回马枪"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2367.cs b/Assets/PerfectWorld/Scripts/Skills/skill2367.cs index 1dadc1fd61..d62b253fcb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2367.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2367.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "荒·回马枪"; nativename = "荒·回马枪"; - icon = "回马枪2.dds"; + icon = "回马枪2"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2回马枪.sgc"; + effect = "2回马枪"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2368.cs b/Assets/PerfectWorld/Scripts/Skills/skill2368.cs index fe419f1b8e..df1e9df64e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2368.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2368.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "玄·追魂诀"; nativename = "玄·追魂诀"; - icon = "追魂诀1.DDS"; + icon = "追魂诀1"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1追魂诀.sgc"; + effect = "1追魂诀"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2369.cs b/Assets/PerfectWorld/Scripts/Skills/skill2369.cs index c4790866cc..e4e77e5f66 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2369.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2369.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "荒·追魂诀"; nativename = "荒·追魂诀"; - icon = "追魂诀2.DDS"; + icon = "追魂诀2"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2追魂诀.sgc"; + effect = "2追魂诀"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2370.cs b/Assets/PerfectWorld/Scripts/Skills/skill2370.cs index de74f6e52f..afd2b67859 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2370.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2370.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "玄·劈星斩月"; nativename = "玄·劈星斩月"; - icon = "玄·劈星斩月.dds"; + icon = "玄·劈星斩月"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1流星赶月.sgc"; + effect = "1流星赶月"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2371.cs b/Assets/PerfectWorld/Scripts/Skills/skill2371.cs index a5e9807ff3..3ede2b4d68 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2371.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2371.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "荒·劈星斩月"; nativename = "荒·劈星斩月"; - icon = "荒·劈星斩月.dds"; + icon = "荒·劈星斩月"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2流星赶月.sgc"; + effect = "2流星赶月"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2372.cs b/Assets/PerfectWorld/Scripts/Skills/skill2372.cs index cffeff5edb..20eaee2c14 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2372.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2372.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "玄·破山"; nativename = "玄·破山"; - icon = "玄·破山.dds"; + icon = "玄·破山"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1霸王断岳.sgc"; + effect = "1霸王断岳"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2373.cs b/Assets/PerfectWorld/Scripts/Skills/skill2373.cs index 83270bda2a..87c62be5e7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2373.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2373.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "荒·破山"; nativename = "荒·破山"; - icon = "荒·破山.dds"; + icon = "荒·破山"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2霸王断岳.sgc"; + effect = "2霸王断岳"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2374.cs b/Assets/PerfectWorld/Scripts/Skills/skill2374.cs index 9abff2d05b..926368147d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2374.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2374.cs @@ -88,7 +88,7 @@ namespace BrewMonster cls = 0; name = "玄·升龙破"; nativename = "玄·升龙破"; - icon = "玄·升龙破.DDS"; + icon = "玄·升龙破"; max_level = 1; type = 1; apcost = 100; @@ -110,7 +110,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1霸王龙飞.sgc"; + effect = "1霸王龙飞"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2375.cs b/Assets/PerfectWorld/Scripts/Skills/skill2375.cs index 9b0bc50a81..92249ec197 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2375.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2375.cs @@ -88,7 +88,7 @@ namespace BrewMonster cls = 0; name = "荒·升龙破"; nativename = "荒·升龙破"; - icon = "荒·升龙破.DDS"; + icon = "荒·升龙破"; max_level = 1; type = 1; apcost = 100; @@ -110,7 +110,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2霸王龙飞.sgc"; + effect = "2霸王龙飞"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2452.cs b/Assets/PerfectWorld/Scripts/Skills/skill2452.cs index 0f52f2fa99..1f891bdef0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2452.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2452.cs @@ -126,7 +126,7 @@ namespace BrewMonster cls = 1; name = "玄·冰霜烈焰"; nativename = "玄·冰霜烈焰"; - icon = "玄·冰霜烈焰.dds"; + icon = "玄·冰霜烈焰"; max_level = 1; type = 1; apcost = 0; @@ -148,7 +148,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1凌杀.sgc"; + effect = "1凌杀"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2453.cs b/Assets/PerfectWorld/Scripts/Skills/skill2453.cs index 6d11b92622..94c37069a7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2453.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2453.cs @@ -126,7 +126,7 @@ namespace BrewMonster cls = 1; name = "荒·冰霜烈焰"; nativename = "荒·冰霜烈焰"; - icon = "荒·冰霜烈焰.dds"; + icon = "荒·冰霜烈焰"; max_level = 1; type = 1; apcost = 0; @@ -148,7 +148,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1凌杀.sgc"; + effect = "1凌杀"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill3.cs b/Assets/PerfectWorld/Scripts/Skills/skill3.cs index 38dae95b38..566029fd68 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill3.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill3.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "凌风"; nativename = "凌风"; - icon = "凌风.dds"; + icon = "凌风"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "凌风.sgc"; + effect = "凌风"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill362.cs b/Assets/PerfectWorld/Scripts/Skills/skill362.cs index 9fac60b92f..c4bae90597 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill362.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill362.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 0; name = "仙元爆发"; nativename = "仙元爆发"; - icon = "仙元爆发.dds"; + icon = "仙元爆发"; max_level = 1; type = 2; apcost = 300; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill363.cs b/Assets/PerfectWorld/Scripts/Skills/skill363.cs index 5c3c98016d..da05b3d231 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill363.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill363.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 0; name = "魔元爆发"; nativename = "魔元爆发"; - icon = "魔元爆发.dds"; + icon = "魔元爆发"; max_level = 1; type = 2; apcost = 300; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill364.cs b/Assets/PerfectWorld/Scripts/Skills/skill364.cs index 5e1d1d2c4a..14e62daa14 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill364.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill364.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 1; name = "仙元爆发"; nativename = "仙元爆发"; - icon = "仙元爆发.dds"; + icon = "仙元爆发"; max_level = 1; type = 2; apcost = 300; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill365.cs b/Assets/PerfectWorld/Scripts/Skills/skill365.cs index a726f8bd53..c987152eb5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill365.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill365.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 1; name = "魔元爆发"; nativename = "魔元爆发"; - icon = "魔元爆发.dds"; + icon = "魔元爆发"; max_level = 1; type = 2; apcost = 300; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill374.cs b/Assets/PerfectWorld/Scripts/Skills/skill374.cs index d9eb548dbb..86db3cdf24 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill374.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill374.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·虎击"; nativename = "真·虎击"; - icon = "虎击1.dds"; + icon = "虎击1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1虎击.sgc"; + effect = "1虎击"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill375.cs b/Assets/PerfectWorld/Scripts/Skills/skill375.cs index 13ad42231e..7937986dab 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill375.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill375.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·虎击"; nativename = "狂·虎击"; - icon = "虎击2.dds"; + icon = "虎击2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2虎击.sgc"; + effect = "2虎击"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill376.cs b/Assets/PerfectWorld/Scripts/Skills/skill376.cs index 11d1b66490..ff6537dec3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill376.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill376.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·寸力"; nativename = "真·寸力"; - icon = "寸力1.dds"; + icon = "寸力1"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1寸力.sgc"; + effect = "1寸力"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill377.cs b/Assets/PerfectWorld/Scripts/Skills/skill377.cs index 052209184e..d4d9fbffd2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill377.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill377.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·寸力"; nativename = "狂·寸力"; - icon = "寸力2.dds"; + icon = "寸力2"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2寸力.sgc"; + effect = "2寸力"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill378.cs b/Assets/PerfectWorld/Scripts/Skills/skill378.cs index 0b4de6dddf..9c8b4f274b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill378.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill378.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·流水"; nativename = "真·流水"; - icon = "流水1.dds"; + icon = "流水1"; max_level = 1; type = 1; apcost = 20; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1流水.sgc"; + effect = "1流水"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill379.cs b/Assets/PerfectWorld/Scripts/Skills/skill379.cs index abb4a11b08..c9c1bff2a8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill379.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill379.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·流水"; nativename = "狂·流水"; - icon = "流水2.dds"; + icon = "流水2"; max_level = 1; type = 1; apcost = 30; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2流水.sgc"; + effect = "2流水"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill380.cs b/Assets/PerfectWorld/Scripts/Skills/skill380.cs index 1205cf8499..9187777374 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill380.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill380.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·凌风"; nativename = "真·凌风"; - icon = "凌风1.dds"; + icon = "凌风1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1凌风.sgc"; + effect = "1凌风"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill381.cs b/Assets/PerfectWorld/Scripts/Skills/skill381.cs index 0d39acc87d..bd94a05fb5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill381.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill381.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·凌风"; nativename = "狂·凌风"; - icon = "凌风2.dds"; + icon = "凌风2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2凌风.sgc"; + effect = "2凌风"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill382.cs b/Assets/PerfectWorld/Scripts/Skills/skill382.cs index fd9c4d81ca..7e14124347 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill382.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill382.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·龙现"; nativename = "真·龙现"; - icon = "龙现1.dds"; + icon = "龙现1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1龙现.sgc"; + effect = "1龙现"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill383.cs b/Assets/PerfectWorld/Scripts/Skills/skill383.cs index b803317cdb..a107353b07 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill383.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill383.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·龙现"; nativename = "狂·龙现"; - icon = "龙现2.dds"; + icon = "龙现2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2龙现.sgc"; + effect = "2龙现"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill384.cs b/Assets/PerfectWorld/Scripts/Skills/skill384.cs index 5af03f498e..a06416cf94 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill384.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill384.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·断岩斩"; nativename = "真·断岩斩"; - icon = "断岩斩1.dds"; + icon = "断岩斩1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1断岩斩.sgc"; + effect = "1断岩斩"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill385.cs b/Assets/PerfectWorld/Scripts/Skills/skill385.cs index 4adfdb9bb0..58842cef53 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill385.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill385.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·断岩斩"; nativename = "狂·断岩斩"; - icon = "断岩斩2.dds"; + icon = "断岩斩2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2断岩斩.sgc"; + effect = "2断岩斩"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill386.cs b/Assets/PerfectWorld/Scripts/Skills/skill386.cs index b38e77e201..9d13e93a34 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill386.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill386.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·狂龙斩"; nativename = "真·狂龙斩"; - icon = "狂龙斩1.dds"; + icon = "狂龙斩1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1狂龙斩.sgc"; + effect = "1狂龙斩"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill387.cs b/Assets/PerfectWorld/Scripts/Skills/skill387.cs index b07591f401..144484eaae 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill387.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill387.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·狂龙斩"; nativename = "狂·狂龙斩"; - icon = "狂龙斩2.dds"; + icon = "狂龙斩2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2狂龙斩.sgc"; + effect = "2狂龙斩"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill388.cs b/Assets/PerfectWorld/Scripts/Skills/skill388.cs index a1c96e6811..220a71bbc8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill388.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill388.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·横扫千军"; nativename = "真·横扫千军"; - icon = "横扫千军1.dds"; + icon = "横扫千军1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1横扫千军.sgc"; + effect = "1横扫千军"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill389.cs b/Assets/PerfectWorld/Scripts/Skills/skill389.cs index cafae4b052..ec84263177 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill389.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill389.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·横扫千军"; nativename = "狂·横扫千军"; - icon = "横扫千军2.dds"; + icon = "横扫千军2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2横扫千军.sgc"; + effect = "2横扫千军"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill390.cs b/Assets/PerfectWorld/Scripts/Skills/skill390.cs index 6626b60838..5118f282aa 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill390.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill390.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·劈空掌"; nativename = "真·劈空掌"; - icon = "劈空掌1.dds"; + icon = "劈空掌1"; max_level = 1; type = 1; apcost = 100; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1劈空掌.sgc"; + effect = "1劈空掌"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill391.cs b/Assets/PerfectWorld/Scripts/Skills/skill391.cs index 1265f85ec1..d539322c6c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill391.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill391.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·劈空掌"; nativename = "狂·劈空掌"; - icon = "劈空掌2.dds"; + icon = "劈空掌2"; max_level = 1; type = 1; apcost = 100; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2劈空掌.sgc"; + effect = "2劈空掌"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill392.cs b/Assets/PerfectWorld/Scripts/Skills/skill392.cs index 44a6051064..bc0b63ebde 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill392.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill392.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·无影脚"; nativename = "真·无影脚"; - icon = "无影脚1.dds"; + icon = "无影脚1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1无影脚.sgc"; + effect = "1无影脚"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill393.cs b/Assets/PerfectWorld/Scripts/Skills/skill393.cs index c03e0cdd06..c0b1b2fc5e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill393.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill393.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·无影脚"; nativename = "狂·无影脚"; - icon = "无影脚2.dds"; + icon = "无影脚2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2无影脚.sgc"; + effect = "2无影脚"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill394.cs b/Assets/PerfectWorld/Scripts/Skills/skill394.cs index 0ad29e0718..8e25eb58f6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill394.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill394.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·风卷残云"; nativename = "真·风卷残云"; - icon = "风卷残云1.dds"; + icon = "风卷残云1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1风卷残云.sgc"; + effect = "1风卷残云"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill395.cs b/Assets/PerfectWorld/Scripts/Skills/skill395.cs index 95ccca7de2..39969b3b01 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill395.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill395.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·风卷残云"; nativename = "狂·风卷残云"; - icon = "风卷残云2.dds"; + icon = "风卷残云2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2风卷残云.sgc"; + effect = "2风卷残云"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill396.cs b/Assets/PerfectWorld/Scripts/Skills/skill396.cs index 07ccedbad9..50fee9d8a2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill396.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill396.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·云龙九现"; nativename = "真·云龙九现"; - icon = "云龙九现1.dds"; + icon = "云龙九现1"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1云龙九现.sgc"; + effect = "1云龙九现"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill397.cs b/Assets/PerfectWorld/Scripts/Skills/skill397.cs index dd6ca4cde3..27da6f06f7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill397.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill397.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·云龙九现"; nativename = "狂·云龙九现"; - icon = "云龙九现2.dds"; + icon = "云龙九现2"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2云龙九现.sgc"; + effect = "2云龙九现"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill398.cs b/Assets/PerfectWorld/Scripts/Skills/skill398.cs index a016f15605..ec1e7f0f0f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill398.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill398.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·疾风刺"; nativename = "真·疾风刺"; - icon = "疾风刺1.DDS"; + icon = "疾风刺1"; max_level = 1; type = 1; apcost = 100; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1疾风霹雳.sgc"; + effect = "1疾风霹雳"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill399.cs b/Assets/PerfectWorld/Scripts/Skills/skill399.cs index 8a2874b0c6..3dced45601 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill399.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill399.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·疾风刺"; nativename = "狂·疾风刺"; - icon = "疾风刺2.dds"; + icon = "疾风刺2"; max_level = 1; type = 1; apcost = 100; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2疾风霹雳.sgc"; + effect = "2疾风霹雳"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill4.cs b/Assets/PerfectWorld/Scripts/Skills/skill4.cs index 5156d599e4..fb193c3f6f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill4.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill4.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 0; name = "狮子吼"; nativename = "狮子吼"; - icon = "狮子吼.dds"; + icon = "狮子吼"; max_level = 10; type = 3; apcost = 35; @@ -104,7 +104,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "狮子吼.sgc"; + effect = "狮子吼"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill400.cs b/Assets/PerfectWorld/Scripts/Skills/skill400.cs index c744caa8b8..2e8cc944df 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill400.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill400.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·回马枪"; nativename = "真·回马枪"; - icon = "回马枪1.dds"; + icon = "回马枪1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1回马枪.sgc"; + effect = "1回马枪"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill401.cs b/Assets/PerfectWorld/Scripts/Skills/skill401.cs index 1f0ceccca2..69c24945e1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill401.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill401.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·回马枪"; nativename = "狂·回马枪"; - icon = "回马枪2.dds"; + icon = "回马枪2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2回马枪.sgc"; + effect = "2回马枪"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill402.cs b/Assets/PerfectWorld/Scripts/Skills/skill402.cs index ca6e8ea598..dbb296eafe 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill402.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill402.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·流星赶月"; nativename = "真·流星赶月"; - icon = "流星赶月1.dds"; + icon = "流星赶月1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1流星赶月.sgc"; + effect = "1流星赶月"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill403.cs b/Assets/PerfectWorld/Scripts/Skills/skill403.cs index 44cf5278a1..aa90cc70fe 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill403.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill403.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·流星赶月"; nativename = "狂·流星赶月"; - icon = "流星赶月2.dds"; + icon = "流星赶月2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2流星赶月.sgc"; + effect = "2流星赶月"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill404.cs b/Assets/PerfectWorld/Scripts/Skills/skill404.cs index 9bc7c03bbe..14e694dcb0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill404.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill404.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·寒冰刃域"; nativename = "真·寒冰刃域"; - icon = "寒冰刃域1.DDS"; + icon = "寒冰刃域1"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1刃域.sgc"; + effect = "1刃域"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill405.cs b/Assets/PerfectWorld/Scripts/Skills/skill405.cs index 863bef8fe7..56baf1c956 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill405.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill405.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·寒冰刃域"; nativename = "狂·寒冰刃域"; - icon = "寒冰刃域.dds"; + icon = "寒冰刃域"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2刃域.sgc"; + effect = "2刃域"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill406.cs b/Assets/PerfectWorld/Scripts/Skills/skill406.cs index d0a571ba54..3a11451753 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill406.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill406.cs @@ -88,7 +88,7 @@ namespace BrewMonster cls = 0; name = "真·龙飞击"; nativename = "真·龙飞击"; - icon = "龙飞击1.DDS"; + icon = "龙飞击1"; max_level = 1; type = 1; apcost = 100; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1霸王龙飞.sgc"; + effect = "1霸王龙飞"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill407.cs b/Assets/PerfectWorld/Scripts/Skills/skill407.cs index d434518d0a..01885ce49d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill407.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill407.cs @@ -88,7 +88,7 @@ namespace BrewMonster cls = 0; name = "狂·龙飞击"; nativename = "狂·龙飞击"; - icon = "龙飞击2.DDS"; + icon = "龙飞击2"; max_level = 1; type = 1; apcost = 100; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2霸王龙飞.sgc"; + effect = "2霸王龙飞"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill408.cs b/Assets/PerfectWorld/Scripts/Skills/skill408.cs index b641a04c1b..df120a8821 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill408.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill408.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·断岳扫"; nativename = "真·断岳扫"; - icon = "断岳扫1.DDS"; + icon = "断岳扫1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1霸王断岳.sgc"; + effect = "1霸王断岳"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill409.cs b/Assets/PerfectWorld/Scripts/Skills/skill409.cs index 52374b87ba..d8165f1e13 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill409.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill409.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·断岳扫"; nativename = "狂·断岳扫"; - icon = "断岳扫2.DDS"; + icon = "断岳扫2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2霸王断岳.sgc"; + effect = "2霸王断岳"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill410.cs b/Assets/PerfectWorld/Scripts/Skills/skill410.cs index d42c81a88d..c8abe1c305 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill410.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill410.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·裂岩炎震"; nativename = "真·裂岩炎震"; - icon = "裂岩炎震1.DDS"; + icon = "裂岩炎震1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1霸王暴怒.sgc"; + effect = "1霸王暴怒"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill411.cs b/Assets/PerfectWorld/Scripts/Skills/skill411.cs index a4dbe51b55..e7a479ce5d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill411.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill411.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·裂岩炎震"; nativename = "狂·裂岩炎震"; - icon = "裂岩炎震2.dds"; + icon = "裂岩炎震2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2霸王暴怒.sgc"; + effect = "2霸王暴怒"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill412.cs b/Assets/PerfectWorld/Scripts/Skills/skill412.cs index 13f16c7a2a..f6dd0bcb40 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill412.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill412.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·天火狂龙"; nativename = "真·天火狂龙"; - icon = "天火狂龙1.dds"; + icon = "天火狂龙1"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1霸王献鼎.sgc"; + effect = "1霸王献鼎"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill413.cs b/Assets/PerfectWorld/Scripts/Skills/skill413.cs index 7db3c5f3bc..107533b1d2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill413.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill413.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·天火狂龙"; nativename = "狂·天火狂龙"; - icon = "天火狂龙2.dds"; + icon = "天火狂龙2"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2霸王献鼎.sgc"; + effect = "2霸王献鼎"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill414.cs b/Assets/PerfectWorld/Scripts/Skills/skill414.cs index e8bb4b572e..3787466df1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill414.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill414.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·忘情式"; nativename = "真·忘情式"; - icon = "忘情式1.dds"; + icon = "忘情式1"; max_level = 1; type = 1; apcost = 100; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1忘情式.sgc"; + effect = "1忘情式"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill415.cs b/Assets/PerfectWorld/Scripts/Skills/skill415.cs index 5fd834799c..6104f71934 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill415.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill415.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·忘情式"; nativename = "狂·忘情式"; - icon = "忘情式2.dds"; + icon = "忘情式2"; max_level = 1; type = 1; apcost = 100; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2忘情式.sgc"; + effect = "2忘情式"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill416.cs b/Assets/PerfectWorld/Scripts/Skills/skill416.cs index fd037961b7..83540b165d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill416.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill416.cs @@ -88,7 +88,7 @@ namespace BrewMonster cls = 0; name = "真·追魂诀"; nativename = "真·追魂诀"; - icon = "追魂诀1.DDS"; + icon = "追魂诀1"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1追魂诀.sgc"; + effect = "1追魂诀"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill417.cs b/Assets/PerfectWorld/Scripts/Skills/skill417.cs index a37bb695ab..17d257f8c7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill417.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill417.cs @@ -88,7 +88,7 @@ namespace BrewMonster cls = 0; name = "狂·追魂诀"; nativename = "狂·追魂诀"; - icon = "追魂诀2.dds"; + icon = "追魂诀2"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2追魂诀.sgc"; + effect = "2追魂诀"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill418.cs b/Assets/PerfectWorld/Scripts/Skills/skill418.cs index d0d8235475..732ef15913 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill418.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill418.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·剑气纵横"; nativename = "真·剑气纵横"; - icon = "剑气纵横1.dds"; + icon = "剑气纵横1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1剑气纵横.sgc"; + effect = "1剑气纵横"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill419.cs b/Assets/PerfectWorld/Scripts/Skills/skill419.cs index 12d6f63f98..41f4e1f278 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill419.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill419.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·剑气纵横"; nativename = "狂·剑气纵横"; - icon = "剑气纵横2.dds"; + icon = "剑气纵横2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2剑气纵横.sgc"; + effect = "2剑气纵横"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill420.cs b/Assets/PerfectWorld/Scripts/Skills/skill420.cs index 0e298682a3..ae25b3ff2d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill420.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill420.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·万剑诀"; nativename = "真·万剑诀"; - icon = "万剑诀1.dds"; + icon = "万剑诀1"; max_level = 1; type = 1; apcost = 100; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1万剑诀.sgc"; + effect = "1万剑诀"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill421.cs b/Assets/PerfectWorld/Scripts/Skills/skill421.cs index 5d076c368b..d0c91238a9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill421.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill421.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·万剑诀"; nativename = "狂·万剑诀"; - icon = "万剑诀2.dds"; + icon = "万剑诀2"; max_level = 1; type = 1; apcost = 100; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2万剑诀.sgc"; + effect = "2万剑诀"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill422.cs b/Assets/PerfectWorld/Scripts/Skills/skill422.cs index d0231fad31..dbe52697d2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill422.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill422.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "真·金钟罩"; nativename = "真·金钟罩"; - icon = "金钟罩1.dds"; + icon = "金钟罩1"; max_level = 1; type = 2; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1金钟罩.sgc"; + effect = "1金钟罩"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill423.cs b/Assets/PerfectWorld/Scripts/Skills/skill423.cs index d817cc4531..c7ef17838c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill423.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill423.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "狂·金钟罩"; nativename = "狂·金钟罩"; - icon = "金钟罩2.dds"; + icon = "金钟罩2"; max_level = 1; type = 2; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2金钟罩.sgc"; + effect = "2金钟罩"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill424.cs b/Assets/PerfectWorld/Scripts/Skills/skill424.cs index 3913d82ec7..0a351d5598 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill424.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill424.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "真·狮子吼"; nativename = "真·狮子吼"; - icon = "狮子吼1.dds"; + icon = "狮子吼1"; max_level = 1; type = 3; apcost = 20; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "狮子吼.sgc"; + effect = "狮子吼"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill425.cs b/Assets/PerfectWorld/Scripts/Skills/skill425.cs index f311afe5cf..2e183ff454 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill425.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill425.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "狂·狮子吼"; nativename = "狂·狮子吼"; - icon = "狮子吼2.dds"; + icon = "狮子吼2"; max_level = 1; type = 3; apcost = 35; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2狮子吼.sgc"; + effect = "2狮子吼"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill426.cs b/Assets/PerfectWorld/Scripts/Skills/skill426.cs index fd7d9af9a4..a27b4d4c2c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill426.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill426.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 0; name = "真·易筋经"; nativename = "真·易筋经"; - icon = "易筋经1.DDS"; + icon = "易筋经1"; max_level = 1; type = 2; apcost = 0; @@ -71,7 +71,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1易筋经.sgc"; + effect = "1易筋经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill427.cs b/Assets/PerfectWorld/Scripts/Skills/skill427.cs index 7025899a14..590d3ee948 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill427.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill427.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 0; name = "狂·易筋经"; nativename = "狂·易筋经"; - icon = "易筋经2.DDS"; + icon = "易筋经2"; max_level = 1; type = 2; apcost = 0; @@ -71,7 +71,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2易筋经.sgc"; + effect = "2易筋经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill428.cs b/Assets/PerfectWorld/Scripts/Skills/skill428.cs index b56faddf10..c113f766c8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill428.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill428.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 0; name = "真·易髓经"; nativename = "真·易髓经"; - icon = "易髓经1.dds"; + icon = "易髓经1"; max_level = 1; type = 2; apcost = 0; @@ -71,7 +71,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1易髓经.sgc"; + effect = "1易髓经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill429.cs b/Assets/PerfectWorld/Scripts/Skills/skill429.cs index 28f7491cb1..6d515591ea 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill429.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill429.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 0; name = "狂·易髓经"; nativename = "狂·易髓经"; - icon = "易髓经2.dds"; + icon = "易髓经2"; max_level = 1; type = 2; apcost = 0; @@ -71,7 +71,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2易髓经.sgc"; + effect = "2易髓经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill430.cs b/Assets/PerfectWorld/Scripts/Skills/skill430.cs index 412a9ca995..d690faf7c8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill430.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill430.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 0; name = "真·金刚经"; nativename = "真·金刚经"; - icon = "金刚经1.dds"; + icon = "金刚经1"; max_level = 1; type = 2; apcost = 100; @@ -71,7 +71,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1金刚经.sgc"; + effect = "1金刚经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill431.cs b/Assets/PerfectWorld/Scripts/Skills/skill431.cs index 65d4f24362..209752bb86 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill431.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill431.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 0; name = "狂·金刚经"; nativename = "狂·金刚经"; - icon = "金刚经2.dds"; + icon = "金刚经2"; max_level = 1; type = 2; apcost = 100; @@ -71,7 +71,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2金刚经.sgc"; + effect = "2金刚经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill432.cs b/Assets/PerfectWorld/Scripts/Skills/skill432.cs index 98971e856d..26022a7db0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill432.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill432.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 0; name = "真·刀剑精通"; nativename = "真·刀剑精通"; - icon = "刀剑精通1.dds"; + icon = "刀剑精通1"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill433.cs b/Assets/PerfectWorld/Scripts/Skills/skill433.cs index 003aa93efb..164051aa60 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill433.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill433.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 0; name = "狂·刀剑精通"; nativename = "狂·刀剑精通"; - icon = "刀剑精通2.dds"; + icon = "刀剑精通2"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill434.cs b/Assets/PerfectWorld/Scripts/Skills/skill434.cs index 1ab5d387b3..54ca7c921a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill434.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill434.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 0; name = "真·长兵精通"; nativename = "真·长兵精通"; - icon = "长兵精通1.dds"; + icon = "长兵精通1"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill435.cs b/Assets/PerfectWorld/Scripts/Skills/skill435.cs index 7de551ec65..a19ea312c6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill435.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill435.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 0; name = "狂·长兵精通"; nativename = "狂·长兵精通"; - icon = "长兵精通2.dds"; + icon = "长兵精通2"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill436.cs b/Assets/PerfectWorld/Scripts/Skills/skill436.cs index dbe07b67c9..68de001752 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill436.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill436.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 0; name = "真·斧锤精通"; nativename = "真·斧锤精通"; - icon = "斧锤精通1.dds"; + icon = "斧锤精通1"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill437.cs b/Assets/PerfectWorld/Scripts/Skills/skill437.cs index fc71eeee8c..9e442cc1a0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill437.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill437.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 0; name = "真·拳术精通"; nativename = "真·拳术精通"; - icon = "拳术精通1.dds"; + icon = "拳术精通1"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill438.cs b/Assets/PerfectWorld/Scripts/Skills/skill438.cs index 5b39f4f20e..6d8cb7b32b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill438.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill438.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 0; name = "狂·拳术精通"; nativename = "狂·拳术精通"; - icon = "拳术精通2.dds"; + icon = "拳术精通2"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill439.cs b/Assets/PerfectWorld/Scripts/Skills/skill439.cs index 6f6038ed73..847bdaf5b3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill439.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill439.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 0; name = "狂·斧锤精通"; nativename = "狂·斧锤精通"; - icon = "斧锤精通2.dds"; + icon = "斧锤精通2"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill440.cs b/Assets/PerfectWorld/Scripts/Skills/skill440.cs index d635b94063..a42d3388a1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill440.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill440.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·烈火符"; nativename = "真·烈火符"; - icon = "烈火符1.dds"; + icon = "烈火符1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1烈火符.sgc"; + effect = "1烈火符"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill441.cs b/Assets/PerfectWorld/Scripts/Skills/skill441.cs index baf95f8808..2b6f9ef380 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill441.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill441.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·烈火符"; nativename = "狂·烈火符"; - icon = "烈火符2.dds"; + icon = "烈火符2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2烈火符.sgc"; + effect = "2烈火符"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill442.cs b/Assets/PerfectWorld/Scripts/Skills/skill442.cs index faee174a4f..117fcc6212 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill442.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill442.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "真·烈焰护甲"; nativename = "真·烈焰护甲"; - icon = "烈焰护甲1.dds"; + icon = "烈焰护甲1"; max_level = 1; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill443.cs b/Assets/PerfectWorld/Scripts/Skills/skill443.cs index fdfca10008..81137f2607 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill443.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill443.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "狂·烈焰护甲"; nativename = "狂·烈焰护甲"; - icon = "烈焰护甲2.dds"; + icon = "烈焰护甲2"; max_level = 1; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill444.cs b/Assets/PerfectWorld/Scripts/Skills/skill444.cs index 49037c2e3a..b68eafb430 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill444.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill444.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·火煞天灯"; nativename = "真·火煞天灯"; - icon = "火煞天灯1.dds"; + icon = "火煞天灯1"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1火煞天灯.sgc"; + effect = "1火煞天灯"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill445.cs b/Assets/PerfectWorld/Scripts/Skills/skill445.cs index 4bdf56b2c2..ea66244f90 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill445.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill445.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·火煞天灯"; nativename = "狂·火煞天灯"; - icon = "火煞天灯2.dds"; + icon = "火煞天灯2"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "火煞天灯.sgc"; + effect = "火煞天灯"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill446.cs b/Assets/PerfectWorld/Scripts/Skills/skill446.cs index ef61dc30be..24a9f34eec 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill446.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill446.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·神火符"; nativename = "真·神火符"; - icon = "神火符1.dds"; + icon = "神火符1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1神火符.sgc"; + effect = "1神火符"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill447.cs b/Assets/PerfectWorld/Scripts/Skills/skill447.cs index bd4bc877ae..a8abf5d540 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill447.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill447.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·神火符"; nativename = "狂·神火符"; - icon = "神火符2.dds"; + icon = "神火符2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2神火符.sgc"; + effect = "2神火符"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill448.cs b/Assets/PerfectWorld/Scripts/Skills/skill448.cs index d1e9e07767..42098a8957 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill448.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill448.cs @@ -104,7 +104,7 @@ namespace BrewMonster cls = 1; name = "真·炙炎阵"; nativename = "真·炙炎阵"; - icon = "炙炎阵1.dds"; + icon = "炙炎阵1"; max_level = 1; type = 1; apcost = 100; @@ -125,7 +125,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1炙炎阵.sgc"; + effect = "1炙炎阵"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill449.cs b/Assets/PerfectWorld/Scripts/Skills/skill449.cs index 2b324aa871..55a0b39f7b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill449.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill449.cs @@ -104,7 +104,7 @@ namespace BrewMonster cls = 1; name = "狂·炙炎阵"; nativename = "狂·炙炎阵"; - icon = "炙炎阵2.dds"; + icon = "炙炎阵2"; max_level = 1; type = 1; apcost = 100; @@ -125,7 +125,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2炙炎阵.sgc"; + effect = "2炙炎阵"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill450.cs b/Assets/PerfectWorld/Scripts/Skills/skill450.cs index 4b6e589c11..9c16bd4318 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill450.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill450.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·烈火炽翼"; nativename = "真·烈火炽翼"; - icon = "烈火炽翼1.dds"; + icon = "烈火炽翼1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1炎索.sgc"; + effect = "1炎索"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill451.cs b/Assets/PerfectWorld/Scripts/Skills/skill451.cs index c0fd134015..385ff730f6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill451.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill451.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·烈火炽翼"; nativename = "狂·烈火炽翼"; - icon = "烈火炽翼2.dds"; + icon = "烈火炽翼2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2炎索.sgc"; + effect = "2炎索"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill452.cs b/Assets/PerfectWorld/Scripts/Skills/skill452.cs index 4f89ad0993..6e83e21cb0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill452.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill452.cs @@ -88,7 +88,7 @@ namespace BrewMonster cls = 1; name = "真·血祭炎爆"; nativename = "真·血祭炎爆"; - icon = "血祭炎爆1.dds"; + icon = "血祭炎爆1"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1血祭炎爆.sgc"; + effect = "1血祭炎爆"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill453.cs b/Assets/PerfectWorld/Scripts/Skills/skill453.cs index c1e3c9c9f7..83077f383f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill453.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill453.cs @@ -88,7 +88,7 @@ namespace BrewMonster cls = 1; name = "狂·血祭炎爆"; nativename = "狂·血祭炎爆"; - icon = "血祭炎爆2.dds"; + icon = "血祭炎爆2"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2血祭炎爆.sgc"; + effect = "2血祭炎爆"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill454.cs b/Assets/PerfectWorld/Scripts/Skills/skill454.cs index 65789bd297..6f489df5f9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill454.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill454.cs @@ -90,7 +90,7 @@ namespace BrewMonster cls = 1; name = "真·火海刀山"; nativename = "真·火海刀山"; - icon = "火海刀山1.dds"; + icon = "火海刀山1"; max_level = 1; type = 1; apcost = 200; @@ -111,7 +111,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1火海刀山.sgc"; + effect = "1火海刀山"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill455.cs b/Assets/PerfectWorld/Scripts/Skills/skill455.cs index 70148f9edd..f94b861723 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill455.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill455.cs @@ -90,7 +90,7 @@ namespace BrewMonster cls = 1; name = "狂·火海刀山"; nativename = "狂·火海刀山"; - icon = "火海刀山2.dds"; + icon = "火海刀山2"; max_level = 1; type = 1; apcost = 200; @@ -111,7 +111,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2火海刀山.sgc"; + effect = "2火海刀山"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill456.cs b/Assets/PerfectWorld/Scripts/Skills/skill456.cs index ecb5f226b0..8fa078a9b2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill456.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill456.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·涌泉"; nativename = "真·涌泉"; - icon = "涌泉1.dds"; + icon = "涌泉1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1涌泉.sgc"; + effect = "1涌泉"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill457.cs b/Assets/PerfectWorld/Scripts/Skills/skill457.cs index 466ca28d0d..ef5752ad9c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill457.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill457.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·涌泉"; nativename = "狂·涌泉"; - icon = "涌泉2.dds"; + icon = "涌泉2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2涌泉.sgc"; + effect = "2涌泉"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill458.cs b/Assets/PerfectWorld/Scripts/Skills/skill458.cs index 8bcc99d23b..84cbbf2db2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill458.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill458.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "真·寒冰护甲"; nativename = "真·寒冰护甲"; - icon = "寒冰护甲1.dds"; + icon = "寒冰护甲1"; max_level = 1; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill459.cs b/Assets/PerfectWorld/Scripts/Skills/skill459.cs index e0fbf395e3..602b9f05ba 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill459.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill459.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "狂·寒冰护甲"; nativename = "狂·寒冰护甲"; - icon = "寒冰护甲2.dds"; + icon = "寒冰护甲2"; max_level = 1; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill460.cs b/Assets/PerfectWorld/Scripts/Skills/skill460.cs index d666778f24..8cd24dc13c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill460.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill460.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·冰雹"; nativename = "真·冰雹"; - icon = "冰雹1.dds"; + icon = "冰雹1"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 3; - effect = "1冰雹.sgc"; + effect = "1冰雹"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill461.cs b/Assets/PerfectWorld/Scripts/Skills/skill461.cs index cb077f3592..9d89bc9339 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill461.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill461.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·冰雹"; nativename = "狂·冰雹"; - icon = "冰雹2.dds"; + icon = "冰雹2"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 3; - effect = "2冰雹.sgc"; + effect = "2冰雹"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill462.cs b/Assets/PerfectWorld/Scripts/Skills/skill462.cs index aa477b6d69..bc966a3020 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill462.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill462.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "真·寒露"; nativename = "真·寒露"; - icon = "寒露1.DDS"; + icon = "寒露1"; max_level = 1; type = 2; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1寒露.sgc"; + effect = "1寒露"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill463.cs b/Assets/PerfectWorld/Scripts/Skills/skill463.cs index 76324db4c6..009df88739 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill463.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill463.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "狂·寒露"; nativename = "狂·寒露"; - icon = "寒露2.DDS"; + icon = "寒露2"; max_level = 1; type = 2; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2寒露.sgc"; + effect = "2寒露"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill464.cs b/Assets/PerfectWorld/Scripts/Skills/skill464.cs index 5e9b3149dd..9bb9baf442 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill464.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill464.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 1; name = "真·润泽"; nativename = "真·润泽"; - icon = "润泽1.dds"; + icon = "润泽1"; max_level = 1; type = 2; apcost = 100; @@ -71,7 +71,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1润泽.sgc"; + effect = "1润泽"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill465.cs b/Assets/PerfectWorld/Scripts/Skills/skill465.cs index 2733f55e14..2b8bc6027f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill465.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill465.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 1; name = "狂·润泽"; nativename = "狂·润泽"; - icon = "润泽2.dds"; + icon = "润泽2"; max_level = 1; type = 2; apcost = 100; @@ -71,7 +71,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2润泽.sgc"; + effect = "2润泽"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill466.cs b/Assets/PerfectWorld/Scripts/Skills/skill466.cs index 6c1e860e67..dc4ddcf188 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill466.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill466.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "真·霜刃"; nativename = "真·霜刃"; - icon = "霜刃1.dds"; + icon = "霜刃1"; max_level = 1; type = 2; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1霜刃.sgc"; + effect = "1霜刃"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill467.cs b/Assets/PerfectWorld/Scripts/Skills/skill467.cs index c768d423b5..8a9ff828fb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill467.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill467.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "狂·霜刃"; nativename = "狂·霜刃"; - icon = "霜刃2.dds"; + icon = "霜刃2"; max_level = 1; type = 2; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2霜刃.sgc"; + effect = "2霜刃"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill468.cs b/Assets/PerfectWorld/Scripts/Skills/skill468.cs index 348c48f9c0..881c5f3212 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill468.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill468.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·凌杀"; nativename = "真·凌杀"; - icon = "凌杀1.dds"; + icon = "凌杀1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1凌杀.sgc"; + effect = "1凌杀"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill469.cs b/Assets/PerfectWorld/Scripts/Skills/skill469.cs index eec1d00f57..afa97536ee 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill469.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill469.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·凌杀"; nativename = "狂·凌杀"; - icon = "凌杀2.dds"; + icon = "凌杀2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2凌杀.sgc"; + effect = "2凌杀"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill470.cs b/Assets/PerfectWorld/Scripts/Skills/skill470.cs index 81e15bbce8..868ff6a18c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill470.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill470.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·玄冰水龙"; nativename = "真·玄冰水龙"; - icon = "玄冰水龙1.dds"; + icon = "玄冰水龙1"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1玄冰水龙.sgc"; + effect = "1玄冰水龙"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill471.cs b/Assets/PerfectWorld/Scripts/Skills/skill471.cs index 91fa93a5e5..17da8efb10 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill471.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill471.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·玄冰水龙"; nativename = "狂·玄冰水龙"; - icon = "玄冰水龙2.dds"; + icon = "玄冰水龙2"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1玄冰水龙.sgc"; + effect = "1玄冰水龙"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill472.cs b/Assets/PerfectWorld/Scripts/Skills/skill472.cs index 62a746ba90..c76578a475 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill472.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill472.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·落石术"; nativename = "真·落石术"; - icon = "落石术1.dds"; + icon = "落石术1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1落石术.sgc"; + effect = "1落石术"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill473.cs b/Assets/PerfectWorld/Scripts/Skills/skill473.cs index 1364177daa..7683c899b1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill473.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill473.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·落石术"; nativename = "狂·落石术"; - icon = "落石术2.dds"; + icon = "落石术2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2落石术.sgc"; + effect = "2落石术"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill474.cs b/Assets/PerfectWorld/Scripts/Skills/skill474.cs index 14c4b0fb46..fad6ba7738 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill474.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill474.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "真·磐石护甲"; nativename = "真·磐石护甲"; - icon = "奇门护甲1.dds"; + icon = "奇门护甲1"; max_level = 1; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill475.cs b/Assets/PerfectWorld/Scripts/Skills/skill475.cs index a64a1d29fe..ef6683012b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill475.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill475.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "狂·磐石护甲"; nativename = "狂·磐石护甲"; - icon = "奇门护甲2.dds"; + icon = "奇门护甲2"; max_level = 1; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill476.cs b/Assets/PerfectWorld/Scripts/Skills/skill476.cs index 62ef9ea53b..b344da13cd 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill476.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill476.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·沙陷"; nativename = "真·沙陷"; - icon = "沙陷1.dds"; + icon = "沙陷1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1沙陷.sgc"; + effect = "1沙陷"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill477.cs b/Assets/PerfectWorld/Scripts/Skills/skill477.cs index 7634a3257b..139944863d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill477.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill477.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·沙陷"; nativename = "狂·沙陷"; - icon = "沙陷2.dds"; + icon = "沙陷2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2沙陷.sgc"; + effect = "2沙陷"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill478.cs b/Assets/PerfectWorld/Scripts/Skills/skill478.cs index 0ac0a64f5c..e8ccf79149 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill478.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill478.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "真·缩地术"; nativename = "真·缩地术"; - icon = "缩地术1.dds"; + icon = "缩地术1"; max_level = 1; type = 8; apcost = 10; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1缩地术.sgc"; + effect = "1缩地术"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill479.cs b/Assets/PerfectWorld/Scripts/Skills/skill479.cs index e8f8a0a57e..a56fe21b60 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill479.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill479.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "狂·缩地术"; nativename = "狂·缩地术"; - icon = "缩地术2.dds"; + icon = "缩地术2"; max_level = 1; type = 8; apcost = 20; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "缩地术.sgc"; + effect = "缩地术"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill480.cs b/Assets/PerfectWorld/Scripts/Skills/skill480.cs index c1d4133340..f499ff0739 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill480.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill480.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·飞沙术"; nativename = "真·飞沙术"; - icon = "飞沙术1.dds"; + icon = "飞沙术1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1飞沙术.sgc"; + effect = "1飞沙术"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill481.cs b/Assets/PerfectWorld/Scripts/Skills/skill481.cs index 74a8af8dc3..975120315a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill481.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill481.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·飞沙术"; nativename = "狂·飞沙术"; - icon = "飞沙术2.dds"; + icon = "飞沙术2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2飞沙术.sgc"; + effect = "2飞沙术"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill482.cs b/Assets/PerfectWorld/Scripts/Skills/skill482.cs index a3f9a2d08e..a75616a30c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill482.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill482.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "真·石破天惊"; nativename = "真·石破天惊"; - icon = "石破天惊1.dds"; + icon = "石破天惊1"; max_level = 1; type = 3; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1石破天惊.sgc"; + effect = "1石破天惊"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill483.cs b/Assets/PerfectWorld/Scripts/Skills/skill483.cs index aa1981dfa0..0fd846fc7c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill483.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill483.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "狂·石破天惊"; nativename = "狂·石破天惊"; - icon = "石破天惊2.dds"; + icon = "石破天惊2"; max_level = 1; type = 3; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2石破天惊.sgc"; + effect = "2石破天惊"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill484.cs b/Assets/PerfectWorld/Scripts/Skills/skill484.cs index be32f5f12a..75a3b2b92a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill484.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill484.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·泰山压顶"; nativename = "真·泰山压顶"; - icon = "泰山压顶1.dds"; + icon = "泰山压顶1"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1泰山压顶.sgc"; + effect = "1泰山压顶"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill485.cs b/Assets/PerfectWorld/Scripts/Skills/skill485.cs index d148a42cb5..f2e2792100 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill485.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill485.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·泰山压顶"; nativename = "狂·泰山压顶"; - icon = "泰山压顶2.dds"; + icon = "泰山压顶2"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2泰山压顶.sgc"; + effect = "2泰山压顶"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill486.cs b/Assets/PerfectWorld/Scripts/Skills/skill486.cs index 1c794b1726..c69e18645b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill486.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill486.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 1; name = "真·火精通"; nativename = "真·火精通"; - icon = "火精通1.DDS"; + icon = "火精通1"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill487.cs b/Assets/PerfectWorld/Scripts/Skills/skill487.cs index ddf1e1e5ad..26a2b79f78 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill487.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill487.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 1; name = "狂·火精通"; nativename = "狂·火精通"; - icon = "火精通2.DDS"; + icon = "火精通2"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill488.cs b/Assets/PerfectWorld/Scripts/Skills/skill488.cs index 3c951ba512..498a58b22f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill488.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill488.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 1; name = "真·水精通"; nativename = "真·水精通"; - icon = "水精通1.dds"; + icon = "水精通1"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill489.cs b/Assets/PerfectWorld/Scripts/Skills/skill489.cs index 9a712f3171..e01c3b716a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill489.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill489.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 1; name = "狂·水精通"; nativename = "狂·水精通"; - icon = "水精通2.dds"; + icon = "水精通2"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill490.cs b/Assets/PerfectWorld/Scripts/Skills/skill490.cs index 0c201ae473..818f2c0dda 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill490.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill490.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 1; name = "真·土精通"; nativename = "真·土精通"; - icon = "土精通1.dds"; + icon = "土精通1"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill491.cs b/Assets/PerfectWorld/Scripts/Skills/skill491.cs index 42a28ced0e..6f06143fc5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill491.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill491.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 1; name = "狂·土精通"; nativename = "狂·土精通"; - icon = "土精通2.dds"; + icon = "土精通2"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill5.cs b/Assets/PerfectWorld/Scripts/Skills/skill5.cs index bc6ced6403..222989bea7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill5.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill5.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "龙现"; nativename = "龙现"; - icon = "龙现.dds"; + icon = "龙现"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "龙现.sgc"; + effect = "龙现"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill53.cs b/Assets/PerfectWorld/Scripts/Skills/skill53.cs index 1f0702aa70..b4a392a85f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill53.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill53.cs @@ -31,7 +31,7 @@ namespace BrewMonster cls = 1; name = "火精通"; nativename = "火精通"; - icon = "火精通.dds"; + icon = "火精通"; max_level = 10; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill54.cs b/Assets/PerfectWorld/Scripts/Skills/skill54.cs index 2b6ebbb065..4e13e78e03 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill54.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill54.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "流水"; nativename = "流水"; - icon = "流水.dds"; + icon = "流水"; max_level = 10; type = 1; apcost = 30; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "流水.sgc"; + effect = "流水"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill55.cs b/Assets/PerfectWorld/Scripts/Skills/skill55.cs index e8cf526dff..5b3f78f75b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill55.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill55.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "狂龙斩"; nativename = "狂龙斩"; - icon = "狂龙斩.dds"; + icon = "狂龙斩"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "狂龙斩.sgc"; + effect = "狂龙斩"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill56.cs b/Assets/PerfectWorld/Scripts/Skills/skill56.cs index f230566b6e..ef69eff984 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill56.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill56.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "横扫千军"; nativename = "横扫千军"; - icon = "横扫千军.dds"; + icon = "横扫千军"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "横扫千军.sgc"; + effect = "横扫千军"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill57.cs b/Assets/PerfectWorld/Scripts/Skills/skill57.cs index e626a1befc..c64f02b690 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill57.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill57.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "断岩斩"; nativename = "断岩斩"; - icon = "断岩斩.dds"; + icon = "断岩斩"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "断岩斩.sgc"; + effect = "断岩斩"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill58.cs b/Assets/PerfectWorld/Scripts/Skills/skill58.cs index 18ab441fcf..33c817ce13 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill58.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill58.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 0; name = "龙腾"; nativename = "龙腾"; - icon = "龙腾.dds"; + icon = "龙腾"; max_level = 10; type = 8; apcost = 10; @@ -102,7 +102,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "龙腾.sgc"; + effect = "龙腾"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill59.cs b/Assets/PerfectWorld/Scripts/Skills/skill59.cs index 4fc01ea830..d1a15d324c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill59.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill59.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 0; name = "虎跃"; nativename = "虎跃"; - icon = "虎跃.dds"; + icon = "虎跃"; max_level = 10; type = 8; apcost = 10; @@ -102,7 +102,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "虎跃.sgc"; + effect = "虎跃"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill6.cs b/Assets/PerfectWorld/Scripts/Skills/skill6.cs index b324b78039..49fe9c7f05 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill6.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill6.cs @@ -31,7 +31,7 @@ namespace BrewMonster cls = 0; name = "刀剑精通"; nativename = "刀剑精通"; - icon = "刀剑精通.dds"; + icon = "刀剑精通"; max_level = 10; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill60.cs b/Assets/PerfectWorld/Scripts/Skills/skill60.cs index ce2f72eeed..c82ce84e9b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill60.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill60.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "劈空掌"; nativename = "劈空掌"; - icon = "劈空掌.dds"; + icon = "劈空掌"; max_level = 10; type = 1; apcost = 100; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "劈空掌.sgc"; + effect = "劈空掌"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill61.cs b/Assets/PerfectWorld/Scripts/Skills/skill61.cs index 797f6fd683..3c907d4bf6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill61.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill61.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "无影脚"; nativename = "无影脚"; - icon = "无影脚.dds"; + icon = "无影脚"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "无影脚.sgc"; + effect = "无影脚"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill62.cs b/Assets/PerfectWorld/Scripts/Skills/skill62.cs index 0ac870a19d..4b544001b3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill62.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill62.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "风卷残云"; nativename = "风卷残云"; - icon = "风卷残云.dds"; + icon = "风卷残云"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "风卷残云.sgc"; + effect = "风卷残云"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill63.cs b/Assets/PerfectWorld/Scripts/Skills/skill63.cs index b1a8e6c0a7..af51cf337b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill63.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill63.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "云龙九现"; nativename = "云龙九现"; - icon = "云龙九现.dds"; + icon = "云龙九现"; max_level = 10; type = 1; apcost = 200; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "云龙九现.sgc"; + effect = "云龙九现"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill64.cs b/Assets/PerfectWorld/Scripts/Skills/skill64.cs index eac915f1e1..d2d6854327 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill64.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill64.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "疾风刺"; nativename = "疾风刺"; - icon = "疾风霹雳.dds"; + icon = "疾风霹雳"; max_level = 10; type = 1; apcost = 100; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "疾风霹雳.sgc"; + effect = "疾风霹雳"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill65.cs b/Assets/PerfectWorld/Scripts/Skills/skill65.cs index 609263830e..96305c7241 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill65.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill65.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "回马枪"; nativename = "回马枪"; - icon = "回马枪.dds"; + icon = "回马枪"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "回马枪.sgc"; + effect = "回马枪"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill66.cs b/Assets/PerfectWorld/Scripts/Skills/skill66.cs index 49a6a4747f..95a9d980c9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill66.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill66.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "流星赶月"; nativename = "流星赶月"; - icon = "流星赶月.dds"; + icon = "流星赶月"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "流星赶月.sgc"; + effect = "流星赶月"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill67.cs b/Assets/PerfectWorld/Scripts/Skills/skill67.cs index c698316e41..9c627b0de2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill67.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill67.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "寒冰刃域"; nativename = "寒冰刃域"; - icon = "刃域.dds"; + icon = "刃域"; max_level = 10; type = 1; apcost = 200; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "刃域.sgc"; + effect = "刃域"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill68.cs b/Assets/PerfectWorld/Scripts/Skills/skill68.cs index 76111fd021..639295f0ad 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill68.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill68.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "龙飞击"; nativename = "龙飞击"; - icon = "霸王龙飞.dds"; + icon = "霸王龙飞"; max_level = 10; type = 1; apcost = 100; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "霸王龙飞.sgc"; + effect = "霸王龙飞"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill69.cs b/Assets/PerfectWorld/Scripts/Skills/skill69.cs index 44fde88c0a..b54fb0d216 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill69.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill69.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "天火狂龙"; nativename = "天火狂龙"; - icon = "天火狂龙.dds"; + icon = "天火狂龙"; max_level = 10; type = 1; apcost = 200; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "霸王献鼎.sgc"; + effect = "霸王献鼎"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill7.cs b/Assets/PerfectWorld/Scripts/Skills/skill7.cs index 7778aeb749..789e39e9fc 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill7.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill7.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "火煞天灯"; nativename = "火煞天灯"; - icon = "火煞天灯.dds"; + icon = "火煞天灯"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "火煞天灯.sgc"; + effect = "火煞天灯"; doenchant = 1; dobless = 0; commoncooldown = 0; @@ -166,4 +166,3 @@ namespace BrewMonster } } - diff --git a/Assets/PerfectWorld/Scripts/Skills/skill70.cs b/Assets/PerfectWorld/Scripts/Skills/skill70.cs index db1753443a..4a394a9bfe 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill70.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill70.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "断岳扫"; nativename = "断岳扫"; - icon = "霸王断岳.dds"; + icon = "霸王断岳"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "霸王断岳.sgc"; + effect = "霸王断岳"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill71.cs b/Assets/PerfectWorld/Scripts/Skills/skill71.cs index de7344883b..1abd3e6cf8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill71.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill71.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "裂岩炎震"; nativename = "裂岩炎震"; - icon = "霸王暴怒.dds"; + icon = "霸王暴怒"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "霸王暴怒.sgc"; + effect = "霸王暴怒"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill72.cs b/Assets/PerfectWorld/Scripts/Skills/skill72.cs index 2403c04e9f..32117e8871 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill72.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill72.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "忘情式"; nativename = "忘情式"; - icon = "忘情式.dds"; + icon = "忘情式"; max_level = 10; type = 1; apcost = 100; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "忘情式.sgc"; + effect = "忘情式"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill73.cs b/Assets/PerfectWorld/Scripts/Skills/skill73.cs index a28f8af1bf..e3ef67c5b4 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill73.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill73.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "追魂诀"; nativename = "追魂诀"; - icon = "追魂诀.dds"; + icon = "追魂诀"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "追魂诀.sgc"; + effect = "追魂诀"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill74.cs b/Assets/PerfectWorld/Scripts/Skills/skill74.cs index 46da916cd3..128d9c4c0d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill74.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill74.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "剑气纵横"; nativename = "剑气纵横"; - icon = "剑气纵横.dds"; + icon = "剑气纵横"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "剑气纵横.sgc"; + effect = "剑气纵横"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill75.cs b/Assets/PerfectWorld/Scripts/Skills/skill75.cs index 549ddce60a..cf8b13d771 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill75.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill75.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "万剑诀"; nativename = "万剑诀"; - icon = "万剑诀.dds"; + icon = "万剑诀"; max_level = 10; type = 1; apcost = 200; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "万剑诀.sgc"; + effect = "万剑诀"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill76.cs b/Assets/PerfectWorld/Scripts/Skills/skill76.cs index 78da0519c6..65f9421930 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill76.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill76.cs @@ -49,7 +49,7 @@ namespace BrewMonster cls = 0; name = "疾云步"; nativename = "疾云步"; - icon = "疾云步.dds"; + icon = "疾云步"; max_level = 10; type = 2; apcost = 0; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "疾云步.sgc"; + effect = "疾云步"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill77.cs b/Assets/PerfectWorld/Scripts/Skills/skill77.cs index db15bf608d..3e5133ebf8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill77.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill77.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 0; name = "金钟罩"; nativename = "金钟罩"; - icon = "金钟罩.dds"; + icon = "金钟罩"; max_level = 10; type = 2; apcost = 0; @@ -104,7 +104,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "金钟罩.sgc"; + effect = "金钟罩"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill78.cs b/Assets/PerfectWorld/Scripts/Skills/skill78.cs index bd76bb8ca0..14c889c502 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill78.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill78.cs @@ -31,7 +31,7 @@ namespace BrewMonster cls = 0; name = "长兵精通"; nativename = "长兵精通"; - icon = "长兵精通.dds"; + icon = "长兵精通"; max_level = 10; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill79.cs b/Assets/PerfectWorld/Scripts/Skills/skill79.cs index e05beaf9f3..00951c2b71 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill79.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill79.cs @@ -31,7 +31,7 @@ namespace BrewMonster cls = 0; name = "斧锤精通"; nativename = "斧锤精通"; - icon = "斧锤精通.dds"; + icon = "斧锤精通"; max_level = 10; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill8.cs b/Assets/PerfectWorld/Scripts/Skills/skill8.cs index 8ed493b4ca..bda0b23eb9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill8.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill8.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "血祭炎爆"; nativename = "血祭炎爆"; - icon = "血祭炎爆.dds"; + icon = "血祭炎爆"; max_level = 10; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "血祭炎爆.sgc"; + effect = "血祭炎爆"; doenchant = 0; dobless = 0; commoncooldown = 0; @@ -167,4 +167,3 @@ namespace BrewMonster } } - diff --git a/Assets/PerfectWorld/Scripts/Skills/skill80.cs b/Assets/PerfectWorld/Scripts/Skills/skill80.cs index 721c0bfb5f..401f960713 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill80.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill80.cs @@ -31,7 +31,7 @@ namespace BrewMonster cls = 0; name = "拳术精通"; nativename = "拳术精通"; - icon = "拳术精通.dds"; + icon = "拳术精通"; max_level = 10; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill81.cs b/Assets/PerfectWorld/Scripts/Skills/skill81.cs index 5d666fe5df..07bc3e5249 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill81.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill81.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "烈火符"; nativename = "烈火符"; - icon = "烈火符.dds"; + icon = "烈火符"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "烈火符.sgc"; + effect = "烈火符"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill84.cs b/Assets/PerfectWorld/Scripts/Skills/skill84.cs index 8a7602315d..c6072c717f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill84.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill84.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "烈火炽翼"; nativename = "烈火炽翼"; - icon = "烈火炽翼.dds"; + icon = "烈火炽翼"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "炎索.sgc"; + effect = "炎索"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill85.cs b/Assets/PerfectWorld/Scripts/Skills/skill85.cs index a6757f8b5c..53832af5e7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill85.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill85.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "神火符"; nativename = "神火符"; - icon = "神火符.dds"; + icon = "神火符"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "神火符.sgc"; + effect = "神火符"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill86.cs b/Assets/PerfectWorld/Scripts/Skills/skill86.cs index 8c818b5863..ec305f9fb5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill86.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill86.cs @@ -103,7 +103,7 @@ namespace BrewMonster cls = 1; name = "炙炎阵"; nativename = "炙炎阵"; - icon = "炙炎阵.dds"; + icon = "炙炎阵"; max_level = 10; type = 1; apcost = 100; @@ -124,7 +124,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "炙炎阵.sgc"; + effect = "炙炎阵"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill87.cs b/Assets/PerfectWorld/Scripts/Skills/skill87.cs index e40b2d1e35..1f4fffc05a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill87.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill87.cs @@ -89,7 +89,7 @@ namespace BrewMonster cls = 1; name = "火海刀山"; nativename = "火海刀山"; - icon = "火海刀山.dds"; + icon = "火海刀山"; max_level = 10; type = 1; apcost = 200; @@ -110,7 +110,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "火海刀山.sgc"; + effect = "火海刀山"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill88.cs b/Assets/PerfectWorld/Scripts/Skills/skill88.cs index ddd4cd2814..f0328516a2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill88.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill88.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "涌泉"; nativename = "涌泉"; - icon = "涌泉.dds"; + icon = "涌泉"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "涌泉.sgc"; + effect = "涌泉"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill89.cs b/Assets/PerfectWorld/Scripts/Skills/skill89.cs index f358353ecb..a025ef8f96 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill89.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill89.cs @@ -49,7 +49,7 @@ namespace BrewMonster cls = 1; name = "润泽"; nativename = "润泽"; - icon = "润泽.dds"; + icon = "润泽"; max_level = 10; type = 2; apcost = 100; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "润泽.sgc"; + effect = "润泽"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill896.cs b/Assets/PerfectWorld/Scripts/Skills/skill896.cs index cd69542989..dde2c92b18 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill896.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill896.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 0; name = "狂龙之力"; nativename = "狂龙之力"; - icon = "狂龙之力.dds"; + icon = "狂龙之力"; max_level = 1; type = 2; apcost = 100; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "狂龙之力.sgc"; + effect = "狂龙之力"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill897.cs b/Assets/PerfectWorld/Scripts/Skills/skill897.cs index 4c2d1b9ae8..eea7574cc7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill897.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill897.cs @@ -85,7 +85,7 @@ namespace BrewMonster cls = 0; name = "雷霆震击"; nativename = "雷霆震击"; - icon = "雷霆震击.dds"; + icon = "雷霆震击"; max_level = 1; type = 1; apcost = 100; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "雷霆震击.sgc"; + effect = "雷霆震击"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill898.cs b/Assets/PerfectWorld/Scripts/Skills/skill898.cs index 03166af860..d03de9beb1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill898.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill898.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "断空"; nativename = "断空"; - icon = "剑啸长空.dds"; + icon = "剑啸长空"; max_level = 1; type = 1; apcost = 15; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "无影.sgc"; + effect = "无影"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill899.cs b/Assets/PerfectWorld/Scripts/Skills/skill899.cs index e8ec35c665..d1dc8478ea 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill899.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill899.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "一闪"; nativename = "一闪"; - icon = "一闪.dds"; + icon = "一闪"; max_level = 1; type = 1; apcost = 100; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "一闪.sgc"; + effect = "一闪"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill9.cs b/Assets/PerfectWorld/Scripts/Skills/skill9.cs index bf45e4d398..ec23f5e09b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill9.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill9.cs @@ -31,7 +31,7 @@ namespace BrewMonster cls = 1; name = "水精通"; nativename = "水精通"; - icon = "水精通.dds"; + icon = "水精通"; max_level = 10; type = 5; apcost = 0; @@ -98,4 +98,3 @@ namespace BrewMonster } } - diff --git a/Assets/PerfectWorld/Scripts/Skills/skill90.cs b/Assets/PerfectWorld/Scripts/Skills/skill90.cs index b072de8295..717dcce4b2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill90.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill90.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "寒露"; nativename = "寒露"; - icon = "寒霜.dds"; + icon = "寒霜"; max_level = 10; type = 2; apcost = 0; @@ -104,7 +104,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "寒露.sgc"; + effect = "寒露"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill900.cs b/Assets/PerfectWorld/Scripts/Skills/skill900.cs index efe9edbefa..a9e60c4732 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill900.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill900.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "金刚气"; nativename = "金刚气"; - icon = "金刚气.dds"; + icon = "金刚气"; max_level = 1; type = 2; apcost = 0; @@ -104,7 +104,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1风卷残云.sgc.sgc"; + effect = "1风卷残云.sgc"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill901.cs b/Assets/PerfectWorld/Scripts/Skills/skill901.cs index e1006b43ec..4df077d7ce 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill901.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill901.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "气贯长虹"; nativename = "气贯长虹"; - icon = "气贯长虹.dds"; + icon = "气贯长虹"; max_level = 1; type = 2; apcost = 100; @@ -103,7 +103,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "气惯长虹.sgc"; + effect = "气惯长虹"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill902.cs b/Assets/PerfectWorld/Scripts/Skills/skill902.cs index b28c880491..75b9bd9aad 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill902.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill902.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "土灵击"; nativename = "土灵击"; - icon = "土灵击.dds"; + icon = "土灵击"; max_level = 1; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "地缚.sgc"; + effect = "地缚"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill903.cs b/Assets/PerfectWorld/Scripts/Skills/skill903.cs index 9875a9471b..4cdb4dd9c4 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill903.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill903.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 1; name = "摄魂之力"; nativename = "摄魂之力"; - icon = "摄魂之力.dds"; + icon = "摄魂之力"; max_level = 1; type = 3; apcost = 20; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "疲惫.sgc"; + effect = "疲惫"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill904.cs b/Assets/PerfectWorld/Scripts/Skills/skill904.cs index 6c0cbe5232..0f8612260a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill904.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill904.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 1; name = "真元护体"; nativename = "真元护体"; - icon = "真元护体.dds"; + icon = "真元护体"; max_level = 1; type = 2; apcost = 0; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "五行之护.sgc"; + effect = "五行之护"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill905.cs b/Assets/PerfectWorld/Scripts/Skills/skill905.cs index 737fbfa282..41bbeddbbe 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill905.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill905.cs @@ -85,7 +85,7 @@ namespace BrewMonster cls = 1; name = "灵气震爆"; nativename = "灵气震爆"; - icon = "灵气震爆.dds"; + icon = "灵气震爆"; max_level = 1; type = 1; apcost = 100; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "元素虚空.sgc"; + effect = "元素虚空"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill91.cs b/Assets/PerfectWorld/Scripts/Skills/skill91.cs index 755e0801ba..11360eec15 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill91.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill91.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "霜刃"; nativename = "霜刃"; - icon = "霜刃.dds"; + icon = "霜刃"; max_level = 10; type = 2; apcost = 0; @@ -104,7 +104,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "霜刃.sgc"; + effect = "霜刃"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill92.cs b/Assets/PerfectWorld/Scripts/Skills/skill92.cs index fdd1cdb682..2d9c35c623 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill92.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill92.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "凌杀"; nativename = "凌杀"; - icon = "凌杀.dds"; + icon = "凌杀"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "凌杀.sgc"; + effect = "凌杀"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill923.cs b/Assets/PerfectWorld/Scripts/Skills/skill923.cs index 67f8f4533f..307f7922c5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill923.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill923.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "一闪"; nativename = "一闪"; - icon = "一闪.dds"; + icon = "一闪"; max_level = 1; type = 1; apcost = 100; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "一闪.sgc"; + effect = "一闪"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill924.cs b/Assets/PerfectWorld/Scripts/Skills/skill924.cs index 76e91422ee..d08e57f264 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill924.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill924.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "金刚气"; nativename = "金刚气"; - icon = "金刚气.dds"; + icon = "金刚气"; max_level = 1; type = 2; apcost = 0; @@ -104,7 +104,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1风卷残云.sgc"; + effect = "1风卷残云"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill925.cs b/Assets/PerfectWorld/Scripts/Skills/skill925.cs index d520526d59..278e8c30a6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill925.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill925.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "气贯长虹"; nativename = "气贯长虹"; - icon = "气贯长虹.dds"; + icon = "气贯长虹"; max_level = 1; type = 2; apcost = 100; @@ -103,7 +103,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "气惯长虹.sgc"; + effect = "气惯长虹"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill926.cs b/Assets/PerfectWorld/Scripts/Skills/skill926.cs index 578ee9d726..3ceace73c9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill926.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill926.cs @@ -85,7 +85,7 @@ namespace BrewMonster cls = 1; name = "灵气震爆"; nativename = "灵气震爆"; - icon = "灵气震爆.dds"; + icon = "灵气震爆"; max_level = 1; type = 1; apcost = 100; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "元素虚空.sgc"; + effect = "元素虚空"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill93.cs b/Assets/PerfectWorld/Scripts/Skills/skill93.cs index 4bff32e88d..e2cc569929 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill93.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill93.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "玄冰水龙"; nativename = "玄冰水龙"; - icon = "玄冰水龙.dds"; + icon = "玄冰水龙"; max_level = 10; type = 1; apcost = 200; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "玄冰水龙.sgc"; + effect = "玄冰水龙"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill94.cs b/Assets/PerfectWorld/Scripts/Skills/skill94.cs index 600cc9fc88..13b3901b39 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill94.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill94.cs @@ -96,7 +96,7 @@ namespace BrewMonster cls = 1; name = "*"; nativename = "*"; - icon = "冰雹.dds"; + icon = "冰雹"; max_level = 10; type = 1; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill95.cs b/Assets/PerfectWorld/Scripts/Skills/skill95.cs index 7588a99437..1dc62e966d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill95.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill95.cs @@ -79,7 +79,7 @@ namespace BrewMonster cls = 1; name = "＊"; nativename = "＊"; - icon = "水煞.dds"; + icon = "水煞"; max_level = 10; type = 1; apcost = 0; @@ -100,7 +100,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "水煞.sgc"; + effect = "水煞"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill96.cs b/Assets/PerfectWorld/Scripts/Skills/skill96.cs index a5f17ef7a5..eba98bacbb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill96.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill96.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "烈焰护甲"; nativename = "烈焰护甲"; - icon = "烈焰护甲.dds"; + icon = "烈焰护甲"; max_level = 10; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill97.cs b/Assets/PerfectWorld/Scripts/Skills/skill97.cs index 6ef11481f5..7776225dd8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill97.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill97.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "落石术"; nativename = "落石术"; - icon = "落石术.dds"; + icon = "落石术"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "落石术.sgc"; + effect = "落石术"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill98.cs b/Assets/PerfectWorld/Scripts/Skills/skill98.cs index a3f61511f2..1bf2bb1aef 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill98.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill98.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "飞沙术"; nativename = "飞沙术"; - icon = "飞沙术.dds"; + icon = "飞沙术"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "飞沙术.sgc"; + effect = "飞沙术"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill99.cs b/Assets/PerfectWorld/Scripts/Skills/skill99.cs index db67b6e087..7e7782c494 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill99.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill99.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "泰山压顶"; nativename = "泰山压顶"; - icon = "泰山压顶.dds"; + icon = "泰山压顶"; max_level = 10; type = 1; apcost = 200; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "泰山压顶.sgc"; + effect = "泰山压顶"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs index 7ecbf9ea50..408003d63d 100644 --- a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs +++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs @@ -14,10 +14,11 @@ namespace BrewMonster.UI { [Header("Templates")] [SerializeField] private AUISubDialog m_pSubRank; - [SerializeField] private AUISubDialog m_pSubSkill; + [SerializeField] private CDlgSkillSubListItem m_pSubSkill; [Header("Layout")] [SerializeField] private RectTransform m_contentRoot; + [SerializeField] private RectTransform m_contentRootSkill; [SerializeField] private ScrollRect m_scrollRect; [SerializeField] private float m_windowScale = 1f; @@ -25,8 +26,8 @@ namespace BrewMonster.UI [SerializeField] private bool m_isEvil; private readonly Dictionary m_rankSubDialogs = new(); - private readonly List m_skillSubDialogs = new(); - private readonly Dictionary m_skillSubDialogsMap = new(); + private readonly List m_skillSubDialogs = new(); + private readonly Dictionary m_skillSubDialogsMap = new(); private int m_skillSubCount; // 当前显示的技能数量 / Current shown skill count private float m_curBottom; // 当前底部位置 / Current bottom position @@ -77,10 +78,6 @@ namespace BrewMonster.UI m_originBottom = m_pSubRank.GetPos().y; } - if (m_pSubSkill != null) - { - m_skillHeight = m_pSubSkill.GetSize().y; - } if (m_contentRoot != null) { @@ -115,7 +112,6 @@ namespace BrewMonster.UI taoistRank != CECTaoistRank.GetBaseRankEnd(); taoistRank = taoistRank.GetNext()) { - BMLogger.LogError("CDlgSkillSubList::InitRankDlgs: Creating GetBaseRankBegin rank " + taoistRank.GetID()); CreateOneRankDlg(taoistRank); } @@ -123,7 +119,6 @@ namespace BrewMonster.UI taoistRank != CECTaoistRank.GetGodRankEnd(); taoistRank = taoistRank.GetNext()) { - BMLogger.LogError("CDlgSkillSubList::InitRankDlgs: Creating GetGodRankBegin rank " + taoistRank.GetID()); CreateOneRankDlg(taoistRank); } @@ -131,7 +126,6 @@ namespace BrewMonster.UI taoistRank != CECTaoistRank.GetEvilRankEnd(); taoistRank = taoistRank.GetNext()) { - BMLogger.LogError("CDlgSkillSubList::InitRankDlgs: Creating GetEvilRankBegin rank " + taoistRank.GetID()); CreateOneRankDlg(taoistRank); } } @@ -170,7 +164,6 @@ namespace BrewMonster.UI taoistRank = taoistRank.GetNext()) { BMLogger.LogError("CDlgSkillSubList::ResetDialog: Adding GetBaseRankBegin rank " + taoistRank.GetID()); - AddDlgsOfOneRank(taoistRank); } @@ -216,9 +209,14 @@ namespace BrewMonster.UI return; } - CDlgSkillSubListItem subListItem = (CDlgSkillSubListItem)pSub.GetSubDialog(); - subListItem?.UpdateSkill(skillID); - + CDlgSkillSubListItem subListItem = pSub; + if(subListItem == null ) + { + BMLogger.LogError("HoangDev: UpdateOneSubDlg subListItem is null for skillID " + skillID); + return; + } + subListItem.UpdateSkill(skillID); + subListItem.Show(true); if (GetSelectedSkillID() == skillID) { // 选中时可在此扩展树状展示 / Hook skill tree here if needed @@ -228,22 +226,21 @@ namespace BrewMonster.UI // ����һ�����漶��Ի��� / Show a rank sub dialog private void AddRankSubDig(int rankID) { - BMLogger.LogError("HoangDev: AddRankSubDig"); if (!m_rankSubDialogs.TryGetValue(rankID, out var pSub)) { return; } pSub.Show(true); + pSub.SetLabel(CECTaoistRank.GetTaoistRank(rankID).GetName()); //pSub.SetPos(0f, m_curBottom); //m_curBottom += m_rankHeight * m_windowScale; - BMLogger.LogError("HoangDev: AddRankSubDig Done: " + CECTaoistRank.GetTaoistRank(rankID).GetName()); pSub.SetLabel(CECTaoistRank.GetTaoistRank(rankID).GetName()); } // ����һ�����ܶԻ��򣬵��øú����������UpdateOneSubDlg / Add a skill sub dialog then update it - private void AddSkillSubDlg(int skillID) + private void AddSkillSubDlg(int skillID, int rankID) { if (m_pSubSkill == null || m_contentRoot == null) { @@ -252,23 +249,12 @@ namespace BrewMonster.UI if (m_skillSubCount >= m_skillSubDialogs.Count) { - AUISubDialog pSubSkill = Instantiate(m_pSubSkill, m_contentRoot); - //CDlgSkillSubListItem pDlg = Instantiate(cDlgSkillSubListItem, cDlgSkillSubListItemRoot); - string dlgName = $"{m_pSubSkill.GetName()}{m_skillSubDialogs.Count}"; - pSubSkill.SetName(dlgName); - //pSubSkill.SetDialog(pDlg); - + CDlgSkillSubListItem pSubSkill = Instantiate(m_pSubSkill, m_rankSubDialogs[rankID].transform); m_skillSubDialogs.Add(pSubSkill); } - AUISubDialog curSubSkill = m_skillSubDialogs[m_skillSubCount]; - CDlgSkillSubListItem item = curSubSkill.GetComponent(); - item?.SetHighlight(false); - - curSubSkill.SetPos(0f, m_curBottom); - curSubSkill.Show(true); - curSubSkill.SetData(Mathf.RoundToInt(m_curBottom)); - m_curBottom += m_skillHeight * m_windowScale; + CDlgSkillSubListItem curSubSkill = m_skillSubDialogs[m_skillSubCount]; + curSubSkill?.SetHighlight(false); m_skillSubDialogsMap[skillID] = curSubSkill; m_skillSubCount++; @@ -311,6 +297,7 @@ namespace BrewMonster.UI { if (ElementSkill.IsOverridden((uint)skillID)) { + BMLogger.LogError("HoangDev: AddDlgsOfOneRank ElementSkill.IsOverridden for skillID " + skillID); continue; } /* bool bOnlyShowSkillCanLearn = GetGameUIMan()->m_pDlgSkillAction->IsOnlyShowSkillCanLearn(); @@ -336,9 +323,10 @@ namespace BrewMonster.UI } AddRankSubDig(rankID); + rankSkills.Sort(); foreach (int skillID in rankSkills) { - AddSkillSubDlg(skillID); + AddSkillSubDlg(skillID , rankID); } } @@ -361,20 +349,6 @@ namespace BrewMonster.UI { return; } - - float subTop = sub.GetPos().y; - float subBottom = subTop + sub.GetSize().y; - float expandedHeight = m_curBottom; - float viewportHeight = m_scrollRect.viewport != null ? m_scrollRect.viewport.rect.height : expandedHeight; - - if (viewportHeight >= expandedHeight || expandedHeight <= 0f) - { - return; - } - - float mid = (subTop + subBottom) * 0.5f; - float target = Mathf.Clamp01(mid / expandedHeight); - m_scrollRect.verticalNormalizedPosition = 1f - target; } // ׼�����Ľ��� / Prepare for layout change diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUISubDialog.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUISubDialog.cs index 71b7311adc..d5270a87e6 100644 --- a/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUISubDialog.cs +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUISubDialog.cs @@ -9,7 +9,6 @@ namespace BrewMonster { [SerializeField] private CDlgSkillSubListItem m_subDialog; [SerializeField] private RectTransform m_rectTransform; - [SerializeField] private TextMeshProUGUI levelName; [SerializeField] private TextMeshProUGUI label; private int m_data; diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/CDlgSkillSubListItem.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/CDlgSkillSubListItem.cs index 5f48b40c8b..2d0d19dd24 100644 --- a/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/CDlgSkillSubListItem.cs +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/CDlgSkillSubListItem.cs @@ -1,25 +1,50 @@ using BrewMonster.Scripts.Skills; +using System; using TMPro; using UnityEngine; +using UnityEngine.Splines; using UnityEngine.UI; +using static TMPro.SpriteAssetUtilities.TexturePacker_JsonArray; namespace BrewMonster { [DisallowMultipleComponent] public class CDlgSkillSubListItem : MonoBehaviour { - [SerializeField] private TextMeshProUGUI m_nameText; + [SerializeField] private TextMeshProUGUI m_skillNameLbl; + [SerializeField] private Image skillIcon; [SerializeField] private GameObject m_highlight; private int m_skillID; public void UpdateSkill(int skillID) { - m_skillID = skillID; - if (m_nameText != null) + CECHostSkillModel model = CECHostSkillModel.Instance; + var spriteName = model.GetSkillIcon(skillID); + var sprites = Resources.LoadAll("iconlist_skill_multisprite"); + if (sprites == null || sprites.Length == 0) + return; + + for (int i = 0; i < sprites.Length; i++) { - m_nameText.text = CECHostSkillModel.Instance?.GetSkillName(skillID) ?? $"Skill {skillID}"; + if (sprites[i].name == spriteName) + { + skillIcon.sprite = sprites[i]; + break; + } } + + m_skillID = skillID; + string skillName = model.GetSkillName(m_skillID); + /* if (model.IsPassiveSkill(m_skillID)) + { + skillName += ACString(GetStringFromTable(11322)); + }*/ + if (m_skillNameLbl == null) + { + BMLogger.LogError("HoangDev: CDlgSkillSubListItem m_skillNameLbl is null for skillID " + skillID); + } + m_skillNameLbl.text = skillName; } public void SetHighlight(bool bHighlight) @@ -29,7 +54,10 @@ namespace BrewMonster m_highlight.SetActive(bHighlight); } } - + public void Show(bool active) + { + gameObject.SetActive(active); + } public void EnableUpgrade(bool bEnable) { Button btn = GetComponentInChildren