summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--db/re/item_db.conf77
-rw-r--r--sql-files/item_db_re.sql4
-rw-r--r--src/map/status.c4
3 files changed, 43 insertions, 42 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index faf6f6d23..22adff486 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -9367,6 +9367,7 @@ item_db: (
bonus bBaseAtk,10;
}
bonus bVit,2;
+ bonus4 bAutoSpellOnSkill,BS_HAMMERFALL,SM_MAGNUM,3,500;
">
},
{
@@ -9410,11 +9411,11 @@ item_db: (
noauction: true
}
Script: <"
+ bonus bAspdRate,-25;
+ bonus bUseSPrate,100;
if(readparam(bStr)>=95) {
bonus bBaseAtk,400;
bonus2 bAddEff,Eff_Stun,3000;
- bonus bAspdRate,-25;
- bonus bUseSPrate,100;
bonus bBreakArmorRate,500;
}
">
@@ -133332,42 +133333,42 @@ item_db: (
Loc: 4
View: 5
Script: <"
- if(readparam(bStr)>=90) {
- bonus bAllStats,1;
- bonus bMaxHPrate,1;
- bonus bMaxSPrate,1;
- bonus bStr,getrefine();
- }
- if(readparam(bAgi)>=90) {
- bonus bAllStats,1;
- bonus bMaxHPrate,1;
- bonus bMaxSPrate,1;
- bonus bAgi,getrefine();
- }
- if(readparam(bVit)>=90) {
- bonus bAllStats,1;
- bonus bMaxHPrate,1;
- bonus bMaxSPrate,1;
- bonus bVit,getrefine();
- }
- if(readparam(bInt)>=90) {
- bonus bAllStats,1;
- bonus bMaxHPrate,1;
- bonus bMaxSPrate,1;
- bonus bInt,getrefine();
- }
- if(readparam(bDex)>=90) {
- bonus bAllStats,1;
- bonus bMaxHPrate,1;
- bonus bMaxSPrate,1;
- bonus bDex,getrefine();
- }
- if(readparam(bLuk)>=90) {
- bonus bAllStats,1;
- bonus bMaxHPrate,1;
- bonus bMaxSPrate,1;
- bonus bLuk,getrefine();
- }
+ if(readparam(bStr)>=90) {
+ bonus bAllStats,1;
+ bonus bMaxHPrate,1;
+ bonus bMaxSPrate,1;
+ bonus bStr,getrefine();
+ }
+ if(readparam(bAgi)>=90) {
+ bonus bAllStats,1;
+ bonus bMaxHPrate,1;
+ bonus bMaxSPrate,1;
+ bonus bAgi,getrefine();
+ }
+ if(readparam(bVit)>=90) {
+ bonus bAllStats,1;
+ bonus bMaxHPrate,1;
+ bonus bMaxSPrate,1;
+ bonus bVit,getrefine();
+ }
+ if(readparam(bInt)>=90) {
+ bonus bAllStats,1;
+ bonus bMaxHPrate,1;
+ bonus bMaxSPrate,1;
+ bonus bInt,getrefine();
+ }
+ if(readparam(bDex)>=90) {
+ bonus bAllStats,1;
+ bonus bMaxHPrate,1;
+ bonus bMaxSPrate,1;
+ bonus bDex,getrefine();
+ }
+ if(readparam(bLuk)>=90) {
+ bonus bAllStats,1;
+ bonus bMaxHPrate,1;
+ bonus bMaxSPrate,1;
+ bonus bLuk,getrefine();
+ }
">
},
{
diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql
index 6c787422d..c766fa2cb 100644
--- a/sql-files/item_db_re.sql
+++ b/sql-files/item_db_re.sql
@@ -735,9 +735,9 @@ REPLACE INTO `item_db` VALUES ('1380','BF_Two_Handed_Axe2','Brave Insane Battle
REPLACE INTO `item_db` VALUES ('1381','N_Battle_Axe','Novice Battle Axe','4','0','0','0','100','0','0','1','3','279714','63','2','34','1','3',NULL,'0','7','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
REPLACE INTO `item_db` VALUES ('1382','Krieger_Twohand_Axe1','Glorious Twohanded Axe','4','20','10','0','220','0','0','1','0','279714','63','2','34','4','80',NULL,'1','7','0','0','0','499',NULL,'0',NULL,'0',NULL,'0','bonus2 bAddRace,RC_DemiPlayer,70; bonus2 bIgnoreDefRate,RC_DemiPlayer,25; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bAddRace,RC_DemiPlayer,pow(min(getrefine(),14)-3,2); bonus2 bIgnoreDefRate,RC_DemiPlayer,5; bonus3 bAutoSpell,NPC_CRITICALWOUND,1,50; } if(getrefine()>8) { bonus3 bAutoSpell,NPC_CRITICALWOUND,1,100; bonus4 bAutoSpellOnSkill,MC_MAMMONITE,NPC_CRITICALWOUND,2,200; bonus4 bAutoSpellOnSkill,WS_CARTTERMINATION,NPC_CRITICALWOUND,2,200; }','','');
REPLACE INTO `item_db` VALUES ('1383','Holy_Celestial_Axe','Holy Celestial Axe','4','20','10','1500','200','0','0','1','0','263200','63','2','34','4','60',NULL,'1','7','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkEle,Ele_Holy; bonus bVit,10; bonus2 bAddRace,RC_Undead,10; bonus3 bAutoSpell,AL_BLESSING,5,50;','','');
-REPLACE INTO `item_db` VALUES ('1384','Veteran_Axe','Veteran Axe','4','10000','5000','3000','250','0','0','1','2','263200','63','2','34','3','80',NULL,'1','7','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','if(getskilllv(BS_DAGGER)==3) { bonus bBaseAtk,10; } if(getskilllv(BS_SWORD)==3) { bonus bBaseAtk,10; } if(getskilllv(BS_TWOHANDSWORD)==3) { bonus bBaseAtk,10; } if(getskilllv(BS_KNUCKLE)==3) { bonus bBaseAtk,10; } if(getskilllv(BS_SPEAR)==3) { bonus bBaseAtk,10; } if(getskilllv(BS_AXE)==3) { bonus bBaseAtk,10; } if(getskilllv(BS_MACE)==3) { bonus bBaseAtk,10; } bonus bVit,2;','','');
+REPLACE INTO `item_db` VALUES ('1384','Veteran_Axe','Veteran Axe','4','10000','5000','3000','250','0','0','1','2','263200','63','2','34','3','80',NULL,'1','7','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','if(getskilllv(BS_DAGGER)==3) { bonus bBaseAtk,10; } if(getskilllv(BS_SWORD)==3) { bonus bBaseAtk,10; } if(getskilllv(BS_TWOHANDSWORD)==3) { bonus bBaseAtk,10; } if(getskilllv(BS_KNUCKLE)==3) { bonus bBaseAtk,10; } if(getskilllv(BS_SPEAR)==3) { bonus bBaseAtk,10; } if(getskilllv(BS_AXE)==3) { bonus bBaseAtk,10; } if(getskilllv(BS_MACE)==3) { bonus bBaseAtk,10; } bonus bVit,2; bonus4 bAutoSpellOnSkill,BS_HAMMERFALL,SM_MAGNUM,3,500;','','');
REPLACE INTO `item_db` VALUES ('1385','Bradium_Stonehammer','Bradium Stonehammer','4','20','10','2700','210','0','0','1','0','1024','58','2','34','4','75',NULL,'1','7','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus3 bAddEffOnSkill,BS_HAMMERFALL,Eff_Stun,500+(200*getrefine());','','');
-REPLACE INTO `item_db` VALUES ('1386','Doom_Slayer_I','Doom Slayer','4','0','0','0','20','0','0','1','0','279714','63','2','34','4','0',NULL,'0','7','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','if(readparam(bStr)>=95) { bonus bBaseAtk,400; bonus2 bAddEff,Eff_Stun,3000; bonus bAspdRate,-25; bonus bUseSPrate,100; bonus bBreakArmorRate,500; }','','');
+REPLACE INTO `item_db` VALUES ('1386','Doom_Slayer_I','Doom Slayer','4','0','0','0','20','0','0','1','0','279714','63','2','34','4','0',NULL,'0','7','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','bonus bAspdRate,-25; bonus bUseSPrate,100; if(readparam(bStr)>=95) { bonus bBaseAtk,400; bonus2 bAddEff,Eff_Stun,3000; bonus bBreakArmorRate,500; }','','');
REPLACE INTO `item_db` VALUES ('1387','Giant_Axe','Giant Axe','4','20','10','4000','330','0','0','1','1','279714','58','2','34','3','50',NULL,'1','7','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bSkillAtk,WS_CARTTERMINATION,15; if(readparam(bStr)>=95) { bonus bHit,10; bonus bAspdRate,3; }','','');
REPLACE INTO `item_db` VALUES ('1388','Two_Handed_Axe_C','Two-Handed Axe','4','0','0','0','220','0','0','1','0','279714','63','2','34','3','0',NULL,'0','7','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','bonus2 bAddSize,Size_Small,40; bonus2 bAddSize,Size_Medium,40; bonus2 bAddSize,Size_Large,40;','','');
REPLACE INTO `item_db` VALUES ('1389','E_Tomahawk_C','E Tomahawk C','4','2','1','0','200','0','0','1','0','279714','63','2','34','4','0',NULL,'0','7','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkEle,Ele_Wind;','','');
diff --git a/src/map/status.c b/src/map/status.c
index fd75ef81c..ffc534de9 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -9932,11 +9932,11 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
if (src && sc2 && sc2->data[SC_RG_CCONFINE_M]) {
//If status was already ended, do nothing.
//Decrease count
- if (--(sc2->data[SC_RG_CCONFINE_M]->val1) <= 0) //No more holds, free him up.
+ if (--(sc2->data[SC_RG_CCONFINE_M]->val2) <= 0) //No more holds, free him up.
status_change_end(src, SC_RG_CCONFINE_M, INVALID_TIMER);
}
}
- /* Fall through */
+ break;
case SC_RG_CCONFINE_M:
if (sce->val2 > 0) {
//Caster has been unlocked... nearby chars need to be unlocked.
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-13 07:33:08 +0000