Skip to content
Permalink
Browse files
* Release of Summoner skills! 
* All skills are usable from from the base list to all 3 branch types.
-- Some skills still need their official activation chance and durations.
Thanks to Rytech and @NovaRagnarok for their information!
Thanks to Rathena
  • Loading branch information
@dastgirp
dastgirp committed Jun 17, 2016
1 parent 06e7b32 commit 50153d0a719828450440882ba59bde9606d5b95f
Showing with 364 additions and 53 deletions.
  1. +10 −0 db/re/item_db.conf
  2. +2 −0 db/re/map_zone_db.conf
  3. +33 −5 db/re/skill_cast_db.txt
  4. +13 −13 db/re/skill_db.txt
  5. +22 −25 db/re/skill_require_db.txt
  6. +4 −0 db/re/skill_unit_db.txt
  7. +1 −0 db/sc_config.txt
  8. +44 −2 src/map/battle.c
  9. +2 −0 src/map/itemdb.h
  10. +2 −0 src/map/pc.c
  11. +2 −0 src/map/script.c
  12. +132 −4 src/map/skill.c
  13. +3 −0 src/map/skill.h
  14. +93 −4 src/map/status.c
  15. +1 −0 src/map/unit.c
10 db/re/item_db.conf
View file
@@ -84536,6 +84536,16 @@ item_db: (
montransform QUVE, 600000, SC_MTF_HITFLEE, 10, 20;
">
},
{
Id: 11602
AegisName: "Catnip_Fruit"
Name: "Catnip Fruit"
Type: 0
Buy: 15
Weight: 1
Upper: 63
Script: <" itemheal rand(10,40),0; ">
},
{
Id: 11701
AegisName: "Girl_Bunch_Of_Flower"
2 db/re/map_zone_db.conf
View file
@@ -193,6 +193,7 @@ zones: (
BS_GREED: "PLAYER"
SC_FATALMENACE: "PLAYER"
SC_DIMENSIONDOOR: "PLAYER"
SU_LOPE: "PLAYER"
}

disabled_items: {
@@ -292,6 +293,7 @@ zones: (
CASH_ASSUMPTIO: "PLAYER"
SC_FATALMENACE: "PLAYER"
SC_DIMENSIONDOOR: "PLAYER"
SU_LOPE: "PLAYER"
}
disabled_items: {
Assumptio_5_Scroll: true
38 db/re/skill_cast_db.txt
View file
@@ -1706,15 +1706,43 @@

//===== Summoner ===========================
//-- SU_BITE
5019,1000,0,500,0,0,0,0
5019,1000,1000,0,0,0,0,0
//-- SU_HIDE
5020,0,0,500,15000,0,-1,0
5020,0,1000,0,-1,0,15000,0
//-- SU_SCRATCH
5021,0,0,500,3000:2000:1000,0,0,0
5021,0,1000,0,10000,0,3000:2000:1000,0
//-- SU_STOOP
5022,0,0,500,15000,0,6000,0
5022,0,1000,0,6000,0,15000,0
//-- SU_LOPE
5023,1000,0,500,2000:4000:6000,0,0,0
5023,500,1000,0,0,0,2000:4000:6000,0
//-- SU_SV_STEMSPEAR
5026,2500,1000,0,10000,0,0,0
//-- SU_CN_POWDERING
5027,1500,1000,0,3000:4000:5000:6000:7000,0,0,0
//-- SU_CN_METEOR
5028,6000,1000,0,500,5000,2000:3000:4000:5000:6000,0
//-- SU_SV_ROOTTWIST
5029,0,1000,0,7000:9000:11000:13000:15000,0,3000,0
//-- SU_SV_ROOTTWIST_ATK
5030,0,1000,0,0,0,0
//-- SU_SCAROFTAROU
5032,500,1000,0,9000,1000,0,0
//-- SU_PICKYPECK
5033,2500,1000,0,0,0,0,0
//-- SU_PICKYPECK_DOUBLE_ATK
5034,0,1000,0,0,0,0,0
//-- SU_ARCLOUSEDASH
5035,2500,1000,0,60000:70000:80000:90000:100000,0,10000,0
//-- SU_LUNATICCARROTBEAT
5036,3000,1000,0,1000,0,8000,0
//-- SU_TUNABELLY
5038,2000,1000,0,0,0,8000:10000:12000:14000:16000,0
//-- SU_TUNAPARTY
5039,0,1000,0,30000,0,20000,0
//-- SU_BUNCHOFSHRIMP
5040,0,1000,0,60000:90000:120000:150000:180000,0,10000,0
//-- SU_FRESHSHRIMP
5041,0,1000,0,120000,0,7000,0

//===== Homunculus Skills ==================
//-- HLIF_HEAL
26 db/re/skill_db.txt
View file
@@ -1147,22 +1147,22 @@
5023,6:10:14,6,2,0,0x1,0,3,1,yes,0,0,0,none,0, SU_LOPE,Lope
5024,0,0,0,0,0,0,1,0,no,0,0,0,none,0, SU_SPRITEMABLE,Spirit Marble
5025,0,0,0,0,0,0,1,0,no,0,0,0,none,0, SU_POWEROFLAND,Power of Land
5026,9,6,1,0,0,0,5,1,yes,0,0,0,magic,0, SU_SV_STEMSPEAR,Silvervine Stem Spear
5027,9,6,1,0,0,0,5,1,yes,0,0,0,none,0, SU_CN_POWDERING,Catnip Powdering
5028,9,6,2,0,0,0,5,1,yes,0,0,0,magic,0, SU_CN_METEOR,Catnip Meteor
5029,9,6,1,0,0,0,5,1,yes,0,0,0,none,0, SU_SV_ROOTTWIST,Silvervine Root Twist
5030,0,6,1,0,0,0,5,1,yes,0,0x4000,0,magic,0, SU_SV_ROOTTWIST_ATK,Silver Vine Root Twist Attack
5026,9,6,1,2:3:1:4:8,0x0,0,5,1,yes,0,0,0,magic,0, SU_SV_STEMSPEAR,Silvervine Stem Spear
5027,9,6,1,0,0x3,0,5,1,yes,0,0,1,none,0, SU_CN_POWDERING,Catnip Powdering
5028,9,8,2,0,0,1:1:2:2:3,5,1:2:3:4:5,yes,0,0,0,magic,0, SU_CN_METEOR,Catnip Meteor
5029,9,6,1,0,0x1,0,5,1,yes,0,0,1,none,0, SU_SV_ROOTTWIST,Silvervine Root Twist
5030,0,6,1,5,0x30,0,5,1,no,0,0,1,magic,0, SU_SV_ROOTTWIST_ATK,Silver Vine Root Twist Attack
5031,0,0,0,0,0,0,1,0,no,0,0,0,none,0, SU_POWEROFLIFE,Power of Life
5032,9,6,1,-1,0,0,5,1,yes,0,0,0,weapon,0, SU_SCAROFTAROU,Scar of Tarou
5033,9,6,1,-1,0,0,5,1,yes,0,0,0,weapon,0, SU_PICKYPECK,Picky Peck
5034,0,6,1,-1,0,0,5,1,yes,0,0x4000,0,weapon,0, SU_PICKYPECK_DOUBLE_ATK,Picky Peck Double Attack
5035,9,6,16,0,0,0,5,1,yes,0,0,0,none,0, SU_ARCLOUSEDASH,Arclouse Dash
5036,9,6,1,-1,0,0,5,1,yes,0,0,0,weapon,0, SU_LUNATICCARROTBEAT,Lunatic Carrot Beat
5033,9,8,1,-1,0,0,5,-5,yes,0,0,0,weapon,0, SU_PICKYPECK,Picky Peck
5034,0,8,1,-1,0,0,5,-5,yes,0,0,0,weapon,0, SU_PICKYPECK_DOUBLE_ATK,Picky Peck Double Attack
5035,9,6,16,0,0x1,0,5,1,yes,0,0,0,none,0, SU_ARCLOUSEDASH,Arclouse Dash
5036,9,8,1,-1,0x2,1:1:2:2:3,5,1:2:3:4:5,yes,0,0,0,weapon,0, SU_LUNATICCARROTBEAT,Lunatic Carrot Beat
5037,0,0,0,0,0,0,1,0,no,0,0,0,none,0, SU_POWEROFSEA,Power of Sea
5038,9,6,16,0,0,0,5,1,yes,0,0,0,none,0, SU_TUNABELLY,Tuna Belly
5039,9,6,16,0,0,0,5,1,yes,0,0,0,none,0, SU_TUNAPARTY,Tuna Party
5040,0,6,4,0,0,0,5,1,yes,0,0,0,none,0, SU_BUNCHOFSHRIMP,Bunch of Shrimp
5041,9,6,16,0,0,0,5,1,yes,0,0,0,none,0, SU_FRESHSHRIMP,Fresh Shrimp
5038,9,6,16,0,0x1,0,5,1,yes,0,0,0,none,0, SU_TUNABELLY,Tuna Belly
5039,9,6,16,0,0x1,0,5,1,yes,0,0,0,none,0, SU_TUNAPARTY,Tuna Party
5040,0,6,4,0,0x3,-1,5,1,yes,0,0,0,none,0, SU_BUNCHOFSHRIMP,Bunch of Shrimp
5041,9,6,16,0,0x3,0,5,1,yes,0,0,0,none,0, SU_FRESHSHRIMP,Fresh Shrimp

5042,0,6,2,0,0,0,5,1,yes,0,0x4000,0,magic,0, SU_CN_METEOR_ATK,
5043,0,6,1,0,0,0,5,1,yes,0,0x4000,0,weapon,0, SU_LUNATICCARROTBEAT_ATK,
47 db/re/skill_require_db.txt
View file
@@ -905,31 +905,28 @@

// Summoner
//5018,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_BASIC_SKILL,Basic Skill
5019,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_BITE##
5020,0,0,30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_HIDE##
5021,0,0,20:25:30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_SCRATCH##
5022,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_STOOP##
5023,0,0,30:30:30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_LOPE##

5026,0,0,40:40:40:40:40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_SV_STEMSPEAR##
5027,0,0,40:36:32:28:24,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_CN_POWDERING##
5028,0,0,20:35:50:65:80,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_CN_METEOR##
5029,0,0,10:12:14:16:18,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_SV_ROOTTWIST##
5030,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_SV_ROOTTWIST_ATK##

5032,0,0,10:14:18:22:26,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_SCAROFTAROU##
5033,0,0,10:19:28:37:46,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_PICKYPECK##
5034,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_PICKYPECK_DOUBLE_ATK##
5035,0,0,12:20:28:36:44,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_ARCLOUSEDASH##
5036,0,0,15:25:35:45:55,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_LUNATICCARROTBEAT##

5038,0,0,20:30:40:50:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_TUNABELLY##
5039,0,0,20:30:40:50:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_TUNAPARTY##
5040,0,0,44:48:52:56:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_BUNCHOFSHRIMP##
5041,0,0,22:24:26:28:30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_FRESHSHRIMP##

5042,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_CN_METEOR_ATK##
5043,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_LUNATICCARROTBEAT_ATK##
5019,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_BITE
5020,0,0,30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_HIDE
5021,0,0,20:25:30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_SCRATCH
5022,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_STOOP
5023,0,0,30:30:30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_LOPE
5026,0,0,40:40:40:40:40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_SV_STEMSPEAR
5027,0,0,40:36:32:28:24,0,0,0,99,0,0,none,0,0,11602,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_CN_POWDERING
5028,0,0,20:35:50:65:80,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_CN_METEOR
5029,0,0,10:12:14:16:18,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_SV_ROOTTWIST
5030,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_SV_ROOTTWIST_ATK
5032,0,0,10:14:18:22:26,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_SCAROFTAROU
5033,0,0,10:19:28:37:46,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_PICKYPECK
5034,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_PICKYPECK_DOUBLE_ATK
5035,0,0,12:20:28:36:44,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_ARCLOUSEDASH
5036,0,0,15:25:35:45:55,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_LUNATICCARROTBEAT
5038,0,0,20:30:40:50:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_TUNABELLY
5039,0,0,20:30:40:50:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_TUNAPARTY
5040,0,0,44:48:52:56:60,0,0,0,99,0,0,none,0,0,567,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_BUNCHOFSHRIMP
5041,0,0,22:24:26:28:30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SU_FRESHSHRIMP
// Unknown Summoner Skills
//5042,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //
//5043,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //

10010,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GD_BATTLEORDER##
10011,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GD_REGENERATION##
4 db/re/skill_unit_db.txt
View file
@@ -167,6 +167,10 @@
5008,0x7e, , 0, 0, -1,all, 0x003 //SO_ELEMENTAL_SHIELD
5010,0xfe, , 0, 2, -1,enemy, 0x000 //SC_ESCAPE

5027,0x106, , 1:1:2:2:3, 0, -1,enemy, 0x2010 // SU_CN_POWDERING
5028,0x86, , 1, 0,1000,enemy, 0x10 // SU_CN_METEOR
5029,0x107, , 0, 0,1000,enemy, 0x10 // SU_SV_ROOTTWIST

8020,0xf5, , 0, 3,2300:2100:1900:1700:1500,enemy, 0x018 //MH_POISON_MIST
8033,0x7e, , 0, 0, -1,all, 0x003 //MH_STEINWAND
8025,0x86, , 0, 2:2:3:3:4,1000,enemy, 0x018 //MH_XENO_SLASHER
1 db/sc_config.txt
View file
@@ -491,6 +491,7 @@ SC_BLOSSOM_FLUTTERING, 207

// Summoner
SC_SPRITEMABLE, 205
SC_BITESCAR, 4

// Cant Clear
SC_ALL_RIDING, 141
46 src/map/battle.c
View file
@@ -1883,6 +1883,12 @@ int battle_calc_skillratio(int attack_type, struct block_list *src, struct block
pc->del_charm(sd, sd->charm_count, sd->charm_type);
}
break;
case SU_SV_STEMSPEAR:
skillratio += 600;
break;
case SU_CN_METEOR:
skillratio += 100 + 100 * skill_lv;
break;
default:
battle->calc_skillratio_magic_unknown(&attack_type, src, target, &skill_id, &skill_lv, &skillratio, &flag);
break;
@@ -2288,10 +2294,22 @@ int battle_calc_skillratio(int attack_type, struct block_list *src, struct block
* Summoner
**/
case SU_BITE:
skillratio = 200;
skillratio += 100;
break;
case SU_SCRATCH:
skillratio = 50 + 50 * skill_lv;
skillratio += -50 + 50 * skill_lv;
break;
case SU_SCAROFTAROU:
skillratio += -100 + 100 * skill_lv;
break;
case SU_PICKYPECK:
case SU_PICKYPECK_DOUBLE_ATK:
skillratio += 100 + 100 * skill_lv;
if (status_get_max_hp(target) / 100 <= 50)
skillratio *= 2;
break;
case SU_LUNATICCARROTBEAT:
skillratio += 100 + 100 * skill_lv;
break;
/**
* Arch Bishop
@@ -3184,6 +3202,17 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
status_change_end(bl, SC_KYRIE, INVALID_TIMER);
}

if ((sce = sc->data[SC_TUNAPARTY]) && damage > 0) {
clif->specialeffect(bl, 336, AREA);
sce->val2 -= (int)cap_value(damage, INT_MIN, INT_MAX);
if (sce->val2 >= 0)
damage = 0;
else
damage = -sce->val2;
if (/*(--sce->val3) <= 0 ||*/ (sce->val2 <= 0))
status_change_end(bl, SC_TUNAPARTY, INVALID_TIMER);
}

if( sc->data[SC_MEIKYOUSISUI] && rnd()%100 < 40 ) // custom value
damage = 0;

@@ -3675,6 +3704,9 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
//Damage calculation from iRO wiki. [Jobbie]
ad.damage = status->get_lv(src) * 10 + sstatus->int_;
break;
case SU_SV_ROOTTWIST_ATK:
ad.damage = 100;
break;
default: {
unsigned int skillratio = 100; //Skill dmg modifiers.
MATK_ADD( status->get_matk(src, 2) );
@@ -5192,6 +5224,13 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
if (hd != NULL)
ATK_ADD(hd->homunculus.spiritball * 3);
}
if ((wd.flag&(BF_LONG|BF_MAGIC)) == BF_LONG) {
if (sd && pc->checkskill(sd, SU_POWEROFLIFE) > 0) {
if (pc->checkskill(sd, SU_SCAROFTAROU) == 5 && pc->checkskill(sd, SU_PICKYPECK) == 5 && pc->checkskill(sd, SU_ARCLOUSEDASH) == 5 && pc->checkskill(sd, SU_LUNATICCARROTBEAT) == 5) {
ATK_ADDRATE(20);
}
}
}
}

switch (skill_id) {
@@ -5256,6 +5295,9 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
if( sc && sc->data[SC_MTF_RANGEATK] )
ATK_ADDRATE(sc->data[SC_MTF_RANGEATK]->val1);// temporary it should be 'bonus.long_attack_atk_rate'
#endif
if (sc->data[SC_ARCLOUSEDASH] && sc->data[SC_ARCLOUSEDASH]->val4) {
ATK_ADDRATE(sc->data[SC_ARCLOUSEDASH]->val4);
}
if( (i=pc->checkskill(sd,AB_EUCHARISTICA)) > 0 &&
(tstatus->race == RC_DEMON || tstatus->def_ele == ELE_DARK) )
ATK_ADDRATE(-i);
2 src/map/itemdb.h
View file
@@ -54,6 +54,7 @@ enum item_itemid {
ITEMID_WHITE_POTION = 504,
ITEMID_BLUE_POTION = 505,
ITEMID_APPLE = 512,
ITEMID_CARROT = 515,
ITEMID_HOLY_WATER = 523,
ITEMID_PUMPKIN = 535,
ITEMID_RED_SLIM_POTION = 545,
@@ -113,6 +114,7 @@ enum item_itemid {
ITEMID_GOLD_KEY77 = 7782,
ITEMID_SILVER_KEY77 = 7783,
ITEMID_TRAP_ALLOY = 7940,
ITEMID_CATNIP_FRUIT = 11602,
ITEMID_RED_POUCH_OF_SURPRISE = 12024,
ITEMID_BLOODY_DEAD_BRANCH = 12103,
ITEMID_PORING_BOX = 12109,
2 src/map/pc.c
View file
@@ -8309,6 +8309,8 @@ int pc_itemheal(struct map_session_data *sd,int itemid, int hp,int sp)
if( sd->sc.data[SC_EXTREMITYFIST2] )
sp = 0;
#endif
if (sd->sc.data[SC_BITESCAR])
hp = 0;
}

return status->heal(&sd->bl, hp, sp, 1);
2 src/map/script.c
View file
@@ -6334,6 +6334,8 @@ BUILDIN(percentheal)
if( sd->sc.data[SC_EXTREMITYFIST2] )
sp = 0;
#endif
if (sd->sc.data[SC_BITESCAR])
hp = 0;
pc->percentheal(sd,hp,sp);
return true;
}

0 comments on commit 50153d0

Please sign in to comment.