Skip to content

[pull] master from rathena:master #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Mar 9, 2026
+30 −16
Merged

[pull] master from rathena:master #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions db/re/item_combos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50639,16 +50639,16 @@ Body:
- Combos:
- Combo:
- aegis_400676 # 400676
- aegis_490475 # 490475
- Chemical_Glove_ROC # 490475
- Combo:
- aegis_400676 # 400676
- aegis_490476 # 490476
- Comp_Chemical_Glove_ROC # 490476
- Combo:
- aegis_400677 # 400677
- aegis_490475 # 490475
- Chemical_Glove_ROC # 490475
- Combo:
- aegis_400677 # 400677
- aegis_490476 # 490476
- Comp_Chemical_Glove_ROC # 490476
Script: |
bonus2 bSkillAtk,"CR_ACIDDEMONSTRATION",100;
bonus2 bSkillAtk,"AM_ACIDTERROR",50;
Expand Down
16 changes: 4 additions & 12 deletions db/re/item_db_equip.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225650,7 +225650,7 @@ Body:
bonus bDelayrate,-5;
bonus bUseSPrate,5;
- Id: 490475
AegisName: aegis_490475
AegisName: Chemical_Glove_ROC
Name: Chemical Glove
Type: Armor
Weight: 100
Expand All @@ -225672,15 +225672,11 @@ Body:
bonus bBaseAtk,5*.@a;
bonus bMaxHPrate,2*.@a;
bonus2 bSkillUseSP,"CR_ACIDDEMONSTRATION",.@a;
bonus2 bAddItemHealRate,501,100;
bonus2 bAddItemHealRate,502,100;
bonus2 bAddItemHealRate,503,100;
bonus2 bAddItemHealRate,504,100;
bonus2 bAddItemHealRate,547,100;
bonus2 bAddItemGroupHealRate,IG_CHEMICAL_GLOVE_ROC,100;
bonus2 bSkillAtk,"CR_ACIDDEMONSTRATION",20*(BaseLevel/20);
bonus2 bSkillAtk,"AM_ACIDTERROR",30*(BaseLevel/20);
- Id: 490476
AegisName: aegis_490476
AegisName: Comp_Chemical_Glove_ROC
Name: "[Not For Sale] Chemical Glove"
Type: Armor
Weight: 100
Expand Down Expand Up @@ -225709,11 +225705,7 @@ Body:
bonus bBaseAtk,5*.@a;
bonus bMaxHPrate,2*.@a;
bonus2 bSkillUseSP,"CR_ACIDDEMONSTRATION",.@a;
bonus2 bAddItemHealRate,501,100;
bonus2 bAddItemHealRate,502,100;
bonus2 bAddItemHealRate,503,100;
bonus2 bAddItemHealRate,504,100;
bonus2 bAddItemHealRate,547,100;
bonus2 bAddItemGroupHealRate,IG_CHEMICAL_GLOVE_ROC,100;
bonus2 bSkillAtk,"CR_ACIDDEMONSTRATION",20*(BaseLevel/20);
bonus2 bSkillAtk,"AM_ACIDTERROR",30*(BaseLevel/20);
- Id: 490479
Expand Down
20 changes: 20 additions & 0 deletions db/re/item_group_db.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133134,3 +133134,23 @@ Body:
- Index: 11
Item: Yggdrasil_Dust
Rate: 200
- Group: CHEMICAL_GLOVE_ROC
SubGroups:
- SubGroup: 1
Algorithm: Random
List:
- Index: 0
Item: Red_Potion
Rate: 1
- Index: 1
Item: Orange_Potion
Rate: 1
- Index: 2
Item: Yellow_Potion
Rate: 1
- Index: 3
Item: White_Potion
Rate: 1
- Index: 4
Item: White_Slim_Potion
Rate: 1
1 change: 1 addition & 0 deletions src/map/itemdb.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3224,6 +3224,7 @@ enum e_random_item_group {
IG_SELECT_DEC_PACK2,
IG_SELECT_DEC_PACK3,
IG_SPENDID_CAPE_BR,
IG_CHEMICAL_GLOVE_ROC,

IG_MAX
};
Expand Down
1 change: 1 addition & 0 deletions src/map/script_constants.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7398,6 +7398,7 @@
export_constant(IG_SELECT_DEC_PACK2);
export_constant(IG_SELECT_DEC_PACK3);
export_constant(IG_SPENDID_CAPE_BR);
export_constant(IG_CHEMICAL_GLOVE_ROC);

/* unit stop walking */
export_constant(USW_NONE);
Expand Down
Loading