diff options
author | panikon <panikon@zoho.com> | 2014-06-18 16:18:48 -0300 |
---|---|---|
committer | panikon <panikon@zoho.com> | 2014-06-18 16:18:48 -0300 |
commit | 6ae0d5bb8baca91a782c37ee2cefa61a886eaf0a (patch) | |
tree | d6b9cf875561f10149ac63f5258c3c3eaa21ff25 | |
parent | 26a18851b346064f626697680b99f065ac408bb4 (diff) | |
parent | fb2fc548cab17a504fc59d0d622814783f08c92e (diff) | |
download | hercules-6ae0d5bb8baca91a782c37ee2cefa61a886eaf0a.tar.gz hercules-6ae0d5bb8baca91a782c37ee2cefa61a886eaf0a.tar.bz2 hercules-6ae0d5bb8baca91a782c37ee2cefa61a886eaf0a.tar.xz hercules-6ae0d5bb8baca91a782c37ee2cefa61a886eaf0a.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
-rw-r--r-- | db/re/item_db.conf | 22 | ||||
-rw-r--r-- | sql-files/item_db_re.sql | 22 | ||||
-rw-r--r-- | src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc | 4 | ||||
-rw-r--r-- | src/plugins/HPMHooking/HPMHooking.HookingPoints.inc | 1 | ||||
-rw-r--r-- | src/plugins/HPMHooking/HPMHooking.Hooks.inc | 26 |
5 files changed, 53 insertions, 22 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf index ecd2b7c17..15a08a236 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -1192,7 +1192,7 @@ item_db: ( AegisName: "Wing_Of_Fly" Name: "Fly Wing" Type: 11 - Buy: 500 + Buy: 60 Weight: 50 Upper: 63 BuyingStore: true @@ -110843,7 +110843,7 @@ item_db: ( AegisName: "Cannon_Ball" Name: "Cannon Ball" Type: 10 - Buy: 100 + Buy: 10 Weight: 10 Atk: 100 Job: 0x00040400 @@ -110856,7 +110856,7 @@ item_db: ( AegisName: "Holy_Cannon_Ball" Name: "Holy Cannon Ball" Type: 10 - Buy: 200 + Buy: 10 Weight: 10 Atk: 120 Job: 0x00040400 @@ -110870,7 +110870,7 @@ item_db: ( AegisName: "Dark_Cannon_Ball" Name: "Dark Cannon Ball" Type: 10 - Buy: 200 + Buy: 10 Weight: 10 Atk: 120 Job: 0x00040400 @@ -110884,7 +110884,7 @@ item_db: ( AegisName: "Soul_Cannon_Ball" Name: "Soul Cannon Ball" Type: 10 - Buy: 200 + Buy: 10 Weight: 10 Atk: 120 Job: 0x00040400 @@ -110898,7 +110898,7 @@ item_db: ( AegisName: "Iron_Cannon_Ball" Name: "Iron Cannon Ball" Type: 10 - Buy: 500 + Buy: 10 Weight: 10 Atk: 250 Job: 0x00040400 @@ -111427,7 +111427,7 @@ item_db: ( AegisName: "Hattah_Black" Name: "Hata Black" Type: 5 - Buy: 50000 + Buy: 12000 Weight: 4000 Def: 2 Slots: 1 @@ -115718,7 +115718,7 @@ item_db: ( AegisName: "Blue_Pencil_In_Mouth" Name: "Blue Pencil In Mouth" Type: 5 - Buy: 0 + Buy: 20 Weight: 100 Loc: 1 EquipLv: 1 @@ -116272,7 +116272,7 @@ item_db: ( AegisName: "Weisswurst" Name: "Weisswurst" Type: 5 - Buy: 0 + Buy: 20 Weight: 100 Def: 1 Loc: 1 @@ -116285,7 +116285,7 @@ item_db: ( AegisName: "Seppl_Hat" Name: "Seppl Hat" Type: 5 - Buy: 0 + Buy: 20 Weight: 500 Def: 5 Slots: 1 @@ -117427,7 +117427,7 @@ item_db: ( AegisName: "C_Tiara" Name: "Costume Tiara" Type: 5 - Buy: 1000 + Buy: 20 Loc: 1024 View: 19 }, diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql index ab7d2fc75..8e34fb202 100644 --- a/sql-files/item_db_re.sql +++ b/sql-files/item_db_re.sql @@ -143,7 +143,7 @@ REPLACE INTO `item_db_re` VALUES ('596','Cute_Strawberry_Choco','Cute Strawberry REPLACE INTO `item_db_re` VALUES ('597','Lovely_Choco_Tart','Lovely Choco-Tart','0','20','10','100','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','itemheal rand(10,400),0;','',''); REPLACE INTO `item_db_re` VALUES ('598','Light_Red_Pot','Light Red Potion','0','50','25','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','itemheal rand(45,65),0;','',''); REPLACE INTO `item_db_re` VALUES ('599','Light_Orange_Pot','Light Orange Potion','0','200','100','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','itemheal rand(105,145),0;','',''); -REPLACE INTO `item_db_re` VALUES ('601','Wing_Of_Fly','Fly Wing','11','500','250','50','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','1','0','0',NULL,'0',NULL,'0',NULL,'0','itemskill AL_TELEPORT,1;','',''); +REPLACE INTO `item_db_re` VALUES ('601','Wing_Of_Fly','Fly Wing','11','60','30','50','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','1','0','0',NULL,'0',NULL,'0',NULL,'0','itemskill AL_TELEPORT,1;','',''); REPLACE INTO `item_db_re` VALUES ('602','Wing_Of_Butterfly','Butterfly Wing','11','300','150','50','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','1','0','0',NULL,'0',NULL,'0',NULL,'0','itemskill AL_TELEPORT,3;','',''); REPLACE INTO `item_db_re` VALUES ('603','Old_Blue_Box','Old Blue Box','2','10000','5000','200','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','1','0','0',NULL,'0',NULL,'0',NULL,'0','getrandgroupitem 603,1;','',''); REPLACE INTO `item_db_re` VALUES ('604','Branch_Of_Dead_Tree','Dead Branch','2','50','25','50','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','1','0','0',NULL,'0',NULL,'0',NULL,'0','monster \"this\",-1,-1,\"--ja--\",-1,1,\"\";','',''); @@ -7841,11 +7841,11 @@ REPLACE INTO `item_db_re` VALUES ('17257','Bad_Student_Gift_Box','Bad Student Gi REPLACE INTO `item_db_re` VALUES ('17262','Def_Potion_Set_Box','Special Defense Potion Box','18','20','10','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db_re` VALUES ('17270','STR_Biscuit_Stick_Box','Bar of Strength Box','18','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','getitem 14616,20;','',''); REPLACE INTO `item_db_re` VALUES ('17271','VIT_Biscuit_Stick_Box','VIT Biscuit Stick Box','18','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','getitem 14617,20;','',''); -REPLACE INTO `item_db_re` VALUES ('18000','Cannon_Ball','Cannon Ball','10','100','50','10','100','0','0','0','0','263168','8','2','32768','0','0',NULL,'0','8','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); -REPLACE INTO `item_db_re` VALUES ('18001','Holy_Cannon_Ball','Holy Cannon Ball','10','200','100','10','120','0','0','0','0','263168','8','2','32768','0','0',NULL,'0','8','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkEle,Ele_Holy;','',''); -REPLACE INTO `item_db_re` VALUES ('18002','Dark_Cannon_Ball','Dark Cannon Ball','10','200','100','10','120','0','0','0','0','263168','8','2','32768','0','0',NULL,'0','8','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkEle,Ele_Dark;','',''); -REPLACE INTO `item_db_re` VALUES ('18003','Soul_Cannon_Ball','Soul Cannon Ball','10','200','100','10','120','0','0','0','0','263168','8','2','32768','0','0',NULL,'0','8','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkEle,Ele_Ghost;','',''); -REPLACE INTO `item_db_re` VALUES ('18004','Iron_Cannon_Ball','Iron Cannon Ball','10','500','250','10','250','0','0','0','0','263168','8','2','32768','0','0',NULL,'0','8','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); +REPLACE INTO `item_db_re` VALUES ('18000','Cannon_Ball','Cannon Ball','10','10','5','10','100','0','0','0','0','263168','8','2','32768','0','0',NULL,'0','8','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); +REPLACE INTO `item_db_re` VALUES ('18001','Holy_Cannon_Ball','Holy Cannon Ball','10','10','5','10','120','0','0','0','0','263168','8','2','32768','0','0',NULL,'0','8','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkEle,Ele_Holy;','',''); +REPLACE INTO `item_db_re` VALUES ('18002','Dark_Cannon_Ball','Dark Cannon Ball','10','10','5','10','120','0','0','0','0','263168','8','2','32768','0','0',NULL,'0','8','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkEle,Ele_Dark;','',''); +REPLACE INTO `item_db_re` VALUES ('18003','Soul_Cannon_Ball','Soul Cannon Ball','10','10','5','10','120','0','0','0','0','263168','8','2','32768','0','0',NULL,'0','8','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkEle,Ele_Ghost;','',''); +REPLACE INTO `item_db_re` VALUES ('18004','Iron_Cannon_Ball','Iron Cannon Ball','10','10','5','10','250','0','0','0','0','263168','8','2','32768','0','0',NULL,'0','8','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db_re` VALUES ('18100','Shooting_Star_C','Shooting Star','4','1','0','0','190','0','0','5','0','526336','63','2','34','4','0',NULL,'0','11','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bLongAtkRate,20;','',''); REPLACE INTO `item_db_re` VALUES ('18101','F_Bow_Of_Rudra_C','Rental Bow Of Rudra','4','2','1','0','185','0','0','5','0','657416','63','2','34','4','0',NULL,'0','11','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkEle,Ele_Holy; bonus bInt,5; skill AL_CURE,1; skill AL_HEAL,1; bonus2 bResEff,Eff_Poison,5000; bonus2 bResEff,Eff_Curse,5000; bonus2 bResEff,Eff_Silence,5000; bonus2 bResEff,Eff_Confusion,5000; bonus2 bResEff,Eff_Blind,5000;','',''); REPLACE INTO `item_db_re` VALUES ('18102','E_Bow_Of_Rudra_C','E Bow Of Rudra C','4','2','1','0','185','0','0','5','0','657416','63','2','34','4','0',NULL,'0','11','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkEle,Ele_Holy; bonus bInt,5; skill AL_CURE,1; skill AL_HEAL,1; bonus2 bResEff,Eff_Poison,5000; bonus2 bResEff,Eff_Curse,5000; bonus2 bResEff,Eff_Silence,5000; bonus2 bResEff,Eff_Confusion,5000; bonus2 bResEff,Eff_Blind,5000;','',''); @@ -7870,7 +7870,7 @@ REPLACE INTO `item_db_re` VALUES ('18502','Cheer_Scarf10','Cheering scarf X','5' REPLACE INTO `item_db_re` VALUES ('18503','Small_Horn_Of_Devil','Small Devil Horns','5','20','10','100','0','0','2','0','0','4294967295','63','2','512','0','0',NULL,'0','562','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkRate,5; bonus bMatkRate,5; bonus bMaxHPrate,10; bonus bMaxSPrate,10;','',''); REPLACE INTO `item_db_re` VALUES ('18504','Anubis_Helm_J','Anubis Helm J','5','20','10','1000','0','0','0','0','0','4294967295','63','2','769','0','70',NULL,'0','485','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db_re` VALUES ('18505','Umbala_Spirit','Umbala Spirit','5','0','0','0','0','0','1','0','0','4294967295','63','2','1','0','0',NULL,'0','675','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bMaxHPrate,1; bonus2 bAddMonsterDropItem,517,500; bonus2 bAddItemHealRate,517,25;','',''); -REPLACE INTO `item_db_re` VALUES ('18506','Hattah_Black','Hata Black','5','50000','25000','4000','0','0','2','0','1','4294967295','63','2','769','0','0',NULL,'1','676','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); +REPLACE INTO `item_db_re` VALUES ('18506','Hattah_Black','Hata Black','5','12000','6000','4000','0','0','2','0','1','4294967295','63','2','769','0','0',NULL,'1','676','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db_re` VALUES ('18507','Elven_Ears_','Elven Ears','5','20','10','100','0','0','0','0','1','2147483646','63','2','512','0','70',NULL,'0','73','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db_re` VALUES ('18508','Garuda_Hat','Garuda Hat','5','20','10','100','0','0','4','0','1','2147483646','63','2','256','0','30',NULL,'1','677','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bSubRace,RC_NonBoss,5; bonus2 bSubRace,RC_Boss,5; bonus bLuk,3; bonus bMdef,3; bonus bHit,10; bonus bDelayrate,-5; if(getrefine() > 5) bonus2 bAddMonsterDropItem,522,100+(getrefine()/100);','',''); REPLACE INTO `item_db_re` VALUES ('18509','RWC2010_Indonesia','RWC 2010 Indonesia','5','20','10','100','0','0','6','0','1','2147483646','63','2','256','0','15',NULL,'1','678','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bSubRace,RC_DemiHuman,10; bonus bCritical,10; bonus2 bAddItemHealRate,501,100; bonus2 bAddItemHealRate,504,100; bonus bLuk,5; bonus bAspd,1; bonus bAtkRate,3; bonus bMatkRate,3;','',''); @@ -8159,7 +8159,7 @@ REPLACE INTO `item_db_re` VALUES ('18815','Devil_School_Cap','Devil School Cap', REPLACE INTO `item_db_re` VALUES ('18816','Adv_Angel_School_Cap','Evoked Angel School Cap','5','20','10','100','0','0','4','0','1','2147483646','63','2','256','0','0',NULL,'1','929','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bInt,2; bonus bVit,2; bonus bLuk,1;','',''); REPLACE INTO `item_db_re` VALUES ('18817','Adv_Devil_School_Cap','Evoked Devil School Cap','5','20','10','100','0','0','4','0','1','2147483646','63','2','256','0','0',NULL,'1','930','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bStr,2; bonus bVit,2; bonus bLuk,1;','',''); REPLACE INTO `item_db_re` VALUES ('18818','Red_Pencil_In_Mouth','Red Pencil In Mouth','5','20','10','100','0','0','0','0','0','4294967295','63','2','1','0','0',NULL,'0','931','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bUnbreakableHelm,0;','',''); -REPLACE INTO `item_db_re` VALUES ('18819','Blue_Pencil_In_Mouth','Blue Pencil In Mouth','5','0','0','100','0','0','0','0','0','4294967295','63','2','1','0','1',NULL,'0','932','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); +REPLACE INTO `item_db_re` VALUES ('18819','Blue_Pencil_In_Mouth','Blue Pencil In Mouth','5','20','10','100','0','0','0','0','0','4294967295','63','2','1','0','1',NULL,'0','932','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db_re` VALUES ('18820','Black_As_Night_Helmet','Black As Night Helmet','5','0','0','0','0','0','0','0','1','4294967295','63','2','256','0','1',NULL,'1','941','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db_re` VALUES ('18821','Rainbow_Feather_Deco','RWC Commemorative Pin','5','20','10','300','0','0','5','0','1','4294967295','63','2','256','0','0',NULL,'1','934','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkRate,1; bonus bMatkRate,1;','',''); REPLACE INTO `item_db_re` VALUES ('18828','2012RMSCNO1','RMSC2012 Champion Headgear','5','0','0','1000','0','0','20','0','1','4294967295','63','2','256','0','95',NULL,'0','942','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bUnbreakableHelm,0; bonus bAllStats,5; bonus bMdef,5;','',''); @@ -8199,8 +8199,8 @@ REPLACE INTO `item_db_re` VALUES ('18895','Celestial_Dark_Flame','Celestial Dark REPLACE INTO `item_db_re` VALUES ('18896','Pterios_Fins','Pterios Fins','5','0','0','200','0','0','5','0','0','4294967295','63','2','512','0','50',NULL,'0','1009','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db_re` VALUES ('18897','Azure_Diadem','Azure Diadem','5','0','0','200','0','0','5','0','0','4294967295','63','2','512','0','50',NULL,'0','1010','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db_re` VALUES ('18898','Yggdrasil_Herald_Crown','Yggdrasil Herald Crown','5','0','0','200','0','0','6','0','1','4294967295','63','2','512','0','50',NULL,'0','997','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); -REPLACE INTO `item_db_re` VALUES ('18900','Weisswurst','Weisswurst','5','0','0','100','0','0','1','0','0','4294967295','63','2','1','0','60',NULL,'0','1022','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); -REPLACE INTO `item_db_re` VALUES ('18901','Seppl_Hat','Seppl Hat','5','0','0','500','0','0','5','0','1','4294967295','63','2','1','0','60',NULL,'1','1023','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); +REPLACE INTO `item_db_re` VALUES ('18900','Weisswurst','Weisswurst','5','20','10','100','0','0','1','0','0','4294967295','63','2','1','0','60',NULL,'0','1022','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); +REPLACE INTO `item_db_re` VALUES ('18901','Seppl_Hat','Seppl Hat','5','20','10','500','0','0','5','0','1','4294967295','63','2','1','0','60',NULL,'1','1023','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db_re` VALUES ('18921','Costume_Tarnished_Lamp','Costume: Tarnished Lamp','5','0','0','200','0','0','0','0','0','4294967295','63','2','1024','0','50',NULL,'0','897','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db_re` VALUES ('19500','T_Mr_Smile','Costume: Mr. Smile','5','0','0','0','0','0','0','0','0','4294967295','63','2','6144','0','0',NULL,'0','65','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bStr,2;','',''); REPLACE INTO `item_db_re` VALUES ('19501','T_Spinx_Helm','Costume: Sphinx Hat','5','0','0','0','0','0','0','0','0','4294967295','63','2','5120','0','0',NULL,'0','137','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); @@ -8300,7 +8300,7 @@ REPLACE INTO `item_db_re` VALUES ('19616','Costume_Wickebine\'s_Black_Cat_Ears', REPLACE INTO `item_db_re` VALUES ('19619','Costume_Corsair','Costume Corsair','5','1000','500','0','0','0','0','0','1','4294967295','63','2','1024','0','0',NULL,'1','105','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db_re` VALUES ('19625','Costume_Refined_Bunny_Band','Costume Refined Bunny Band','5','1000','500','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','15','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db_re` VALUES ('19627','Costume_Satellite_Hairband','Costume Satellite Hairband','5','1000','500','0','0','0','0','0','1','4294967295','63','2','1024','0','0',NULL,'1','266','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); -REPLACE INTO `item_db_re` VALUES ('19629','C_Tiara','Costume Tiara','5','1000','500','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','19','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); +REPLACE INTO `item_db_re` VALUES ('19629','C_Tiara','Costume Tiara','5','20','10','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','19','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db_re` VALUES ('19630','Costume_Crown','Costume Crown','5','1000','500','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','45','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db_re` VALUES ('19632','Costume_Hat','Costume Hat','5','1000','500','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','16','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db_re` VALUES ('19633','Costume_Flower_Band','Costume Flower Band','5','1000','500','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','5','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc index 9c877c56a..e9727658f 100644 --- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc @@ -4799,6 +4799,8 @@ struct { struct HPMHookPoint *HP_status_get_total_def_post; struct HPMHookPoint *HP_status_get_matk_pre; struct HPMHookPoint *HP_status_get_matk_post; + struct HPMHookPoint *HP_status_update_matk_pre; + struct HPMHookPoint *HP_status_update_matk_post; struct HPMHookPoint *HP_status_readdb_pre; struct HPMHookPoint *HP_status_readdb_post; struct HPMHookPoint *HP_status_initChangeTables_pre; @@ -9832,6 +9834,8 @@ struct { int HP_status_get_total_def_post; int HP_status_get_matk_pre; int HP_status_get_matk_post; + int HP_status_update_matk_pre; + int HP_status_update_matk_post; int HP_status_readdb_pre; int HP_status_readdb_post; int HP_status_initChangeTables_pre; diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc index 603752447..387d91e24 100644 --- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc @@ -2436,6 +2436,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(status->get_total_mdef, HP_status_get_total_mdef) }, { HP_POP(status->get_total_def, HP_status_get_total_def) }, { HP_POP(status->get_matk, HP_status_get_matk) }, + { HP_POP(status->update_matk, HP_status_update_matk) }, { HP_POP(status->readdb, HP_status_readdb) }, { HP_POP(status->initChangeTables, HP_status_initChangeTables) }, { HP_POP(status->initDummyData, HP_status_initDummyData) }, diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc index f5e4b5cb0..96b9718dc 100644 --- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc @@ -64575,6 +64575,32 @@ int HP_status_get_matk(struct block_list *src, int flag) { } return retVal___; } +void HP_status_update_matk(struct block_list *bl) { + int hIndex = 0; + if( HPMHooks.count.HP_status_update_matk_pre ) { + void (*preHookFunc) (struct block_list *bl); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_status_update_matk_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_status_update_matk_pre[hIndex].func; + preHookFunc(bl); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.status.update_matk(bl); + } + if( HPMHooks.count.HP_status_update_matk_post ) { + void (*postHookFunc) (struct block_list *bl); + for(hIndex = 0; hIndex < HPMHooks.count.HP_status_update_matk_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_status_update_matk_post[hIndex].func; + postHookFunc(bl); + } + } + return; +} int HP_status_readdb(void) { int hIndex = 0; int retVal___ = 0; |