From a7ea96afa985542351bb0adde476640211c6dc74 Mon Sep 17 00:00:00 2001 From: eppc0330 <47050704+eppc0330@users.noreply.github.com> Date: Fri, 15 Sep 2023 05:49:11 +0900 Subject: [PATCH] Item DB corrections (#7919) * Implemented status change SC_G_LIFEPOTION * Corrected status change SC_ALMIGHTY --- db/re/item_combos.yml | 13 -- db/re/item_db_equip.yml | 71 ++++---- db/re/item_db_etc.yml | 90 +++++++++- db/re/item_db_usable.yml | 312 ++++++++++++++++++++--------------- db/re/status.yml | 35 +--- src/map/script_constants.hpp | 1 + src/map/status.cpp | 14 +- src/map/status.hpp | 3 +- 8 files changed, 314 insertions(+), 225 deletions(-) diff --git a/db/re/item_combos.yml b/db/re/item_combos.yml index 54ff55af02..29f1b71e9c 100644 --- a/db/re/item_combos.yml +++ b/db/re/item_combos.yml @@ -11274,7 +11274,6 @@ Body: - S_Liberation_Shoes Script: | bonus2 bAddClass,Class_Boss,5; - bonus2 bMagicAddClass,Class_Boss,5; - Combos: - Combo: - S_Brutal_Shield @@ -22423,9 +22422,6 @@ Body: bonus bDelayrate,-15; bonus bAtkRate,7; - Combos: - - Combo: - - Cvt_Physical_Wing - - Battle_Processor - Combo: - Cvt_Physical_Wing - Battle_Processor_ @@ -22434,9 +22430,6 @@ Body: bonus bShortAtkRate,5; bonus bAtkRate,7; - Combos: - - Combo: - - Cvt_Physical_Wing - - Deepblue_Sunglasses - Combo: - Deepblue_Sunglasses_ - Cvt_Physical_Wing @@ -22451,9 +22444,6 @@ Body: bonus bDelayrate,-15; bonus bMatkRate,7; - Combos: - - Combo: - - Cvt_Magical_Wing - - Battle_Processor - Combo: - Cvt_Magical_Wing - Battle_Processor_ @@ -22461,9 +22451,6 @@ Body: bonus2 bMagicAtkEle,Ele_All,5; bonus bMatkRate,7; - Combos: - - Combo: - - Cvt_Magical_Wing - - Deepblue_Sunglasses - Combo: - Deepblue_Sunglasses_ - Cvt_Magical_Wing diff --git a/db/re/item_db_equip.yml b/db/re/item_db_equip.yml index e2a9bec041..8fba5c0272 100644 --- a/db/re/item_db_equip.yml +++ b/db/re/item_db_equip.yml @@ -919,7 +919,7 @@ Body: Script: | bonus bAtkEle,Ele_Water; bonus2 bAddEff,Eff_Freeze,500; - bonus2 bAddEff2,Eff_Freeze,10; + bonus2 bAddEff2,Eff_Freeze,100; skill "MG_COLDBOLT",3; bonus3 bAutoSpell,"MG_COLDBOLT",3,100; - Id: 1132 @@ -28566,6 +28566,7 @@ Body: ArmorLevel: 1 EquipLevelMin: 94 Script: | + bonus bUnbreakableShoes; bonus bMdef,10; bonus bMaxHPrate,20; bonus bMaxSPrate,20; @@ -56367,7 +56368,6 @@ Body: Costume_Head_Low: true ArmorLevel: 1 EquipLevelMin: 1 - View: 1378 Script: | hateffect HAT_EF_FLUTTER_BUTTERFLY,true; UnEquipScript: | @@ -57045,7 +57045,6 @@ Body: Costume_Head_Low: true ArmorLevel: 1 EquipLevelMin: 1 - View: 1380 Script: | hateffect HAT_EF_ANGEL_FLUTTERING,true; UnEquipScript: | @@ -75795,7 +75794,7 @@ Body: bonus bUnbreakableWeapon; bonus2 bAddEff,Eff_Stun,1500; bonus3 bAutoSpell,"SM_BASH",max(getskilllv("SM_BASH"),5),20; - bonus2 bAddEff2,Eff_Freeze,100; + bonus2 bAddEff2,Eff_Freezing,100; if (BaseLevel>99) bonus bBaseAtk,20; - Id: 16017 @@ -82679,9 +82678,14 @@ Body: Head_Low: true ArmorLevel: 1 EquipLevelMin: 20 + Trade: + NoDrop: true + NoTrade: true + NoCart: true + NoGuildStorage: true + NoMail: true + NoAuction: true View: 823 - Script: | - bonus2 bAddRace,RC_Plant,2; - Id: 18678 AegisName: Leek_In_Mouth Name: Leek In Mouth @@ -91074,7 +91078,7 @@ Body: bonus bBaseAtk,10*(.@r/2); bonus bAspdRate,2*(.@r/3); if (.@r>=8) - bonus bCritAtkRate,10*getskilllv("TF_DOUBLE"); + bonus bCritAtkRate,10*(getskilllv("TF_DOUBLE")/2); if (.@r>=11) { bonus bAspd,1; bonus bBaseAtk,20; @@ -98505,8 +98509,6 @@ Body: ArmorLevel: 1 EquipLevelMin: 1 View: 717 - Script: | - bonus bVariableCastrate,-10; - Id: 19904 AegisName: C_Skull_Cap Name: Costume Skull cap @@ -109674,7 +109676,6 @@ Body: Locations: Costume_Garment: true ArmorLevel: 1 - View: 94 Script: | hateffect HAT_EF_GEARWHEEL,true; UnEquipScript: | @@ -143884,7 +143885,6 @@ Body: Name: Costume Bubbly Arc Angeling Hairband Type: Armor View: 1633 - Weight: 10 Locations: Costume_Head_Top: true ArmorLevel: 1 @@ -144418,7 +144418,6 @@ Body: Costume_Head_Low: true ArmorLevel: 1 EquipLevelMin: 1 - View: 1665 Script: | hateffect(HAT_EF_C_FLUTTERBUTTERFLY_BL,true); UnEquipScript: | @@ -145573,7 +145572,7 @@ Body: Name: C Fluffy Heart Earmuffs Type: Armor Locations: - Costume_Head_Mid: true + Costume_Head_Top: true ArmorLevel: 1 EquipLevelMin: 1 View: 1707 @@ -147691,7 +147690,7 @@ Body: Name: C Mermaid Wig Type: Armor Locations: - Costume_Head_Top: true + Costume_Head_Low: true ArmorLevel: 1 EquipLevelMin: 1 View: 1866 @@ -155169,6 +155168,10 @@ Body: Locations: Costume_Head_Mid: true ArmorLevel: 1 + Script: | + hateffect(HAT_EF_BLACK_THUNDER,true); + UnEquipScript: | + hateffect(HAT_EF_BLACK_THUNDER,false); - Id: 400150 AegisName: Thanos_Helm_4 Name: Thanos Fighter Helmet @@ -160199,7 +160202,7 @@ Body: ArmorLevel: 1 View: 496 - Id: 400462 - AegisName: aegis_400462 + AegisName: C_Sailor_Cap Name: Costume Sailor Cap Type: Armor Locations: @@ -162533,6 +162536,10 @@ Body: Locations: Costume_Head_Mid: true ArmorLevel: 1 + Script: | + hateffect(HAT_EF_alice_tea,true); + UnEquipScript: | + hateffect(HAT_EF_alice_tea,false); - Id: 410232 AegisName: aegis_410232 Name: Gambler's Seal @@ -164389,7 +164396,7 @@ Body: bonus2 bAddSize,Size_All,15; bonus2 bMagicAddSize,Size_All,15; - Id: 420224 - AegisName: aegis_420224 + AegisName: C_Ocean_Color_Long Name: Costume Ocean Color Long Type: Armor Locations: @@ -164682,6 +164689,7 @@ Body: Type: Armor Locations: Costume_Head_Top: true + Costume_Head_Mid: true Costume_Head_Low: true ArmorLevel: 1 EquipLevelMin: 1 @@ -179010,7 +179018,6 @@ Body: Locations: Costume_Garment: true ArmorLevel: 1 - View: 100 Script: | hateffect HAT_EF_SNOW_POWDER,true; UnEquipScript: | @@ -181589,6 +181596,10 @@ Body: Locations: Costume_Garment: true ArmorLevel: 1 + Script: | + hateffect(HAT_EF_rabbit_aura,true); + UnEquipScript: | + hateffect(HAT_EF_rabbit_aura,false); - Id: 480310 AegisName: C_Giant_Mad_Bunny Name: Costume Big Mad Bunny @@ -181840,7 +181851,7 @@ Body: bonus2 bHPDrainRate,5,100; } - Id: 480320 - AegisName: aegis_480320 + AegisName: C_Aqua_Fin_Decoration Name: Costume Aqua Fin Decoration Type: Armor Locations: @@ -181931,20 +181942,20 @@ Body: bonus bPAtk,5; bonus bSMatk,5; if (.@g>=ENCHANTGRADE_C) { - bonus2 bIgnoreDefRaceRate,RC_Angel,5; - bonus2 bIgnoreDefRaceRate,RC_Dragon,5; - bonus2 bIgnoreMdefRaceRate,RC_Angel,5; - bonus2 bIgnoreMdefRaceRate,RC_Dragon,5; + bonus2 bIgnoreResRaceRate,RC_Angel,5; + bonus2 bIgnoreResRaceRate,RC_Dragon,5; + bonus2 bIgnoreMResRaceRate,RC_Angel,5; + bonus2 bIgnoreMResRaceRate,RC_Dragon,5; if (.@g>=ENCHANTGRADE_B) { - bonus2 bIgnoreDefRaceRate,RC_Angel,5; - bonus2 bIgnoreDefRaceRate,RC_Dragon,5; - bonus2 bIgnoreMdefRaceRate,RC_Angel,5; - bonus2 bIgnoreMdefRaceRate,RC_Dragon,5; + bonus2 bIgnoreResRaceRate,RC_Angel,5; + bonus2 bIgnoreResRaceRate,RC_Dragon,5; + bonus2 bIgnoreMResRaceRate,RC_Angel,5; + bonus2 bIgnoreMResRaceRate,RC_Dragon,5; if (.@g>=ENCHANTGRADE_A) { - bonus2 bIgnoreDefRaceRate,RC_Angel,5; - bonus2 bIgnoreDefRaceRate,RC_Dragon,5; - bonus2 bIgnoreMdefRaceRate,RC_Angel,5; - bonus2 bIgnoreMdefRaceRate,RC_Dragon,5; + bonus2 bIgnoreResRaceRate,RC_Angel,5; + bonus2 bIgnoreResRaceRate,RC_Dragon,5; + bonus2 bIgnoreMResRaceRate,RC_Angel,5; + bonus2 bIgnoreMResRaceRate,RC_Dragon,5; } } } diff --git a/db/re/item_db_etc.yml b/db/re/item_db_etc.yml index 0b7c64b045..1d09790826 100644 --- a/db/re/item_db_etc.yml +++ b/db/re/item_db_etc.yml @@ -15891,6 +15891,30 @@ Body: NoGuildStorage: true NoMail: true NoAuction: true + - Id: 6046 + AegisName: Clothing_Dye_Coupon + Name: Clothing Dye Coupon + Type: Etc + Trade: + NoDrop: true + NoTrade: true + NoSell: true + NoCart: true + NoGuildStorage: true + NoMail: true + NoAuction: true + - Id: 6047 + AegisName: Clothing_Dye_Coupon2 + Name: Clothing Dye Coupon II + Type: Etc + Trade: + NoDrop: true + NoTrade: true + NoSell: true + NoCart: true + NoGuildStorage: true + NoMail: true + NoAuction: true - Id: 6048 AegisName: Unidentified_Mineral Name: Unidentified Mineral @@ -20987,6 +21011,8 @@ Body: Type: Etc Buy: 10 Weight: 10 + Flags: + BuyingStore: true - Id: 6650 AegisName: Shabby_Ring Name: Old Ring @@ -21557,6 +21583,36 @@ Body: Type: Etc Buy: 10 Weight: 100 + - Id: 6720 + AegisName: Status_Reset_Coupon + Name: Status Reset Coupon + Type: Etc + Buy: 10 + EquipLevelMin: 1 + Trade: + NoDrop: true + NoTrade: true + NoSell: true + NoCart: true + NoStorage: true + NoGuildStorage: true + NoMail: true + NoAuction: true + - Id: 6721 + AegisName: Status_Reset_Coupon2 + Name: Status Reset Coupon + Type: Etc + Buy: 10 + EquipLevelMin: 1 + Trade: + NoDrop: true + NoTrade: true + NoSell: true + NoCart: true + NoStorage: true + NoGuildStorage: true + NoMail: true + NoAuction: true - Id: 6722 AegisName: Delicious_Clam Name: Delicious Clam Flesh @@ -23895,6 +23951,14 @@ Body: AegisName: Evt_Cos_Coin Name: Event Stone Coin Type: Etc + Trade: + NoDrop: true + NoTrade: true + NoSell: true + NoCart: true + NoGuildStorage: true + NoMail: true + NoAuction: true - Id: 7001 AegisName: Mould_Powder Name: Mould Powder @@ -36555,6 +36619,8 @@ Body: Name: Orc Warlord Token Type: Etc Weight: 10 + Flags: + BuyingStore: true - Id: 25509 AegisName: Shining_Round_Shell Name: Shiny Round Shell @@ -36624,6 +36690,8 @@ Body: Name: White Snake's Tear Type: Etc Weight: 10 + Flags: + BuyingStore: true - Id: 25627 AegisName: Gold_Card Name: Gold Card @@ -36635,6 +36703,8 @@ Body: Name: Knotted Letter Type: Etc Weight: 10 + Flags: + BuyingStore: true - Id: 25633 AegisName: Token_Of_Wootan Name: Wootan's Token @@ -39632,7 +39702,7 @@ Body: Flags: DropEffect: CLIENT Script: | - bonus2 bAddEffWhenHit,Eff_Freeze,3000 + (readparam(bInt) >= 110 ? 1000 : 0); + bonus2 bAddEffWhenHit,Eff_Freezing,3000 + (readparam(bInt) >= 110 ? 1000 : 0); bonus bMdef,5; - Id: 27152 AegisName: Cutie_Card @@ -40747,7 +40817,7 @@ Body: Flags: DropEffect: CLIENT Script: | - autobonus "{ bonus bDef,300; }",20,10000,BF_WEAPON|BF_SHORT,"{ specialeffect2 EF_POTION_BERSERK; active_transform 1040,10000; }"; + autobonus "{ bonus bDef,300; }",20,10000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; active_transform 1040,10000; }"; - Id: 27264 AegisName: Evil_Shadow_Card Name: Evil Shadow Card @@ -43526,9 +43596,9 @@ Body: Type: Card SubType: Enchant Script: | - hateffect HAT_EF_GUMGANG,true; + hateffect HAT_EF_CIRCLEPOWER,true; UnEquipScript: | - hateffect HAT_EF_GUMGANG,false; + hateffect HAT_EF_CIRCLEPOWER,false; - Id: 29161 AegisName: Pink_Glow_Effect Name: Pink Glow Effect @@ -43872,16 +43942,18 @@ Body: Type: Card SubType: Enchant Script: | - hateffect HAT_EF_WATER_BELOW2,true; + hateffect HAT_EF_WATER_BELOW4,true; UnEquipScript: | - hateffect HAT_EF_WATER_BELOW2,false; + hateffect HAT_EF_WATER_BELOW4,false; - Id: 29226 AegisName: ExplodingWave_Effect Name: Crimson Wave Effect Type: Card SubType: Enchant Script: | - /* todo */ + hateffect HAT_EF_DOUBLEGUMGANG,true; + UnEquipScript: | + hateffect HAT_EF_DOUBLEGUMGANG,false; - Id: 29227 AegisName: Heal Name: Heal @@ -46819,7 +46891,7 @@ Body: BuyingStore: true DropEffect: CLIENT Script: | - bonus5 bAutoSpell,"SO_PSYCHIC_WAVE",1,100,BF_WEAPON,1; + bonus5 bAutoSpell,"SO_PSYCHIC_WAVE",1,100,BF_SHORT,1; - Id: 300007 AegisName: Jungoliant_Card Name: Jeweled Ungoliant Card @@ -51017,7 +51089,7 @@ Body: } bonus2 bMagicAtkEle,Ele_Dark,.@rate; bonus2 bMagicAtkEle,Ele_Holy,.@rate; - bonus2 bMagicAtkEle,Ele_Fire,.@rate; + bonus2 bMagicAtkEle,Ele_Ghost,.@rate; bonus2 bMagicAtkEle,Ele_Neutral,.@rate; - Id: 300376 AegisName: Eyes_Dollocaris_Card diff --git a/db/re/item_db_usable.yml b/db/re/item_db_usable.yml index 4b50e42f72..c79a406e2c 100644 --- a/db/re/item_db_usable.yml +++ b/db/re/item_db_usable.yml @@ -2075,64 +2075,6 @@ Body: Sitting: true Script: | itemskill "MG_FROSTDIVER",1; - - Id: 6046 - AegisName: Clothing_Dye_Coupon - Name: Clothing Dye Coupon - Type: Usable - Trade: - NoDrop: true - NoTrade: true - NoSell: true - NoCart: true - NoGuildStorage: true - NoMail: true - NoAuction: true - - Id: 6047 - AegisName: Clothing_Dye_Coupon2 - Name: Clothing Dye Coupon II - Type: Usable - Trade: - NoDrop: true - NoTrade: true - NoSell: true - NoCart: true - NoGuildStorage: true - NoMail: true - NoAuction: true - - Id: 6720 - AegisName: Status_Reset_Coupon - Name: Status Reset Coupon - Type: Cash - Buy: 10 - EquipLevelMin: 1 - Trade: - NoDrop: true - NoTrade: true - NoSell: true - NoCart: true - NoStorage: true - NoGuildStorage: true - NoMail: true - NoAuction: true - Script: | - resetstatus; - - Id: 6721 - AegisName: Status_Reset_Coupon2 - Name: Status Reset Coupon - Type: Cash - Buy: 10 - EquipLevelMin: 1 - Trade: - NoDrop: true - NoTrade: true - NoSell: true - NoCart: true - NoStorage: true - NoGuildStorage: true - NoMail: true - NoAuction: true - Script: | - resetstatus; - Id: 7037 AegisName: Trade_Coupon Name: Coupon @@ -7310,7 +7252,6 @@ Body: Name: Field Manual Type: Usable Buy: 2 - Weight: 10 Trade: NoDrop: true NoTrade: true @@ -7321,7 +7262,7 @@ Body: NoMail: true NoAuction: true Script: | - sc_start SC_EXPBOOST,1800000,200; + sc_start SC_EXPBOOST,1800000,50; - Id: 12264 AegisName: Comp_Bubble_Gum Name: Bubble Gum @@ -7337,7 +7278,7 @@ Body: NoMail: true NoAuction: true Script: | - sc_start SC_ITEMBOOST,1800000,200; + sc_start SC_ITEMBOOST,1800000,100; - Id: 12265 AegisName: Comp_Insurance Name: Life Insurrance @@ -10717,14 +10658,6 @@ Body: AegisName: Poison_Bottle_Box2 Name: Deadly Poison Box Type: Usable - Trade: - NoDrop: true - NoTrade: true - NoSell: true - NoCart: true - NoGuildStorage: true - NoMail: true - NoAuction: true Script: | getitem 678,30; - Id: 12551 @@ -11011,7 +10944,7 @@ Body: NoAuction: true Script: | specialeffect2 EF_HEAL3; - bonus_script "{ bonus2 bHPRegenRate,(MaxHp/100*6),3000; }",600; + sc_start4 SC_G_LIFEPOTION,600000,-6,3,0,0; - Id: 12579 AegisName: Ring_Of_Valkyrie_Box Name: Ring Of Valkyrie Box @@ -14153,6 +14086,12 @@ Body: Script: | specialeffect2 EF_BASH3D; sc_start SC_ALMIGHTY,1800000,10; + sc_start SC_FOOD_STR_CASH,1800000,10; + sc_start SC_FOOD_AGI_CASH,1800000,10; + sc_start SC_FOOD_INT_CASH,1800000,10; + sc_start SC_FOOD_DEX_CASH,1800000,10; + sc_start SC_FOOD_LUK_CASH,1800000,10; + sc_start SC_FOOD_VIT_CASH,1800000,10; - Id: 12884 AegisName: Infinite_Center_Potion Name: Infinite Concentration Potion @@ -34616,7 +34555,7 @@ Body: - Id: 14717 AegisName: 2013_RWC_Scroll Name: 2013 RWC Scroll - Type: Cash + Type: Usable Buy: 10 Weight: 10 Trade: @@ -46169,7 +46108,7 @@ Body: rentitem 15023,86400; - Id: 17314 AegisName: C_Wing_Of_Fly_1Day_Box - Name: Infinite Giant Fly Wing Box + Name: Infinite Fly Wing Box Type: Cash Buy: 10 Weight: 10 @@ -46182,7 +46121,7 @@ Body: NoMail: true NoAuction: true Script: | - rentitem 23023,86400; + rentitem 12887,86400; - Id: 17315 AegisName: Silvervine_Box10_ Name: Lucky Silvervine Fruit Box(10) @@ -47361,7 +47300,7 @@ Body: getitem 12210,2; getitem 12883,2; getitem 14600,2; - /*getitem Mysterious Water of Life,6;*/ + getitem 12832,6; if (!rand(100)) getitem 22823,1; - Id: 17502 @@ -47383,7 +47322,7 @@ Body: getitem 12210,20; getitem 12883,20; getitem 14600,20; - /*getitem Mysterious Water of Life,60;*/ + getitem 12832,60; if (!rand(100)) getitem 22823,11; - Id: 17507 @@ -47602,7 +47541,7 @@ Body: Script: | getitem 14534,20; getitem 14535,20; - /*getitem Mysterious Water of Life,20;*/ + getitem 12832,20; getitem 22842,1; - Id: 17522 AegisName: 3_Life_Potion_10pack5 @@ -47621,7 +47560,7 @@ Body: Script: | getitem 14534,200; getitem 14535,200; - /*getitem Mysterious Water of Life,200;*/ + getitem 12832,200; getitem 22842,11; - Id: 17523 AegisName: Costama_Egg29 @@ -50618,7 +50557,7 @@ Body: - Id: 22554 AegisName: First_Aid_Kit_B Name: First Aid Box - Type: Cash + Type: Usable Buy: 10 Weight: 200 Trade: @@ -52059,14 +51998,6 @@ Body: Weight: 10 NoUse: Sitting: true - Trade: - NoDrop: true - NoTrade: true - NoSell: true - NoCart: true - NoGuildStorage: true - NoMail: true - NoAuction: true Script: | specialeffect2 EF_HEAL3; sc_start2 SC_M_LIFEPOTION,3600000,-4,3; @@ -52078,14 +52009,6 @@ Body: Weight: 10 NoUse: Sitting: true - Trade: - NoDrop: true - NoTrade: true - NoSell: true - NoCart: true - NoGuildStorage: true - NoMail: true - NoAuction: true Script: | specialeffect2 EF_HEAL3; sc_start2 SC_S_LIFEPOTION,3600000,-5,5; @@ -52097,14 +52020,6 @@ Body: Weight: 10 NoUse: Sitting: true - Trade: - NoDrop: true - NoTrade: true - NoSell: true - NoCart: true - NoGuildStorage: true - NoMail: true - NoAuction: true Script: | specialeffect2 EF_HEAL3; sc_start2 SC_L_LIFEPOTION,3600000,-7,4; @@ -52114,16 +52029,15 @@ Body: Name: True Almighty Type: Usable Weight: 10 - Trade: - NoDrop: true - NoTrade: true - NoSell: true - NoCart: true - NoGuildStorage: true - NoAuction: true Script: | specialeffect2 EF_BASH3D; sc_start SC_ALMIGHTY,3600000,10; + sc_start SC_FOOD_STR_CASH,3600000,10; + sc_start SC_FOOD_AGI_CASH,3600000,10; + sc_start SC_FOOD_INT_CASH,3600000,10; + sc_start SC_FOOD_DEX_CASH,3600000,10; + sc_start SC_FOOD_LUK_CASH,3600000,10; + sc_start SC_FOOD_VIT_CASH,3600000,10; sc_start SC_SPEEDUP0,600000,25; - Id: 22820 AegisName: G_ASPD_Potion @@ -52132,17 +52046,6 @@ Body: Weight: 10 NoUse: Sitting: true - Delay: - Duration: 3600000 - Status: Reuse_Limit_Aspd_Potion - Trade: - NoDrop: true - NoTrade: true - NoSell: true - NoCart: true - NoGuildStorage: true - NoMail: true - NoAuction: true Script: | sc_start SC_ATTHASTE_CASH,3600000,3; sc_start SC_SPEEDUP0,600000,25; @@ -52153,14 +52056,6 @@ Body: Weight: 10 NoUse: Sitting: true - Trade: - NoDrop: true - NoTrade: true - NoSell: true - NoCart: true - NoGuildStorage: true - NoMail: true - NoAuction: true Script: | specialeffect2 EF_POTION_BERSERK; sc_start SC_2011RWC_SCROLL,3600000,0; @@ -58113,6 +58008,8 @@ Body: Name: Giant Orc Helm Combination SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23819 @@ -58120,6 +58017,8 @@ Body: Name: Crimson Rose SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23820 @@ -58127,6 +58026,8 @@ Body: Name: Grand Peco Hairband SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23821 @@ -58134,6 +58035,8 @@ Body: Name: Moonflower Hair Hat SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23822 @@ -58141,6 +58044,8 @@ Body: Name: Wings of 8 Purgatories SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23823 @@ -58148,6 +58053,8 @@ Body: Name: Tare Neko Cru SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23824 @@ -58155,6 +58062,8 @@ Body: Name: Glory Soccer Ball Hat SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23825 @@ -58162,6 +58071,8 @@ Body: Name: Wicket marching Hat SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23826 @@ -58169,6 +58080,8 @@ Body: Name: Wandering Wolf Hat SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23827 @@ -58176,6 +58089,8 @@ Body: Name: Status Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23828 @@ -58183,6 +58098,8 @@ Body: Name: Elegant Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23829 @@ -58190,6 +58107,8 @@ Body: Name: Tension Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23830 @@ -58197,6 +58116,8 @@ Body: Name: Restore Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23831 @@ -58204,6 +58125,8 @@ Body: Name: Healing Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23832 @@ -58211,6 +58134,8 @@ Body: Name: Amistr Cap SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23833 @@ -58218,6 +58143,8 @@ Body: Name: Tiger King Doll Hat SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23834 @@ -58225,6 +58152,8 @@ Body: Name: Bacsojin Doll SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23835 @@ -58232,6 +58161,8 @@ Body: Name: Candy Pouch Bag SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23836 @@ -58239,6 +58170,8 @@ Body: Name: Gold Fish Head Hat SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23837 @@ -58246,6 +58179,8 @@ Body: Name: Survival SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23838 @@ -58253,6 +58188,8 @@ Body: Name: Toy Sringe SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23839 @@ -58260,6 +58197,8 @@ Body: Name: Indigor Rear Ribbon SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23840 @@ -58267,6 +58206,8 @@ Body: Name: Magical Booster SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23841 @@ -58274,6 +58215,8 @@ Body: Name: Rosario's Necklace SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23842 @@ -58281,6 +58224,8 @@ Body: Name: Spirit Crown SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23843 @@ -58288,6 +58233,8 @@ Body: Name: Guard's Cap SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23844 @@ -58295,6 +58242,8 @@ Body: Name: Bandit's Hood SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23845 @@ -58302,6 +58251,8 @@ Body: Name: Angel's Blessing SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23846 @@ -58309,6 +58260,8 @@ Body: Name: Rabbit Magic Hat SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23847 @@ -58316,6 +58269,8 @@ Body: Name: Anubis Helm SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23848 @@ -58323,6 +58278,8 @@ Body: Name: Imp Hat SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23849 @@ -58330,6 +58287,8 @@ Body: Name: Red Marching Hat SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23850 @@ -58337,6 +58296,8 @@ Body: Name: Ifrit Mask SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23851 @@ -58344,6 +58305,8 @@ Body: Name: Incarnation Of Morocc Doll SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23852 @@ -58351,6 +58314,8 @@ Body: Name: Samambaia SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23853 @@ -58358,6 +58323,8 @@ Body: Name: Chick Hat SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23854 @@ -58365,6 +58332,8 @@ Body: Name: Class Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23855 @@ -58372,6 +58341,8 @@ Body: Name: Spell Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23856 @@ -58379,6 +58350,8 @@ Body: Name: Size Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23857 @@ -58386,6 +58359,8 @@ Body: Name: Race Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23858 @@ -58393,6 +58368,8 @@ Body: Name: Stability Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23859 @@ -58400,6 +58377,8 @@ Body: Name: Special Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23860 @@ -58407,6 +58386,8 @@ Body: Name: Physical Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23861 @@ -58414,6 +58395,8 @@ Body: Name: Magical Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23862 @@ -58421,6 +58404,8 @@ Body: Name: EXP Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23863 @@ -58428,6 +58413,8 @@ Body: Name: Mad Bunny SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23864 @@ -58435,6 +58422,8 @@ Body: Name: Archangel's Wings SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23865 @@ -58442,6 +58431,8 @@ Body: Name: Smokie's Transformation Leaf SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23866 @@ -58449,6 +58440,8 @@ Body: Name: Ifrit's Ear SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23867 @@ -58456,6 +58449,8 @@ Body: Name: Heartwing Band SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23868 @@ -58463,6 +58458,8 @@ Body: Name: Sigrun's Wings SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23869 @@ -58470,6 +58467,8 @@ Body: Name: Cat Headdress SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23870 @@ -58477,6 +58476,8 @@ Body: Name: Noble Mask SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23871 @@ -58484,6 +58485,8 @@ Body: Name: Gemstone Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23872 @@ -58491,6 +58494,8 @@ Body: Name: Bearers Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23873 @@ -58498,6 +58503,8 @@ Body: Name: Hasty Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23874 @@ -58505,6 +58512,8 @@ Body: Name: Critical Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23875 @@ -58512,6 +58521,8 @@ Body: Name: Mortal Blow Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23876 @@ -58519,6 +58530,8 @@ Body: Name: Fallen Angel Wings SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23877 @@ -58526,6 +58539,8 @@ Body: Name: Adventurer's Backpack SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23878 @@ -58550,6 +58565,8 @@ Body: Name: Spell Circuit SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23880 @@ -58557,6 +58574,8 @@ Body: Name: New Wave Sunglasses SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23881 @@ -58564,6 +58583,8 @@ Body: Name: Giant Snake Breath SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23882 @@ -58571,6 +58592,8 @@ Body: Name: Judge Hat SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23883 @@ -58578,6 +58601,8 @@ Body: Name: Dog Officer SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23884 @@ -58585,6 +58610,8 @@ Body: Name: Fancy Feather Hat SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23885 @@ -58592,6 +58619,8 @@ Body: Name: Amistr Beret SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23886 @@ -58599,6 +58628,8 @@ Body: Name: General Helm SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23887 @@ -58606,6 +58637,8 @@ Body: Name: Cursed Knight's Shield SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23888 @@ -58613,6 +58646,8 @@ Body: Name: Penetration Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23889 @@ -58620,6 +58655,8 @@ Body: Name: Tempest Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23890 @@ -58627,6 +58664,8 @@ Body: Name: Blitz Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23891 @@ -58634,6 +58673,8 @@ Body: Name: Reload Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23892 @@ -58641,6 +58682,8 @@ Body: Name: Force and Spirit Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23893 @@ -58648,6 +58691,8 @@ Body: Name: Infinity Shadow SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23894 @@ -58655,6 +58700,8 @@ Body: Name: Wickebine's Black Cat's Ear SynthesisBox Type: DelayConsume Weight: 10 + Flags: + BuyingStore: true Script: | laphine_synthesis(); - Id: 23896 @@ -58722,6 +58769,12 @@ Body: Script: | specialeffect2 EF_BASH3D; sc_start SC_ALMIGHTY,1800000,10; + sc_start SC_FOOD_STR_CASH,1800000,10; + sc_start SC_FOOD_AGI_CASH,1800000,10; + sc_start SC_FOOD_INT_CASH,1800000,10; + sc_start SC_FOOD_DEX_CASH,1800000,10; + sc_start SC_FOOD_LUK_CASH,1800000,10; + sc_start SC_FOOD_VIT_CASH,1800000,10; - Id: 23900 AegisName: Time_Overload_Box Name: Temporal Transcendence Box @@ -65428,7 +65481,6 @@ Body: Name: Beast's Leather Shoes Combination Scroll Type: DelayConsume Weight: 10 - EquipLevelMin: 200 Flags: BuyingStore: true Script: | @@ -65438,7 +65490,6 @@ Body: Name: Pirate Captain's Coat Combination Scroll Type: DelayConsume Weight: 10 - EquipLevelMin: 200 Flags: BuyingStore: true Script: | @@ -65448,7 +65499,6 @@ Body: Name: Phreeoni Wing Suit Combination Scroll Type: DelayConsume Weight: 10 - EquipLevelMin: 200 Flags: BuyingStore: true Script: | diff --git a/db/re/status.yml b/db/re/status.yml index ded347d53e..d961799612 100644 --- a/db/re/status.yml +++ b/db/re/status.yml @@ -2888,22 +2888,12 @@ Body: NoDispell: true NoBanishingBuster: true NoClearance: true - EndOnStart: - L_Lifepotion: true - M_Lifepotion: true - Fail: - S_Lifepotion: true - Status: L_Lifepotion Icon: EFST_L_LIFEPOTION Flags: NoDispell: true NoBanishingBuster: true NoClearance: true - EndOnStart: - S_Lifepotion: true - M_Lifepotion: true - Fail: - L_Lifepotion: true - Status: Jexpboost Icon: EFST_CASH_PLUSONLYJOBEXP Flags: @@ -8269,19 +8259,12 @@ Body: NoDispell: true NoBanishingBuster: true NoClearance: true - EndOnStart: - S_Lifepotion: true - L_Lifepotion: true - Fail: - M_Lifepotion: true - Status: S_Manapotion Icon: EFST_S_MANAPOTION Flags: NoDispell: true NoBanishingBuster: true NoClearance: true - Fail: - S_Manapotion: true - Status: Sub_Weaponproperty Flags: NoBanishingBuster: true @@ -8294,12 +8277,6 @@ Body: - Status: Almighty Icon: EFST_ALMIGHTY CalcFlags: - Str: true - Agi: true - Vit: true - Int: true - Dex: true - Luk: true Batk: true Matk: true Flags: @@ -8309,12 +8286,6 @@ Body: NoBanishingBuster: true NoClearance: true EndOnStart: - Food_Str_Cash: true - Food_Agi_Cash: true - Food_Vit_Cash: true - Food_Int_Cash: true - Food_Dex_Cash: true - Food_Luk_Cash: true UltimateCook: true - Status: UltimateCook Icon: EFST_ULTIMATECOOK @@ -8772,3 +8743,9 @@ Body: DurationLookup: MT_RUSH_QUAKE CalcFlags: All: true + - Status: G_LIFEPOTION + Icon: EFST_G_LIFEPOTION + Flags: + NoDispell: true + NoBanishingBuster: true + NoClearance: true diff --git a/src/map/script_constants.hpp b/src/map/script_constants.hpp index 4fdc4e91e8..84fadace2b 100644 --- a/src/map/script_constants.hpp +++ b/src/map/script_constants.hpp @@ -1892,6 +1892,7 @@ export_constant(SC_RELIEVE_OFF); export_constant(SC_RUSH_QUAKE1); export_constant(SC_RUSH_QUAKE2); + export_constant(SC_G_LIFEPOTION); #ifdef RENEWAL export_constant(SC_EXTREMITYFIST2); diff --git a/src/map/status.cpp b/src/map/status.cpp index e6ded785de..6b0dc124bd 100644 --- a/src/map/status.cpp +++ b/src/map/status.cpp @@ -6413,8 +6413,6 @@ static unsigned short status_calc_str(struct block_list *bl, status_change *sc, #endif if (sc->getSCE(SC_UNIVERSESTANCE)) str += sc->getSCE(SC_UNIVERSESTANCE)->val2; - if (sc->getSCE(SC_ALMIGHTY)) - str += sc->getSCE(SC_ALMIGHTY)->val1; if (sc->getSCE(SC_ULTIMATECOOK)) str += sc->getSCE(SC_ULTIMATECOOK)->val1; if (sc->getSCE(SC_ALL_STAT_DOWN)) @@ -6500,8 +6498,6 @@ static unsigned short status_calc_agi(struct block_list *bl, status_change *sc, #endif if (sc->getSCE(SC_UNIVERSESTANCE)) agi += sc->getSCE(SC_UNIVERSESTANCE)->val2; - if (sc->getSCE(SC_ALMIGHTY)) - agi += sc->getSCE(SC_ALMIGHTY)->val1; if (sc->getSCE(SC_ULTIMATECOOK)) agi += sc->getSCE(SC_ULTIMATECOOK)->val1; if (sc->getSCE(SC_ALL_STAT_DOWN)) @@ -6577,8 +6573,6 @@ static unsigned short status_calc_vit(struct block_list *bl, status_change *sc, #endif if (sc->getSCE(SC_UNIVERSESTANCE)) vit += sc->getSCE(SC_UNIVERSESTANCE)->val2; - if (sc->getSCE(SC_ALMIGHTY)) - vit += sc->getSCE(SC_ALMIGHTY)->val1; if (sc->getSCE(SC_ULTIMATECOOK)) vit += sc->getSCE(SC_ULTIMATECOOK)->val1; if (sc->getSCE(SC_CUP_OF_BOZA)) @@ -6671,8 +6665,6 @@ static unsigned short status_calc_int(struct block_list *bl, status_change *sc, if (sc->getSCE(SC_NIBELUNGEN) && sc->getSCE(SC_NIBELUNGEN)->val2 == RINGNBL_ALLSTAT) int_ += 15; #endif - if (sc->getSCE(SC_ALMIGHTY)) - int_ += sc->getSCE(SC_ALMIGHTY)->val1; if (sc->getSCE(SC_ULTIMATECOOK)) int_ += sc->getSCE(SC_ULTIMATECOOK)->val1; if (sc->getSCE(SC_ALL_STAT_DOWN)) @@ -6760,8 +6752,6 @@ static unsigned short status_calc_dex(struct block_list *bl, status_change *sc, #endif if (sc->getSCE(SC_UNIVERSESTANCE)) dex += sc->getSCE(SC_UNIVERSESTANCE)->val2; - if (sc->getSCE(SC_ALMIGHTY)) - dex += sc->getSCE(SC_ALMIGHTY)->val1; if (sc->getSCE(SC_ULTIMATECOOK)) dex += sc->getSCE(SC_ULTIMATECOOK)->val1; if (sc->getSCE(SC_ALL_STAT_DOWN)) @@ -6835,8 +6825,6 @@ static unsigned short status_calc_luk(struct block_list *bl, status_change *sc, #endif if (sc->getSCE(SC_UNIVERSESTANCE)) luk += sc->getSCE(SC_UNIVERSESTANCE)->val2; - if (sc->getSCE(SC_ALMIGHTY)) - luk += sc->getSCE(SC_ALMIGHTY)->val1; if (sc->getSCE(SC_ULTIMATECOOK)) luk += sc->getSCE(SC_ULTIMATECOOK)->val1; if (sc->getSCE(SC_MYSTICPOWDER)) @@ -10928,6 +10916,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty case SC_L_LIFEPOTION: case SC_M_LIFEPOTION: case SC_S_MANAPOTION: + case SC_G_LIFEPOTION: if( val1 == 0 ) return 0; // val1 = heal percent/amout // val2 = seconds between heals @@ -14012,6 +14001,7 @@ TIMER_FUNC(status_change_timer){ case SC_S_LIFEPOTION: case SC_L_LIFEPOTION: case SC_M_LIFEPOTION: + case SC_G_LIFEPOTION: if( --(sce->val4) >= 0 ) { // val1 < 0 = per max% | val1 > 0 = exact amount int hp = 0; diff --git a/src/map/status.hpp b/src/map/status.hpp index 5a99abf09e..386b4bf381 100644 --- a/src/map/status.hpp +++ b/src/map/status.hpp @@ -1282,7 +1282,8 @@ enum sc_type : int16 { SC_RUSH_QUAKE1, SC_RUSH_QUAKE2, - + + SC_G_LIFEPOTION, #ifdef RENEWAL SC_EXTREMITYFIST2, //! NOTE: This SC should be right before SC_MAX, so it doesn't disturb if RENEWAL is disabled #endif