Update EDP requirements (#7463)

Fixes #7458

Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
This commit is contained in:
idk-whoami 2022-12-19 18:19:30 +07:00 committed by GitHub
parent 9b6a4de288
commit 5b8d0ee6a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 6 deletions

View File

@ -1823,7 +1823,7 @@ Body:
Flags: Flags:
BuyingStore: true BuyingStore: true
Script: | Script: |
if (Class == Job_Assassin_Cross || Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T || Class == Job_Shadow_Cross) { if ((eaclass()&EAJ_ASSASSIN_CROSS)==EAJ_ASSASSIN_CROSS) {
sc_start SC_DPOISON,60000,0; sc_start SC_DPOISON,60000,0;
sc_start SC_ASPDPOTION3,60000,9; sc_start SC_ASPDPOTION3,60000,9;
} }
@ -50395,7 +50395,6 @@ Body:
AegisName: Poison_Bottle_B AegisName: Poison_Bottle_B
Name: Poison Bottle Name: Poison Bottle
Type: Usable Type: Usable
Buy: 10
Weight: 100 Weight: 100
Trade: Trade:
NoDrop: true NoDrop: true
@ -50405,7 +50404,7 @@ Body:
NoMail: true NoMail: true
NoAuction: true NoAuction: true
Script: | Script: |
if (Class == Job_Assassin_Cross || Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T) { if ((eaclass()&EAJ_ASSASSIN_CROSS)==EAJ_ASSASSIN_CROSS) {
sc_start SC_DPOISON,60000,0; sc_start SC_DPOISON,60000,0;
sc_start SC_ASPDPOTION3,60000,9; sc_start SC_ASPDPOTION3,60000,9;
} }

View File

@ -48944,3 +48944,9 @@ Body:
List: List:
- Item: Shadow_Refine_Hammer - Item: Shadow_Refine_Hammer
Amount: 3 Amount: 3
- Group: EDP
SubGroups:
- SubGroup: 0
List:
- Item: Poison_Bottle
- Item: Poison_Bottle_B

View File

@ -10516,9 +10516,6 @@ Body:
Amount: 90 Amount: 90
- Level: 5 - Level: 5
Amount: 100 Amount: 100
ItemCost:
- Item: Poison_Bottle
Amount: 1
Status: Edp Status: Edp
- Id: 379 - Id: 379
Name: ASC_BREAKER Name: ASC_BREAKER

View File

@ -1835,6 +1835,7 @@ enum e_random_item_group {
IG_S_TEMP2_CUBE, IG_S_TEMP2_CUBE,
IG_BLACKSMITH_BLESS_BOX_3, IG_BLACKSMITH_BLESS_BOX_3,
IG_SHADOW_HAMMER_BOX_3, IG_SHADOW_HAMMER_BOX_3,
IG_EDP,
IG_MAX, IG_MAX,
}; };

View File

@ -6633,6 +6633,7 @@
export_constant(IG_S_TEMP2_CUBE); export_constant(IG_S_TEMP2_CUBE);
export_constant(IG_BLACKSMITH_BLESS_BOX_3); export_constant(IG_BLACKSMITH_BLESS_BOX_3);
export_constant(IG_SHADOW_HAMMER_BOX_3); export_constant(IG_SHADOW_HAMMER_BOX_3);
export_constant(IG_EDP);
/* unit stop walking */ /* unit stop walking */
export_constant(USW_NONE); export_constant(USW_NONE);

View File

@ -17948,6 +17948,18 @@ bool skill_check_condition_castend(map_session_data* sd, uint16 skill_id, uint16
} }
break; break;
} }
#ifdef RENEWAL
case ASC_EDP:
if(sd) {
int16 item_edp = itemdb_group.item_exists_pc(sd, IG_EDP);
if (item_edp < 0) {
clif_skill_fail( sd, skill_id, USESKILL_FAIL_NEED_ITEM, 1, ITEMID_POISON_BOTTLE ); // [%s] required '%d' amount.
return false;
} else
pc_delitem(sd, item_edp, 1, 0, 1, LOG_TYPE_CONSUME);
}
break;
#endif
} }
status = &sd->battle_status; status = &sd->battle_status;