Merge remote-tracking branch 'upstream/master' into SkidConst

6 files changed, 62 insertions, 11 deletions

diff --git a/db/const.txt b/db/const.txt
index 23a28c088..af3dedbc5 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1236,6 +1236,12 @@ SC_OFFERTORIUM	559
 SC_FRIGG_SONG	560
 SC_MONSTER_TRANSFORM 563
 SC_ANGEL_PROTECT 564
+SC_ILLUSIONDOPING 565
+SC_MTF_ASPD 566
+SC_MTF_RANGEATK 567
+SC_MTF_MATK 568
+SC_MTF_MLEATKED 569
+SC_MTF_CRIDAMAGE 570
 
 e_gasp	0
 e_what	1
diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt
index 779c3c495..4f91b462c 100644
--- a/db/pre-re/item_db.txt
+++ b/db/pre-re/item_db.txt
@@ -5128,7 +5128,6 @@
 12580,Vending_Search_Scroll,Universal Catalog Silver,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ searchstores 10,0; },{},{}
 12581,Vending_Search_Scroll2,Universal Catalog Gold,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ searchstores 10,1; },{},{}
 12591,Uni_Catalog_Bz,Universal Catalog Bronze,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ searchstores 10,1; },{},{}
-12622,Boarding_Halter,Halter Lead,11,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ setmounting(); },{},{}
 12701,Old_Blue_Box_F,Old Blue Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12702,Old_Bleu_Box,Old Navy Box,2,0,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getrandgroupitem 12702,1; getrandgroupitem 12702,1; },{},{}
 12703,Holy_Egg_2,Holy Egg,11,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
diff --git a/db/item_delay.txt b/db/pre-re/item_delay.txt
index c5bf0da7d..3e24f9d31 100644
--- a/db/item_delay.txt
+++ b/db/pre-re/item_delay.txt
@@ -23,8 +23,6 @@
 11524,3000	// White_Raffle_Sap
 11525,5000	// Mora_Hip_Tea
 
-12622,3000 // Reins_Of_Mount
-
 //12580,0 // Vending_Search_Scroll
 //12581,0 // Vending_Search_Scroll2
 //12591,0 // Vending_Search_Scroll3
@@ -34,4 +32,3 @@
 12727,60000 // Runstone_Verkana,Berkana Rune
 12732,1000 // Runstone_Pertz,Wyrd Rune
 22540,60000 // Runstone_Luxanima,Lux Anima Rune
-
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index 0bdbff440..870fbfd60 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -5975,13 +5975,13 @@
 12655,Brain_Powder,Brain Powder,11,2000,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 12656,Magical_Powder,Magical Powder,11,3000,,200,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 12657,Madness_Powder,Madness Powder,11,4000,,300,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12658,Trans_Scroll_Devi,Transformation Scroll(Deviruchi),2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start4 SC_MONSTER_TRANSFORM,1200000,1109,0,0,0; },{},{}
-12659,Trans_Scroll_Ray_Arch,Transformation Scroll(Raydric),2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start4 SC_MONSTER_TRANSFORM,1200000,1276,0,0,0; },{},{}
-12660,Trans_Scroll_Mavka,Transformation Scroll(Mavka),2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start4 SC_MONSTER_TRANSFORM,1200000,1884,0,0,0; },{},{}
-12661,Trans_Scroll_Marduk,Transformation Scroll(Marduk),2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start4 SC_MONSTER_TRANSFORM,1200000,1140,0,0,0; },{},{}
-12662,Trans_Scroll_Banshee,Transformation Scroll(Banshee),2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start4 SC_MONSTER_TRANSFORM,1200000,1867,0,0,0; },{},{}
-12663,Trans_Scroll_Poring,Transformation Scroll(Poring),2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start4 SC_MONSTER_TRANSFORM,1200000,1002,0,0,0; },{},{}
-12664,Trans_Scroll_Golem,Transformation Scroll(Golem),2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start4 SC_MONSTER_TRANSFORM,1200000,1040,0,0,0; },{},{}
+12658,Trans_Scroll_Devi,Transformation Scroll(Deviruchi),2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ montransform "Deviruchi",1200000,SC_MTF_ASPD; },{},{}
+12659,Trans_Scroll_Ray_Arch,Transformation Scroll(Raydric),2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ montransform "Raydric Archer",1200000,SC_MTF_RANGEATK; },{},{}
+12660,Trans_Scroll_Mavka,Transformation Scroll(Mavka),2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ montransform "Mavka",1200000,SC_MTF_RANGEATK; },{},{}
+12661,Trans_Scroll_Marduk,Transformation Scroll(Marduk),2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ montransform "Marduk",1200000,SC_MTF_MATK; },{},{}
+12662,Trans_Scroll_Banshee,Transformation Scroll(Banshee),2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ montransform "Banshee",1200000,SC_MTF_MATK; },{},{}
+12663,Trans_Scroll_Poring,Transformation Scroll(Poring),2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ montransform "Poring",1200000,SC_MTF_CRIDAMAGE; },{},{}
+12664,Trans_Scroll_Golem,Transformation Scroll(Golem),2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ montransform "Golem",1200000,SC_MTF_MLEATKED; },{},{}
 //
 // ID,AegisName,Name,Type,Buy,Sell,Weight,ATK,DEF,Range,Slots,Job,Upper,Gender,Loc,wLV,eLV,Refineable,View,{ Script },{ OnEquip_Script },{ OnUnequip_Script }
 
diff --git a/db/re/item_delay.txt b/db/re/item_delay.txt
new file mode 100644
index 000000000..8905edb11
--- /dev/null
+++ b/db/re/item_delay.txt
@@ -0,0 +1,44 @@
+// Item Delay Database
+// There is a max concurrent number of entries modifiable in src/map/itemdb.h as MAX_ITEMDELAYS
+//
+// Structure:
+// Item ID,Delay in Milliseconds
+
+//12202,60000	//Str_Dish10_
+//12203,60000	//Agi_Dish10_
+//12204,60000	//Int_Dish10_
+//12205,60000	//Dex_Dish10_
+//12206,60000	//Luk_Dish10_
+//12207,60000	//Vit_Dish10_
+12208,60000	//Battle_Manual
+12210,60000	//Bubble_Gum
+14538,300000	//Glass_Of_Illusion
+14586,180000	//Spark_Candy
+607,5000	// Yggdrasil_Berry
+608,3000	// Yggdrasil_Seed
+
+// Bifrost Items
+11522,1000	// Red_Raffle_Sap
+11523,2000	// Yellow_Raffle_Sap
+11524,3000	// White_Raffle_Sap
+11525,5000	// Mora_Hip_Tea
+
+12622,3000 // Reins_Of_Mount
+
+//12580,0 // Vending_Search_Scroll
+//12581,0 // Vending_Search_Scroll2
+//12591,0 // Vending_Search_Scroll3
+
+12725,120000 // Runstone_Nosiege,Nauthiz Rune
+12726,30000 // Runstone_Rhydo,Raido Rune
+12727,60000 // Runstone_Verkana,Berkana Rune
+12732,1000 // Runstone_Pertz,Wyrd Rune
+22540,60000 // Runstone_Luxanima,Lux Anima Rune
+
+12658, 10000 // Transformation Scroll(Deviruchi)
+12659, 10000 // Transformation Scroll(Raydric)
+12660, 10000 // Transformation Scroll(Mavka)
+12661, 10000 // Transformation Scroll(Marduk)
+12662, 10000 // Transformation Scroll(Banshee)
+12663, 10000 // Transformation Scroll(Poring)
+12664, 10000 // Transformation Scroll(Golem)
\ No newline at end of file
diff --git a/db/sc_config.txt b/db/sc_config.txt
index a9715dfbf..1adfec6ca 100644
--- a/db/sc_config.txt
+++ b/db/sc_config.txt
@@ -378,6 +378,11 @@ SC_LIGHT_OF_REGENE, 1
 //SC_ALL_RIDING_REUSE_LIMIT, 1	
 //SC_HANDICAPSTATE_DEEP_SLEEP, 80
 SC_MONSTER_TRANSFORM, 12
+SC_MTF_ASPD, 12
+SC_MTF_RANGEATK, 12
+SC_MTF_MATK, 12
+SC_MTF_MLEATKED,12
+SC_MTF_CRIDAMAGE, 12
 
 SC_FULL_THROTTLE, 18
 SC_REBOUND, 18