From 867a2b49b167b58ee57594ec09b70eb502fdf8d5 Mon Sep 17 00:00:00 2001 From: idk-whoami <60462533+idk-whoami@users.noreply.github.com> Date: Mon, 9 Mar 2026 17:39:44 +0700 Subject: [PATCH] Corrected script and update AegisName of item (Chemical Glove) (#9907) --- db/re/item_combos.yml | 8 ++++---- db/re/item_db_equip.yml | 16 ++++------------ db/re/item_group_db.yml | 20 ++++++++++++++++++++ src/map/itemdb.hpp | 1 + src/map/script_constants.hpp | 1 + 5 files changed, 30 insertions(+), 16 deletions(-) diff --git a/db/re/item_combos.yml b/db/re/item_combos.yml index bfda7b1a4fc..84b4814ed6e 100644 --- a/db/re/item_combos.yml +++ b/db/re/item_combos.yml @@ -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; diff --git a/db/re/item_db_equip.yml b/db/re/item_db_equip.yml index 2dedde49cbf..b2bbd816af1 100644 --- a/db/re/item_db_equip.yml +++ b/db/re/item_db_equip.yml @@ -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 @@ -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 @@ -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 diff --git a/db/re/item_group_db.yml b/db/re/item_group_db.yml index c17da7e002a..917dbe81e57 100644 --- a/db/re/item_group_db.yml +++ b/db/re/item_group_db.yml @@ -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 diff --git a/src/map/itemdb.hpp b/src/map/itemdb.hpp index c5f95133971..1c80caeaecc 100644 --- a/src/map/itemdb.hpp +++ b/src/map/itemdb.hpp @@ -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 }; diff --git a/src/map/script_constants.hpp b/src/map/script_constants.hpp index 61005bafcc8..443725c1f80 100644 --- a/src/map/script_constants.hpp +++ b/src/map/script_constants.hpp @@ -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);