Merge branch 'master' of https://github.com/HerculesWS/Hercules

3 files changed, 142 insertions, 9 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index b4b313446..e977e2160 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -32111,6 +32111,7 @@ item_db: (
 	Loc: 136
 	EquipLv: 90
 	Refine: false
+	Script: <" skill "ECLAGE_RECALL",1; ">
 },
 {
 	Id: 2917
@@ -39552,6 +39553,125 @@ item_db: (
 		bonus5 bAutoSpellWhenHit,NPC_WIDESTONE,3,2500,BF_MAGIC,0;
 	">
 },
+{
+	Id: 4593
+	AegisName: "Menblatt_Card"
+	Name: "Menblatt Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 4
+	Script: <" bonus bLongAtkDef,readparam(bDex)/10; ">
+},
+{
+	Id: 4594
+	AegisName: "Petal_Card"
+	Name: "Petal Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 4
+	Script: <" bonus bCritAtkRate,2*(readparam(bLuk)/10); ">
+},
+{
+	Id: 4595
+	AegisName: "Cenere_Card"
+	Name: "Cenere Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 4
+	Script: <"
+		bonus bAspdRate,2*(readparam(bAgi)/10);
+		bonus bDelayrate,-2*(readparam(bAgi)/10);
+	">
+},
+{
+	Id: 4596
+	AegisName: "Antique_Book_Card"
+	Name: "Antique Book Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 4
+	Script: <" bonus bMatk,5*(readparam(bInt)/10); ">
+},
+{
+	Id: 4597
+	AegisName: "Lichtern_Blue_Card"
+	Name: "Lichtern Blue Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 769
+	Script: <"
+		bonus bMatk,10;
+		bonus2 bMagicAtkEle,Ele_Water,(getrefine()>=9)?10:5;
+	">
+},
+{
+	Id: 4598
+	AegisName: "Lichtern_Green_Card"
+	Name: "Lichtern Green Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 769
+	Script: <"
+		bonus bMatk,10;
+		bonus2 bMagicAtkEle,Ele_Ghost,(getrefine()>=9)?10:5;
+	">
+},
+{
+	Id: 4599
+	AegisName: "Lichtern_Red_Card"
+	Name: "Lichtern Red Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 769
+	Script: <"
+		bonus bMatk,10;
+		bonus2 bMagicAtkEle,Ele_Fire,(getrefine()>=9)?10:5;
+	">
+},
+{
+	Id: 4600
+	AegisName: "Lichtern_Yellow_Card"
+	Name: "Lichtern Yellow Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 769
+	Script: <"
+		bonus bMatk,10;
+		bonus2 bMagicAtkEle,Ele_Earth,(getrefine()>=9)?10:5;
+	">
+},
+{
+	Id: 4607
+	AegisName: "Faithful_Manager_Card"
+	Name: "Faithful Manager Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 2
+	Script: <"
+		bonus bBaseAtk,5;
+		bonus bMatk,5;
+		if(getiteminfo(getequipid(EQI_HAND_R),11) == 15) {
+			if(getrefine()>=10) {
+				bonus bBaseAtk,20;
+				bonus bMatk,20;
+			}
+			if(getrefine()>=14) {
+				bonus bBaseAtk,20;
+				bonus bMatk,20;
+			}
+		}
+
+	">
+},
 //  Armor Enchant System
 // ===================================================================
 {
diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt
index ef5f37f74..8b63002bf 100644
--- a/db/re/mob_db.txt
+++ b/db/re/mob_db.txt
@@ -1508,15 +1508,15 @@
 2362,N_AMON_RA,Nightmare Amon Ra,Amon Ra (Nightmare),145,2515784,1,3252974,2604174,3,4106,3201,367,301,86,89,120,131,101,92,14,12,2,7,62,0x1A4,170,854,2016,480,813243,607,5500,608,3500,732,5500,5053,300,2615,100,7211,14000,985,7600,616,800,1552,20,607,3000,0,0,0,0,4236,1
 
 // Eclage (14.2)
-2363,MENBLATT,Menblatt,Menblatt,143,82200,1,8300,6842,3,816,201,79,50,70,68,40,55,108,30,10,12,1,4,44,0x3795,145,472,1056,480,0,0,0,0,0,0,0,6557,3000,7168,1000,7163,2304,12813,5,0,0,0,0,0,0,7199,500,0,0,0,0
-2364,PETAL,Petal,Petal,141,81031,1,8116,6722,9,671,173,73,33,70,82,55,45,108,25,10,12,1,2,24,0x3795,200,1500,768,480,0,0,0,0,0,0,0,6558,3000,12346,1000,1026,1000,6089,250,12814,5,0,0,0,0,7199,500,0,0,0,0
-2365,CENERE,Cenere,Cenere,146,130131,1,14234,11424,1,1802,1031,87,81,67,39,30,35,95,45,10,12,0,3,24,0x3795,300,1500,720,360,0,0,0,0,0,0,0,6561,5000,7322,500,7001,1500,7320,1000,12815,500,0,0,0,0,0,0,0,0,0,0
-2366,ANTIQUE_BOOK,Antique Book,Antique Book,148,134615,1,14450,11740,1,1861,1213,74,42,67,53,32,44,125,5,10,12,0,0,60,0x3795,150,864,960,480,0,0,0,0,0,0,0,6560,3000,7015,1000,1097,1000,12812,5,0,0,0,0,0,0,0,0,0,0,0,0
-2367,LICHTERN_B,Blue Lichtern,Lichtern,149,131211,1,14374,11402,1,1513,1410,76,41,124,74,60,55,92,50,10,12,0,0,81,0x3795,150,480,1728,480,0,0,0,0,0,0,0,1000,1000,1001,1000,995,20,12812,5,0,0,0,0,0,0,0,0,0,0,0,0
-2368,LICHTERN_Y,Yellow Lichtern,Lichtern,147,131513,1,14142,11620,1,1416,1561,84,51,141,94,75,91,144,50,10,12,0,0,88,0x3795,150,0,3456,480,0,0,0,0,0,0,0,1000,1000,1001,1000,997,20,12815,5,0,0,0,0,0,0,0,0,0,0,0,0
-2369,LICHTERN_R,Red Lichtern,Lichtern,149,135718,1,14402,12026,1,1647,1449,111,53,147,77,66,65,133,50,10,12,0,0,83,0x3795,150,0,4032,480,0,0,0,0,0,0,0,1000,1000,1001,1000,994,20,12813,5,0,0,0,0,0,0,0,0,0,0,0,0
-2370,LICHTERN_G,Green Lichtern,Lichtern,151,133451,1,14428,11420,1,1547,1594,120,57,121,60,58,62,102,50,10,12,0,0,82,0x3795,100,0,2304,480,0,0,0,0,0,0,0,1000,1000,1001,1000,996,20,12814,5,0,0,0,0,0,0,0,0,0,0,0,0
-2371,FAITHFUL_MANAGER,Faithful Manager,Faithful Manager,155,151548,1,17352,13002,3,2091,1607,204,141,80,28,40,25,88,45,10,12,2,0,80,0x3795,200,480,1536,480,0,0,0,0,0,0,0,6559,3000,12353,1000,970,100,971,100,972,100,0,0,0,0,0,0,0,0,0,0
+2363,MENBLATT,Menblatt,Menblatt,143,82200,1,4150,4105,3,816,201,79,50,70,68,40,55,108,30,10,12,1,4,44,0x3795,145,472,1056,480,0,0,0,0,0,0,0,6557,3000,7168,1000,7163,2304,12813,5,0,0,0,0,0,0,0,0,0,0,4593,1
+2364,PETAL,Petal,Petal,141,81031,1,4058,4033,9,671,173,73,33,70,82,55,45,108,25,10,12,1,2,24,0x3795,200,1500,768,480,0,0,0,0,0,0,0,6558,3000,12346,1000,1026,1000,6089,250,12814,5,0,0,0,0,0,0,0,0,4594,1
+2365,CENERE,Cenere,Cenere,146,130131,1,7117,6854,1,1802,1031,87,81,67,39,30,35,95,45,10,12,0,3,24,0x3795,300,1500,720,360,0,0,0,0,0,0,0,6561,5000,7322,500,7001,1500,7320,1000,12815,500,0,0,0,0,0,0,0,0,4595,1
+2366,ANTIQUE_BOOK,Antique Book,Antique Book,148,134615,1,7225,7044,1,1861,1213,74,42,67,53,32,44,125,5,10,12,0,0,60,0x3795,150,864,960,480,0,0,0,0,0,0,0,6560,3000,7015,1000,1097,1000,12812,5,0,0,0,0,0,0,0,0,0,0,4596,1
+2367,LICHTERN_B,Blue Lichtern,Lichtern,149,131211,1,7187,6841,1,1513,1410,76,41,124,74,60,55,92,50,10,12,0,0,81,0x3795,150,480,1728,480,0,0,0,0,0,0,0,1000,1000,1001,1000,995,20,12812,5,0,0,0,0,0,0,0,0,0,0,4597,1
+2368,LICHTERN_Y,Yellow Lichtern,Lichtern,147,131513,1,7071,6972,1,1416,1561,84,51,141,94,75,91,144,50,10,12,0,0,82,0x3795,100,0,2304,480,0,0,0,0,0,0,0,1000,1000,1001,1000,996,20,12814,5,0,0,0,0,0,0,0,0,0,0,4600,1
+2369,LICHTERN_R,Red Lichtern,Lichtern,149,135718,1,7201,7215,1,1647,1449,111,53,147,77,66,65,133,50,10,12,0,0,83,0x3795,150,0,4032,480,0,0,0,0,0,0,0,1000,1000,1001,1000,994,20,12813,5,0,0,0,0,0,0,0,0,0,0,4599,1
+2370,LICHTERN_G,Green Lichtern,Lichtern,151,133451,1,7214,6852,1,1547,1594,120,57,121,60,58,62,102,50,10,12,0,0,88,0x3795,150,0,3456,480,0,0,0,0,0,0,0,1000,1000,1001,1000,997,20,12815,5,0,0,0,0,0,0,0,0,0,0,4598,1
+2371,FAITHFUL_MANAGER,Faithful Manager,Faithful Manager,155,151548,1,8676,7801,3,2091,1607,204,141,80,28,40,25,88,45,10,12,2,0,80,0x3795,200,480,1536,480,0,0,0,0,0,0,0,6559,3000,12353,1000,970,100,971,100,972,100,0,0,0,0,0,0,0,0,4607,1
 
 // Additional Monsters
 2372,SOIL,Soil,Soil,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt
index 91bd7bac4..d57982486 100644
--- a/db/re/skill_cast_db.txt
+++ b/db/re/skill_cast_db.txt
@@ -1720,6 +1720,19 @@
 3027,1000,0,0,10000:15000:20000:25000:30000,0,15000,0
 //-- OB_AKAITSUKI
 3029,1000:1500:2000:2500:3000,1000,0,10000:15000:20000:25000:30000,0,30000,2000
+
+//===== Eclage Skills ======================
+//-- ECL_SNOWFLIP
+3031,0,0,0,0,0,5000,0
+//-- ECL_PEONYMAMY
+3032,0,0,0,0,0,5000,0
+//-- ECL_SADAGUI
+3033,0,0,0,0,0,5000,0
+//-- ECL_SEQUOIADUST
+3034,0,0,0,0,0,5000,0
+//-- ECLAGE_RECALL
+3035,0,0,0,0,0,300000,3000
+
 //==========================================
 
 //-- ALL_FULL_THROTTLE