From 3be73773f493e11111bf9b00c5729727bb7ef896 Mon Sep 17 00:00:00 2001 From: idk-whoami <60462533+idk-whoami@users.noreply.github.com> Date: Sat, 12 Mar 2022 05:05:25 +0700 Subject: [PATCH] Implementations + corrections of a bunch of items (#6652) --- db/re/item_combos.yml | 151 +++++- db/re/item_db_equip.yml | 415 ++++++++++++++- db/re/item_db_etc.yml | 12 + db/re/item_db_usable.yml | 98 +++- db/re/item_group_db.yml | 969 +++++++++++++++++++++++++++++++++++ src/map/itemdb.hpp | 4 + src/map/script_constants.hpp | 4 + 7 files changed, 1628 insertions(+), 25 deletions(-) diff --git a/db/re/item_combos.yml b/db/re/item_combos.yml index 5ddaa5b8ae..320de60acb 100644 --- a/db/re/item_combos.yml +++ b/db/re/item_combos.yml @@ -8557,8 +8557,8 @@ Body: bonus2 bSubSize,Size_All,5; - Combos: - Combo: - - Poring_Sunglasses_ - - Angel_Poring_Boots + - Poring_Sunglasses_ # 19117 + - AngelPoring_Boots # 22101 Script: | bonus2 bDropAddRace,RC_All,5; bonus2 bExpAddRace,RC_All,5; @@ -8567,8 +8567,8 @@ Body: } - Combos: - Combo: - - Poring_Sunglasses__ - - Angel_Poring_Boots + - Poring_Sunglasses__ # 19118 + - AngelPoring_Boots # 22101 Script: | bonus2 bDropAddRace,RC_All,4; bonus2 bExpAddRace,RC_All,4; @@ -10216,8 +10216,8 @@ Body: bonus bMaxSPrate,.@r; - Combos: - Combo: - - Angel_Poring_Boots - - Leo_Stone + - AngelPoring_Boots # 22101 + - Leo_Stone # 29148 Script: | bonus bMaxHPRate,5; bonus bMaxSPRate,5; @@ -10233,8 +10233,8 @@ Body: } - Combos: - Combo: - - Angel_Poring_Boots - - Pisces_Stone + - AngelPoring_Boots # 22101 + - Pisces_Stone # 29149 Script: | bonus bMaxHPRate,5; bonus bMaxSPRate,5; @@ -10250,8 +10250,8 @@ Body: } - Combos: - Combo: - - Angel_Poring_Boots - - Capricorn_Stone + - AngelPoring_Boots # 22101 + - Capricorn_Stone # 29150 Script: | bonus bMaxHPRate,5; bonus bMaxSPRate,5; @@ -10267,8 +10267,8 @@ Body: } - Combos: - Combo: - - Angel_Poring_Boots - - Aquarius_Stone + - AngelPoring_Boots # 22101 + - Aquarius_Stone # 29151 Script: | bonus bMaxHPRate,5; bonus bMaxSPRate,5; @@ -10284,8 +10284,8 @@ Body: } - Combos: - Combo: - - Angel_Poring_Boots - - Scorpio_Stone + - AngelPoring_Boots # 22101 + - Scorpio_Stone # 29152 Script: | bonus bMaxHPRate,5; bonus bMaxSPRate,5; @@ -10301,8 +10301,8 @@ Body: } - Combos: - Combo: - - Angel_Poring_Boots - - Taurus_Stone + - AngelPoring_Boots # 22101 + - Taurus_Stone # 29153 Script: | bonus bMaxHPRate,5; bonus bMaxSPRate,5; @@ -23888,7 +23888,7 @@ Body: - aegis_32296 # 32296 - Strong_Blow5 # 29370 Script: | - if (BaseClass == Job_Novice || BaseClass == Job_Swordman || BaseClass == Job_Archer || BaseClass == Job_Acolyte || BaseClass == Job_Archer || BaseClass == Job_Merchant || BaseClass == Job_Taekwon || BaseClass == Job_Gunslinger || BaseClass == Job_Summoner) { + if (BaseClass == Job_Novice || BaseClass == Job_Swordman || BaseClass == Job_Mage || BaseClass == Job_Acolyte || BaseClass == Job_Archer || BaseClass == Job_Merchant || BaseClass == Job_Taekwon || BaseClass == Job_Gunslinger || BaseClass == Job_Summoner) { bonus2 bAddClass,Class_All,10; bonus bPerfectHitAddRate,30; } @@ -24707,3 +24707,120 @@ Body: Script: | bonus2 bAddClass,Class_All,5; bonus bMatkRate,5; + - Combos: + - Combo: + - Ring_Of_Hunter # 490096 + - Speed_Of_Light # 4877 + Script: | + bonus bAgi,40; + bonus2 bAddSize,Size_All,10; + - Combos: + - Combo: + - aegis_490182 # 490182 + - Katar_170 # 28010 + Script: | + .@r = getequiprefinerycnt(EQI_HAND_R); + bonus2 bAddClass,Class_All,.@r; + if (.@r >= 10) + autobonus "{ bonus bAgi,20; }",10,10000,BF_WEAPON; + if (.@r >= 12) { + bonus bDelayrate,-5; + bonus bLongAtkRate,8; + } + - Combos: + - Combo: + - aegis_490182 # 490182 + - Staff_170 # 2027 + Script: | + .@r = getequiprefinerycnt(EQI_HAND_R); + bonus2 bSkillAtk,"WL_CRIMSONROCK",2*.@r; + if (.@r >= 10) + autobonus "{ bonus2 bMagicAtkEle,Ele_Fire,15; }",10,10000,BF_MAGIC,"{ specialeffect2 255; }"; + if (.@r >= 12) { + bonus bMaxHPrate,5; + bonus bMaxSPrate,5; + bonus2 bMagicAddSize,Size_All,10; + } + - Combos: + - Combo: + - aegis_490182 # 490182 + - Two_Hand_Spear_170 # 21018 + Script: | + .@r = getequiprefinerycnt(EQI_HAND_R); + bonus bCritAtkRate,.@r; + if (.@r >= 10) + bonus3 bAutoSpell,"RK_IGNITIONBREAK",3,10; + if (.@r >= 12) { + bonus2 bAddClass,Class_Boss,15; + bonus bAspd,2; + } + - Combos: + - Combo: + - aegis_410136 # 410136 + - aegis_480161 # 480161 + Script: | + .@r = getequiprefinerycnt(EQI_GARMENT); + bonus bLongAtkRate,7; + if (.@r >= 11) + bonus bDelayrate,-min(.@r,15); + - Combos: + - Combo: + - aegis_410136 # 410136 + - aegis_480166 # 480166 + Script: | + .@r = getequiprefinerycnt(EQI_GARMENT); + bonus bMatk,50; + if (.@r >= 11) + bonus bMatk,20*min(.@r,15); + - Combos: + - Combo: + - aegis_410136 # 410136 + - aegis_480172 # 480172 + Script: | + .@r = getequiprefinerycnt(EQI_GARMENT); + bonus bBaseAtk,50; + if (.@r >= 11) + bonus2 bAddClass,Class_All,2*min(.@r,15); + - Combos: + - Combo: + - aegis_480172 # 480172 + - Old_Rune_Circlet # 18971 + Script: | + .@r = getequiprefinerycnt(EQI_GARMENT); + bonus bCritAtkRate,3*(.@r/2); + if (.@r>=12) + skill "TF_DOUBLE",5; + - Combos: + - Combo: + - aegis_480172 # 480172 + - Old_Circlet_Of_Bone # 18982 + Script: | + .@r = getequiprefinerycnt(EQI_GARMENT); + bonus2 bSkillAtk,"GC_COUNTERSLASH",3*(.@r/2); + if (.@r>=12) + bonus2 bAddRace,RC_All,5; + - Combos: + - Combo: + - aegis_480172 # 480172 + - Old_Driver_Band_R # 18973 + Script: | + .@r = getequiprefinerycnt(EQI_GARMENT); + bonus2 bSkillAtk,"NC_AXETORNADO",3*(.@r/2); + if (.@r>=12) + bonus bDelayrate,-5; + - Combos: + - Combo: + - aegis_480172 # 480172 + - Old_Blazing_Soul # 18979 + Script: | + .@r = getequiprefinerycnt(EQI_GARMENT); + bonus2 bSkillAtk,"SR_TIGERCANNON",3*(.@r/2); + if (.@r>=12) + bonus bLongAtkDef,5; + - Combos: + - Combo: + - Angel_Poring_Earing # 28592 + - Angel_Poring_Ring # 28593 + Script: | + bonus bBaseAtk,20; + bonus bMatk,20; diff --git a/db/re/item_db_equip.yml b/db/re/item_db_equip.yml index 43123465c2..09d8c3c992 100644 --- a/db/re/item_db_equip.yml +++ b/db/re/item_db_equip.yml @@ -14057,7 +14057,7 @@ Body: bonus2 bSkillVariableCast,"SO_PSYCHIC_WAVE",-3000; bonus2 bSkillUseSP,"SO_PSYCHIC_WAVE",-60; UnEquipScript: | - itemheal 0,-100; + heal 0,-100; - Id: 1655 AegisName: Adventure_Staff Name: Adventure Staff @@ -54798,7 +54798,6 @@ Body: Head_Mid: true ArmorLevel: 1 EquipLevelMin: 30 - Refineable: true View: 1409 Script: | bonus2 bSkillAtk,"PA_SACRIFICE",BaseLevel*2; @@ -67095,6 +67094,33 @@ Body: bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player_Human,2; } + - Id: 15171 + AegisName: Angeling_Suit + Name: Angeling Suit # !todo check english name + Type: Armor + Weight: 400 + Defense: 77 + Slots: 1 + Locations: + Armor: true + ArmorLevel: 1 + EquipLevelMin: 90 + Refineable: true + Script: | + .@r = getrefine(); + bonus bMdef,20; + bonus bMaxHP,1000; + bonus bMaxSP,100; + if (BaseLevel >= 100) { + bonus bMaxHP,30*BaseLevel; + bonus bMaxSP,5*BaseLevel; + } + if (.@r >= 7) + bonus bMatkRate,10; + if (.@r >= 8) + skill "BS_WEAPONPERFECT",5; + if (.@r >= 9) + bonus bDefEle,Ele_Holy; - Id: 15174 AegisName: Surfer_Swimsuit Name: Surfer Swimsuit @@ -95470,6 +95496,18 @@ Body: hateffect(HAT_EF_C_POPPING_PORING_AURA,true); UnEquipScript: | hateffect(HAT_EF_C_POPPING_PORING_AURA,false); + - Id: 20553 + AegisName: C_99LV_Minstrel_Pink + Name: Costume Pink Energy + Type: Armor + Locations: + Costume_Garment: true + ArmorLevel: 1 + EquipLevelMin: 1 + Script: | + hateffect(HAT_EF_99LV_Minstrel_Pink,true); + UnEquipScript: | + hateffect(HAT_EF_99LV_Minstrel_Pink,false); - Id: 20556 AegisName: C_99LV_ShadowC_Black Name: Costume Aura of Night @@ -95494,6 +95532,18 @@ Body: hateffect(HAT_EF_160LV_RUNE_RED,true); UnEquipScript: | hateffect(HAT_EF_160LV_RUNE_RED,false); + - Id: 20564 + AegisName: C_160LV_Minstrel_Pink + Name: Costume Pink Aura + Type: Armor + Locations: + Costume_Garment: true + ArmorLevel: 1 + EquipLevelMin: 1 + Script: | + hateffect(HAT_EF_160LV_Minstrel_Pink,true); + UnEquipScript: | + hateffect(HAT_EF_160LV_Minstrel_Pink,false); - Id: 20567 AegisName: C_160LV_ShadowC_Black Name: Costume Aura of Darkness @@ -102131,7 +102181,7 @@ Body: Script: | bonus2 bExpAddRace,RC_Formless,5+getrefine(); - Id: 22101 - AegisName: Angel_Poring_Boots + AegisName: AngelPoring_Boots Name: Angel Poring Boots Type: Armor Buy: 10 @@ -122805,6 +122855,30 @@ Body: bonus bAspdRate,10; bonus2 bAddEle,Ele_All,5; bonus bPerfectHitAddRate,20; + - Id: 28592 + AegisName: Angel_Poring_Earing + Name: Angel Poring Earrings + Type: Armor + Weight: 50 + Slots: 1 + Locations: + Both_Accessory: true + ArmorLevel: 1 + EquipLevelMin: 1 + Script: | + bonus bMaxHPrate,3; + bonus bMaxSPrate,3; + - Id: 28593 + AegisName: Angel_Poring_Ring + Name: Angel Poring Ring + Type: Armor + Weight: 50 + Locations: + Both_Accessory: true + ArmorLevel: 1 + EquipLevelMin: 1 + Script: | + bonus bAllStats,1; - Id: 28594 AegisName: Temporal_Ring Name: Temporal Ring @@ -139109,6 +139183,42 @@ Body: skill "DC_FORTUNEKISS",getskilllv("BA_POEMBRAGI"); skill "BA_POEMBRAGI",getskilllv("DC_FORTUNEKISS"); } + - Id: 410027 + AegisName: aegis_410027 + Name: Wonder Egg Basket + Type: Armor + Locations: + Head_Mid: true + ArmorLevel: 1 + EquipLevelMin: 100 + View: 2055 + Script: | + bonus2 bAddSize,Size_All,10; + bonus2 bMagicAddSize,Size_All,10; + if (getpetinfo(PETINFO_ID) == 9112) + bonus2 bHPVanishRate,40,4; + if (getpetinfo(PETINFO_ID) == 9088) { + bonus bBaseAtk,readparam(bLuk); + bonus bMatk,readparam(bLuk); + bonus2 bExpAddClass,Class_All,5; + } + if (getpetinfo(PETINFO_ID) == 9096) { + bonus2 bAddRace,RC_Demon,30; + bonus2 bMagicAddRace,RC_Demon,30; + bonus2 bSubRace,RC_Demon,5; + } + if (getpetinfo(PETINFO_ID) == 9087) { + bonus2 bAddRace,RC_Brute,30; + bonus2 bMagicAddRace,RC_Brute,30; + bonus2 bSubRace,RC_Brute,5; + } + if (getpetinfo(PETINFO_ID) == 9069) { + bonus2 bAddRace,RC_Plant,30; + bonus2 bMagicAddRace,RC_Plant,30; + bonus2 bSubRace,RC_Plant,5; + } + if (getpetinfo(PETINFO_ID) == 9106) + bonus3 bAutoSpell,"WM_METALICSOUND",5,150; - Id: 410029 AegisName: C_Wonder_Egg_Basket Name: Costume Wonder Egg Basket @@ -139367,6 +139477,66 @@ Body: Costume_Head_Mid: true ArmorLevel: 1 View: 2171 + - Id: 410136 + AegisName: aegis_410136 + Name: Raven Of Tomb + Type: Armor + Weight: 10 + Defense: 10 + Locations: + Head_Mid: true + ArmorLevel: 1 + EquipLevelMin: 100 + View: 1035 + Script: | + if (readparam(bStr) >= 100) { + bonus2 bAddClass,Class_All,4; + bonus bHit,10; + if (readparam(bStr) >= 120) { + bonus2 bAddClass,Class_All,6; + bonus bHit,10; + } + } + if (readparam(bInt) >= 100) { + bonus bMatkRate,4; + bonus2 bMagicAtkEle,Ele_All,4; + if (readparam(bInt) >= 120) { + bonus bMatkRate,6; + bonus2 bMagicAtkEle,Ele_All,6; + } + } + if (readparam(bDex) >= 100) { + bonus bDelayrate,-3; + bonus bCritical,4; + if (readparam(bDex) >= 120) { + bonus bDelayrate,-3; + bonus bCritical,6; + } + } + if (readparam(bVit) >= 100) { + bonus bMaxHPrate,4; + bonus bAspdRate,4; + if (readparam(bVit) >= 120) { + bonus bMaxHPrate,4; + bonus bAspdRate,4; + } + } + if (readparam(bLuk) >= 100) { + bonus bBaseAtk,20; + bonus bMatk,20; + if (readparam(bLuk) >= 120) { + bonus bBaseAtk,40; + bonus bMatk,40; + } + } + if (readparam(bAgi) >= 100) { + bonus bFlee,10; + bonus bCritAtkRate,7; + if (readparam(bAgi) >= 120) { + bonus bFlee,10; + bonus bCritAtkRate,7; + } + } - Id: 420003 AegisName: CD_In_MouthK Name: CD in Mouth @@ -139885,6 +140055,22 @@ Body: Costume_Head_Low: true ArmorLevel: 1 View: 2050 + - Id: 420130 + AegisName: aegis_420130 + Name: Fumi Fan + Type: Armor + Weight: 500 + Defense: 20 + Locations: + Head_Low: true + ArmorLevel: 1 + EquipLevelMin: 1 + View: 1051 + Script: | + bonus bMaxHPrate,5; + bonus bMaxSPrate,5; + bonus bLongAtkDef,5; + bonus bHealPower2,5; - Id: 436000 AegisName: aegis_436000 Name: Thanatos's Maeror Mask @@ -145023,6 +145209,26 @@ Body: bonus bDef,150; bonus bMdef,15; } + - Id: 460004 + AegisName: Illusion_Shield_A + Name: Illusion Shield I + Type: Armor + Weight: 1200 + Defense: 95 + Slots: 1 + Locations: + Left_Hand: true + ArmorLevel: 1 + EquipLevelMin: 100 + Refineable: true + View: 3 + Script: | + bonus bMaxHPrate,10; + bonus bMaxSPrate,10; + bonus bDef,50*(getrefine()/3); + bonus bMdef,5*(getrefine()/3); + if (BaseLevel >= 170) + bonus2 bSubEle,Ele_Neutral,5; - Id: 460005 AegisName: MD_Geffen_Shield Name: Magic Absorber @@ -145700,6 +145906,87 @@ Body: if (.@r>=7) { bonus2 bMagicAtkEle,Ele_All,7; } + - Id: 470027 + AegisName: Juggernaut + Name: Juggernaut + Type: Armor + Weight: 400 + Defense: 12 + Locations: + Shoes: true + ArmorLevel: 1 + EquipLevelMin: 100 + Refineable: true + Script: | + .@r = getrefine(); + bonus bMdef,10; + bonus bMaxHPrate,3; + bonus bMaxSPrate,3; + skill "AC_CONCENTRATION",1; + bonus2 bSkillCooldown,"RL_RICHS_COIN",-3000; + bonus2 bFixedCastrate,"RL_BANISHING_BUSTER",-20*getskilllv("RL_BANISHING_BUSTER"); + bonus2 bSkillAtk,"RL_BANISHING_BUSTER",60*getskilllv("RL_BANISHING_BUSTER"); + bonus2 bAddClass,Class_All,4*getskilllv("RL_FIREDANCE"); + bonus2 bSkillAtk,"RL_FIREDANCE",50*getskilllv("RL_FIREDANCE"); + bonus bDelayrate,-8*getskilllv("RL_H_MINE"); + bonus2 bSkillAtk,"RL_H_MINE",40*getskilllv("RL_H_MINE"); + if (getskilllv("RL_FALLEN_ANGEL") == 1) { + bonus bAspdRate,20; + bonus2 bSkillUseSP,"RL_FIREDANCE",20; + } + if (getskilllv("RL_AM_BLAST") == 5) { + bonus2 bIgnoreDefRaceRate,RC_All,100; + bonus4 bAutoSpellOnSkill,"RL_HAMMER_OF_GOD","RL_RICHS_COIN",1,1000; + } + if (.@r>=5) { + bonus bMaxHPrate,7; + bonus bMaxSPrate,7; + } + if (.@r>=7) { + bonus bMaxHPrate,10; + bonus bMaxSPrate,10; + } + - Id: 470028 + AegisName: Juggernaut_ + Name: Juggernaut + Type: Armor + Weight: 400 + Defense: 12 + Slots: 1 + Locations: + Shoes: true + ArmorLevel: 1 + EquipLevelMin: 100 + Refineable: true + Script: | + .@r = getrefine(); + bonus bMdef,10; + bonus bMaxHPrate,3; + bonus bMaxSPrate,3; + skill "AC_CONCENTRATION",1; + bonus2 bSkillCooldown,"RL_RICHS_COIN",-3000; + bonus2 bFixedCastrate,"RL_BANISHING_BUSTER",-20*getskilllv("RL_BANISHING_BUSTER"); + bonus2 bSkillAtk,"RL_BANISHING_BUSTER",60*getskilllv("RL_BANISHING_BUSTER"); + bonus2 bAddClass,Class_All,4*getskilllv("RL_FIREDANCE"); + bonus2 bSkillAtk,"RL_FIREDANCE",50*getskilllv("RL_FIREDANCE"); + bonus bDelayrate,-8*getskilllv("RL_H_MINE"); + bonus2 bSkillAtk,"RL_H_MINE",40*getskilllv("RL_H_MINE"); + if (getskilllv("RL_FALLEN_ANGEL") == 1) { + bonus bAspdRate,20; + bonus2 bSkillUseSP,"RL_FIREDANCE",20; + } + if (getskilllv("RL_AM_BLAST") == 5) { + bonus2 bIgnoreDefRaceRate,RC_All,100; + bonus4 bAutoSpellOnSkill,"RL_HAMMER_OF_GOD","RL_RICHS_COIN",1,1000; + } + if (.@r>=5) { + bonus bMaxHPrate,7; + bonus bMaxSPrate,7; + } + if (.@r>=7) { + bonus bMaxHPrate,10; + bonus bMaxSPrate,10; + } - Id: 470033 AegisName: Elemental_BootsK Name: Elemental Boots @@ -146288,6 +146575,28 @@ Body: } } } + - Id: 470075 + AegisName: Peep_Toe_Sandals + Name: Peep Toe Sandals + Type: Armor + Defense: 10 + Weight: 300 + Slots: 1 + Locations: + Shoes: true + ArmorLevel: 1 + EquipLevelMin: 100 + Refineable: true + Script: | + .@r = getrefine(); + .@val = 5; + bonus bBaseAtk,BaseLevel; + bonus bMatk,BaseLevel; + if (.@r >= 9) + .@val += 5; + if (.@r >= 11) + .@val += 5; + bonus2 bExpAddClass,Class_All,.@val; - Id: 470076 AegisName: MD_Airboat_Boots5 Name: Unknown Agility Boots @@ -147563,6 +147872,47 @@ Body: Costume_Garment: true ArmorLevel: 1 View: 82 + - Id: 480075 + AegisName: Baby_Boar_Bib + Name: Baby Boar Bib + Type: Armor + Weight: 100 + Defense: 12 + Locations: + Garment: true + ArmorLevel: 1 + EquipLevelMin: 100 + Refineable: true + Script: | + .@r = getrefine(); + bonus bMaxHPrate,5; + bonus2 bSubRace,RC_Player_Human,5; + bonus2 bVariableCastrate,"SU_PICKYPECK",-10; + bonus2 bVariableCastrate,"SU_SCAROFTAROU",-10; + bonus2 bVariableCastrate,"SU_LUNATICCARROTBEAT",-10; + bonus2 bVariableCastrate,"SU_SVG_SPIRIT",-10; + bonus2 bSkillAtk,"SU_PICKYPECK",15; + bonus2 bSkillAtk,"SU_SCAROFTAROU",15; + bonus2 bSkillAtk,"SU_LUNATICCARROTBEAT",15; + bonus2 bSkillAtk,"SU_SVG_SPIRIT",15; + bonus bAspdRate,2*getskilllv("SU_HISS"); + bonus bPerfectHitAddRate,4*getskilllv("SU_POWEROFFLOCK"); + bonus2 bAddSize,Size_All,2*getskilllv("SU_POWEROFFLOCK"); + bonus2 bSkillCooldown,"SU_LUNATICCARROTBEAT",200*getskilllv("SU_SPIRITOFLIFE"); + if (.@r>=9) { + bonus bMaxHPrate,10; + bonus2 bVariableCastrate,"SU_PICKYPECK",-20; + bonus2 bVariableCastrate,"SU_SCAROFTAROU",-20; + bonus2 bVariableCastrate,"SU_LUNATICCARROTBEAT",-20; + bonus2 bVariableCastrate,"SU_SVG_SPIRIT",-20; + } + if (.@r>=11) { + bonus bMaxHPrate,5; + bonus2 bVariableCastrate,"SU_PICKYPECK",-20; + bonus2 bVariableCastrate,"SU_SCAROFTAROU",-20; + bonus2 bVariableCastrate,"SU_LUNATICCARROTBEAT",-20; + bonus2 bVariableCastrate,"SU_SVG_SPIRIT",-20; + } - Id: 480077 AegisName: aegis_480077 Name: Lava Manteau @@ -148490,6 +148840,30 @@ Body: bonus2 bMagicAtkEle,Ele_All,2*(.@r/3); if (.@r>=9) bonus bMatkRate,7; + - Id: 480172 + AegisName: aegis_480172 + Name: Subject Cape (Melee) + Type: Armor + Defense: 10 + Slots: 1 + Jobs: + Swordman: true + Thief: true + Acolyte: true + Merchant: true + Locations: + Garment: true + ArmorLevel: 1 + EquipLevelMin: 100 + Refineable: true + Script: | + .@r = getrefine(); + bonus bUnbreakableGarment; + bonus bBaseAtk,20; + bonus bMaxHPrate,.@r/2; + bonus bMaxSPrate,.@r/2; + if (.@r>=9) + bonus2 bAddClass,Class_All,5; - Id: 490004 AegisName: Attacker_Booster_Ring Name: Attacker Booster Ring @@ -148565,7 +148939,7 @@ Body: ArmorLevel: 1 EquipLevelMin: 100 Script: | - bonus2 bAddRace,RC_All,10; + bonus2 bAddRace,RC_All,5; bonus2 bSkillCooldown,"SR_ASSIMILATEPOWER",-3000; if (getskilllv("SR_EARTHSHAKER") == 5) { bonus2 bSkillUseSP,"SR_HOWLINGOFLION",35; @@ -149518,6 +149892,25 @@ Body: bonus bLongAtkRate,5; bonus bShortAtkRate,5; bonus bBaseAtk,30; + - Id: 490096 + AegisName: Ring_Of_Hunter + Name: Ring of Hunter + Type: Armor + Weight: 400 + Slots: 1 + Locations: + Both_Accessory: true + ArmorLevel: 1 + EquipLevelMin: 100 + Script: | + bonus2 bAddClass,Class_All,10; + bonus2 bSkillAtk,"SC_FATALMENACE",BaseLevel/3; + if (getskilllv("SC_ESCAPE") == 5) + bonus2 bSkillCooldown,"SC_ESCAPE",500; + if (getskilllv("SC_FATALMENACE") == 10) + bonus bDelayrate,-30; + if (getskilllv("SC_FEINTBOMB") == 10) + bonus bSPDrainValue,3; - Id: 490098 AegisName: aegis_490098 Name: Ring of Pazuzu @@ -150578,6 +150971,20 @@ Body: bonus bMatkRate,10; bonus2 bAddClass,Class_All,10; bonus bVariableCastrate,-10; + - Id: 490182 + AegisName: aegis_490182 + Name: Immortal Dog Tag + Type: Armor + Weight: 100 + Slots: 1 + Locations: + Both_Accessory: true + ArmorLevel: 1 + EquipLevelMin: 100 + Script: | + bonus bBaseAtk,40; + bonus bMatk,40; + bonus2 bSubRace,RC_Undead,4; - Id: 490184 AegisName: aegis_490184 Name: Token of a Hero (Shinkiro & Shiranui) # !todo check english name diff --git a/db/re/item_db_etc.yml b/db/re/item_db_etc.yml index 1429da5239..54972f1081 100644 --- a/db/re/item_db_etc.yml +++ b/db/re/item_db_etc.yml @@ -62467,6 +62467,18 @@ Body: Name: Shadow Chaser Stone (Bottom) Type: Etc Weight: 100 + - Id: 1000891 + AegisName: aegis_1000891 + Name: Special Red Pill Exchange + Type: Etc + Weight: 10 + Trade: + NoDrop: true + NoTrade: true + NoCart: true + NoGuildStorage: true + NoMail: true + NoAuction: true - Id: 1220001 AegisName: Kunai Name: Kunai diff --git a/db/re/item_db_usable.yml b/db/re/item_db_usable.yml index 5e228f5973..ce6883f6c8 100644 --- a/db/re/item_db_usable.yml +++ b/db/re/item_db_usable.yml @@ -33571,6 +33571,22 @@ Body: NoAuction: true Script: | getgroupitem(IG_July_Lucky_Scroll); + - Id: 14840 + AegisName: DF_Megaphone + Name: "[Sale] Megaphone" + Type: Usable + Weight: 10 + Trade: + NoDrop: true + NoTrade: true + NoSell: true + NoCart: true + NoGuildStorage: true + NoMail: true + NoAuction: true + Script: | + input .@megaphone$; + announce strcharinfo(0) + ": " + .@megaphone$,bc_all,0xFF0000; - Id: 14841 AegisName: DF_Songpyun Name: "[Scroll] Korean Rice Cake" @@ -33860,6 +33876,22 @@ Body: itemskill "AC_CONCENTRATION",max(getskilllv("AC_CONCENTRATION"),3); specialeffect2 EF_POTION_BERSERK; showscript "Oh My GOODNESS!!! I FEEL AWESOMELY STRONG!!! WOWOW"; + - Id: 14875 + AegisName: DF_Med_Life_Potion + Name: "[Scroll] Medium Life potion" + Type: Usable + Weight: 10 + Trade: + NoDrop: true + NoTrade: true + NoSell: true + NoCart: true + NoGuildStorage: true + NoMail: true + NoAuction: true + Script: | + specialeffect2 EF_HEAL3; + sc_start4 SC_L_LIFEPOTION,600000,-7,4,0,0; - Id: 14886 AegisName: UltimateCook_S Name: "[Scroll] Ultimate Cook" @@ -44939,12 +44971,11 @@ Body: AegisName: Shadow_Cube Name: Shadow Cube Type: Usable - Buy: 10 Weight: 10 - Classes: - All: false + Flags: + Container: true Script: | - /*No Info*/ + getgroupitem(IG_SHADOW_CUBE); - Id: 22828 AegisName: Sealed_Scroll Name: Sealed Album Scroll @@ -45635,6 +45666,24 @@ Body: Container: true Script: | getgroupitem(IG_Enchant_Stone_Box7); + - Id: 22977 + AegisName: Shadow_Cube_Pendant + Name: Shadow Cube (Pendant) + Type: Usable + Weight: 10 + Flags: + Container: true + Script: | + getgroupitem(IG_SHADOW_CUBE_PENDANT); + - Id: 22978 + AegisName: Shadow_Cube_Earing + Name: Shadow Cube (Earing) + Type: Usable + Weight: 10 + Flags: + Container: true + Script: | + getgroupitem(IG_SHADOW_CUBE_EARING); - Id: 22979 AegisName: Comp_Battle_Bubble Name: "[Sale] Battle Manual and Bubble Gum" @@ -45863,6 +45912,23 @@ Body: Container: true Script: | getgroupitem(IG_Enchant_Stone_Box9); + - Id: 23073 + AegisName: AngelPoring_Box + Name: Angel Poring Shoes Box + Type: Usable + Weight: 10 + Flags: + Container: true + Trade: + NoDrop: true + NoTrade: true + NoSell: true + NoCart: true + NoGuildStorage: true + NoMail: true + NoAuction: true + Script: | + getgroupitem(IG_ANGELPORING_BOX); - Id: 23076 AegisName: Build_Up_Potion_SS Name: Build Up Potion SS @@ -50028,6 +50094,30 @@ Body: NoAuction: true Script: | percentheal 30,30; + - Id: 101322 + AegisName: aegis_101322 + Name: Love Confession Chocolate + Type: Healing + Script: | + percentheal 30,30; + - Id: 101336 + AegisName: aegis_101336 + Name: "[Scroll] DEX Biscuit Stick" + Type: Usable + Weight: 10 + Trade: + Script: | + sc_start SC_FOOD_DEX_CASH,1800000,15; + sc_start SC_HITFOOD,600000,rand(11,33); + - Id: 101337 + AegisName: aegis_101337 + Name: "[Scroll] VIT Biscuit Stick" + Type: Usable + Weight: 10 + Trade: + Script: | + sc_start SC_FOOD_VIT_CASH,1800000,15; + bonus_script "{ bonus bHPRecovRate,rand(11,33); }",1800,1; - Id: 200185 AegisName: LI_Nyangvine_Box1_26 # Name: (Limited) Actinidia Cat Fruit Box I (Stone Box 26) diff --git a/db/re/item_group_db.yml b/db/re/item_group_db.yml index 2566e1655b..fba352e96c 100644 --- a/db/re/item_group_db.yml +++ b/db/re/item_group_db.yml @@ -27497,3 +27497,972 @@ Body: Rate: 1 - Item: Enchant_Stone_Box19 Rate: 1 + - Group: ANGELPORING_BOX + SubGroups: + - SubGroup: 0 + List: + - Item: AngelPoring_Boots + - SubGroup: 1 + List: + - Item: Leo_Stone + Rate: 1667 + - Item: Pisces_Stone + Rate: 1667 + - Item: Capricorn_Stone + Rate: 1667 + - Item: Aquarius_Stone + Rate: 1667 + - Item: Scorpio_Stone + Rate: 1667 + - Item: Taurus_Stone + Rate: 1667 + - Group: SHADOW_CUBE_PENDANT + SubGroups: + - SubGroup: 1 + List: + - Item: S_Physical_Pendant + Rate: 278 + - Item: S_Magical_Pendant + Rate: 278 + - Item: S_Int_Pendant + Rate: 278 + - Item: S_Power_Pendant + Rate: 278 + - Item: S_Resist_Spell_Pendant + Rate: 278 + - Item: S_Rapid_Pendant + Rate: 278 + - Item: S_Caster_Pendant + Rate: 278 + - Item: S_Spiritual_Pendent + Rate: 278 + - Item: S_Gemstone_Pendent + Rate: 278 + - Item: Unfreeze_Pendent_S + Rate: 278 + - Item: Vitality_Pendant_S + Rate: 278 + - Item: S_Neutral_Pendent + Rate: 278 + - Item: S_Curse_Lift_Pendent + Rate: 278 + - Item: S_Greed_Pendant + Rate: 278 + - Item: S_Heal_Pendant + Rate: 278 + - Item: S_Hiding_Pendant + Rate: 278 + - Item: S_Cloaking_Pendant + Rate: 278 + - Item: S_Teleport_Pendant + Rate: 278 + - Item: S_Steal_Pendant + Rate: 278 + - Item: S_Infinity_Pendant + Rate: 278 + - Item: S_Immortal_Pendant + Rate: 278 + - Item: S_Penetration_Pendent + Rate: 278 + - Item: S_Tempest_Pendent + Rate: 278 + - Item: S_Bearers_Pendent + Rate: 278 + - Item: S_Blitz_Pendent + Rate: 278 + - Item: S_Force_Pendant + Rate: 278 + - Item: S_Spirit_Pendant + Rate: 278 + - Item: S_Titan_Pendant + Rate: 278 + - Item: S_Boned_Pendant + Rate: 278 + - Item: S_Gigantic_Pendant + Rate: 278 + - Item: S_Tension_Pendent + Rate: 278 + - Item: S_Elegant_Pendent + Rate: 278 + - Item: S_Restore_Pendant + Rate: 278 + - Item: S_Mortal_Blow_Pendant + Rate: 278 + - Item: Sentimental_Pendant_S + Rate: 278 + - Item: Enchanting_Pendant_S + Rate: 278 + - Group: SHADOW_CUBE_EARING + SubGroups: + - SubGroup: 1 + List: + - Item: S_Physical_Earring + Rate: 270 + - Item: S_Magical_Earring + Rate: 270 + - Item: S_Power_Earring + Rate: 270 + - Item: S_Int_Earring + Rate: 270 + - Item: S_Hard_Earring + Rate: 270 + - Item: S_Wise_Earring + Rate: 270 + - Item: S_Athena_Earring + Rate: 270 + - Item: S_Spiritual_Earring + Rate: 270 + - Item: S_Gemstone_Earring + Rate: 270 + - Item: Unfreeze_Earing_S + Rate: 270 + - Item: Vitality_Earing_S + Rate: 270 + - Item: S_Neutral_Earring + Rate: 270 + - Item: S_Curse_Lift_Earring + Rate: 270 + - Item: S_Caster_earring + Rate: 270 + - Item: S_Greed_Earring + Rate: 270 + - Item: S_Heal_Earring + Rate: 270 + - Item: S_Hiding_Earring + Rate: 270 + - Item: S_Cloaking_Earring + Rate: 270 + - Item: S_Teleport_Earring + Rate: 270 + - Item: S_Steal_Earring + Rate: 270 + - Item: S_Infinity_Earring + Rate: 270 + - Item: S_Solid_Earring + Rate: 270 + - Item: S_Penetration_Earring + Rate: 270 + - Item: S_Tempest_Earring + Rate: 270 + - Item: S_Bearers_Earring + Rate: 270 + - Item: S_Blitz_Earring + Rate: 270 + - Item: S_Force_Earring + Rate: 270 + - Item: S_Spirit_Earring + Rate: 270 + - Item: S_Titan_Earring + Rate: 270 + - Item: S_Boned_Earring + Rate: 270 + - Item: S_Gigantic_Earring + Rate: 270 + - Item: S_Tension_Earring + Rate: 270 + - Item: S_Elegant_Earring + Rate: 270 + - Item: S_Restore_Earring + Rate: 270 + - Item: S_Mortal_Blow_Earring + Rate: 270 + - Item: Sentimental_Earring_S + Rate: 270 + - Item: Enchanting_Earring_S + Rate: 270 + - Group: SHADOW_CUBE + SubGroups: + - SubGroup: 1 + List: + - Item: S_Runeknight_Weapon + Rate: 4 + - Item: S_Royalguard_Weapon + Rate: 4 + - Item: S_Mechanic_weapon + Rate: 4 + - Item: S_Genetic_Weapon + Rate: 4 + - Item: S_Archbishop_Weapon + Rate: 4 + - Item: S_Sura_weapon + Rate: 4 + - Item: S_Guillotine_Weapon + Rate: 4 + - Item: S_Shadowchaser_Weapon + Rate: 4 + - Item: S_Warlock_Weapon + Rate: 4 + - Item: S_Sorcerer_Weapon + Rate: 4 + - Item: S_Ranger_Weapon + Rate: 4 + - Item: S_Minstrel_Weapon + Rate: 4 + - Item: S_Wanderer_Weapon + Rate: 4 + - Item: S_Runeknight_Shield + Rate: 4 + - Item: S_Royalguard_Shield + Rate: 4 + - Item: S_Mechanic_Shield + Rate: 4 + - Item: S_Genetic_Shield + Rate: 4 + - Item: S_Archbishop_Shield + Rate: 4 + - Item: S_Sura_Shield + Rate: 4 + - Item: S_Guillotine_Shield + Rate: 4 + - Item: S_Shadowchaser_Shield + Rate: 4 + - Item: S_Warlock_Shield + Rate: 4 + - Item: S_Sorcerer_Shield + Rate: 4 + - Item: S_Ranger_Shield + Rate: 4 + - Item: S_Minstrel_Shield + Rate: 4 + - Item: S_Wanderer_Shield + Rate: 4 + - Item: S_Hasty_Shoes_II + Rate: 4 + - Item: S_Bearer's_Pendant_II + Rate: 4 + - Item: S_Gemstone_Earring_II + Rate: 4 + - Item: S_Spellflow_Shield_II + Rate: 4 + - Item: S_Spiritual_Weapon_II + Rate: 4 + - Item: S_Malicious_Armor_II + Rate: 4 + - Item: S_Sigrun_Armor + Rate: 4 + - Item: S_Sigrun_Shield + Rate: 4 + - Item: S_Force_Executioner_Weapon + Rate: 4 + - Item: S_Spirit_Magic_Executioner_Weapon + Rate: 4 + - Item: S_Caster_Armor_II + Rate: 4 + - Item: S_Reload_Armor_II + Rate: 4 + - Item: S_Magic_Compose_Armor + Rate: 4 + - Item: S_Gemstone_Weapon_II + Rate: 4 + - Item: S_Gemstone_Shield_II + Rate: 4 + - Item: S_Bearer's_Armor_II + Rate: 4 + - Item: S_Bearer's_Shoes_II + Rate: 4 + - Item: S_Almighty_Earring + Rate: 4 + - Item: S_Almighty_Pendant + Rate: 4 + - Item: S_All_Race_Shoes + Rate: 4 + - Item: S_All_Race_Shield + Rate: 4 + - Item: S_Tempest_Shield + Rate: 4 + - Item: S_Tempest_Shoes + Rate: 4 + - Item: S_Magic_Executioner_Holy_Water_Armor + Rate: 4 + - Item: S_Magic_Exorcist_Corrupted_Armor + Rate: 4 + - Item: S_Magic_Vibration_Dragon_Killer_Armor + Rate: 4 + - Item: S_Magic_Scissor_Hunting_Armor + Rate: 4 + - Item: S_Magic_Fishing_Insect_Net_Armor + Rate: 4 + - Item: S_Plasterer's_Armor_II + Rate: 4 + - Item: S_Insomniac_Shoes_II + Rate: 4 + - Item: S_Peerless_Armor_II + Rate: 4 + - Item: S_Adulate_Shoes_II + Rate: 4 + - Item: S_Unfreezing_Weapon_II + Rate: 4 + - Item: S_Vitality_Earring_II + Rate: 4 + - Item: S_Neutral_Weapon_II + Rate: 4 + - Item: S_Uncursed_Pendant_II + Rate: 4 + - Item: S_Penetration_Shoes + Rate: 4 + - Item: S_Penetration_Shield + Rate: 4 + - Item: S_Executioner_Holy_Water_Armor + Rate: 4 + - Item: S_Exorcist_Corrupted_Armor + Rate: 4 + - Item: S_Vibration_Dragon_Killer_Armor + Rate: 4 + - Item: S_Scissor_Hunting_Armor + Rate: 4 + - Item: S_Fishing_Insect_Net_Armor + Rate: 4 + - Item: S_Infinity_Weapon + Rate: 4 + - Item: S_Physical_Shoes + Rate: 4 + - Item: S_Physical_Shield + Rate: 4 + - Item: S_Physical_Armor + Rate: 4 + - Item: S_Magical_Shoes + Rate: 4 + - Item: S_Magical_Shield + Rate: 4 + - Item: S_Magical_Armor + Rate: 4 + - Item: S_Immune_Athena_Shield + Rate: 4 + - Item: S_Hard_Champion_Shoes + Rate: 4 + - Item: S_Kingbird_Ancient_Armor + Rate: 4 + - Item: S_Rebellion_Armor + Rate: 4 + - Item: S_Kagerou_Armor + Rate: 4 + - Item: S_Oboro_Armor + Rate: 4 + - Item: S_Rebellion_Shoes + Rate: 4 + - Item: S_Kagerou_Shoes + Rate: 4 + - Item: S_Oboro_Shoes + Rate: 4 + - Item: S_DoramPhysical_Armor + Rate: 4 + - Item: S_DoramPhysical_Shoes + Rate: 4 + - Item: S_DoramMagical_Armor + Rate: 4 + - Item: S_DoramMagical_Shoes + Rate: 4 + - Item: S_Knight_Shoes + Rate: 17 + - Item: S_Crusader_Shoes + Rate: 17 + - Item: S_Blacksmith_Shoes + Rate: 17 + - Item: S_Alchemist_Shoes + Rate: 17 + - Item: S_Priest_Shoes + Rate: 17 + - Item: S_Monk_Shoes + Rate: 17 + - Item: S_Assassin_Shoes + Rate: 17 + - Item: S_Rogue_Shoes + Rate: 17 + - Item: S_Wizard_Shoes + Rate: 17 + - Item: S_Sage_Shoes + Rate: 17 + - Item: S_Hunter_Shoes + Rate: 17 + - Item: S_Bard_Shoes + Rate: 17 + - Item: S_Dancer_Shoes + Rate: 17 + - Item: S_Knight_Armor + Rate: 17 + - Item: S_Crusader_Armor + Rate: 17 + - Item: S_Blacksmith_Armor + Rate: 17 + - Item: S_Alchemist_Armor + Rate: 17 + - Item: S_Priest_Armor + Rate: 17 + - Item: S_Monk_Armor + Rate: 17 + - Item: S_Assassin_Armor + Rate: 17 + - Item: S_Rogue_Armor + Rate: 17 + - Item: S_Wizard_Armor + Rate: 17 + - Item: S_Sage_Armor + Rate: 17 + - Item: S_Hunter_Armor + Rate: 17 + - Item: S_Bard_Armor + Rate: 17 + - Item: S_Dancer_Armor + Rate: 17 + - Item: S_SuperNovice_Weapon + Rate: 17 + - Item: S_Gunslinger_Weapon + Rate: 17 + - Item: S_Taekwon_Weapon + Rate: 17 + - Item: S_Ninja_Weapon + Rate: 17 + - Item: S_DoramMagical_Weapon + Rate: 17 + - Item: S_DoramPhysical_Weapon + Rate: 17 + - Item: S_Ninja_Shield + Rate: 17 + - Item: S_Taekwon_Shield + Rate: 17 + - Item: S_DoramPhysical_Shield + Rate: 17 + - Item: S_DoramMagical_Shield + Rate: 17 + - Item: S_SuperNovice_Shield + Rate: 17 + - Item: S_Gunslinger_Shield + Rate: 17 + - Item: S_Promotion_Weapon + Rate: 33 + - Item: S_Promotion_Armor + Rate: 33 + - Item: S_Promotion_Shoes + Rate: 33 + - Item: S_Promotion_Shield + Rate: 33 + - Item: S_Promotion_Earring + Rate: 33 + - Item: S_Promotion_Pendant + Rate: 33 + - Item: S_Physical_Earring + Rate: 33 + - Item: S_Physical_Weapon + Rate: 33 + - Item: S_Physical_Pendant + Rate: 33 + - Item: S_Magical_Earring + Rate: 33 + - Item: S_Magical_Weapon + Rate: 33 + - Item: S_Magical_Pendant + Rate: 33 + - Item: S_Breezy_Armor + Rate: 33 + - Item: S_Champion_Shoes + Rate: 33 + - Item: S_Athena_Shield + Rate: 33 + - Item: S_Immune_Armor + Rate: 33 + - Item: S_Hard_Armor + Rate: 33 + - Item: S_Ancient_Armor + Rate: 33 + - Item: S_Critical_Armor + Rate: 33 + - Item: S_Kingbird_Weapon + Rate: 33 + - Item: S_Cri_Hit_Weapon + Rate: 33 + - Item: S_Healing_Weapon + Rate: 33 + - Item: S_Lucky_Weapon + Rate: 33 + - Item: S_Power_Earring + Rate: 33 + - Item: S_Int_Pendant + Rate: 33 + - Item: S_Dexterous_Armor + Rate: 33 + - Item: S_Vital_Shoes + Rate: 33 + - Item: S_Athletic_Shield + Rate: 33 + - Item: S_Lucky_Armor + Rate: 33 + - Item: S_Power_Pendant + Rate: 33 + - Item: S_Int_Earring + Rate: 33 + - Item: S_Dexterous_Weapon + Rate: 33 + - Item: S_Vital_Shield + Rate: 33 + - Item: S_Athletic_Shoes + Rate: 33 + - Item: S_Resist_Spell_Pendant + Rate: 33 + - Item: S_Rapid_Pendant + Rate: 33 + - Item: S_Caster_Pendant + Rate: 33 + - Item: S_Hard_Earring + Rate: 33 + - Item: S_Wise_Earring + Rate: 33 + - Item: S_Athena_Earring + Rate: 33 + - Item: S_Cranial_Shield + Rate: 33 + - Item: S_Safeguard_Shield + Rate: 33 + - Item: S_Brutal_Shield + Rate: 33 + - Item: S_Gargantua_Shield + Rate: 33 + - Item: S_Homers_Shield + Rate: 33 + - Item: S_Dragoon_Shield + Rate: 33 + - Item: S_Satanic_Shield + Rate: 33 + - Item: S_Flameguard_Shield + Rate: 33 + - Item: S_Requiem_Shield + Rate: 33 + - Item: S_Cadi_Shield + Rate: 33 + - Item: S_Bloody_Shoes + Rate: 33 + - Item: S_Liberation_Shoes + Rate: 33 + - Item: S_Chemical_Shoes + Rate: 33 + - Item: S_Clamorous_Shoes + Rate: 33 + - Item: S_Insecticide_Shoes + Rate: 33 + - Item: S_Fisher_Shoes + Rate: 33 + - Item: S_Seraphim_Shoes + Rate: 33 + - Item: S_Beholder_Shoes + Rate: 33 + - Item: S_Divine_Shoes + Rate: 33 + - Item: S_Dragoon_Shoes + Rate: 33 + - Item: S_Big_Armor + Rate: 33 + - Item: S_Medium_Armor + Rate: 33 + - Item: S_Small_Armor + Rate: 33 + - Item: S_Big_Weapon + Rate: 33 + - Item: S_Medium_Weapon + Rate: 33 + - Item: S_Small_Weapon + Rate: 33 + - Item: S_Spiritual_Weapon + Rate: 33 + - Item: S_Spiritual_Earring + Rate: 33 + - Item: S_Spiritual_Pendent + Rate: 33 + - Item: S_Malicious_Armor + Rate: 33 + - Item: S_Malicious_Shoes + Rate: 33 + - Item: S_Malicious_Shield + Rate: 33 + - Item: S_Gemstone_Armor + Rate: 33 + - Item: S_Gemstone_Shoes + Rate: 33 + - Item: S_Gemstone_Shield + Rate: 33 + - Item: S_Gemstone_Weapon + Rate: 33 + - Item: S_Gemstone_Earring + Rate: 33 + - Item: S_Gemstone_Pendent + Rate: 33 + - Item: S_Stability_Shield + Rate: 33 + - Item: S_Plasterer's_Armor + Rate: 33 + - Item: S_Plasterer's_Shoes + Rate: 33 + - Item: S_Insomniac_Armor + Rate: 33 + - Item: S_Insomniac_Shoes + Rate: 33 + - Item: S_Peerless_Armor + Rate: 33 + - Item: S_Peerless_Shoes + Rate: 33 + - Item: S_Adurate_Armor + Rate: 33 + - Item: S_Adurate_Shoes + Rate: 33 + - Item: Unfreez_Weapon_S + Rate: 33 + - Item: Unfreeze_Earing_S + Rate: 33 + - Item: Unfreeze_Pendent_S + Rate: 33 + - Item: Vitality_Earing_S + Rate: 33 + - Item: Vitality_Pendant_S + Rate: 33 + - Item: S_Neutral_Weapon + Rate: 33 + - Item: S_Neutral_Earring + Rate: 33 + - Item: S_Neutral_Pendent + Rate: 33 + - Item: S_Curse_Lift_Earring + Rate: 33 + - Item: S_Curse_Lift_Pendent + Rate: 33 + - Item: S_Caster_earring + Rate: 33 + - Item: S_Caster_Weapon + Rate: 33 + - Item: S_Spell_Flow_Shoes + Rate: 33 + - Item: S_Spell_Flow_Armor + Rate: 33 + - Item: S_Spell_Flow_Shield + Rate: 33 + - Item: S_Greed_Armor + Rate: 33 + - Item: S_Greed_Shoes + Rate: 33 + - Item: S_Greed_Shield + Rate: 33 + - Item: S_Greed_Weapon + Rate: 33 + - Item: S_Greed_Earring + Rate: 33 + - Item: S_Greed_Pendant + Rate: 33 + - Item: S_Heal_Armor + Rate: 33 + - Item: S_Heal_Shoes + Rate: 33 + - Item: S_Heal_Shield + Rate: 33 + - Item: S_Heal_Weapon + Rate: 33 + - Item: S_Heal_Earring + Rate: 33 + - Item: S_Heal_Pendant + Rate: 33 + - Item: S_Hiding_Armor + Rate: 33 + - Item: S_Hiding_Shoes + Rate: 33 + - Item: S_Hiding_Shield + Rate: 33 + - Item: S_Hiding_Weapon + Rate: 33 + - Item: S_Hiding_Earring + Rate: 33 + - Item: S_Hiding_Pendant + Rate: 33 + - Item: S_Cloaking_Armor + Rate: 33 + - Item: S_Cloaking_Shoes + Rate: 33 + - Item: S_Cloaking_Shield + Rate: 33 + - Item: S_Cloaking_Weapon + Rate: 33 + - Item: S_Cloaking_Earring + Rate: 33 + - Item: S_Cloaking_Pendant + Rate: 33 + - Item: S_Teleport_Armor + Rate: 33 + - Item: S_Teleport_Shoes + Rate: 33 + - Item: S_Teleport_Shield + Rate: 33 + - Item: S_Teleport_Weapon + Rate: 33 + - Item: S_Teleport_Earring + Rate: 33 + - Item: S_Teleport_Pendant + Rate: 33 + - Item: S_Steal_Armor + Rate: 33 + - Item: S_Steal_Shoes + Rate: 33 + - Item: S_Steal_Shield + Rate: 33 + - Item: S_Steal_Weapon + Rate: 33 + - Item: S_Steal_Earring + Rate: 33 + - Item: S_Steal_Pendant + Rate: 33 + - Item: S_Infinity_Earring + Rate: 33 + - Item: S_Infinity_Pendant + Rate: 33 + - Item: S_Solid_Weapon + Rate: 33 + - Item: S_Solid_Earring + Rate: 33 + - Item: S_Immortal_Armor + Rate: 33 + - Item: S_Immortal_Pendant + Rate: 33 + - Item: S_Executioner_Weapon + Rate: 33 + - Item: S_Exorcist_Weapon + Rate: 33 + - Item: S_Hunting_Weapon + Rate: 33 + - Item: S_Insect_Net_Weapon + Rate: 33 + - Item: S_Fishing_Weapon + Rate: 33 + - Item: S_Dragon_Killer_Weapon + Rate: 33 + - Item: S_Corrupt_Weapon + Rate: 33 + - Item: S_Vibration_Weapon + Rate: 33 + - Item: S_Holy_Water_Weapon + Rate: 33 + - Item: S_Scissors_Weapon + Rate: 33 + - Item: S_Penetration_Earring + Rate: 33 + - Item: S_Penetration_Pendent + Rate: 33 + - Item: S_Tempest_Earring + Rate: 33 + - Item: S_Tempest_Pendent + Rate: 33 + - Item: S_M_Executioner_Weapon + Rate: 33 + - Item: S_M_Exorcist_Weapon + Rate: 33 + - Item: S_M_Hunting_Weapon + Rate: 33 + - Item: S_M_Insect_Net_Weapon + Rate: 33 + - Item: S_M_Fishing_Weapon + Rate: 33 + - Item: S_M_Dragon_K_Weapon + Rate: 33 + - Item: S_M_Corrupt_Weapon + Rate: 33 + - Item: S_M_Vibration_Weapon + Rate: 33 + - Item: S_M_Holy_Water_Weapon + Rate: 33 + - Item: S_M_Scissors_Weapon + Rate: 33 + - Item: S_Bearers_Armor + Rate: 33 + - Item: S_Bearers_Shoes + Rate: 33 + - Item: S_Bearers_Shield + Rate: 33 + - Item: S_Bearers_Weapon + Rate: 33 + - Item: S_Bearers_Earring + Rate: 33 + - Item: S_Bearers_Pendent + Rate: 33 + - Item: S_Basis_Armor + Rate: 33 + - Item: S_Hallowed_Armor + Rate: 33 + - Item: S_Saharic_Armor + Rate: 33 + - Item: S_Underneath_Armor + Rate: 33 + - Item: S_Flam_Armor + Rate: 33 + - Item: S_Windy_Armor + Rate: 33 + - Item: S_Envenom_Armor + Rate: 33 + - Item: S_Damned_Armor + Rate: 33 + - Item: S_Geist_Armor + Rate: 33 + - Item: S_Divine_Armor + Rate: 33 + - Item: S_Hasty_Shoes + Rate: 33 + - Item: S_Hasty_Armor + Rate: 33 + - Item: S_Basis_Shield + Rate: 33 + - Item: S_Hallowed_Shield + Rate: 33 + - Item: S_Saharic_Shield + Rate: 33 + - Item: S_Underneath_Shield + Rate: 33 + - Item: S_Flam_Shield + Rate: 33 + - Item: S_Windy_Shield + Rate: 33 + - Item: S_Envenom_Shield + Rate: 33 + - Item: S_Damned_Shield + Rate: 33 + - Item: S_Geist_Shield + Rate: 33 + - Item: S_Divine_Shield + Rate: 33 + - Item: S_Expert_Shoes + Rate: 33 + - Item: S_Expert_Shield + Rate: 33 + - Item: S_Beginner_Shoes + Rate: 33 + - Item: S_Beginner_Shield + Rate: 33 + - Item: S_Rookie_Shoes + Rate: 33 + - Item: S_Rookie_Shield + Rate: 33 + - Item: S_Advanced_Shoes + Rate: 33 + - Item: S_Advanced_Shield + Rate: 33 + - Item: S_Attack_Armor + Rate: 33 + - Item: S_Blitz_Earring + Rate: 33 + - Item: S_Blitz_Pendent + Rate: 33 + - Item: S_ColdBolt_Armor + Rate: 33 + - Item: S_FireBolt_Armor + Rate: 33 + - Item: S_LightingBolt_Armor + Rate: 33 + - Item: S_EarthSpike_Armor + Rate: 33 + - Item: S_Enhance_Force_Weapon + Rate: 33 + - Item: S_Force_Weapon + Rate: 33 + - Item: S_Force_Earring + Rate: 33 + - Item: S_Force_Pendant + Rate: 33 + - Item: S_Enhance_Spirit_Weapon + Rate: 33 + - Item: S_Spirit_Weapon + Rate: 33 + - Item: S_Spirit_Earring + Rate: 33 + - Item: S_Spirit_Pendant + Rate: 33 + - Item: S_Blitz_Shoes + Rate: 33 + - Item: S_Blitz_Shield + Rate: 33 + - Item: S_Exceed_Weapon + Rate: 33 + - Item: S_Titan_Earring + Rate: 33 + - Item: S_Titan_Pendant + Rate: 33 + - Item: S_Boned_Earring + Rate: 33 + - Item: S_Boned_Pendant + Rate: 33 + - Item: S_Gigantic_Earring + Rate: 33 + - Item: S_Gigantic_Pendant + Rate: 33 + - Item: S_Caster_Shoes + Rate: 33 + - Item: S_Caster_Shield + Rate: 33 + - Item: S_Caster_Armor + Rate: 33 + - Item: S_Reload_Shoes + Rate: 33 + - Item: S_Reload_Shield + Rate: 33 + - Item: S_Reload_Armor + Rate: 33 + - Item: S_Swordman_earring + Rate: 33 + - Item: S_Merchant_earring + Rate: 33 + - Item: S_Acolyte_earring + Rate: 33 + - Item: S_Magician_earring + Rate: 33 + - Item: S_Swordman_Pendant + Rate: 33 + - Item: S_Merchant_Pendant + Rate: 33 + - Item: S_Acolyte_Pendant + Rate: 33 + - Item: S_Thief_Pendant + Rate: 33 + - Item: S_Magician_Pendant + Rate: 33 + - Item: S_Archer_Pendant + Rate: 33 + - Item: S_Critical_Shield + Rate: 33 + - Item: S_Critical_Shoes + Rate: 33 + - Item: S_Blitz_Weapon + Rate: 33 + - Item: S_Blitz_Armor + Rate: 33 + - Item: S_Tension_Weapon + Rate: 33 + - Item: S_Tension_Earring + Rate: 33 + - Item: S_Tension_Pendent + Rate: 33 + - Item: S_Elegant_Weapon + Rate: 33 + - Item: S_Elegant_Earring + Rate: 33 + - Item: S_Elegant_Pendent + Rate: 33 + - Item: S_Healing_Shield + Rate: 33 + - Item: S_Healing_Shoes + Rate: 33 + - Item: S_Restore_Earring + Rate: 33 + - Item: S_Restore_Pendant + Rate: 33 + - Item: S_Mortal_Blow_Weapon + Rate: 33 + - Item: S_Mortal_Blow_Earring + Rate: 33 + - Item: S_Mortal_Blow_Pendant + Rate: 33 + - Item: Sentimental_Weapone_S + Rate: 33 + - Item: Sentimental_Earring_S + Rate: 33 + - Item: Sentimental_Pendant_S + Rate: 33 + - Item: Enchanting_Weapone_S + Rate: 33 + - Item: Enchanting_Earring_S + Rate: 33 + - Item: Enchanting_Pendant_S + Rate: 33 + - Item: S_Thief_earring + Rate: 33 + - Item: S_Archer_earring + Rate: 33 diff --git a/src/map/itemdb.hpp b/src/map/itemdb.hpp index ccb2a4d6d5..5a47585753 100644 --- a/src/map/itemdb.hpp +++ b/src/map/itemdb.hpp @@ -890,6 +890,10 @@ enum e_random_item_group { IG_PIERCING_MIX, IG_HASTY_MIX, IG_ENCHANTSTONE_RECIPE_4M, + IG_SHADOW_CUBE, + IG_SHADOW_CUBE_PENDANT, + IG_SHADOW_CUBE_EARING, + IG_ANGELPORING_BOX, IG_MAX, }; diff --git a/src/map/script_constants.hpp b/src/map/script_constants.hpp index 6774966a78..6c97c9e231 100644 --- a/src/map/script_constants.hpp +++ b/src/map/script_constants.hpp @@ -5645,6 +5645,10 @@ export_constant(IG_PIERCING_MIX); export_constant(IG_HASTY_MIX); export_constant(IG_ENCHANTSTONE_RECIPE_4M); + export_constant(IG_SHADOW_CUBE); + export_constant(IG_SHADOW_CUBE_PENDANT); + export_constant(IG_SHADOW_CUBE_EARING); + export_constant(IG_ANGELPORING_BOX); /* unit stop walking */ export_constant(USW_NONE);