diff --git a/documentation/DocumentationTest.CloseDefenceDocumentation.approved.md b/documentation/DocumentationTest.CloseDefenceDocumentation.approved.md index 7de66e3..c46a99c 100644 --- a/documentation/DocumentationTest.CloseDefenceDocumentation.approved.md +++ b/documentation/DocumentationTest.CloseDefenceDocumentation.approved.md @@ -100,7 +100,7 @@ - Level 98 - Close Defence: 53 - Level 99 - Close Defence: 54 -## Class Swordman +## Class Swordsman - Level 1 - Close Defence: 5 - Level 2 - Close Defence: 5 - Level 3 - Close Defence: 6 @@ -302,7 +302,7 @@ - Level 98 - Close Defence: 68 - Level 99 - Close Defence: 68 -## Class Magician +## Class Mage - Level 1 - Close Defence: 5 - Level 2 - Close Defence: 5 - Level 3 - Close Defence: 6 diff --git a/documentation/DocumentationTest.DamageDocumentation.approved.md b/documentation/DocumentationTest.DamageDocumentation.approved.md index ca1f9c5..1ec9eaa 100644 --- a/documentation/DocumentationTest.DamageDocumentation.approved.md +++ b/documentation/DocumentationTest.DamageDocumentation.approved.md @@ -100,7 +100,7 @@ - Level 98 - Damage Min: 107 Damage Max: 107 - Level 99 - Damage Min: 108 Damage Max: 108 -## Class Swordman +## Class Swordsman - Level 1 - Damage Min: 10 Damage Max: 10 - Level 2 - Damage Min: 11 Damage Max: 11 - Level 3 - Damage Min: 13 Damage Max: 13 @@ -302,7 +302,7 @@ - Level 98 - Damage Min: 215 Damage Max: 215 - Level 99 - Damage Min: 216 Damage Max: 216 -## Class Magician +## Class Mage - Level 1 - Damage Min: 10 Damage Max: 10 - Level 2 - Damage Min: 11 Damage Max: 11 - Level 3 - Damage Min: 13 Damage Max: 13 diff --git a/documentation/DocumentationTest.DistanceDefenceDocumentation.approved.md b/documentation/DocumentationTest.DistanceDefenceDocumentation.approved.md index 4c8a905..02da55b 100644 --- a/documentation/DocumentationTest.DistanceDefenceDocumentation.approved.md +++ b/documentation/DocumentationTest.DistanceDefenceDocumentation.approved.md @@ -100,7 +100,7 @@ - Level 98 - Distance Defence: 53 - Level 99 - Distance Defence: 54 -## Class Swordman +## Class Swordsman - Level 1 - Distance Defence: 5 - Level 2 - Distance Defence: 5 - Level 3 - Distance Defence: 6 @@ -302,7 +302,7 @@ - Level 98 - Distance Defence: 82 - Level 99 - Distance Defence: 83 -## Class Magician +## Class Mage - Level 1 - Distance Defence: 25 - Level 2 - Distance Defence: 25 - Level 3 - Distance Defence: 26 diff --git a/documentation/DocumentationTest.DistanceDodgeDocumentation.approved.md b/documentation/DocumentationTest.DistanceDodgeDocumentation.approved.md index e6e9253..35ef671 100644 --- a/documentation/DocumentationTest.DistanceDodgeDocumentation.approved.md +++ b/documentation/DocumentationTest.DistanceDodgeDocumentation.approved.md @@ -100,7 +100,7 @@ - Level 98 - Distance Dodge: 107 - Level 99 - Distance Dodge: 108 -## Class Swordman +## Class Swordsman - Level 1 - Distance Dodge: 10 - Level 2 - Distance Dodge: 11 - Level 3 - Distance Dodge: 12 @@ -302,7 +302,7 @@ - Level 98 - Distance Dodge: 175 - Level 99 - Distance Dodge: 176 -## Class Magician +## Class Mage - Level 1 - Distance Dodge: 10 - Level 2 - Distance Dodge: 11 - Level 3 - Distance Dodge: 12 diff --git a/documentation/DocumentationTest.HitDodgeDocumentation.approved.md b/documentation/DocumentationTest.HitDodgeDocumentation.approved.md index ff10277..c80da41 100644 --- a/documentation/DocumentationTest.HitDodgeDocumentation.approved.md +++ b/documentation/DocumentationTest.HitDodgeDocumentation.approved.md @@ -100,7 +100,7 @@ - Level 98 - Hit Dodge: 107 - Level 99 - Hit Dodge: 108 -## Class Swordman +## Class Swordsman - Level 1 - Hit Dodge: 10 - Level 2 - Hit Dodge: 11 - Level 3 - Hit Dodge: 12 @@ -302,7 +302,7 @@ - Level 98 - Hit Dodge: 175 - Level 99 - Hit Dodge: 176 -## Class Magician +## Class Mage - Level 1 - Hit Dodge: 20 - Level 2 - Hit Dodge: 21 - Level 3 - Hit Dodge: 22 diff --git a/documentation/DocumentationTest.HitRateDocumentation.approved.md b/documentation/DocumentationTest.HitRateDocumentation.approved.md index a546b0b..fcae5a3 100644 --- a/documentation/DocumentationTest.HitRateDocumentation.approved.md +++ b/documentation/DocumentationTest.HitRateDocumentation.approved.md @@ -100,7 +100,7 @@ - Level 98 - HitRate: 107 - Level 99 - HitRate: 108 -## Class Swordman +## Class Swordsman - Level 1 - HitRate: 25 - Level 2 - HitRate: 26 - Level 3 - HitRate: 27 @@ -302,7 +302,7 @@ - Level 98 - HitRate: 343 - Level 99 - HitRate: 347 -## Class Magician +## Class Mage - Level 1 - HitRate: 0 - Level 2 - HitRate: 0 - Level 3 - HitRate: 0 diff --git a/documentation/DocumentationTest.HpDocumentation.approved.md b/documentation/DocumentationTest.HpDocumentation.approved.md index e468463..7a849d2 100644 --- a/documentation/DocumentationTest.HpDocumentation.approved.md +++ b/documentation/DocumentationTest.HpDocumentation.approved.md @@ -100,7 +100,7 @@ - Level 98 - HP: 6526 - Level 99 - HP: 6640 -## Class Swordman +## Class Swordsman - Level 1 - HP: 221 - Level 2 - HP: 238 - Level 3 - HP: 275 @@ -302,7 +302,7 @@ - Level 98 - HP: 10238 - Level 99 - HP: 10381 -## Class Magician +## Class Mage - Level 1 - HP: 221 - Level 2 - HP: 238 - Level 3 - HP: 256 diff --git a/documentation/DocumentationTest.JobExperienceDocumentation.approved.md b/documentation/DocumentationTest.JobExperienceDocumentation.approved.md index 926aa5f..3175d41 100644 --- a/documentation/DocumentationTest.JobExperienceDocumentation.approved.md +++ b/documentation/DocumentationTest.JobExperienceDocumentation.approved.md @@ -21,7 +21,7 @@ - Level 19 - XP: 14800 - Level 20 - XP: 15500 -## Class Swordman +## Class Swordsman - Level 1 - XP: 14500 - Level 2 - XP: 19000 - Level 3 - XP: 23500 @@ -185,7 +185,7 @@ - Level 79 - XP: 775000 - Level 80 - XP: 790000 -## Class Magician +## Class Mage - Level 1 - XP: 14500 - Level 2 - XP: 19000 - Level 3 - XP: 23500 diff --git a/documentation/DocumentationTest.MagicDefenceDocumentation.approved.md b/documentation/DocumentationTest.MagicDefenceDocumentation.approved.md index 4c13913..a7fb4eb 100644 --- a/documentation/DocumentationTest.MagicDefenceDocumentation.approved.md +++ b/documentation/DocumentationTest.MagicDefenceDocumentation.approved.md @@ -100,7 +100,7 @@ - Level 98 - Magic Defence: 53 - Level 99 - Magic Defence: 54 -## Class Swordman +## Class Swordsman - Level 1 - Magic Defence: 5 - Level 2 - Magic Defence: 5 - Level 3 - Magic Defence: 6 @@ -302,7 +302,7 @@ - Level 98 - Magic Defence: 58 - Level 99 - Magic Defence: 58 -## Class Magician +## Class Mage - Level 1 - Magic Defence: 5 - Level 2 - Magic Defence: 5 - Level 3 - Magic Defence: 6 diff --git a/documentation/DocumentationTest.MpDocumentation.approved.md b/documentation/DocumentationTest.MpDocumentation.approved.md index d039d84..49011c0 100644 --- a/documentation/DocumentationTest.MpDocumentation.approved.md +++ b/documentation/DocumentationTest.MpDocumentation.approved.md @@ -100,7 +100,7 @@ - Level 98 - MP: 3213 - Level 99 - MP: 3270 -## Class Swordman +## Class Swordsman - Level 1 - MP: 60 - Level 2 - MP: 69 - Level 3 - MP: 78 @@ -302,7 +302,7 @@ - Level 98 - MP: 3744 - Level 99 - MP: 3805 -## Class Magician +## Class Mage - Level 1 - MP: 60 - Level 2 - MP: 69 - Level 3 - MP: 87 diff --git a/documentation/DocumentationTest.SecondaryDamageDocumentation.approved.md b/documentation/DocumentationTest.SecondaryDamageDocumentation.approved.md index fa77814..46a53be 100644 --- a/documentation/DocumentationTest.SecondaryDamageDocumentation.approved.md +++ b/documentation/DocumentationTest.SecondaryDamageDocumentation.approved.md @@ -100,7 +100,7 @@ - Level 98 - Secondary Damage Min: 107 Secondary Damage Max: 107 - Level 99 - Secondary Damage Min: 108 Secondary Damage Max: 108 -## Class Swordman +## Class Swordsman - Level 1 - Secondary Damage Min: 10 Secondary Damage Max: 10 - Level 2 - Secondary Damage Min: 11 Secondary Damage Max: 11 - Level 3 - Secondary Damage Min: 12 Secondary Damage Max: 12 @@ -302,7 +302,7 @@ - Level 98 - Secondary Damage Min: 136 Secondary Damage Max: 136 - Level 99 - Secondary Damage Min: 137 Secondary Damage Max: 137 -## Class Magician +## Class Mage - Level 1 - Secondary Damage Min: 10 Secondary Damage Max: 10 - Level 2 - Secondary Damage Min: 11 Secondary Damage Max: 11 - Level 3 - Secondary Damage Min: 12 Secondary Damage Max: 12 diff --git a/documentation/DocumentationTest.SecondaryHitRateDocumentation.approved.md b/documentation/DocumentationTest.SecondaryHitRateDocumentation.approved.md index 2d2c4f5..2ae3920 100644 --- a/documentation/DocumentationTest.SecondaryHitRateDocumentation.approved.md +++ b/documentation/DocumentationTest.SecondaryHitRateDocumentation.approved.md @@ -100,7 +100,7 @@ - Level 98 - HitRate: 214 - Level 99 - HitRate: 216 -## Class Swordman +## Class Swordsman - Level 1 - HitRate: 20 - Level 2 - HitRate: 22 - Level 3 - HitRate: 24 @@ -302,7 +302,7 @@ - Level 98 - HitRate: 180 - Level 99 - HitRate: 181 -## Class Magician +## Class Mage - Level 1 - HitRate: 20 - Level 2 - HitRate: 22 - Level 3 - HitRate: 24 diff --git a/documentation/DocumentationTest.SpeedDocumentation.approved.md b/documentation/DocumentationTest.SpeedDocumentation.approved.md index f3e4822..7e07edc 100644 --- a/documentation/DocumentationTest.SpeedDocumentation.approved.md +++ b/documentation/DocumentationTest.SpeedDocumentation.approved.md @@ -1,6 +1,6 @@ # Speed Table - Adventurer : 11 -- Swordman : 11 +- Swordsman : 11 - Archer : 12 -- Magician : 10 +- Mage : 10 - MartialArtist : 11 diff --git a/src/NosCore.Algorithm/CloseDefenceService/CloseDefenceService.cs b/src/NosCore.Algorithm/CloseDefenceService/CloseDefenceService.cs index 1c2ed83..aa18e9f 100644 --- a/src/NosCore.Algorithm/CloseDefenceService/CloseDefenceService.cs +++ b/src/NosCore.Algorithm/CloseDefenceService/CloseDefenceService.cs @@ -22,7 +22,7 @@ public CloseDefenceService() _closeDefence[(byte)CharacterClassType.Adventurer, i] = adventurerDefence; swordmanDefence += (i % 2 == 0 || (i - 3) % 10 == 0 || (i - 5) % 10 == 0 || (i - 7) % 10 == 0 || (i - 9) % 10 == 0 || (i - 10) % 10 == 0) ? 1 : 0; - _closeDefence[(byte)CharacterClassType.Swordman, i] = swordmanDefence; + _closeDefence[(byte)CharacterClassType.Swordsman, i] = swordmanDefence; bool plus = i > 10 && i < 20 || i > 30 && i < 40 || i > 50 && i < 60 || i > 70 && i < 80 || i > 90 && i < 99; @@ -30,7 +30,7 @@ public CloseDefenceService() _closeDefence[(byte)CharacterClassType.Archer, i] = archerDefence; mageDefence += i % 2 == 0 ? 1 : 0; - _closeDefence[(byte)CharacterClassType.Magician, i] = mageDefence; + _closeDefence[(byte)CharacterClassType.Mage, i] = mageDefence; fighterDefence += ((i - 2) % 10 == 0 || (i - 3) % 20 == 0 || (i - 4) % 10 == 0 || (i - 6) % 10 == 0 || (i - 7) % 20 == 0 || (i - 8) % 10 == 0 || (i - 10) % 10 == 0 || i > 10 && (i - 11) % 20 == 0 || i > 10 && (i - 15) % 20 == 0 || i > 10 && (i - 19) % 20 == 0) ? 1 : 0; _closeDefence[(byte)CharacterClassType.MartialArtist, i] = fighterDefence; diff --git a/src/NosCore.Algorithm/DamageService/DamageService.cs b/src/NosCore.Algorithm/DamageService/DamageService.cs index 3c089a0..fa5bb18 100644 --- a/src/NosCore.Algorithm/DamageService/DamageService.cs +++ b/src/NosCore.Algorithm/DamageService/DamageService.cs @@ -19,9 +19,9 @@ public class DamageService : IDamageService public DamageService() { _minDamage[(byte)CharacterClassType.Adventurer, 0] = 10; - _minDamage[(byte)CharacterClassType.Swordman, 0] = 10; + _minDamage[(byte)CharacterClassType.Swordsman, 0] = 10; _minDamage[(byte)CharacterClassType.Archer, 0] = 60; - _minDamage[(byte)CharacterClassType.Magician, 0] = 10; + _minDamage[(byte)CharacterClassType.Mage, 0] = 10; _minDamage[(byte)CharacterClassType.MartialArtist, 0] = 10; var swordmanMinUp = 2; @@ -40,7 +40,7 @@ public DamageService() swordmanMinUp--; } - _minDamage[(byte)CharacterClassType.Swordman, i] = _minDamage[(byte)CharacterClassType.Swordman, i - 1] + swordmanMinUp; + _minDamage[(byte)CharacterClassType.Swordsman, i] = _minDamage[(byte)CharacterClassType.Swordsman, i - 1] + swordmanMinUp; int archerMinUp; if ((i - 1) % 10 == 0 || (i - 3) % 10 == 0 || (i - 5) % 10 == 0 || (i - 8) % 10 == 0) @@ -64,7 +64,7 @@ public DamageService() mageMinUp--; } - _minDamage[(byte)CharacterClassType.Magician, i] = _minDamage[(byte)CharacterClassType.Magician, i - 1] + mageMinUp; + _minDamage[(byte)CharacterClassType.Mage, i] = _minDamage[(byte)CharacterClassType.Mage, i - 1] + mageMinUp; if ((i - 2) % 10 == 0 || (i - 4) % 10 == 0 || (i - 6) % 10 == 0 || (i - 8) % 10 == 0 || (i - 10) % 10 == 0) diff --git a/src/NosCore.Algorithm/DistanceDefenceService/DistanceDefenceService.cs b/src/NosCore.Algorithm/DistanceDefenceService/DistanceDefenceService.cs index d6de17e..5ee12a1 100644 --- a/src/NosCore.Algorithm/DistanceDefenceService/DistanceDefenceService.cs +++ b/src/NosCore.Algorithm/DistanceDefenceService/DistanceDefenceService.cs @@ -22,13 +22,13 @@ public DistanceDefenceService() _distanceDefence[(byte)CharacterClassType.Adventurer, i] = adventurerDefence; swordmanDefence += i == 0 || (i - 2) % 10 == 0 || (i - 4) % 10 == 0 || (i - 5) % 5 == 0 || (i - 7) % 10 == 0 || (i - 9) % 10 == 0 ? 1 : 0; - _distanceDefence[(byte)CharacterClassType.Swordman, i] = swordmanDefence; + _distanceDefence[(byte)CharacterClassType.Swordsman, i] = swordmanDefence; archerDefence += i == 0 || (i - 2) % 10 == 0 || (i - 3) % 10 == 0 || (i - 4) % 10 == 0 || (i - 5) % 5 == 0 || (i - 7) % 10 == 0 || (i - 8) % 10 == 0 || (i - 9) % 10 == 0 ? 1 : 0; _distanceDefence[(byte)CharacterClassType.Archer, i] = archerDefence; mageDefence += i == 0 || (i - 2) % 10 == 0 || (i - 4) % 10 == 0 || (i - 5) % 5 == 0 || (i - 7) % 10 == 0 || (i - 9) % 10 == 0 ? 1 : 0; - _distanceDefence[(byte)CharacterClassType.Magician, i] = mageDefence; + _distanceDefence[(byte)CharacterClassType.Mage, i] = mageDefence; fighterDefence += i > 0 && ((i - 1) % 20 == 0 || (i - 3) % 20 == 0 || (i - 6) % 20 == 0 || (i - 9) % 20 == 0 || (i - 12) % 20 == 0 || (i - 15) % 20 == 0 || (i - 18) % 20 == 0) ? 0 : 1; _distanceDefence[(byte)CharacterClassType.MartialArtist, i] = fighterDefence; diff --git a/src/NosCore.Algorithm/DistanceDodgeService/DistanceDodgeService.cs b/src/NosCore.Algorithm/DistanceDodgeService/DistanceDodgeService.cs index f130326..0f97444 100644 --- a/src/NosCore.Algorithm/DistanceDodgeService/DistanceDodgeService.cs +++ b/src/NosCore.Algorithm/DistanceDodgeService/DistanceDodgeService.cs @@ -20,13 +20,13 @@ public DistanceDodgeService() _distanceDodge[(byte)CharacterClassType.Adventurer, i] = i + 10; swordmanDodge += (i - 5) % 5 == 0 ? 2 : 1; - _distanceDodge[(byte)CharacterClassType.Swordman, i] = swordmanDodge; + _distanceDodge[(byte)CharacterClassType.Swordsman, i] = swordmanDodge; archerDodge += ((i - 2) % 10 == 0 || (i - 4) % 10 == 0 || (i - 5) % 5 == 0 || (i - 7) % 10 == 0 || (i - 9) % 10 == 0 || (i - 10) % 10 == 0) ? 2 : 1; _distanceDodge[(byte)CharacterClassType.Archer, i] = archerDodge; mageDodge += (i - 5) % 5 == 0 ? 2 : 1; - _distanceDodge[(byte)CharacterClassType.Magician, i] = mageDodge; + _distanceDodge[(byte)CharacterClassType.Mage, i] = mageDodge; fighterDodge += ((i - 4) % 10 == 0 || (i - 7) % 10 == 0 || (i - 10) % 10 == 0) ? 2 : 1; _distanceDodge[(byte)CharacterClassType.MartialArtist, i] = fighterDodge; diff --git a/src/NosCore.Algorithm/DodgeService/HitDodgeService.cs b/src/NosCore.Algorithm/DodgeService/HitDodgeService.cs index d384ffd..0e29155 100644 --- a/src/NosCore.Algorithm/DodgeService/HitDodgeService.cs +++ b/src/NosCore.Algorithm/DodgeService/HitDodgeService.cs @@ -20,13 +20,13 @@ public HitDodgeService() _hitDodge[(byte)CharacterClassType.Adventurer, i] = i + 10; swordmanDodge += (i - 5) % 5 == 0 ? 2 : 1; - _hitDodge[(byte)CharacterClassType.Swordman, i] = swordmanDodge; + _hitDodge[(byte)CharacterClassType.Swordsman, i] = swordmanDodge; archerDodge += ((i - 2) % 10 == 0 || (i - 4) % 10 == 0 || (i - 5) % 5 == 0 || (i - 7) % 10 == 0 || (i - 9) % 10 == 0 || (i - 10) % 10 == 0) ? 2 : 1; _hitDodge[(byte)CharacterClassType.Archer, i] = archerDodge; mageDodge += (i - 5) % 5 == 0 ? 2 : 1; - _hitDodge[(byte)CharacterClassType.Magician, i] = mageDodge; + _hitDodge[(byte)CharacterClassType.Mage, i] = mageDodge; fighterDodge += ((i - 4) % 10 == 0 || (i - 7) % 10 == 0 || (i - 10) % 10 == 0) ? 2 : 1; _hitDodge[(byte)CharacterClassType.MartialArtist, i] = fighterDodge; diff --git a/src/NosCore.Algorithm/HitRateService/HitRateService.cs b/src/NosCore.Algorithm/HitRateService/HitRateService.cs index fb0c2b9..24c4992 100644 --- a/src/NosCore.Algorithm/HitRateService/HitRateService.cs +++ b/src/NosCore.Algorithm/HitRateService/HitRateService.cs @@ -24,12 +24,12 @@ public HitRateService() _hitRate[(byte)CharacterClassType.Adventurer, i] = i + 10; swordHitRate += (i - 5) % 5 == 0 ? 2 : 1; - _hitRate[(byte)CharacterClassType.Swordman, i] = swordHitRate; + _hitRate[(byte)CharacterClassType.Swordsman, i] = swordHitRate; archerHitRate += i != 96 && i % 2 == 0 || i > 0 && i % 5 == 0 ? 4 : 2; _hitRate[(byte)CharacterClassType.Archer, i] = archerHitRate; - _hitRate[(byte)CharacterClassType.Magician, i] = 0; + _hitRate[(byte)CharacterClassType.Mage, i] = 0; fighterHitRate += i == 0 || (i - 4) % 10 == 0 || i > 0 && (i - 7) % 10 == 0 || i > 0 && (i - 10) % 10 == 0 ? 2 : 1; _hitRate[(byte)CharacterClassType.MartialArtist, i] = fighterHitRate; diff --git a/src/NosCore.Algorithm/HpService/HpService.cs b/src/NosCore.Algorithm/HpService/HpService.cs index 74ea062..61c892a 100644 --- a/src/NosCore.Algorithm/HpService/HpService.cs +++ b/src/NosCore.Algorithm/HpService/HpService.cs @@ -47,7 +47,7 @@ public HpService() swordHp += swordInc; } - _hpData[(byte)CharacterClassType.Swordman, i] = swordHp; + _hpData[(byte)CharacterClassType.Swordsman, i] = swordHp; } var magecHp = 205; @@ -57,7 +57,7 @@ public HpService() mageInc++; magecHp += mageInc; - _hpData[(byte)CharacterClassType.Magician, i] = magecHp; + _hpData[(byte)CharacterClassType.Mage, i] = magecHp; } var archerHp = 190; diff --git a/src/NosCore.Algorithm/JobExperienceService/JobExperienceService.cs b/src/NosCore.Algorithm/JobExperienceService/JobExperienceService.cs index 12e565a..880cc8d 100644 --- a/src/NosCore.Algorithm/JobExperienceService/JobExperienceService.cs +++ b/src/NosCore.Algorithm/JobExperienceService/JobExperienceService.cs @@ -16,9 +16,9 @@ public JobExperienceService() { _jobXpData[(byte)CharacterClassType.Adventurer, 0] = 2200; _jobXpData[(byte)CharacterClassType.Archer, 0] = 14500; - _jobXpData[(byte)CharacterClassType.Magician, 0] = 14500; + _jobXpData[(byte)CharacterClassType.Mage, 0] = 14500; _jobXpData[(byte)CharacterClassType.MartialArtist, 0] = 14500; - _jobXpData[(byte)CharacterClassType.Swordman, 0] = 14500; + _jobXpData[(byte)CharacterClassType.Swordsman, 0] = 14500; for (var i = 1; i < Constants.MaxJobLevel; i++) { @@ -29,9 +29,9 @@ public JobExperienceService() _jobXpData[(byte)CharacterClassType.Archer, i] = _jobXpData[(byte)CharacterClassType.Archer, i - 1] + (i > 39 ? 15000 : 4500); - _jobXpData[(byte)CharacterClassType.Magician, i] = _jobXpData[(byte)CharacterClassType.Archer, i]; + _jobXpData[(byte)CharacterClassType.Mage, i] = _jobXpData[(byte)CharacterClassType.Archer, i]; _jobXpData[(byte)CharacterClassType.MartialArtist, i] = _jobXpData[(byte)CharacterClassType.Archer, i]; - _jobXpData[(byte)CharacterClassType.Swordman, i] = _jobXpData[(byte)CharacterClassType.Archer, i]; + _jobXpData[(byte)CharacterClassType.Swordsman, i] = _jobXpData[(byte)CharacterClassType.Archer, i]; } } public long GetJobExperience(CharacterClassType @class, byte level) diff --git a/src/NosCore.Algorithm/MagicDefenceService/MagicDefenceService.cs b/src/NosCore.Algorithm/MagicDefenceService/MagicDefenceService.cs index 6c368ce..67e4af0 100644 --- a/src/NosCore.Algorithm/MagicDefenceService/MagicDefenceService.cs +++ b/src/NosCore.Algorithm/MagicDefenceService/MagicDefenceService.cs @@ -23,14 +23,14 @@ public MagicDefenceService() _magicDefence[(byte)CharacterClassType.Adventurer, i] = adventurerDefence; swordmanDefence += (i % 2 == 0) ? 1 : 0; - _magicDefence[(byte)CharacterClassType.Swordman, i] = swordmanDefence; + _magicDefence[(byte)CharacterClassType.Swordsman, i] = swordmanDefence; bool plus = i > 10 && i < 20 || i > 30 && i < 40 || i > 50 && i < 60 || i > 70 && i < 80 || i > 90 && i < 99; archerDefence += plus ? ((i + 1) % 2 == 0 ? 1 : 0) : i % 2 == 0 ? 1 : 0; _magicDefence[(byte)CharacterClassType.Archer, i] = archerDefence; mageDefence += (i % 2 == 0 || (i - 3) % 10 == 0 || (i - 5) % 5 == 0 || (i - 7) % 10 == 0 || (i - 9) % 10 == 0) ? 1 : 0; - _magicDefence[(byte)CharacterClassType.Magician, i] = mageDefence; + _magicDefence[(byte)CharacterClassType.Mage, i] = mageDefence; fighterDefence += ((i - 2) % 10 == 0 || (i - 4) % 10 == 0 || (i - 5) % 5 == 0 || (i - 7) % 10 == 0 || (i - 9) % 10 == 0) ? 1 : 0; _magicDefence[(byte)CharacterClassType.MartialArtist, i] = fighterDefence; diff --git a/src/NosCore.Algorithm/MpService/MpService.cs b/src/NosCore.Algorithm/MpService/MpService.cs index d5c682c..3cece59 100644 --- a/src/NosCore.Algorithm/MpService/MpService.cs +++ b/src/NosCore.Algorithm/MpService/MpService.cs @@ -21,8 +21,8 @@ public MpService() var archerMpAdd = new[] { 9, 9, 9, 10, 11, 11, 11, 12, 13, 26 }; _mpData[(byte)CharacterClassType.Adventurer, 0] = 60; - _mpData[(byte)CharacterClassType.Swordman, 0] = 60; - _mpData[(byte)CharacterClassType.Magician, 0] = 60; + _mpData[(byte)CharacterClassType.Swordsman, 0] = 60; + _mpData[(byte)CharacterClassType.Mage, 0] = 60; _mpData[(byte)CharacterClassType.MartialArtist, 0] = 60; _mpData[(byte)CharacterClassType.Archer, 0] = 60; var countMagician = 9; @@ -35,7 +35,7 @@ public MpService() adventurerMpAdd += i % 4 == 0 ? 2 : 0; _mpData[(byte)CharacterClassType.Adventurer, i] = _mpData[(byte)CharacterClassType.Adventurer, i - 1] + (i % 4 == 0 ? adventurerMpAdd - 1 : adventurerMpAdd); - _mpData[(byte)CharacterClassType.Swordman, i] = _mpData[(byte)CharacterClassType.Adventurer, i]; + _mpData[(byte)CharacterClassType.Swordsman, i] = _mpData[(byte)CharacterClassType.Adventurer, i]; if (i - 1 > 9) { var switcher = !substractMagician ? 1 : -1; @@ -69,8 +69,8 @@ public MpService() martialArtistMpAdd[(i - 1) % 10] += (i - 1) % 5 == 4 ? 12 : 6; } - _mpData[(byte)CharacterClassType.Magician, i] = - _mpData[(byte)CharacterClassType.Magician, i - 1] + magicianMpAdd[(i - 1) % 10]; + _mpData[(byte)CharacterClassType.Mage, i] = + _mpData[(byte)CharacterClassType.Mage, i - 1] + magicianMpAdd[(i - 1) % 10]; _mpData[(byte)CharacterClassType.MartialArtist, i] = _mpData[(byte)CharacterClassType.MartialArtist, i - 1] + martialArtistMpAdd[(i - 1) % 10]; diff --git a/src/NosCore.Algorithm/NosCore.Algorithm.csproj b/src/NosCore.Algorithm/NosCore.Algorithm.csproj index 494223e..2c6a924 100644 --- a/src/NosCore.Algorithm/NosCore.Algorithm.csproj +++ b/src/NosCore.Algorithm/NosCore.Algorithm.csproj @@ -12,7 +12,7 @@ https://github.com/NosCoreIO/NosCore.Algorithm.git nostale, noscore, nostale private server source, nostale emulator - 0.4.1 + 0.5.0 false NosCore's Algorithm GPL-3.0-only @@ -26,7 +26,7 @@ - + diff --git a/src/NosCore.Algorithm/SecondaryDamageService/SecondaryDamageService.cs b/src/NosCore.Algorithm/SecondaryDamageService/SecondaryDamageService.cs index 31d9b92..238950d 100644 --- a/src/NosCore.Algorithm/SecondaryDamageService/SecondaryDamageService.cs +++ b/src/NosCore.Algorithm/SecondaryDamageService/SecondaryDamageService.cs @@ -26,13 +26,13 @@ public SecondaryDamageService() _secondaryMinDamage[(byte)CharacterClassType.Adventurer, i] = i + 10; swordmanMin += i == 0 || (i - 5) % 10 == 0 || i % 10 == 0 ? 2 : 1; - _secondaryMinDamage[(byte)CharacterClassType.Swordman, i] = swordmanMin; + _secondaryMinDamage[(byte)CharacterClassType.Swordsman, i] = swordmanMin; archerMin += i == 0 || (i - 4) % 10 == 0 || (i - 7) % 10 == 0 || i > 1 && (i - 1) % 10 == 0 ? 2 : 1; _secondaryMinDamage[(byte)CharacterClassType.Archer, i] = archerMin; mageMin += i == 0 || (i - 5) % 10 == 0 || i % 10 == 0 ? 2 : 1; - _secondaryMinDamage[(byte)CharacterClassType.Magician, i] = mageMin; + _secondaryMinDamage[(byte)CharacterClassType.Mage, i] = mageMin; fighterMin += i == 0 || (i - 4) % 10 == 0 || (i - 7) % 10 == 0 || i > 1 && (i - 1) % 10 == 0 ? 2 : 1; _secondaryMinDamage[(byte)CharacterClassType.MartialArtist, i] = fighterMin; diff --git a/src/NosCore.Algorithm/SecondaryHitRateService/SecondaryHitRateService.cs b/src/NosCore.Algorithm/SecondaryHitRateService/SecondaryHitRateService.cs index 091fa7a..bbde947 100644 --- a/src/NosCore.Algorithm/SecondaryHitRateService/SecondaryHitRateService.cs +++ b/src/NosCore.Algorithm/SecondaryHitRateService/SecondaryHitRateService.cs @@ -23,13 +23,13 @@ public SecondaryHitRateService() _secondaryHitRate[(byte)CharacterClassType.Adventurer, i] = adventurerHit; swordmanHit += (i - 5) % 5 == 0 ? 4 : 2; - _secondaryHitRate[(byte)CharacterClassType.Swordman, i] = swordmanHit; + _secondaryHitRate[(byte)CharacterClassType.Swordsman, i] = swordmanHit; archerHit += i != 0 && ((i - 1) % 10 == 0 || (i - 3) % 10 == 0 || (i - 5) % 10 == 0 || (i - 8) % 10 == 0) ? 1 : 2; _secondaryHitRate[(byte)CharacterClassType.Archer, i] = archerHit; mageHit += (i - 5) % 5 == 0 ? 4 : 2; - _secondaryHitRate[(byte)CharacterClassType.Magician, i] = mageHit; + _secondaryHitRate[(byte)CharacterClassType.Mage, i] = mageHit; fighterHit += (i - 4) % 4 == 0 || (i - 10) % 10 == 0 ? 4 : 2; _secondaryHitRate[(byte)CharacterClassType.MartialArtist, i] = fighterHit; diff --git a/src/NosCore.Algorithm/SpeedService/SpeedService.cs b/src/NosCore.Algorithm/SpeedService/SpeedService.cs index cdb207d..0eb626f 100644 --- a/src/NosCore.Algorithm/SpeedService/SpeedService.cs +++ b/src/NosCore.Algorithm/SpeedService/SpeedService.cs @@ -16,9 +16,9 @@ public class SpeedService : ISpeedService public SpeedService() { _data[CharacterClassType.Adventurer] = 11; - _data[CharacterClassType.Swordman] = 11; + _data[CharacterClassType.Swordsman] = 11; _data[CharacterClassType.Archer] = 12; - _data[CharacterClassType.Magician] = 10; + _data[CharacterClassType.Mage] = 10; _data[CharacterClassType.MartialArtist] = 11; }