summaryrefslogtreecommitdiff
path: root/npc/craft/options.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/craft/options.txt')
-rw-r--r--npc/craft/options.txt25
1 files changed, 14 insertions, 11 deletions
diff --git a/npc/craft/options.txt b/npc/craft/options.txt
index c56bd0312..8e6ace561 100644
--- a/npc/craft/options.txt
+++ b/npc/craft/options.txt
@@ -512,6 +512,7 @@ function script csys_BonusCalc {
if (.@base >= (.@avg+1)*7/10)
.@base=rand2(1, .@avg+1);
+ ////////////////////////////////////
// Legendary Weapon? Effects +50%
if (@csysArmor & CSYS_LEGENDARY)
.@base=max(1, .@base*3/2);
@@ -520,18 +521,9 @@ function script csys_BonusCalc {
if (@csysArmor & CSYS_SAVIOR)
.@base=max(1, .@base*6/5);
- // Attack for 2H?
- if (.@var == VAR_ATKPERCENT || .@var == VAR_MAGICATKPERCENT) {
- // Two Hands/Bows: x2
- if ((@csysArmor & CSYS_ZWEIHANDER) || (@csysArmor & CSYS_RANGED))
- .@base=max(1, .@base*2);
- // Brawling/Magical: +80%
- else if ((@csysArmor & CSYS_BRAWLING) || (@csysArmor & CSYS_MAGICAL))
- .@base=max(1, .@base*18/10);
- }
-
+ ////////////////////////////////////
// Normal Attack for 2H?
- if (.@var == VAR_ATTPOWER || .@var == VAR_ATTMPOWER) {
+ if (.@var == VAR_ATTPOWER || .@var == VAR_ATKPERCENT) {
// Two Hands/Bows: +50%
if ((@csysArmor & CSYS_ZWEIHANDER) || (@csysArmor & CSYS_RANGED))
.@base=max(1, .@base*3/2);
@@ -540,6 +532,17 @@ function script csys_BonusCalc {
.@base=max(1, .@base*7/5);
}
+ // Similar rule but for MATK and Wands
+ if (.@var == VAR_MAGICATKPERCENT || .@var == VAR_ATTMPOWER) {
+ // Magical: +50%
+ if (@csysArmor & CSYS_MAGICAL)
+ .@base=max(1, .@base*3/2);
+ // Brawling: +40%
+ else if (@csysArmor & CSYS_BRAWLING)
+ .@base=max(1, .@base*7/5);
+ }
+
+ ////////////////////////////////////
// Armor? Cap it to 25%
if (@csysArmor & CSYS_ARMOR)
.@base=max(1, .@base/4);