summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--db/const.txt2
-rw-r--r--db/pre-re/item_db.conf207
-rw-r--r--db/re/item_db.conf248
-rw-r--r--db/sc_config.txt4
-rw-r--r--src/map/status.c67
-rw-r--r--src/map/status.h4
6 files changed, 279 insertions, 253 deletions
diff --git a/db/const.txt b/db/const.txt
index 2d61a01d6..ec2d6280c 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1339,6 +1339,8 @@ SC_2011RWC 628
SC_STR_SCROLL 629
SC_INT_SCROLL 630
SC_STEAMPACK 631
+SC_MOVHASTE_POTION 632
+SC_MOVESLOW_POTION 633
e_gasp 0
e_what 1
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index e17b1d952..84a4d98d2 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -1642,7 +1642,7 @@ item_db: (
Buy: 800
Weight: 100
BuyingStore: true
- Script: <" sc_start SC_ATTHASTE_POTION1,1800000,0; ">
+ Script: <" sc_start SC_ATTHASTE_POTION1, 1800000, 0; ">
},
{
Id: 656
@@ -1654,7 +1654,7 @@ item_db: (
Job: 0xFFF7FEEF
EquipLv: 40
BuyingStore: true
- Script: <" sc_start SC_ATTHASTE_POTION2,1800000,0; ">
+ Script: <" sc_start SC_ATTHASTE_POTION2, 1800000, 0; ">
},
{
Id: 657
@@ -1666,7 +1666,7 @@ item_db: (
Job: 0x01E646A6
EquipLv: 85
BuyingStore: true
- Script: <" sc_start SC_ATTHASTE_POTION3,1800000,0; ">
+ Script: <" sc_start SC_ATTHASTE_POTION3, 1800000, 0; ">
},
{
Id: 658
@@ -1725,7 +1725,7 @@ item_db: (
Buy: 1450
Weight: 30
BuyingStore: true
- Script: <" sc_start SC_MOVHASTE_HORSE,180000,0; ">
+ Script: <" sc_start SC_MOVHASTE_HORSE, 180000, 25; ">
},
{
Id: 663
@@ -1935,7 +1935,7 @@ item_db: (
Buy: 0
Weight: 100
BuyingStore: true
- Script: <" sc_start SC_PLUSATTACKPOWER,60000,30; ">
+ Script: <" sc_start SC_PLUSATTACKPOWER, 60000, 30; ">
},
{
Id: 683
@@ -1945,7 +1945,7 @@ item_db: (
Buy: 0
Weight: 50
BuyingStore: true
- Script: <" sc_start SC_PLUSMAGICPOWER,60000,30; ">
+ Script: <" sc_start SC_PLUSMAGICPOWER, 60000, 30; ">
},
{
Id: 684
@@ -1956,8 +1956,8 @@ item_db: (
Weight: 300
BuyingStore: true
Script: <"
- sc_start SC_PLUSATTACKPOWER,60000,10;
- sc_start SC_PLUSMAGICPOWER,60000,10;
+ sc_start SC_PLUSATTACKPOWER, 60000, 10;
+ sc_start SC_PLUSMAGICPOWER, 60000, 10;
">
},
{
@@ -61722,7 +61722,7 @@ item_db: (
Buy: 2
Weight: 100
BuyingStore: true
- Script: <" sc_start SC_MOVHASTE_INFINITY, 5000, 100; ">
+ Script: <" sc_start SC_MOVHASTE_POTION, 5000, 100; ">
},
{
Id: 12017
@@ -61732,7 +61732,7 @@ item_db: (
Buy: 2
Weight: 100
BuyingStore: true
- Script: <" sc_start SC_SLOWDOWN, 5000, 100; ">
+ Script: <" sc_start SC_MOVESLOW_POTION, 5000, 100; ">
},
{
Id: 12018
@@ -61844,7 +61844,7 @@ item_db: (
Nouse: {
sitting: true
}
- Script: <" sc_start SC_MOVHASTE_HORSE,20000,0; ">
+ Script: <" sc_start SC_MOVHASTE_HORSE, 20000, 25; ">
},
{
Id: 12029
@@ -61870,7 +61870,7 @@ item_db: (
Nouse: {
sitting: true
}
- Script: <" sc_start SC_PLUSATTACKPOWER,60000,20; ">
+ Script: <" sc_start SC_PLUSATTACKPOWER, 60000, 20; ">
},
{
Id: 12031
@@ -61883,7 +61883,7 @@ item_db: (
Nouse: {
sitting: true
}
- Script: <" sc_start SC_PLUSMAGICPOWER,60000,20; ">
+ Script: <" sc_start SC_PLUSMAGICPOWER, 60000, 20; ">
},
{
Id: 12032
@@ -63096,6 +63096,7 @@ item_db: (
Type: 0
Buy: 2
Weight: 100
+ Script: <" sc_start SC_FOOD_LUK, 1800000, 15; ">
},
{
Id: 12132
@@ -63105,7 +63106,10 @@ item_db: (
Buy: 0
Weight: 200
BuyingStore: true
- Script: <" sc_start SC_XMAS,600000,0; ">
+ Script: <"
+ sc_start SC_XMAS, 600000, 0;
+ sc_start SC_MOVHASTE_HORSE, 600000, 25;
+ ">
},
{
Id: 12133
@@ -64482,12 +64486,12 @@ item_db: (
Buy: 20
Weight: 50
Script: <"
- sc_start SC_MOVHASTE_HORSE,5400000,0;
- percentheal 100,100;
- sc_start SC_FOOD_STR,5400000,10;
- sc_start SC_FOOD_DEX,5400000,5;
- sc_start SC_PLUSATTACKPOWER,5400000,22;
- sc_start SC_MATKFOOD,5400000,15;
+ sc_start SC_MOVHASTE_INFINITY, 5400000, 100;
+ percentheal 100, 100;
+ sc_start SC_FOOD_STR, 5400000, 10;
+ sc_start SC_FOOD_DEX, 5400000, 5;
+ sc_start SC_PLUSATTACKPOWER, 5400000, 22;
+ sc_start SC_PLUSMAGICPOWER, 5400000, 15;
">
},
{
@@ -64498,12 +64502,12 @@ item_db: (
Buy: 20
Weight: 50
Script: <"
- sc_start SC_MOVHASTE_HORSE,5400000,0;
- percentheal 100,100;
- sc_start SC_FOOD_INT,5400000,8;
- sc_start SC_FOOD_VIT,5400000,7;
- sc_start SC_FOOD_LUK,5400000,7;
- sc_start SC_PLUSATTACKPOWER,5400000,10;
+ sc_start SC_MOVHASTE_INFINITY, 5400000, 100;
+ percentheal 100, 100;
+ sc_start SC_FOOD_INT, 5400000, 8;
+ sc_start SC_FOOD_VIT, 5400000, 7;
+ sc_start SC_FOOD_LUK, 5400000, 7;
+ sc_start SC_PLUSATTACKPOWER, 5400000, 10;
">
},
{
@@ -64514,11 +64518,11 @@ item_db: (
Buy: 20
Weight: 50
Script: <"
- sc_start SC_MOVHASTE_HORSE,5400000,0;
- percentheal 100,100;
- sc_start SC_FOOD_AGI,5400000,15;
- sc_start SC_PLUSATTACKPOWER,5400000,52;
- sc_start SC_MATKFOOD,5400000,10;
+ sc_start SC_MOVHASTE_INFINITY, 5400000, 100;
+ percentheal 100, 100;
+ sc_start SC_FOOD_AGI, 5400000, 15;
+ sc_start SC_PLUSATTACKPOWER, 5400000, 52;
+ sc_start SC_PLUSMAGICPOWER, 5400000, 10;
">
},
{
@@ -64529,12 +64533,12 @@ item_db: (
Buy: 20
Weight: 50
Script: <"
- sc_start SC_MOVHASTE_HORSE,5400000,0;
- percentheal 100,100;
- sc_start SC_FOOD_STR,5400000,3;
- sc_start SC_FOOD_AGI,5400000,5;
- sc_start SC_FOOD_VIT,5400000,10;
- sc_start SC_MATKFOOD,5400000,52;
+ sc_start SC_MOVHASTE_INFINITY, 5400000, 100;
+ percentheal 100, 100;
+ sc_start SC_FOOD_STR, 5400000, 3;
+ sc_start SC_FOOD_AGI, 5400000, 5;
+ sc_start SC_FOOD_VIT, 5400000, 10;
+ sc_start SC_PLUSMAGICPOWER, 5400000, 52;
">
},
{
@@ -64545,12 +64549,12 @@ item_db: (
Buy: 20
Weight: 50
Script: <"
- sc_start SC_MOVHASTE_HORSE,5400000,0;
- percentheal 100,100;
- sc_start SC_FOOD_INT,5400000,3;
- sc_start SC_FOOD_DEX,5400000,12;
- sc_start SC_PLUSATTACKPOWER,5400000,20;
- sc_start SC_MATKFOOD,5400000,20;
+ sc_start SC_MOVHASTE_INFINITY, 5400000, 100;
+ percentheal 100, 100;
+ sc_start SC_FOOD_INT, 5400000, 3;
+ sc_start SC_FOOD_DEX, 5400000, 12;
+ sc_start SC_PLUSATTACKPOWER, 5400000, 20;
+ sc_start SC_PLUSMAGICPOWER, 5400000, 20;
">
},
{
@@ -64562,15 +64566,14 @@ item_db: (
Weight: 50
Script: <"
percentheal 100,100;
- sc_start SC_MOVHASTE_HORSE,5400000,0;
- sc_start SC_FOOD_STR,5400000,6;
- sc_start SC_FOOD_DEX,5400000,6;
- sc_start SC_FOOD_AGI,5400000,6;
- sc_start SC_FOOD_INT,5400000,6;
- sc_start SC_FOOD_VIT,5400000,6;
- sc_start SC_FOOD_LUK,5400000,6;
- sc_start SC_PLUSATTACKPOWER,5400000,24;
- sc_start SC_MATKFOOD,5400000,24;
+ sc_start SC_FOOD_STR, 5400000, 6;
+ sc_start SC_FOOD_DEX, 5400000, 6;
+ sc_start SC_FOOD_AGI, 5400000, 6;
+ sc_start SC_FOOD_INT, 5400000, 6;
+ sc_start SC_FOOD_VIT, 5400000, 6;
+ sc_start SC_FOOD_LUK, 5400000, 6;
+ sc_start SC_PLUSATTACKPOWER, 5400000, 24;
+ sc_start SC_PLUSMAGICPOWER, 5400000, 24;
">
},
{
@@ -64581,8 +64584,8 @@ item_db: (
Buy: 20
Weight: 150
Script: <"
- sc_start SC_ATTHASTE_POTION2,900000,0;
- sc_start SC_MOVHASTE_HORSE,900000,0;
+ sc_start SC_ATTHASTE_POTION2, 900000, 0;
+ sc_start SC_MOVHASTE_INFINITY, 900000, 100;
">
},
{
@@ -64691,7 +64694,7 @@ item_db: (
Buy: 800
Weight: 100
BuyingStore: true
- Script: <" mercenary_sc_start SC_ATTHASTE_POTION1,1800000,0; ">
+ Script: <" mercenary_sc_start SC_ATTHASTE_POTION1, 1800000, 0; ">
},
{
Id: 12242
@@ -64701,7 +64704,7 @@ item_db: (
Buy: 1500
Weight: 150
BuyingStore: true
- Script: <" mercenary_sc_start SC_ATTHASTE_POTION2,1800000,0; ">
+ Script: <" mercenary_sc_start SC_ATTHASTE_POTION2, 1800000, 0; ">
},
{
Id: 12243
@@ -64711,7 +64714,7 @@ item_db: (
Buy: 3000
Weight: 200
BuyingStore: true
- Script: <" mercenary_sc_start SC_ATTHASTE_POTION3,1800000,0; ">
+ Script: <" mercenary_sc_start SC_ATTHASTE_POTION3, 1800000, 0; ">
},
{
Id: 12244
@@ -64951,7 +64954,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" sc_start SC_MOVHASTE_HORSE,180000,0; ">
+ Script: <" sc_start SC_MOVHASTE_HORSE, 180000, 25; ">
},
{
Id: 12263
@@ -65063,8 +65066,8 @@ item_db: (
noauction: true
}
Script: <"
- sc_start SC_PLUSATTACKPOWER,60000,10;
- sc_start SC_MATKFOOD,120000,10;
+ sc_start SC_PLUSATTACKPOWER, 60000, 10;
+ sc_start SC_PLUSMAGICPOWER, 60000, 10;
">
},
{
@@ -65083,7 +65086,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" sc_start SC_PLUSATTACKPOWER,600000,15; ">
+ Script: <" sc_start SC_PLUSATTACKPOWER, 600000, 15; ">
},
{
Id: 12270
@@ -65101,7 +65104,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" sc_start SC_PLUSMAGICPOWER,600000,15; ">
+ Script: <" sc_start SC_PLUSMAGICPOWER, 600000, 15; ">
},
{
Id: 12271
@@ -65275,14 +65278,14 @@ item_db: (
Buy: 0
Weight: 10
Script: <"
- sc_start SC_FOOD_STR,5400000,3;
- sc_start SC_FOOD_DEX,5400000,3;
- sc_start SC_FOOD_AGI,5400000,3;
- sc_start SC_FOOD_INT,5400000,3;
- sc_start SC_FOOD_VIT,5400000,3;
- sc_start SC_FOOD_LUK,5400000,3;
- sc_start SC_PLUSATTACKPOWER,5400000,15;
- sc_start SC_PLUSMAGICPOWER,5400000,15;
+ sc_start SC_FOOD_STR, 5400000, 3;
+ sc_start SC_FOOD_DEX, 5400000, 3;
+ sc_start SC_FOOD_AGI, 5400000, 3;
+ sc_start SC_FOOD_INT, 5400000, 3;
+ sc_start SC_FOOD_VIT, 5400000, 3;
+ sc_start SC_FOOD_LUK, 5400000, 3;
+ sc_start SC_PLUSATTACKPOWER, 5400000, 15;
+ sc_start SC_PLUSMAGICPOWER, 5400000, 15;
">
},
{
@@ -65293,11 +65296,11 @@ item_db: (
Buy: 0
Weight: 10
Script: <"
- sc_start SC_FOOD_STR,5400000,8;
- sc_start SC_FOOD_DEX,5400000,4;
- sc_start SC_FOOD_AGI,5400000,6;
- sc_start SC_PLUSATTACKPOWER,5400000,32;
- sc_start SC_FOOD_BASICAVOIDANCE,5400000,5;
+ sc_start SC_FOOD_STR, 5400000, 8;
+ sc_start SC_FOOD_DEX, 5400000, 4;
+ sc_start SC_FOOD_AGI, 5400000, 6;
+ sc_start SC_PLUSATTACKPOWER, 5400000, 32;
+ sc_start SC_FOOD_BASICAVOIDANCE, 5400000, 5;
">
},
{
@@ -65308,10 +65311,10 @@ item_db: (
Buy: 0
Weight: 10
Script: <"
- sc_start SC_FOOD_INT,5400000,8;
- sc_start SC_FOOD_VIT,5400000,4;
- sc_start SC_FOOD_DEX,5400000,6;
- sc_start SC_PLUSMAGICPOWER,5400000,40;
+ sc_start SC_FOOD_INT, 5400000, 8;
+ sc_start SC_FOOD_VIT, 5400000, 4;
+ sc_start SC_FOOD_DEX, 5400000, 6;
+ sc_start SC_PLUSMAGICPOWER, 5400000, 40;
">
},
{
@@ -65322,11 +65325,11 @@ item_db: (
Buy: 0
Weight: 10
Script: <"
- sc_start SC_FOOD_DEX,5400000,8;
- sc_start SC_FOOD_LUK,5400000,4;
- sc_start SC_FOOD_AGI,5400000,6;
- sc_start SC_PLUSATTACKPOWER,5400000,24;
- sc_start SC_PLUSMAGICPOWER,5400000,24;
+ sc_start SC_FOOD_DEX, 5400000, 8;
+ sc_start SC_FOOD_LUK, 5400000, 4;
+ sc_start SC_FOOD_AGI, 5400000, 6;
+ sc_start SC_PLUSATTACKPOWER, 5400000, 24;
+ sc_start SC_PLUSMAGICPOWER, 5400000, 24;
">
},
{
@@ -65862,8 +65865,8 @@ item_db: (
Buy: 0
Weight: 300
Script: <"
- sc_start SC_PLUSATTACKPOWER,600000,5;
- sc_start SC_PLUSMAGICPOWER,600000,5;
+ sc_start SC_PLUSATTACKPOWER, 600000, 5;
+ sc_start SC_PLUSMAGICPOWER, 600000, 5;
">
},
{
@@ -67275,9 +67278,9 @@ item_db: (
Weight: 10
BuyingStore: true
Script: <"
- sc_start SC_ATTHASTE_POTION1,1800000,0;
- sc_start SC_INC_AGI,140000,5;
- skilleffect AL_INCAGI,0;
+ sc_start SC_ATTHASTE_POTION1, 1800000, 0;
+ sc_start SC_INC_AGI, 140000, 5;
+ skilleffect AL_INCAGI, 0;
">
},
{
@@ -69079,7 +69082,7 @@ item_db: (
Type: 2
Buy: 0
Weight: 200
- Script: <" sc_start SC_MOVHASTE_INFINITY, 300000, 100; ">
+ Script: <" sc_start SC_MOVHASTE_POTION, 300000, 100; ">
},
{
Id: 12711
@@ -75368,7 +75371,7 @@ item_db: (
Type: 18
Buy: 20
Weight: 10
- Script: <" getitem 14509,20; ">
+ Script: <" getitem Light_Center_Pot, 20; ">
},
{
Id: 13536
@@ -75377,7 +75380,7 @@ item_db: (
Type: 18
Buy: 20
Weight: 10
- Script: <" getitem 14510,20; ">
+ Script: <" getitem Light_Awakening_Pot, 20; ">
},
{
Id: 13537
@@ -75386,7 +75389,7 @@ item_db: (
Type: 18
Buy: 20
Weight: 10
- Script: <" getitem 14511,20; ">
+ Script: <" getitem Light_Berserk_Pot, 20; ">
},
{
Id: 13538
@@ -86827,7 +86830,7 @@ item_db: (
Type: 2
Buy: 800
Weight: 20
- Script: <" sc_start SC_ATTHASTE_POTION1,1800000,4; ">
+ Script: <" sc_start SC_ATTHASTE_POTION1, 1800000, 0; ">
},
{
Id: 14510
@@ -86838,7 +86841,7 @@ item_db: (
Weight: 20
Job: 0xFFF7FEEF
EquipLv: 40
- Script: <" sc_start SC_ATTHASTE_POTION2,1800000,6; ">
+ Script: <" sc_start SC_ATTHASTE_POTION2, 1800000, 0; ">
},
{
Id: 14511
@@ -86849,7 +86852,7 @@ item_db: (
Weight: 20
Job: 0x01E646A6
EquipLv: 85
- Script: <" sc_start SC_ATTHASTE_POTION3,1800000,9; ">
+ Script: <" sc_start SC_ATTHASTE_POTION3, 1800000, 0; ">
},
{
Id: 14512
@@ -86987,7 +86990,7 @@ item_db: (
Type: 2
Buy: 0
Weight: 10
- Script: <" sc_start SC_PLUSATTACKPOWER,1800000,10; ">
+ Script: <" sc_start SC_PLUSATTACKPOWER, 1800000, 10; ">
},
{
Id: 14526
@@ -86996,7 +86999,7 @@ item_db: (
Type: 2
Buy: 0
Weight: 10
- Script: <" sc_start SC_PLUSMAGICPOWER,1800000,10; ">
+ Script: <" sc_start SC_PLUSMAGICPOWER, 1800000, 10; ">
},
{
Id: 14527
@@ -88092,10 +88095,10 @@ item_db: (
nogstorage: true
}
Script: <"
- sc_start SC_FOOD_BASICAVOIDANCE,300000,30;
- sc_start SC_FOOD_BASICHIT,300000,30;
- sc_start SC_PLUSATTACKPOWER,300000,20;
- sc_start SC_PLUSMAGICPOWER,300000,20;
+ sc_start SC_FOOD_BASICAVOIDANCE, 300000, 30;
+ sc_start SC_FOOD_BASICHIT, 300000, 30;
+ sc_start SC_PLUSATTACKPOWER, 300000, 20;
+ sc_start SC_PLUSMAGICPOWER, 300000, 20;
">
},
{
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 0bd005274..6fc8f88df 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1749,7 +1749,7 @@ item_db: (
Buy: 1450
Weight: 30
BuyingStore: true
- Script: <" sc_start SC_MOVHASTE_HORSE,180000,0; ">
+ Script: <" sc_start SC_MOVHASTE_HORSE, 180000, 25; ">
},
{
Id: 663
@@ -1953,7 +1953,7 @@ item_db: (
Buy: 0
Weight: 100
BuyingStore: true
- Script: <" sc_start SC_PLUSATTACKPOWER,60000,30; ">
+ Script: <" sc_start SC_PLUSATTACKPOWER, 60000, 30; ">
},
{
Id: 683
@@ -1963,7 +1963,7 @@ item_db: (
Buy: 0
Weight: 50
BuyingStore: true
- Script: <" sc_start SC_PLUSMAGICPOWER,60000,30; ">
+ Script: <" sc_start SC_PLUSMAGICPOWER, 60000, 30; ">
},
{
Id: 684
@@ -1974,8 +1974,8 @@ item_db: (
Weight: 300
BuyingStore: true
Script: <"
- sc_start SC_PLUSATTACKPOWER,60000,10;
- sc_start SC_PLUSMAGICPOWER,60000,10;
+ sc_start SC_PLUSATTACKPOWER, 60000, 10;
+ sc_start SC_PLUSMAGICPOWER, 60000, 10;
">
},
{
@@ -41090,7 +41090,7 @@ item_db: (
Weight: 10
Loc: 64
Script: <"
- autobonus "{ sc_start SC_MOVHASTE_HORSE, 3000, 100; bonus bAgi, 44; heal 0, -40; }", 3, 3000, 0, "{ specialeffect2 EF_WIND; }";
+ autobonus "{ sc_start SC_MOVHASTE_HORSE, 3000, 25; bonus bAgi, 44; heal 0, -40; }", 3, 3000, 0, "{ specialeffect2 EF_WIND; }";
">
},
{
@@ -76642,7 +76642,7 @@ item_db: (
Buy: 2
Weight: 100
BuyingStore: true
- Script: <" sc_start SC_MOVHASTE_INFINITY, 5000, 100; ">
+ Script: <" sc_start SC_MOVHASTE_POTION, 5000, 100; ">
},
{
Id: 12017
@@ -76652,7 +76652,7 @@ item_db: (
Buy: 2
Weight: 100
BuyingStore: true
- Script: <" sc_start SC_SLOWDOWN, 5000, 100; ">
+ Script: <" sc_start SC_MOVESLOW_POTION, 5000, 100; ">
},
{
Id: 12018
@@ -76764,7 +76764,7 @@ item_db: (
Nouse: {
sitting: true
}
- Script: <" sc_start SC_MOVHASTE_HORSE,20000,0; ">
+ Script: <" sc_start SC_MOVHASTE_HORSE, 20000, 25; ">
},
{
Id: 12029
@@ -76790,7 +76790,7 @@ item_db: (
Nouse: {
sitting: true
}
- Script: <" sc_start SC_PLUSATTACKPOWER,60000,20; ">
+ Script: <" sc_start SC_PLUSATTACKPOWER, 60000, 20; ">
},
{
Id: 12031
@@ -76803,7 +76803,7 @@ item_db: (
Nouse: {
sitting: true
}
- Script: <" sc_start SC_PLUSMAGICPOWER,60000,20; ">
+ Script: <" sc_start SC_PLUSMAGICPOWER, 60000, 20; ">
},
{
Id: 12032
@@ -77930,7 +77930,7 @@ item_db: (
Buy: 2
Weight: 70
BuyingStore: true
- Script: <" sc_start SC_FOOD_BASICAVOIDANCE,1200000,30; ">
+ Script: <" sc_start SC_FOOD_BASICAVOIDANCE, 1200000, 30; ">
},
{
Id: 12124
@@ -77941,8 +77941,8 @@ item_db: (
Weight: 70
BuyingStore: true
Script: <"
- sc_start SC_BATKFOOD,1200000,10;
- sc_start SC_MATKFOOD,120000,10;
+ sc_start SC_PLUSATTACKPOWER, 1200000, 10;
+ sc_start SC_PLUSMAGICPOWER, 120000, 10;
">
},
{
@@ -78016,6 +78016,7 @@ item_db: (
Type: 0
Buy: 2
Weight: 100
+ Script: <" sc_start SC_FOOD_LUK, 1800000, 15; ">
},
{
Id: 12132
@@ -78025,7 +78026,10 @@ item_db: (
Buy: 0
Weight: 200
BuyingStore: true
- Script: <" sc_start SC_XMAS,600000,0; ">
+ Script: <"
+ sc_start SC_XMAS, 600000, 0;
+ sc_start SC_MOVHASTE_HORSE, 600000, 25;
+ ">
},
{
Id: 12133
@@ -78834,6 +78838,7 @@ item_db: (
Type: 2
Buy: 2
Weight: 300
+ Script: <" sc_start SC_MOVHASTE_INFINITY, 180000, 25; ">
},
{
Id: 12191
@@ -78843,8 +78848,8 @@ item_db: (
Buy: 2
Weight: 500
Script: <"
- sc_start SC_ATTHASTE_POTION1,600000,4;
- sc_start SC_MOVHASTE_HORSE,600000,0;
+ sc_start SC_ATTHASTE_POTION1, 600000, 4;
+ sc_start SC_MOVHASTE_HORSE, 600000, 25;
">
},
{
@@ -79402,12 +79407,12 @@ item_db: (
Buy: 20
Weight: 50
Script: <"
- sc_start SC_MOVHASTE_HORSE,5400000,0;
- percentheal 100,100;
- sc_start SC_FOOD_STR,5400000,10;
- sc_start SC_FOOD_DEX,5400000,5;
- sc_start SC_PLUSATTACKPOWER,5400000,22;
- sc_start SC_MATKFOOD,5400000,15;
+ sc_start SC_MOVHASTE_INFINITY, 5400000, 100;
+ percentheal 100, 100;
+ sc_start SC_FOOD_STR, 5400000, 10;
+ sc_start SC_FOOD_DEX, 5400000, 5;
+ sc_start SC_PLUSATTACKPOWER, 5400000, 22;
+ sc_start SC_PLUSMAGICPOWER, 5400000, 15;
">
},
{
@@ -79418,12 +79423,12 @@ item_db: (
Buy: 20
Weight: 50
Script: <"
- sc_start SC_MOVHASTE_HORSE,5400000,0;
- percentheal 100,100;
- sc_start SC_FOOD_INT,5400000,8;
- sc_start SC_FOOD_VIT,5400000,7;
- sc_start SC_FOOD_LUK,5400000,7;
- sc_start SC_PLUSATTACKPOWER,5400000,10;
+ sc_start SC_MOVHASTE_INFINITY, 5400000, 100;
+ percentheal 100, 100;
+ sc_start SC_FOOD_INT, 5400000, 8;
+ sc_start SC_FOOD_VIT, 5400000, 7;
+ sc_start SC_FOOD_LUK, 5400000, 7;
+ sc_start SC_PLUSATTACKPOWER, 3600000, 20;
">
},
{
@@ -79434,11 +79439,11 @@ item_db: (
Buy: 20
Weight: 50
Script: <"
- sc_start SC_MOVHASTE_HORSE,5400000,0;
- percentheal 100,100;
- sc_start SC_FOOD_AGI,5400000,15;
- sc_start SC_PLUSATTACKPOWER,5400000,52;
- sc_start SC_MATKFOOD,5400000,10;
+ sc_start SC_MOVHASTE_INFINITY, 5400000, 100;
+ percentheal 100, 100;
+ sc_start SC_FOOD_AGI, 5400000, 15;
+ sc_start SC_PLUSATTACKPOWER, 5400000, 52;
+ sc_start SC_PLUSMAGICPOWER, 5400000, 10;
">
},
{
@@ -79449,12 +79454,12 @@ item_db: (
Buy: 20
Weight: 50
Script: <"
- sc_start SC_MOVHASTE_HORSE,5400000,0;
- percentheal 100,100;
- sc_start SC_FOOD_STR,5400000,3;
- sc_start SC_FOOD_AGI,5400000,5;
- sc_start SC_FOOD_VIT,5400000,10;
- sc_start SC_MATKFOOD,5400000,52;
+ sc_start SC_MOVHASTE_INFINITY, 5400000, 100;
+ percentheal 100, 100;
+ sc_start SC_FOOD_STR, 5400000, 3;
+ sc_start SC_FOOD_AGI, 5400000, 5;
+ sc_start SC_FOOD_VIT, 5400000, 10;
+ sc_start SC_PLUSMAGICPOWER, 5400000, 52;
">
},
{
@@ -79465,12 +79470,12 @@ item_db: (
Buy: 20
Weight: 50
Script: <"
- sc_start SC_MOVHASTE_HORSE,5400000,0;
- percentheal 100,100;
- sc_start SC_FOOD_INT,5400000,3;
- sc_start SC_FOOD_DEX,5400000,12;
- sc_start SC_PLUSATTACKPOWER,5400000,20;
- sc_start SC_MATKFOOD,5400000,20;
+ sc_start SC_MOVHASTE_INFINITY, 5400000, 100;
+ percentheal 100, 100;
+ sc_start SC_FOOD_INT, 5400000, 3;
+ sc_start SC_FOOD_DEX, 5400000, 12;
+ sc_start SC_PLUSATTACKPOWER, 5400000, 20;
+ sc_start SC_PLUSMAGICPOWER, 5400000, 20;
">
},
{
@@ -79481,16 +79486,15 @@ item_db: (
Buy: 20
Weight: 50
Script: <"
- percentheal 100,100;
- sc_start SC_MOVHASTE_HORSE,5400000,0;
- sc_start SC_FOOD_STR,5400000,6;
- sc_start SC_FOOD_DEX,5400000,6;
- sc_start SC_FOOD_AGI,5400000,6;
- sc_start SC_FOOD_INT,5400000,6;
- sc_start SC_FOOD_VIT,5400000,6;
- sc_start SC_FOOD_LUK,5400000,6;
- sc_start SC_PLUSATTACKPOWER,5400000,24;
- sc_start SC_MATKFOOD,5400000,24;
+ percentheal 100, 100;
+ sc_start SC_FOOD_STR, 5400000, 6;
+ sc_start SC_FOOD_DEX, 5400000, 6;
+ sc_start SC_FOOD_AGI, 5400000, 6;
+ sc_start SC_FOOD_INT, 5400000, 6;
+ sc_start SC_FOOD_VIT, 5400000, 6;
+ sc_start SC_FOOD_LUK, 5400000, 6;
+ sc_start SC_PLUSATTACKPOWER, 5400000, 24;
+ sc_start SC_PLUSMAGICPOWER, 5400000, 24;
">
},
{
@@ -79501,8 +79505,8 @@ item_db: (
Buy: 20
Weight: 150
Script: <"
- sc_start SC_ATTHASTE_POTION2,900000,0;
- sc_start SC_MOVHASTE_HORSE,900000,0;
+ sc_start SC_ATTHASTE_POTION2, 900000, 6;
+ sc_start SC_MOVHASTE_INFINITY, 900000, 100;
">
},
{
@@ -79885,7 +79889,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" sc_start SC_MOVHASTE_HORSE,180000,0; ">
+ Script: <" sc_start SC_MOVHASTE_HORSE, 180000, 25; ">
},
{
Id: 12263
@@ -79998,8 +80002,8 @@ item_db: (
noauction: true
}
Script: <"
- sc_start SC_PLUSATTACKPOWER,60000,10;
- sc_start SC_MATKFOOD,120000,10;
+ sc_start SC_PLUSATTACKPOWER, 60000, 10;
+ sc_start SC_PLUSMAGICPOWER, 60000, 10;
">
},
{
@@ -80017,7 +80021,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" sc_start SC_PLUSATTACKPOWER,600000,15; ">
+ Script: <" sc_start SC_PLUSATTACKPOWER, 600000, 15; ">
},
{
Id: 12270
@@ -80034,7 +80038,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" sc_start SC_PLUSMAGICPOWER,600000,15; ">
+ Script: <" sc_start SC_PLUSMAGICPOWER, 600000, 15; ">
},
{
Id: 12271
@@ -80217,14 +80221,14 @@ item_db: (
Buy: 0
Weight: 10
Script: <"
- sc_start SC_FOOD_STR,5400000,3;
- sc_start SC_FOOD_DEX,5400000,3;
- sc_start SC_FOOD_AGI,5400000,3;
- sc_start SC_FOOD_INT,5400000,3;
- sc_start SC_FOOD_VIT,5400000,3;
- sc_start SC_FOOD_LUK,5400000,3;
- sc_start SC_PLUSATTACKPOWER,5400000,15;
- sc_start SC_PLUSMAGICPOWER,5400000,15;
+ sc_start SC_FOOD_STR, 5400000, 3;
+ sc_start SC_FOOD_DEX, 5400000, 3;
+ sc_start SC_FOOD_AGI, 5400000, 3;
+ sc_start SC_FOOD_INT, 5400000, 3;
+ sc_start SC_FOOD_VIT, 5400000, 3;
+ sc_start SC_FOOD_LUK, 5400000, 3;
+ sc_start SC_PLUSATTACKPOWER, 5400000, 15;
+ sc_start SC_PLUSMAGICPOWER, 5400000, 15;
">
},
{
@@ -80235,11 +80239,11 @@ item_db: (
Buy: 0
Weight: 10
Script: <"
- sc_start SC_FOOD_STR,5400000,8;
- sc_start SC_FOOD_DEX,5400000,4;
- sc_start SC_FOOD_AGI,5400000,6;
- sc_start SC_PLUSATTACKPOWER,5400000,32;
- sc_start SC_FOOD_BASICAVOIDANCE,5400000,5;
+ sc_start SC_FOOD_STR, 5400000, 8;
+ sc_start SC_FOOD_DEX, 5400000, 4;
+ sc_start SC_FOOD_AGI, 5400000, 6;
+ sc_start SC_PLUSATTACKPOWER, 5400000, 32;
+ sc_start SC_FOOD_BASICAVOIDANCE, 5400000, 5;
">
},
{
@@ -80250,10 +80254,10 @@ item_db: (
Buy: 0
Weight: 10
Script: <"
- sc_start SC_FOOD_INT,5400000,8;
- sc_start SC_FOOD_VIT,5400000,4;
- sc_start SC_FOOD_DEX,5400000,6;
- sc_start SC_PLUSMAGICPOWER,5400000,40;
+ sc_start SC_FOOD_INT, 5400000, 8;
+ sc_start SC_FOOD_VIT, 5400000, 4;
+ sc_start SC_FOOD_DEX, 5400000, 6;
+ sc_start SC_PLUSMAGICPOWER, 5400000, 40;
">
},
{
@@ -80264,11 +80268,11 @@ item_db: (
Buy: 0
Weight: 10
Script: <"
- sc_start SC_FOOD_DEX,5400000,8;
- sc_start SC_FOOD_LUK,5400000,4;
- sc_start SC_FOOD_AGI,5400000,6;
- sc_start SC_PLUSATTACKPOWER,5400000,24;
- sc_start SC_PLUSMAGICPOWER,5400000,24;
+ sc_start SC_FOOD_DEX, 5400000, 8;
+ sc_start SC_FOOD_LUK, 5400000, 4;
+ sc_start SC_FOOD_AGI, 5400000, 6;
+ sc_start SC_PLUSATTACKPOWER, 5400000, 24;
+ sc_start SC_PLUSMAGICPOWER, 5400000, 24;
">
},
{
@@ -80822,8 +80826,8 @@ item_db: (
noauction: true
}
Script: <"
- sc_start SC_PLUSATTACKPOWER,600000,5;
- sc_start SC_PLUSMAGICPOWER,600000,5;
+ sc_start SC_PLUSATTACKPOWER, 600000, 5;
+ sc_start SC_PLUSMAGICPOWER, 600000, 5;
">
},
{
@@ -84847,9 +84851,9 @@ item_db: (
Buy: 20
Weight: 30
Script:<"
- sc_start SC_FOOD_LUK,6000,10;
- sc_start SC_PLUSATTACKPOWER,6000,20;
- sc_start SC_PLUSMAGICPOWER,6000,20;
+ sc_start SC_FOOD_LUK, 6000, 10;
+ sc_start SC_PLUSATTACKPOWER, 6000, 20;
+ sc_start SC_PLUSMAGICPOWER, 6000, 20;
">
},
{
@@ -85618,7 +85622,7 @@ item_db: (
Type: 2
Buy: 0
Weight: 200
- Script: <" sc_start SC_MOVHASTE_INFINITY, 300000, 100; ">
+ Script: <" sc_start SC_MOVHASTE_POTION, 300000, 100; ">
},
{
Id: 12711
@@ -94967,11 +94971,11 @@ item_db: (
notrade: true
noselltonpc: true
nocart: true
- nogstorage: true
nomail: true
noauction: true
+ nogstorage: true
}
- Script: <" getitem 14509,20; ">
+ Script: <" getitem Light_Center_Pot, 20; ">
},
{
Id: 13536
@@ -94985,11 +94989,11 @@ item_db: (
notrade: true
noselltonpc: true
nocart: true
- nogstorage: true
nomail: true
noauction: true
+ nogstorage: true
}
- Script: <" getitem 14510,20; ">
+ Script: <" getitem Light_Center_Pot, 20; ">
},
{
Id: 13537
@@ -95003,11 +95007,11 @@ item_db: (
notrade: true
noselltonpc: true
nocart: true
- nogstorage: true
nomail: true
noauction: true
+ nogstorage: true
}
- Script: <" getitem 14511,20; ">
+ Script: <" getitem Light_Center_Pot, 20; ">
},
{
Id: 13538
@@ -110280,7 +110284,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" sc_start SC_PLUSATTACKPOWER,1800000,10; ">
+ Script: <" sc_start SC_PLUSATTACKPOWER, 1800000, 10; ">
},
{
Id: 14526
@@ -110298,7 +110302,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" sc_start SC_PLUSMAGICPOWER,1800000,10; ">
+ Script: <" sc_start SC_PLUSMAGICPOWER, 1800000, 10; ">
},
{
Id: 14527
@@ -111777,10 +111781,10 @@ item_db: (
noauction: true
}
Script: <"
- sc_start SC_FOOD_BASICAVOIDANCE,300000,30;
- sc_start SC_FOOD_BASICHIT,300000,30;
- sc_start SC_PLUSATTACKPOWER,300000,20;
- sc_start SC_PLUSMAGICPOWER,300000,20;
+ sc_start SC_FOOD_BASICAVOIDANCE, 300000, 30;
+ sc_start SC_FOOD_BASICHIT, 300000, 30;
+ sc_start SC_PLUSATTACKPOWER, 300000, 20;
+ sc_start SC_PLUSMAGICPOWER, 300000, 20;
">
},
{
@@ -111941,6 +111945,10 @@ item_db: (
nomail: true
noauction: true
}
+ Script: <"
+ specialeffect2 EF_GUARD;
+ sc_start SC_PROTECT_DEF, 120000, 3;
+ ">
},
{
Id: 14612
@@ -111958,6 +111966,10 @@ item_db: (
nomail: true
noauction: true
}
+ Script: <"
+ specialeffect2 EF_SPELLBREAKER;
+ sc_start SC_PROTECT_MDEF, 120000, 3;
+ ">
},
{
Id: 14613
@@ -111994,8 +112006,8 @@ item_db: (
}
Script: <"
specialeffect2 EF_GUARD;
- sc_start SC_PROTECT_DEF, 1800000, 1;
- sc_start SC_PROTECT_MDEF, 1800000, 1;
+ sc_start SC_PROTECT_DEF, 1800000, 3;
+ sc_start SC_PROTECT_MDEF, 1800000, 3;
">
},
{
@@ -112015,8 +112027,8 @@ item_db: (
noauction: true
}
Script: <"
- sc_start SC_FOOD_STR,180000,15;
- sc_start SC_PLUSATTACKPOWER,60000,rand(11,111);
+ sc_start SC_FOOD_STR, 180000, 15;
+ sc_start SC_PLUSATTACKPOWER, 60000, rand(11,111);
">
},
{
@@ -112036,8 +112048,8 @@ item_db: (
noauction: true
}
Script: <"
- sc_start SC_FOOD_VIT,180000,15;
- percentheal rand(11,33),0;
+ sc_start SC_FOOD_VIT, 180000, 15;
+ percentheal rand(11,33), 0;
">
},
{
@@ -112057,8 +112069,8 @@ item_db: (
noauction: true
}
Script: <"
- sc_start SC_FOOD_AGI,180000,15;
- sc_start SC_FOOD_BASICAVOIDANCE,60000,rand(11,33);
+ sc_start SC_FOOD_AGI, 180000, 15;
+ sc_start SC_FOOD_BASICAVOIDANCE, 60000, rand(11,33);
">
},
{
@@ -112078,8 +112090,8 @@ item_db: (
noauction: true
}
Script: <"
- sc_start SC_FOOD_INT,180000,15;
- sc_start SC_PLUSMAGICPOWER,60000,rand(11,111);
+ sc_start SC_FOOD_INT, 180000, 15;
+ sc_start SC_PLUSMAGICPOWER, 60000, rand(11,111);
">
},
{
@@ -112099,8 +112111,8 @@ item_db: (
noauction: true
}
Script: <"
- sc_start SC_FOOD_DEX,180000,15;
- sc_start SC_FOOD_BASICHIT,60000,rand(11,33);
+ sc_start SC_FOOD_DEX, 180000, 15;
+ sc_start SC_FOOD_BASICHIT, 60000, rand(11,33);
">
},
{
@@ -112120,8 +112132,8 @@ item_db: (
noauction: true
}
Script: <"
- sc_start SC_FOOD_LUK,180000,15;
- sc_start SC_CRITICALSUCCESSVALUE,60000,rand(11,13);
+ sc_start SC_FOOD_LUK, 180000, 15;
+ sc_start SC_CRITICALSUCCESSVALUE, 60000, rand(11,13);
">
},
{
@@ -112132,7 +112144,7 @@ item_db: (
Buy: 20
Weight: 10
Script: <"
- sc_start2 SC_CUP_OF_BOZA,120000,10,5;
+ sc_start2 SC_CUP_OF_BOZA, 120000, 10, 5;
">
},
diff --git a/db/sc_config.txt b/db/sc_config.txt
index 32dd28078..814d30667 100644
--- a/db/sc_config.txt
+++ b/db/sc_config.txt
@@ -46,7 +46,7 @@ SC_ENERGYCOAT, 16
SC_ATTHASTE_POTION1, 24
SC_ATTHASTE_POTION2, 24
SC_ATTHASTE_POTION3, 16
-//SC_MOVHASTE_POTION, 26
+SC_MOVHASTE_POTION, 26
//SC_POSTDELAY, 29
SC_BARRIER, 16
SC_NOEQUIPWEAPON, 30
@@ -122,7 +122,7 @@ SC_ONEHANDQUICKEN, 26
SC_PRESERVE, 18
SC_CHASEWALK, 4
SC_CHASEWALK2, 26
-//SC_MOVESLOW_POTION, 26
+SC_MOVESLOW_POTION, 26
SC_DOUBLECASTING, 26
SC_GRAVITATION, 26
SC_OVERTHRUSTMAX, 18
diff --git a/src/map/status.c b/src/map/status.c
index 52df73455..921d2fc45 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -796,9 +796,11 @@ void initChangeTables(void) {
status->dbs->IconChangeTable[SC_ATTHASTE_POTION1] = SI_ATTHASTE_POTION1;
status->dbs->IconChangeTable[SC_ATTHASTE_POTION2] = SI_ATTHASTE_POTION2;
status->dbs->IconChangeTable[SC_ATTHASTE_POTION3] = SI_ATTHASTE_POTION3;
+ status->dbs->IconChangeTable[SC_MOVHASTE_POTION] = SI_MOVHASTE_POTION;
status->dbs->IconChangeTable[SC_ATTHASTE_INFINITY] = SI_ATTHASTE_INFINITY;
status->dbs->IconChangeTable[SC_MOVHASTE_HORSE] = SI_MOVHASTE_HORSE;
status->dbs->IconChangeTable[SC_MOVHASTE_INFINITY] = SI_MOVHASTE_INFINITY;
+ status->dbs->IconChangeTable[SC_MOVESLOW_POTION] = SI_MOVESLOW_POTION;
status->dbs->IconChangeTable[SC_CHASEWALK2] = SI_INCSTR;
status->dbs->IconChangeTable[SC_MIRACLE] = SI_SOULLINK;
status->dbs->IconChangeTable[SC_CLAIRVOYANCE] = SI_CLAIRVOYANCE;
@@ -983,16 +985,18 @@ void initChangeTables(void) {
status->dbs->IconChangeTable[SC_BLOSSOM_FLUTTERING] = SI_BLOSSOM_FLUTTERING;
// Other SC which are not necessarily associated to skills.
- status->dbs->ChangeFlagTable[SC_ATTHASTE_POTION1] = SCB_ASPD;
- status->dbs->ChangeFlagTable[SC_ATTHASTE_POTION2] = SCB_ASPD;
- status->dbs->ChangeFlagTable[SC_ATTHASTE_POTION3] = SCB_ASPD;
- status->dbs->ChangeFlagTable[SC_ATTHASTE_INFINITY] = SCB_ASPD;
- status->dbs->ChangeFlagTable[SC_MOVHASTE_HORSE] = SCB_SPEED;
- status->dbs->ChangeFlagTable[SC_MOVHASTE_INFINITY] = SCB_SPEED;
+ status->dbs->ChangeFlagTable[SC_ATTHASTE_POTION1] |= SCB_ASPD;
+ status->dbs->ChangeFlagTable[SC_ATTHASTE_POTION2] |= SCB_ASPD;
+ status->dbs->ChangeFlagTable[SC_ATTHASTE_POTION3] |= SCB_ASPD;
+ status->dbs->ChangeFlagTable[SC_MOVHASTE_POTION] |= SCB_SPEED;
+ status->dbs->ChangeFlagTable[SC_ATTHASTE_INFINITY] |= SCB_ASPD;
+ status->dbs->ChangeFlagTable[SC_MOVHASTE_HORSE] |= SCB_SPEED;
+ status->dbs->ChangeFlagTable[SC_MOVHASTE_INFINITY] |= SCB_SPEED;
+ status->dbs->ChangeFlagTable[SC_MOVESLOW_POTION] |= SCB_SPEED;
status->dbs->ChangeFlagTable[SC_SLOWDOWN] |= SCB_SPEED;
- status->dbs->ChangeFlagTable[SC_PLUSATTACKPOWER] = SCB_BATK;
- status->dbs->ChangeFlagTable[SC_PLUSMAGICPOWER] = SCB_MATK;
- status->dbs->ChangeFlagTable[SC_INCALLSTATUS] |= SCB_STR|SCB_AGI|SCB_VIT|SCB_INT|SCB_DEX|SCB_LUK;
+ status->dbs->ChangeFlagTable[SC_PLUSATTACKPOWER] |= SCB_BATK;
+ status->dbs->ChangeFlagTable[SC_PLUSMAGICPOWER] |= SCB_MATK;
+ status->dbs->ChangeFlagTable[SC_INCALLSTATUS] |= SCB_STR | SCB_AGI | SCB_VIT | SCB_INT | SCB_DEX | SCB_LUK;
status->dbs->ChangeFlagTable[SC_CHASEWALK2] |= SCB_STR;
status->dbs->ChangeFlagTable[SC_INCAGI] |= SCB_AGI;
status->dbs->ChangeFlagTable[SC_INCVIT] |= SCB_VIT;
@@ -1003,7 +1007,7 @@ void initChangeTables(void) {
status->dbs->ChangeFlagTable[SC_INCHITRATE] |= SCB_HIT;
status->dbs->ChangeFlagTable[SC_INCFLEE] |= SCB_FLEE;
status->dbs->ChangeFlagTable[SC_INCFLEERATE] |= SCB_FLEE;
- status->dbs->ChangeFlagTable[SC_MTF_HITFLEE] |= SCB_HIT|SCB_FLEE;
+ status->dbs->ChangeFlagTable[SC_MTF_HITFLEE] |= SCB_HIT | SCB_FLEE;
status->dbs->ChangeFlagTable[SC_CRITICALPERCENT] |= SCB_CRI;
status->dbs->ChangeFlagTable[SC_INCASPDRATE] |= SCB_ASPD;
status->dbs->ChangeFlagTable[SC_PLUSAVOIDVALUE] |= SCB_FLEE2;
@@ -1013,7 +1017,7 @@ void initChangeTables(void) {
status->dbs->ChangeFlagTable[SC_MTF_MHP] |= SCB_MAXHP;
status->dbs->ChangeFlagTable[SC_INCMSP] |= SCB_MAXSP;
status->dbs->ChangeFlagTable[SC_MTF_MSP] |= SCB_MAXSP;
- status->dbs->ChangeFlagTable[SC_INCATKRATE] |= SCB_BATK|SCB_WATK;
+ status->dbs->ChangeFlagTable[SC_INCATKRATE] |= SCB_BATK | SCB_WATK;
status->dbs->ChangeFlagTable[SC_INCMATKRATE] |= SCB_MATK;
status->dbs->ChangeFlagTable[SC_INCDEFRATE] |= SCB_DEF;
status->dbs->ChangeFlagTable[SC_FOOD_STR] |= SCB_STR;
@@ -1045,12 +1049,12 @@ void initChangeTables(void) {
status->dbs->ChangeFlagTable[SC_STEAMPACK] |= SCB_BATK | SCB_ASPD | SCB_ALL;
// Cash Items
- status->dbs->ChangeFlagTable[SC_FOOD_STR_CASH] = SCB_STR;
- status->dbs->ChangeFlagTable[SC_FOOD_AGI_CASH] = SCB_AGI;
- status->dbs->ChangeFlagTable[SC_FOOD_VIT_CASH] = SCB_VIT;
- status->dbs->ChangeFlagTable[SC_FOOD_DEX_CASH] = SCB_DEX;
- status->dbs->ChangeFlagTable[SC_FOOD_INT_CASH] = SCB_INT;
- status->dbs->ChangeFlagTable[SC_FOOD_LUK_CASH] = SCB_LUK;
+ status->dbs->ChangeFlagTable[SC_FOOD_STR_CASH] |= SCB_STR;
+ status->dbs->ChangeFlagTable[SC_FOOD_AGI_CASH] |= SCB_AGI;
+ status->dbs->ChangeFlagTable[SC_FOOD_VIT_CASH] |= SCB_VIT;
+ status->dbs->ChangeFlagTable[SC_FOOD_DEX_CASH] |= SCB_DEX;
+ status->dbs->ChangeFlagTable[SC_FOOD_INT_CASH] |= SCB_INT;
+ status->dbs->ChangeFlagTable[SC_FOOD_LUK_CASH] |= SCB_LUK;
// Mercenary Bonus Effects
status->dbs->ChangeFlagTable[SC_MER_FLEE] |= SCB_FLEE;
@@ -1060,11 +1064,11 @@ void initChangeTables(void) {
status->dbs->ChangeFlagTable[SC_MER_HIT] |= SCB_HIT;
// Guillotine Cross Poison Effects
- status->dbs->ChangeFlagTable[SC_PARALYSE] |= SCB_FLEE|SCB_SPEED|SCB_ASPD;
+ status->dbs->ChangeFlagTable[SC_PARALYSE] |= SCB_FLEE | SCB_SPEED | SCB_ASPD;
status->dbs->ChangeFlagTable[SC_VENOMBLEED] |= SCB_MAXHP;
status->dbs->ChangeFlagTable[SC_MAGICMUSHROOM] |= SCB_REGEN;
status->dbs->ChangeFlagTable[SC_DEATHHURT] |= SCB_REGEN;
- status->dbs->ChangeFlagTable[SC_PYREXIA] |= SCB_HIT|SCB_FLEE;
+ status->dbs->ChangeFlagTable[SC_PYREXIA] |= SCB_HIT | SCB_FLEE;
status->dbs->ChangeFlagTable[SC_OBLIVIONCURSE] |= SCB_REGEN;
// RG status
@@ -1106,11 +1110,11 @@ void initChangeTables(void) {
status->dbs->ChangeFlagTable[SC_FREYJASCROLL] |= SCB_MDEF | SCB_FLEE2;
status->dbs->ChangeFlagTable[SC_SOULSCROLL] |= SCB_MAXHP | SCB_MAXSP;
- status->dbs->ChangeFlagTable[SC_ALL_RIDING] = SCB_SPEED;
- status->dbs->ChangeFlagTable[SC_WEDDING] = SCB_SPEED;
+ status->dbs->ChangeFlagTable[SC_ALL_RIDING] |= SCB_SPEED;
+ status->dbs->ChangeFlagTable[SC_WEDDING] |= SCB_SPEED;
- status->dbs->ChangeFlagTable[SC_MTF_ASPD] = SCB_ASPD | SCB_HIT;
- status->dbs->ChangeFlagTable[SC_MTF_MATK] = SCB_MATK;
+ status->dbs->ChangeFlagTable[SC_MTF_ASPD] |= SCB_ASPD | SCB_HIT;
+ status->dbs->ChangeFlagTable[SC_MTF_MATK] |= SCB_MATK;
status->dbs->ChangeFlagTable[SC_MTF_MLEATKED] |= SCB_ALL;
// Eden Crystal Synthesis
@@ -5489,8 +5493,10 @@ unsigned short status_calc_speed(struct block_list *bl, struct status_change *sc
val = max( val, sc->data[SC_CLOAKING]->val1 < 3 ? 300 : 30 - 3 * sc->data[SC_CLOAKING]->val1 );
if( sc->data[SC_GOSPEL] && sc->data[SC_GOSPEL]->val4 == BCT_ENEMY )
val = max( val, 75 );
- if (sc->data[SC_SLOWDOWN]) // Slow Potion
- val = max(val, sc->data[SC_SLOWDOWN]->val1);
+ if (sc->data[SC_SLOWDOWN])
+ val = max(val, 100);
+ if (sc->data[SC_MOVESLOW_POTION]) // Used by Slow_Down_Potion [Frost]
+ val = max(val, sc->data[SC_MOVESLOW_POTION]->val1);
if( sc->data[SC_GS_GATLINGFEVER] )
val = max( val, 100 );
if( sc->data[SC_NJ_SUITON] )
@@ -5532,8 +5538,10 @@ unsigned short status_calc_speed(struct block_list *bl, struct status_change *sc
{
int val = 0;
- if (sc->data[SC_MOVHASTE_INFINITY])
+ if (sc->data[SC_MOVHASTE_INFINITY]) // Used by NPC_AGIUP [Frost]
val = max(val, sc->data[SC_MOVHASTE_INFINITY]->val1);
+ if (sc->data[SC_MOVHASTE_POTION]) // Used by Speed_Up_Potion and Guyak_Pudding [Frost]
+ val = max(val, sc->data[SC_MOVHASTE_POTION]->val1);
if( sc->data[SC_INC_AGI] )
val = max( val, 25 );
if( sc->data[SC_WINDWALK] )
@@ -5564,9 +5572,8 @@ unsigned short status_calc_speed(struct block_list *bl, struct status_change *sc
val = max( val, sc->data[SC_WIND_STEP_OPTION]->val2 );
if( sc->data[SC_FULL_THROTTLE] )
val = max( val, 25);
- //FIXME: official items use a single bonus for this [ultramage]
- if( sc->data[SC_MOVHASTE_HORSE] ) // temporary item-based speedup
- val = max( val, 25 );
+ if (sc->data[SC_MOVHASTE_HORSE])
+ val = max(val, sc->data[SC_MOVHASTE_HORSE]->val1);
if( sd && sd->bonus.speed_rate + sd->bonus.speed_add_rate < 0 ) // permanent item-based speedup
val = max( val, -(sd->bonus.speed_rate + sd->bonus.speed_add_rate) );
@@ -7191,7 +7198,7 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t
case SC_QUAGMIRE:
case SC_DEC_AGI:
case SC_DONTFORGETME:
- if (sc->data[SC_MOVHASTE_INFINITY]) // Doesn't affect by Quagmire, Decrease Agi, Slow Grace [Frost]
+ if (sc->data[SC_MOVHASTE_POTION]) // Doesn't affect by Quagmire, Decrease Agi, Slow Grace [Frost]
return 0;
break;
case SC_MAGNIFICAT:
diff --git a/src/map/status.h b/src/map/status.h
index 187188dfb..3bf862163 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -815,6 +815,8 @@ typedef enum sc_type {
SC_STR_SCROLL,
SC_INT_SCROLL, // 630
SC_STEAMPACK,
+ SC_MOVHASTE_POTION,
+ SC_MOVESLOW_POTION,
SC_MAX, //Automatically updated max, used in for's to check we are within bounds.
} sc_type;
@@ -1011,7 +1013,7 @@ enum si_type {
SI_INCSTR = 182,
//SI_NOT_EXTREMITYFIST = 183,
SI_CLAIRVOYANCE = 184,
- //SI_MOVESLOW_POTION = 185,
+ SI_MOVESLOW_POTION = 185,
SI_DOUBLECASTING = 186,
//SI_GRAVITATION = 187,
SI_OVERTHRUSTMAX = 188,
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-16 13:24:11 +0000