summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--db/const.txt2
-rw-r--r--db/re/item_combo_db.txt2
-rw-r--r--db/re/item_db.conf378
-rw-r--r--db/sc_config.txt2
-rw-r--r--src/map/mob.c4
-rw-r--r--src/map/pc.c2
-rw-r--r--src/map/status.c3
-rw-r--r--src/map/status.h2
8 files changed, 285 insertions, 110 deletions
diff --git a/db/const.txt b/db/const.txt
index 3f0fbdbd0..0fc3c4923 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1313,9 +1313,9 @@ SC_FENRIR_CARD 607
SC_ATKER_ASPD 608
SC_ATKER_MOVESPEED 609
-
SC_FOOD_CRITICALSUCCESSVALUE 610
SC_CUP_OF_BOZA 611
+SC_OVERLAPEXPUP 612
e_gasp 0
e_what 1
diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt
index d2abb9828..6cded9c00 100644
--- a/db/re/item_combo_db.txt
+++ b/db/re/item_combo_db.txt
@@ -206,7 +206,7 @@
2963:15074,{ bonus bDelayrate,-5; bonus2 bAddRaceTolerance,RC_DemiPlayer,5; }
2964:15073,{ bonus bDelayrate,-5; bonus2 bAddRaceTolerance,RC_DemiPlayer,5; }
2964:15074,{ bonus bVariableCastrate,-5; }
-2997:2998,{ bonus bMatkRate,10; bonus bAtkRate,10; }
+2997:2999,{ bonus bMatkRate,10; bonus bAtkRate,10; }
4001:4197,{ bonus bFlee,18; }
4006:4266,{ bonus bFlee,18; }
4009:4179,{ bonus bFlee,18; }
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 460cfff1d..3b26c6ad3 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -60,8 +60,8 @@ item_db: (
},
******************************************************************************/
-// Healing Items
-// =============================================================
+// Healing Items
+// ===================================================================
{
Id: 501
AegisName: "Red_Potion"
@@ -1112,7 +1112,8 @@ item_db: (
}
Script: <" itemheal rand(105,145),0; ">
},
-// Usable Items
+
+// Usable Items
// ===================================================================
{
Id: 601
@@ -2158,7 +2159,8 @@ item_db: (
}
Script: <" itemskill MG_FROSTDIVER,1; ">
},
-// Etc Items
+
+// Etc Items
// ===================================================================
{
Id: 701
@@ -4160,9 +4162,9 @@ item_db: (
Weight: 10
BuyingStore: true
},
-// Weapons
+
+// One-Handed Swords
// ===================================================================
-// 1-Handed Swords
{
Id: 1101
AegisName: "Sword"
@@ -5006,6 +5008,9 @@ item_db: (
EquipLv: 27
View: 2
},
+
+// Two-Handed Swords
+// ===================================================================
{
Id: 1151
AegisName: "Slayer"
@@ -6039,7 +6044,9 @@ item_db: (
EquipLv: 120
View: 3
},
-// Daggers
+
+// Daggers
+// ===================================================================
{
Id: 1201
AegisName: "Knife"
@@ -6862,7 +6869,9 @@ item_db: (
View: 1
Script: <" bonus bAtkEle,Ele_Water; ">
},
-// Katars
+
+// Katars
+// ===================================================================
{
Id: 1250
AegisName: "Jur"
@@ -7970,7 +7979,9 @@ item_db: (
bonus2 bAddEff,Eff_Bleeding,500; /* Custom IRO */
">
},
-// 1-Handed Axes
+
+// One-Handed Axes
+// ===================================================================
{
Id: 1301
AegisName: "Axe"
@@ -8372,7 +8383,9 @@ item_db: (
bonus bInt,8;
">
},
-// 2-Handed Axes
+
+// Two-Handed Axes
+// ===================================================================
{
Id: 1351
AegisName: "Battle_Axe"
@@ -9449,7 +9462,9 @@ item_db: (
bonus2 bAddEff,Eff_Stun,500; /* Custom IRO */
">
},
-// 1-Handed Spears
+
+// One-Handed Spears
+// ===================================================================
{
Id: 1400
AegisName: "Spear_of_Vicious_Mind"
@@ -10301,6 +10316,26 @@ item_db: (
OnUnequipScript: <" heal -1000,0; ">
},
{
+ Id: 1441
+ AegisName: "Ru_Blue_Spear"
+ Name: "Ru Blue Spear"
+ Type: 4
+ Buy: 20
+ Weight: 1200
+ Atk: 200
+ Range: 3
+ Slots: 1
+ Job: 0x00004000
+ Loc: 2
+ WeaponLv: 3
+ EquipLv: 100
+ View: 4
+ Script: <"
+ bonus bStr,5;
+ bonus bAgi,5;
+ ">
+},
+{
Id: 1443
AegisName: "Crimson_Spear"
Name: "Crimson Spear"
@@ -10320,6 +10355,9 @@ item_db: (
if(BaseLevel>70) { bonus bAtk,(((BaseLevel-70)/10)*5); }
">
},
+
+// Two-Handed Spears
+// ===================================================================
{
Id: 1450
AegisName: "Lance_of_Vicious_Mind"
@@ -10733,7 +10771,6 @@ item_db: (
bonus bDex,2;
">
},
-// 2-Handed Spears
{
Id: 1474
AegisName: "Gae_Bolg"
@@ -11309,7 +11346,9 @@ item_db: (
if(BaseLevel>70) { bonus bAtk,(((BaseLevel-70)/10)*5); }
">
},
-// Maces
+
+// Maces
+// ===================================================================
{
Id: 1501
AegisName: "Club"
@@ -12276,7 +12315,9 @@ item_db: (
EquipLv: 99
View: 8
},
-// Books
+
+// Books
+// ===================================================================
{
Id: 1550
AegisName: "Book"
@@ -13259,7 +13300,9 @@ item_db: (
bonus bMatk,getrefine()*3;
">
},
-// GM Weapon
+
+// GM Weapon
+// ===================================================================
{
Id: 1599
AegisName: "Angra_Manyu"
@@ -13289,7 +13332,9 @@ item_db: (
bonus bFixedCastrate,-100;
">
},
-// Staffs
+
+// Staffs / Staves
+// ===================================================================
{
Id: 1600
AegisName: "Rod_of_Vicious_Mind"
@@ -14990,7 +15035,9 @@ item_db: (
if(BaseLevel>70) { bonus bMatk,(((BaseLevel-70)/10)*5); }
">
},
-// Bows
+
+// Bows
+// ===================================================================
{
Id: 1701
AegisName: "Bow"
@@ -15927,7 +15974,9 @@ item_db: (
bonus bDex,2;
">
},
-// Arrows
+
+// Arrows
+// ===================================================================
{
Id: 1750
AegisName: "Arrow"
@@ -16282,7 +16331,9 @@ item_db: (
EquipLv: 95
View: 1
},
-// Knuckles
+
+// Knuckles
+// ===================================================================
{
Id: 1800
AegisName: "Fist_of_Vicious_Mind"
@@ -17093,7 +17144,9 @@ item_db: (
if(BaseLevel>70) { bonus bAtk,(((BaseLevel-70)/10)*5); }
">
},
-// Instruments
+
+// Instruments
+// ===================================================================
{
Id: 1900
AegisName: "Violin_of_Vicious_Mind"
@@ -18008,7 +18061,9 @@ item_db: (
}
">
},
-// Whips
+
+// Whips
+// ===================================================================
{
Id: 1950
AegisName: "Rope"
@@ -18950,7 +19005,9 @@ item_db: (
bonus bMatk,pow(min(getrefine(),15),2)/2;
">
},
-// Additional 2-Handed Staffs
+
+// More Two-Handed Staffs / Staves
+// ===================================================================
{
Id: 2000
AegisName: "Destruction_Rod"
@@ -19629,7 +19686,8 @@ item_db: (
bonus bUnbreakableWeapon,0;
">
},
-// Shields
+
+// Shields
// ===================================================================
{
Id: 2101
@@ -21056,9 +21114,9 @@ item_db: (
bonus bMdef,10;
bonus2 bAddRaceTolerance, RC_All, 30;
bonus bUnbreakableShield,0;
-/* When you receive Melee Physical damage, chance of casting Protective Light for 60 seconds. */
-/* Cancels Stun, Sleep, Curse, Stone Curse, Poison, Blind, Silence, Bleeding, Chaos, and Frozen. */
-/* Protects the user against such effects for a set duration. */
+ /* When you receive Melee Physical damage, chance of casting Protective Light for 60 seconds. */
+ /* Cancels Stun, Sleep, Curse, Stone Curse, Poison, Blind, Silence, Bleeding, Chaos, and Frozen. */
+ /* Protects the user against such effects for a set duration. */
">
},
{
@@ -21249,7 +21307,9 @@ item_db: (
if(getrefine()>=7) { bonus bMatk,20; }
">
},
-// GM Shield
+
+// GM Shield
+// ===================================================================
{
Id: 2199
AegisName: "Ahura_Mazda"
@@ -21279,7 +21339,8 @@ item_db: (
OnEquipScript: <" sc_start4 SC_ENDURE,60000,10,0,0,1; ">
OnUnequipScript: <" sc_end SC_ENDURE; ">
},
-// Headgears
+
+// Headgears
// ===================================================================
{
Id: 2201
@@ -22523,7 +22584,8 @@ item_db: (
Loc: 256
View: 86
},
-// Armors
+
+// Armors
// ===================================================================
{
Id: 2301
@@ -24164,7 +24226,8 @@ item_db: (
Loc: 16
Script: <" bonus bMdef,3; ">
},
-// Footgears
+
+// Footgears
// ===================================================================
{
Id: 2401
@@ -25906,7 +25969,8 @@ item_db: (
bonus bMaxSP,30+((getrefine()/3)*10);
">
},
-// Garments
+
+// Garments
// ===================================================================
{
Id: 2501
@@ -27620,7 +27684,8 @@ item_db: (
bonus bVit,1;
">
},
-// Accessories
+
+// Accessories
// ===================================================================
{
Id: 2601
@@ -33812,7 +33877,7 @@ item_db: (
">
},
{
- Id: 2998
+ Id: 2999
AegisName: "RWC_Silver_Brooch"
Name: "RWC Silver Brooch"
Type: 5
@@ -41770,7 +41835,7 @@ item_db: (
Weight: 10
Loc: 16
Script: <"
- bonus2 bMagicAddEle,Ele_Shadow,50;
+ bonus2 bMagicAddEle,Ele_Dark,50;
bonus2 bMagicAddEle,Ele_Undead,50;
bonus2 bMagicAddRace,RC_Demon,50;
bonus2 bMagicAddRace,RC_Undead,50;
@@ -42242,8 +42307,9 @@ item_db: (
Weight: 10
Loc: 2
Script: <"
- bonus2 bSkillAtk,GC_CROSSIMPACT,100;
- if (getrefine() >= 10) bonus2 bSkillAtk,GC_CROSSIMPACT,200;
+ bonus2 bSkillAtk,GC_CROSSIMPACT,50;
+ if (getequipweaponlv(EQI_HAND_R) == 4) bonus2 bSkillAtk,GC_CROSSIMPACT,50;
+ if (getrefine() >= 10) bonus2 bSkillAtk,GC_CROSSIMPACT,50;
">
},
{
@@ -42255,8 +42321,9 @@ item_db: (
Weight: 10
Loc: 2
Script: <"
- bonus2 bSkillAtk,AB_JUDEX,100;
- if (getrefine() >= 10) bonus2 bSkillAtk,AB_JUDEX,200;
+ bonus2 bSkillAtk,AB_JUDEX,50;
+ if (getequipweaponlv(EQI_HAND_R) == 4) bonus2 bSkillAtk,AB_JUDEX,50;
+ if (getrefine() >= 10) bonus2 bSkillAtk,AB_JUDEX,50;
">
},
{
@@ -42268,8 +42335,9 @@ item_db: (
Weight: 10
Loc: 2
Script: <"
- bonus2 bSkillAtk,WL_HELLINFERNO,100;
- if (getrefine() >= 10) bonus2 bSkillAtk,WL_HELLINFERNO,200;
+ bonus2 bSkillAtk,WL_HELLINFERNO,50;
+ if (getequipweaponlv(EQI_HAND_R) == 4) bonus2 bSkillAtk,WL_HELLINFERNO,50;
+ if (getrefine() >= 10) bonus2 bSkillAtk,WL_HELLINFERNO,50;
">
},
{
@@ -42281,8 +42349,9 @@ item_db: (
Weight: 10
Loc: 2
Script: <"
- bonus2 bSkillAtk,RA_AIMEDBOLT,100;
- if (getrefine() >= 10) bonus2 bSkillAtk,RA_AIMEDBOLT,200;
+ bonus2 bSkillAtk,RA_AIMEDBOLT,50;
+ if (getequipweaponlv(EQI_HAND_R) == 4) bonus2 bSkillAtk,RA_AIMEDBOLT,50;
+ if (getrefine() >= 10) bonus2 bSkillAtk,RA_AIMEDBOLT,50;
">
},
{
@@ -42294,8 +42363,9 @@ item_db: (
Weight: 10
Loc: 2
Script: <"
- bonus2 bSkillAtk,NC_POWERSWING,100;
- if (getrefine() >= 10) bonus2 bSkillAtk,NC_POWERSWING,200;
+ bonus2 bSkillAtk,NC_POWERSWING,50;
+ if (getequipweaponlv(EQI_HAND_R) == 4) bonus2 bSkillAtk,NC_POWERSWING,50;
+ if (getrefine() >= 10) bonus2 bSkillAtk,NC_POWERSWING,50;
">
},
{
@@ -42307,8 +42377,9 @@ item_db: (
Weight: 10
Loc: 2
Script: <"
- bonus2 bSkillAtk,RK_SONICWAVE,100;
- if (getrefine() >= 10) bonus2 bSkillAtk,RK_SONICWAVE,200;
+ bonus2 bSkillAtk,RK_SONICWAVE,50;
+ if (getequipweaponlv(EQI_HAND_R) == 4) bonus2 bSkillAtk,RK_SONICWAVE,50;
+ if (getrefine() >= 10) bonus2 bSkillAtk,RK_SONICWAVE,50;
">
},
{
@@ -42320,8 +42391,9 @@ item_db: (
Weight: 10
Loc: 2
Script: <"
- bonus2 bSkillAtk,LG_BANISHINGPOINT,100;
- if (getrefine() >= 10) bonus2 bSkillAtk,LG_BANISHINGPOINT,200;
+ bonus2 bSkillAtk,LG_BANISHINGPOINT,50;
+ if (getequipweaponlv(EQI_HAND_R) == 4) bonus2 bSkillAtk,LG_BANISHINGPOINT,50;
+ if (getrefine() >= 10) bonus2 bSkillAtk,LG_BANISHINGPOINT,50;
">
},
{
@@ -42333,8 +42405,9 @@ item_db: (
Weight: 10
Loc: 2
Script: <"
- bonus2 bSkillAtk,GN_CARTCANNON,100;
- if (getrefine() >= 10) bonus2 bSkillAtk,GN_CARTCANNON,200;
+ bonus2 bSkillAtk,GN_CARTCANNON,50;
+ if (getequipweaponlv(EQI_HAND_R) == 4) bonus2 bSkillAtk,GN_CARTCANNON,50;
+ if (getrefine() >= 10) bonus2 bSkillAtk,GN_CARTCANNON,50;
">
},
{
@@ -42346,8 +42419,9 @@ item_db: (
Weight: 10
Loc: 2
Script: <"
- bonus2 bSkillAtk,SO_CLOUD_KILL,100;
- if (getrefine() >= 10) bonus2 bSkillAtk,SO_CLOUDKILL,200;
+ bonus2 bSkillAtk,SO_CLOUD_KILL,50;
+ if (getequipweaponlv(EQI_HAND_R) == 4) bonus2 bSkillAtk,SO_CLOUD_KILL,50;
+ if (getrefine() >= 10) bonus2 bSkillAtk,SO_CLOUDKILL,50;
">
},
{
@@ -42359,8 +42433,9 @@ item_db: (
Weight: 10
Loc: 2
Script: <"
- bonus2 bSkillAtk,SR_DRAGONCOMBO,100;
- if (getrefine() >= 10) bonus2 bSkillAtk,SR_DRAGONCOMBO,200;
+ bonus2 bSkillAtk,SR_DRAGONCOMBO,50;
+ if (getequipweaponlv(EQI_HAND_R) == 4) bonus2 bSkillAtk,SR_DRAGONCOMBO,50;
+ if (getrefine() >= 10) bonus2 bSkillAtk,SR_DRAGONCOMBO,50;
">
},
{
@@ -42372,8 +42447,9 @@ item_db: (
Weight: 10
Loc: 2
Script: <"
- bonus2 bSkillAtk,SC_FEINTBOMB,100;
- if (getrefine() >= 10) bonus2 bSkillAtk,SC_FEINTBOMB,200;
+ bonus2 bSkillAtk,SC_FEINTBOMB,50;
+ if (getequipweaponlv(EQI_HAND_R) == 4) bonus2 bSkillAtk,SC_FEINTBOMB,50;
+ if (getrefine() >= 10) bonus2 bSkillAtk,SC_FEINTBOMB,50;
">
},
{
@@ -42385,8 +42461,9 @@ item_db: (
Weight: 10
Loc: 2
Script: <"
- bonus2 bSkillAtk,WM_METALICSOUND,100;
- if (getrefine() >= 10) bonus2 bSkillAtk,WM_METALICSOUND,200;
+ bonus2 bSkillAtk,WM_METALICSOUND,50;
+ if (getequipweaponlv(EQI_HAND_R) == 4) bonus2 bSkillAtk,WM_METALICSOUND,50;
+ if (getrefine() >= 10) bonus2 bSkillAtk,WM_METALICSOUND,50;
">
},
{
@@ -42398,8 +42475,9 @@ item_db: (
Weight: 10
Loc: 2
Script: <"
- bonus2 bSkillAtk,WM_REVERBERATION,100;
- if (getrefine() >= 10) bonus2 bSkillAtk,WM_REVERBERATION,200;
+ bonus2 bSkillAtk,WM_REVERBERATION,50;
+ if (getequipweaponlv(EQI_HAND_R) == 4) bonus2 bSkillAtk,WM_REVERBERATION,50;
+ if (getrefine() >= 10) bonus2 bSkillAtk,WM_REVERBERATION,50;
">
},
@@ -44142,7 +44220,7 @@ item_db: (
Script: <" bonus bMaxSP,75; ">
},
-// More Headgears
+// More Headgears
// ===================================================================
{
Id: 5001
@@ -58834,7 +58912,8 @@ item_db: (
/* Grant additional effects on Rune stone skill activation */
">
},
-// More Etc Items
+
+// More Etc Items
// ===================================================================
{
Id: 6000
@@ -74365,7 +74444,8 @@ item_db: (
Buy: 2
Weight: 10
},
-// Pet Eggs
+
+// Pet Eggs
// ===================================================================
{
Id: 9001
@@ -74812,7 +74892,8 @@ item_db: (
Type: 7
Buy: 20
},
-// Pet Accessories
+
+// Pet Accessories
// ===================================================================
{
Id: 10001
@@ -75087,7 +75168,8 @@ item_db: (
Type: 8
Buy: 20
},
-// Misc "Etc" Books
+
+// Misc "Etc" Books
// ===================================================================
{
Id: 11000
@@ -75558,8 +75640,6 @@ item_db: (
Buy: 20
Weight: 50
},
-// More Usable Items
-// ===================================================================
{
Id: 11058
AegisName: "Novice_Combi_Book"
@@ -75574,6 +75654,9 @@ item_db: (
Buy: 0
Weight: 10
},
+
+// More Usable Items
+// ===================================================================
{
Id: 11500
AegisName: "Light_Yellow_Pot"
@@ -84504,6 +84587,27 @@ item_db: (
Buy: 0
},
{
+ Id: 12633
+ AegisName: "Malang_Cat_Can"
+ Name: "Malang Cat Can"
+ Type: 2
+ Buy: 0
+ Weight: 50
+ Trade: {
+ nodrop: true
+ notrade: true
+ nocart: true
+ noselltonpc: true
+ nomail: true
+ noauction: true
+ nogstorage: true
+ }
+ Script: <"
+ specialeffect EF_MAGICALATTHIT;
+ sc_start2 SC_OVERLAPEXPUP,1200000,10,20;
+ ">
+},
+{
Id: 12636
AegisName: "Malang_Sp_Can"
Name: "Malang Sp Can"
@@ -85525,7 +85629,9 @@ item_db: (
Buy: 0
Weight: 10
},
-// Guillotine Cross Poisons
+
+// Guillotine Cross Poisons
+// ===================================================================
{
Id: 12717
AegisName: "Poison_Paralysis"
@@ -85534,7 +85640,10 @@ item_db: (
Buy: 2
Weight: 20
BuyingStore: true
- Script: <" sc_start SC_PARALYSE,300000,0,10,SCFLAG_FIXEDTICK; ">
+ Script: <"
+ specialeffect2 EF_ENCHANTPOISON;
+ sc_start SC_PARALYSE,300000,0,10,SCFLAG_FIXEDTICK;
+ ">
},
{
Id: 12718
@@ -85544,7 +85653,10 @@ item_db: (
Buy: 2
Weight: 20
BuyingStore: true
- Script: <" sc_start SC_LEECHESEND,300000,0,10,SCFLAG_FIXEDTICK; ">
+ Script: <"
+ specialeffect2 EF_ENCHANTPOISON;
+ sc_start SC_LEECHESEND,300000,0,10,SCFLAG_FIXEDTICK;
+ ">
},
{
Id: 12719
@@ -85554,7 +85666,10 @@ item_db: (
Buy: 2
Weight: 20
BuyingStore: true
- Script: <" sc_start SC_OBLIVIONCURSE,300000,0,10,SCFLAG_FIXEDTICK; ">
+ Script: <"
+ specialeffect2 EF_ENCHANTPOISON;
+ sc_start SC_OBLIVIONCURSE,300000,0,10,SCFLAG_FIXEDTICK;
+ ">
},
{
Id: 12720
@@ -85564,7 +85679,10 @@ item_db: (
Buy: 2
Weight: 20
BuyingStore: true
- Script: <" sc_start SC_DEATHHURT,300000,0,10,SCFLAG_FIXEDTICK; ">
+ Script: <"
+ specialeffect2 EF_ENCHANTPOISON;
+ sc_start SC_DEATHHURT,300000,0,10,SCFLAG_FIXEDTICK;
+ ">
},
{
Id: 12721
@@ -85574,7 +85692,10 @@ item_db: (
Buy: 2
Weight: 20
BuyingStore: true
- Script: <" sc_start SC_TOXIN,300000,0,10,SCFLAG_FIXEDTICK; ">
+ Script: <"
+ specialeffect2 EF_ENCHANTPOISON;
+ sc_start SC_TOXIN,300000,0,10,SCFLAG_FIXEDTICK;
+ ">
},
{
Id: 12722
@@ -85584,7 +85705,10 @@ item_db: (
Buy: 2
Weight: 20
BuyingStore: true
- Script: <" sc_start SC_PYREXIA,300000,0,10,SCFLAG_FIXEDTICK; ">
+ Script: <"
+ specialeffect2 EF_ENCHANTPOISON;
+ sc_start SC_PYREXIA,300000,0,10,SCFLAG_FIXEDTICK;
+ ">
},
{
Id: 12723
@@ -85594,7 +85718,10 @@ item_db: (
Buy: 2
Weight: 20
BuyingStore: true
- Script: <" sc_start SC_MAGICMUSHROOM,300000,0,10,SCFLAG_FIXEDTICK; ">
+ Script: <"
+ specialeffect2 EF_ENCHANTPOISON;
+ sc_start SC_MAGICMUSHROOM,300000,0,10,SCFLAG_FIXEDTICK;
+ ">
},
{
Id: 12724
@@ -85604,9 +85731,14 @@ item_db: (
Buy: 2
Weight: 20
BuyingStore: true
- Script: <" sc_start SC_VENOMBLEED,15000,0,10,SCFLAG_FIXEDTICK; ">
+ Script: <"
+ specialeffect2 EF_ENCHANTPOISON;
+ sc_start SC_VENOMBLEED,15000,0,10,SCFLAG_FIXEDTICK;
+ ">
},
-// Rune Knight's Rune Stones
+
+// Rune Knight's Rune Stones
+// ===================================================================
{
Id: 12725
AegisName: "Runstone_Nosiege"
@@ -85809,7 +85941,6 @@ item_db: (
Stack: [20, 1]
Script: <" itemskill RK_STONEHARDSKIN,1; ">
},
-// Rune Knight Rune Ores
{
Id: 12734
AegisName: "Runstone_Quality"
@@ -85865,6 +85996,9 @@ item_db: (
BuyingStore: true
Script: <" makerune 8; ">
},
+
+// More Cash Shop Usable Items
+// ===================================================================
{
Id: 12739
AegisName: "Snow_Flower"
@@ -90305,7 +90439,9 @@ item_db: (
if(getrefine()>=12) { bonus bAtkRate,7; }
">
},
-// Revolvers
+
+// Revolvers
+// ===================================================================
{
Id: 13100
AegisName: "Six_Shooter"
@@ -90795,7 +90931,9 @@ item_db: (
View: 17
Script: <" bonus bAtk,pow(min(getrefine(),15),2); ">
},
-// Guns
+
+// Guns
+// ===================================================================
{
Id: 13150
AegisName: "Branch"
@@ -91789,7 +91927,9 @@ item_db: (
bonus bLongAtkRate,20;
">
},
-// Bullets
+
+// Bullets
+// ===================================================================
{
Id: 13200
AegisName: "Bullet"
@@ -91982,7 +92122,9 @@ item_db: (
Loc: 32768
View: 3
},
-// Shurikens & Kunais
+
+// Shurikens & Kunais
+// ===================================================================
{
Id: 13250
AegisName: "Shuriken"
@@ -92115,7 +92257,9 @@ item_db: (
bonus2 bAddEff,Eff_Poison,500;
">
},
-// Genetic Created Bombs And Throwing Items
+
+// Genetic Created Bombs And Throwing Items
+// ===================================================================
{
Id: 13260
AegisName: "Apple_Bomb"
@@ -92546,7 +92690,9 @@ item_db: (
View: 9
Script: <" sc_start SC_STOMACHACHE,60000,rand(5,10); ">
},
-// More Shurikens & Kunais
+
+// More Shurikens & Kunais
+// ===================================================================
{
Id: 13291
AegisName: "Starfish"
@@ -92656,7 +92802,9 @@ item_db: (
noauction: true
}
},
-// Ninja Fuuma Shurikens
+
+// Ninja Fuuma Shurikens
+// ===================================================================
{
Id: 13300
AegisName: "Huuma_Bird_Wing"
@@ -93124,7 +93272,9 @@ item_db: (
bonus bUnbreakableWeapon,0;
">
},
-// More 1-Handed Swords
+
+// More One-Handed Swords
+// ===================================================================
{
Id: 13400
AegisName: "Cutlas_"
@@ -94037,7 +94187,9 @@ item_db: (
View: 2
Script: <" bonus bAtk,pow(min(getrefine(),15),2); ">
},
-// More Cash Shop Items
+
+// More Cash Shop Items
+// ===================================================================
{
Id: 13500
AegisName: "Insurance60_Package"
@@ -110127,7 +110279,7 @@ item_db: (
noauction: true
}
Script: <"
- specialeffect2 320;
+ specialeffect2 EF_HEAL3;
sc_start4 SC_S_LIFEPOTION,600000,-5,5,0,0;
">
},
@@ -110148,7 +110300,7 @@ item_db: (
noauction: true
}
Script: <"
- specialeffect2 320;
+ specialeffect2 EF_HEAL3;
sc_start4 SC_L_LIFEPOTION,600000,-7,4,0,0;
">
},
@@ -110169,7 +110321,7 @@ item_db: (
noauction: true
}
Script: <"
- specialeffect2 182;
+ specialeffect2 EF_MAGICALATTHIT;
sc_start SC_CRITICALPERCENT,300000,30;
">
},
@@ -110190,7 +110342,7 @@ item_db: (
noauction: true
}
Script: <"
- specialeffect2 348;
+ specialeffect2 EF_LIGHTSPHERE;
sc_start SC_HEALPLUS,1800000,20;
">
},
@@ -110254,7 +110406,7 @@ item_db: (
noauction: true
}
Script: <"
- specialeffect2 91;
+ specialeffect2 EF_BENEDICTIO;
sc_start4 SC_ARMOR_PROPERTY,1800000,1,Ele_Holy,1,0;
">
},
@@ -113127,7 +113279,8 @@ item_db: (
bonus bMaxSP,50;
">
},
-// More Maces
+
+// More Maces
// ===================================================================
{
Id: 16000
@@ -125636,7 +125789,8 @@ item_db: (
bonus bHit,8;
">
},
-// Costume Equipments
+
+// Costume Equipments
// ===================================================================
{
Id: 19500
@@ -132496,7 +132650,8 @@ item_db: (
Loc: 1024
View: 650
},
-// New Garments
+
+// New Garments
// ===================================================================
{
Id: 20500
@@ -133016,7 +133171,8 @@ item_db: (
}
">
},
-// New Two-handed Swords
+
+// New Two-Handed Swords
// ===================================================================
{
Id: 21000
@@ -133428,7 +133584,8 @@ item_db: (
if(getrefine()>=9) { skill LK_BERSERK,1; }
">
},
-// New Shoes
+
+// New Shoes
// ===================================================================
{
Id: 22000
@@ -134058,7 +134215,8 @@ item_db: (
autobonus3 "{ }",1000,7000,ALL_CATCRY,"{ montransform 1505,420000; }";
">
},
-// New Etc Items
+
+// New Etc Items
// ===================================================================
{
Id: 22514
@@ -134228,7 +134386,8 @@ item_db: (
Weight: 10
Script: <" getrandgroupitem 22838,1; ">
},
-// Shadow Equipments
+
+// Shadow Equipments
// ===================================================================
{
Id: 24000
@@ -137138,7 +137297,8 @@ item_db: (
if (getrefine()>=9) { bonus bDelayrate,-1; }
">
},
-// New Katars
+
+// New Katars
// ===================================================================
{
Id: 28000
@@ -137274,7 +137434,8 @@ item_db: (
bonus bUnbreakableWeapon,0;
">
},
-// New Axes
+
+// New Axes
// ===================================================================
{
Id: 28100
@@ -137390,7 +137551,8 @@ item_db: (
bonus bUnbreakableWeapon,0;
">
},
-// New Grenade Launcher
+
+// New Grenade Launcher
// ===================================================================
{
Id: 28200
@@ -137486,7 +137648,8 @@ item_db: (
bonus bUnbreakableWeapon,0;
">
},
-// New Accessories
+
+// New Accessories
// ===================================================================
{
Id: 28306
@@ -137727,7 +137890,8 @@ item_db: (
bonus bMaxSPrate,3;
">
},
-// New Books
+
+// New Books
// ===================================================================
{
Id: 28604
@@ -137772,7 +137936,8 @@ item_db: (
bonus bUnbreakableWeapon,0;
">
},
-// New Daggers
+
+// New Daggers
// ===================================================================
{
Id: 28703
@@ -137858,7 +138023,8 @@ item_db: (
bonus bMatk,pow(min(getrefine(),15),2)/2;
">
},
-// New Shields
+
+// New Shields
// ===================================================================
{
Id: 28900
diff --git a/db/sc_config.txt b/db/sc_config.txt
index 14ba7b500..74e62297d 100644
--- a/db/sc_config.txt
+++ b/db/sc_config.txt
@@ -421,6 +421,8 @@ SC_GEFFEN_MAGIC2, 2
SC_GEFFEN_MAGIC3, 2
//SC_FENRIR_CARD, ??
+SC_OVERLAPEXPUP, 12
+
// Guild Auras should not be saved
SC_LEADERSHIP,78
SC_GLORYWOUNDS,78
diff --git a/src/map/mob.c b/src/map/mob.c
index d9a3f6776..a6e2c7c21 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2351,7 +2351,9 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
// Increase drop rate if user has SC_CASH_RECEIVEITEM
if (sd && sd->sc.data[SC_CASH_RECEIVEITEM]) // now rig the drop rate to never be over 90% unless it is originally >90%.
- drop_rate = max(drop_rate,cap_value((int)(0.5+drop_rate*(sd->sc.data[SC_CASH_RECEIVEITEM]->val1)/100.),0,9000));
+ drop_rate = max(drop_rate, cap_value((int)(0.5 + drop_rate * (sd->sc.data[SC_CASH_RECEIVEITEM]->val1) / 100.), 0, 9000));
+ if (sd && sd->sc.data[SC_OVERLAPEXPUP])
+ drop_rate = max(drop_rate, cap_value((int)(0.5 + drop_rate * (sd->sc.data[SC_OVERLAPEXPUP]->val2) / 100.), 0, 9000));
#ifdef RENEWAL_DROP
if( drop_modifier != 100 ) {
drop_rate = drop_rate * drop_modifier / 100;
diff --git a/src/map/pc.c b/src/map/pc.c
index 577123628..0313428ab 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -6553,6 +6553,8 @@ void pc_calcexp(struct map_session_data *sd, unsigned int *base_exp, unsigned in
if (sd->sc.data[SC_CASH_PLUSEXP])
bonus += sd->sc.data[SC_CASH_PLUSEXP]->val1;
+ if (sd->sc.data[SC_OVERLAPEXPUP])
+ bonus += sd->sc.data[SC_OVERLAPEXPUP]->val1;
*base_exp = (unsigned int) cap_value(*base_exp + (double)*base_exp * bonus/100., 1, UINT_MAX);
diff --git a/src/map/status.c b/src/map/status.c
index 699e7342b..da2892f98 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -830,6 +830,7 @@ void initChangeTables(void) {
status->dbs->IconChangeTable[SC_ATKER_ASPD] = SI_ATKER_ASPD;
status->dbs->IconChangeTable[SC_ATKER_MOVESPEED] = SI_ATKER_MOVESPEED;
status->dbs->IconChangeTable[SC_CUP_OF_BOZA] = SI_CUP_OF_BOZA;
+ status->dbs->IconChangeTable[SC_OVERLAPEXPUP] = SI_OVERLAPEXPUP;
// Eden Crystal Synthesis
status->dbs->IconChangeTable[SC_QUEST_BUFF1] = SI_QUEST_BUFF1;
@@ -8524,6 +8525,7 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t
break;
case SC_CASH_PLUSEXP:
case SC_CASH_PLUSONLYJOBEXP:
+ case SC_OVERLAPEXPUP:
if (val1 < 0)
val1 = 0;
break;
@@ -9374,6 +9376,7 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t
case SC_CASH_PLUSONLYJOBEXP:
case SC_MONSTER_TRANSFORM:
case SC_CASH_RECEIVEITEM:
+ case SC_OVERLAPEXPUP:
val_flag |= 1;
break;
}
diff --git a/src/map/status.h b/src/map/status.h
index a7549a5e4..f2173d81c 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -773,9 +773,9 @@ typedef enum sc_type {
SC_ATKER_ASPD,
SC_ATKER_MOVESPEED,
-
SC_FOOD_CRITICALSUCCESSVALUE, // 610
SC_CUP_OF_BOZA,
+ SC_OVERLAPEXPUP,
SC_MAX, //Automatically updated max, used in for's to check we are within bounds.
} sc_type;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 20:48:49 +0000