Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Database updates:

Browse Source 
- Updated Renewal item_combo_db with new item entries.
- Updated Renewal item_noequip with Vellum gears/siege items.
- Some small updates to Renewal item_db.

* Other changes:
- Added some towns to various Renewal mapflag files.
- Fixed two typos in Nameless Island quest. (bugreport:8021)
- Fixed an error with the '+=' operator on string variables. When attempting to concatenate and assign to a previously empty string with +=, it'd throw a memory manager error. (Hercules 1afeabf)

Signed-off-by: Euphy <euphy@rathena.org>
This commit is contained in:
Euphy 2013-08-28 14:34:16 -04:00
parent 15074d8c37
commit 4a4fab0298
18 changed files with 319 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
conf/battle/items.conf
View File

@ -76,15 +76,15 @@ gtb_sc_immunity: 50
// always work independently of each other regardless of setting. // always work independently of each other regardless of setting.
autospell_stacking: no autospell_stacking: no
// Allow to consume usable item that is disabled by item_noequip.txt. (Note 1) // Allow the consumption of usable items that are disabled by item_noequip.txt? (Note 1)
// no = will be failed to consume // no = can't be consumed
// yes = consumed with no effect // yes = consumed with no effect
allow_consume_restricted_item: yes allow_consume_restricted_item: yes
// Allow to equip item that is disabled by item_noequip.txt. (Note 1) // Allow equipping items that are disabled by item_noequip.txt? (Note 1)
// no = can't be equipped and will be unequipped // no = can't be equipped and will be unequipped when entering the map
// yes = can be equipped but gives no effect // yes = can be equipped but gives no effect
// If the equip compounded with restricted card, it ignores this check but still gives no effect // If the equip is compounded with restricted card(s), it ignores this check but still gives no effect.
allow_equip_restricted_item: yes allow_equip_restricted_item: yes
// Allow changing of equipment while interacting with NPCs? (Note 1) // Allow changing of equipment while interacting with NPCs? (Note 1)

67
db/pre-re/item_noequip.txt
View File

@ -25,36 +25,49 @@
// you can even mix modes // you can even mix modes
//519,322 (256+64+2) you can't use Milk on PVP, and maps marked as 'restricted zone 2' and 'restricted zone 4' //519,322 (256+64+2) you can't use Milk on PVP, and maps marked as 'restricted zone 2' and 'restricted zone 4'
//PVP //----------------------------------------------------------------------------
14529,2 //Greed Scroll // PVP
//----------------------------------------------------------------------------
14529,2 //Greed_Scroll
//GVG //----------------------------------------------------------------------------
12218,4 //LV5 Assumptio Scroll // GVG
14529,4 //Greed Scroll //----------------------------------------------------------------------------
14590,4 //Party Assumptio 5 Scroll 12218,4 //Assumptio_5_Scroll
14529,4 //Greed_Scroll
14590,4 //Pty_Assumptio_Scroll
//BATTLEGROUND //----------------------------------------------------------------------------
12218,8 //LV5 Assumptio Scroll // Battlegrounds
14590,8 //Party Assumptio 5 Scroll //----------------------------------------------------------------------------
12218,8 //Assumptio_5_Scroll
14590,8 //Pty_Assumptio_Scroll
//----------------------------------------------------------------------------
// Zone 1 - Aldebaran Turbo Track
//----------------------------------------------------------------------------
601,32 //Wing_Of_Fly
605,32 //Anodyne
506,32 //Green_Potion
525,32 //Panacea
//Zone 1 - Aldebaran Turbo Track //----------------------------------------------------------------------------
601,32 //Fly Wing // Zone 2 - Jail
605,32 //Anodyne //----------------------------------------------------------------------------
506,32 //Green Potion 601,64 //Wing_Of_Fly
525,32 //Panacea 602,64 //Wing_Of_Butterfly
12212,64 //Giant_Fly_Wing
14582,64 //WOB_Rune
14583,64 //WOB_Schwaltz
14584,64 //WOB_Rachel
14585,64 //WOB_Local
//Zone 2 - Jail //----------------------------------------------------------------------------
601,64 //Fly Wing - not really needed here but ... // Zone 3 - Izlude Battle Arena
602,64 //Butterfly Wing - also not needed //----------------------------------------------------------------------------
12212,64 //Giant Fly Wing 601,128 //Wing_Of_Fly
14582,64
14583,64
14584,64
14585,64
//Zone 3 - Izlude Battle Arena //----------------------------------------------------------------------------
601,128 //Fly Wing // Zone 7 - Towns
//----------------------------------------------------------------------------
//Zone 7 - Towns 14529,2048 //Greed_Scroll
14529,2048 //Greed Scroll

52
db/pre-re/skill_nocast_db.txt
View File

@ -21,16 +21,22 @@
// Example: // Example:
// 8,6 = Endure cannot be used in PvP and GvG maps (2+4) // 8,6 = Endure cannot be used in PvP and GvG maps (2+4)
//Normal //----------------------------------------------------------------------------
// Normal
//----------------------------------------------------------------------------
2422,1 //WM_LULLABY_DEEPSLEEP 2422,1 //WM_LULLABY_DEEPSLEEP
2423,1 //WM_SIRCLEOFNATURE 2423,1 //WM_SIRCLEOFNATURE
2430,1 //WM_SATURDAY_NIGHT_FEVER 2430,1 //WM_SATURDAY_NIGHT_FEVER
2455,1 //SO_ARRULLO 2455,1 //SO_ARRULLO
//PVP //----------------------------------------------------------------------------
// PVP
//----------------------------------------------------------------------------
1013,2 //BS_GREED 1013,2 //BS_GREED
//GVG //----------------------------------------------------------------------------
// GVG
//----------------------------------------------------------------------------
26,4 //AL_TELEPORT 26,4 //AL_TELEPORT
27,4 //AL_WARP 27,4 //AL_WARP
87,4 //WZ_ICEWALL 87,4 //WZ_ICEWALL
@ -49,7 +55,9 @@
2284,4 //SC_FATALMENACE 2284,4 //SC_FATALMENACE
2300,4 //SC_DIMENSIONDOOR 2300,4 //SC_DIMENSIONDOOR
//BATTLEGROUND //----------------------------------------------------------------------------
// Battlegrounds
//----------------------------------------------------------------------------
26,8 //AL_TELEPORT 26,8 //AL_TELEPORT
27,8 //AL_WARP 27,8 //AL_WARP
87,8 //WZ_ICEWALL 87,8 //WZ_ICEWALL
@ -84,15 +92,21 @@
2284,8 //SC_FATALMENACE 2284,8 //SC_FATALMENACE
2300,8 //SC_DIMENSIONDOOR 2300,8 //SC_DIMENSIONDOOR
//mixed //----------------------------------------------------------------------------
// Mixed
//----------------------------------------------------------------------------
488,3 //CG_HERMODE 488,3 //CG_HERMODE
3013,3 //KO_KYOUGAKU 3013,3 //KO_KYOUGAKU
//Clone Forbidden/pointless skills //----------------------------------------------------------------------------
// Clone Forbidden/pointless skills
//----------------------------------------------------------------------------
77,16 //PR_TURNUNDEAD 77,16 //PR_TURNUNDEAD
79,16 //PR_MAGNUS 79,16 //PR_MAGNUS
//Zone 1 - Aldebaran Turbo Track //----------------------------------------------------------------------------
// Zone 1 - Aldebaran Turbo Track
//----------------------------------------------------------------------------
8,32 //SM_ENDURE 8,32 //SM_ENDURE
26,32 //AL_TELEPORT 26,32 //AL_TELEPORT
27,32 //AL_WARP 27,32 //AL_WARP
@ -112,21 +126,29 @@
2300,32 //SC_DIMENSIONDOOR 2300,32 //SC_DIMENSIONDOOR
2478,32 //GN_CARTBOOST 2478,32 //GN_CARTBOOST
//Zone 2 - Jail //----------------------------------------------------------------------------
// Zone 2 - Jail
//----------------------------------------------------------------------------
421,64 //TK_JUMPKICK 421,64 //TK_JUMPKICK
426,64 //TK_HIGHJUMP 426,64 //TK_HIGHJUMP
//Zone 3 - Izlude Battle Arena //----------------------------------------------------------------------------
// Zone 3 - Izlude Battle Arena
//----------------------------------------------------------------------------
219,128 //RG_INTIMIDATE 219,128 //RG_INTIMIDATE
26,128 //AL_TELEPORT 26,128 //AL_TELEPORT
2284,128 //SC_FATALMENACE 2284,128 //SC_FATALMENACE
2300,128 //SC_DIMENSIONDOOR 2300,128 //SC_DIMENSIONDOOR
//Zone 4 - WoE:SE //----------------------------------------------------------------------------
// Zone 4 - WoE:SE
//----------------------------------------------------------------------------
426,256 //TK_HIGHJUMP 426,256 //TK_HIGHJUMP
290,256 //SA_ABRACADABRA 290,256 //SA_ABRACADABRA
//Zone 5 - Sealed Shrine //----------------------------------------------------------------------------
// Zone 5 - Sealed Shrine
//----------------------------------------------------------------------------
12,512 //MG_SAFETYWALL 12,512 //MG_SAFETYWALL
26,512 //AL_TELEPORT 26,512 //AL_TELEPORT
219,512 //RG_INTIMIDATE 219,512 //RG_INTIMIDATE
@ -135,7 +157,9 @@
2284,512 //SC_FATALMENACE 2284,512 //SC_FATALMENACE
2300,512 //SC_DIMENSIONDOOR 2300,512 //SC_DIMENSIONDOOR
//Zone 6 - Endless Tower, Orc's Memory, Nidhoggur's Nest //----------------------------------------------------------------------------
// Zone 6 - Endless Tower, Orc's Memory, Nidhoggur's Nest
//----------------------------------------------------------------------------
26,1024 //AL_TELEPORT 26,1024 //AL_TELEPORT
87,1024 //WZ_ICEWALL 87,1024 //WZ_ICEWALL
219,1024 //RG_INTIMIDATE 219,1024 //RG_INTIMIDATE
@ -144,7 +168,9 @@
2284,1024 //SC_FATALMENACE 2284,1024 //SC_FATALMENACE
2300,1024 //SC_DIMENSIONDOOR 2300,1024 //SC_DIMENSIONDOOR
//Zone 7 - Towns //----------------------------------------------------------------------------
// Zone 7 - Towns
//----------------------------------------------------------------------------
232,2048 //AM_CANNIBALIZE 232,2048 //AM_CANNIBALIZE
233,2048 //AM_SPHEREMINE 233,2048 //AM_SPHEREMINE
491,2048 //CR_CULTIVATION 491,2048 //CR_CULTIVATION

55
db/re/item_combo_db.txt
View File

@ -4,8 +4,11 @@
// ID:ID:ID:ID,{ Script } // ID:ID:ID:ID,{ Script }
1166:2527,{ bonus2 bAddRace,RC_Dragon,5; } 1166:2527,{ bonus2 bAddRace,RC_Dragon,5; }
1284:2892,{ bonus bBaseAtk,50; bonus2 bSkillAtk,"AS_SONICBLOW",50; bonus bFlee,-30; } 1166:2527:5467,{ bonus2 bAddRace,RC_Dragon,25; }
1285:2892,{ bonus bCritAtkRate,40; bonus bCritical,4; bonus bMaxHPRate,-10; } 1180:2527:5467,{ bonus2 bAddRace,RC_Dragon,25; }
1269:5467,{ bonus bAspd,1; bonus bFlee2,3; }
1284:2892,{ bonus2 bSkillAtk,"AS_SONICBLOW",50; bonus bBaseAtk,50; bonus bFlee,-30; }
1285:2892,{ bonus bCritical,4; bonus bCritAtkRate,40; bonus bMaxHPRate,-10; }
1420:2115,{ bonus3 bAutoSpellWhenHit,"HP_ASSUMPTIO",2,5; } 1420:2115,{ bonus3 bAutoSpellWhenHit,"HP_ASSUMPTIO",2,5; }
1420:2133,{ bonus2 bAddRace,RC_NonBoss,4; bonus2 bAddRace,RC_Boss,4; bonus bDef,2; } 1420:2133,{ bonus2 bAddRace,RC_NonBoss,4; bonus2 bAddRace,RC_Boss,4; bonus bDef,2; }
1421:2133,{ bonus2 bAddRace,RC_NonBoss,4; bonus2 bAddRace,RC_Boss,4; bonus bDef,2; } 1421:2133,{ bonus2 bAddRace,RC_NonBoss,4; bonus2 bAddRace,RC_Boss,4; bonus bDef,2; }
@ -17,9 +20,12 @@
1473:2677,{ bonus bMatkRate,6; bonus bDex,2; bonus bCastrate,-getequiprefinerycnt(EQI_HEAD_TOP); } 1473:2677,{ bonus bMatkRate,6; bonus bDex,2; bonus bCastrate,-getequiprefinerycnt(EQI_HEAD_TOP); }
1473:2711,{ bonus bMatkRate,6; bonus bDex,2; bonus bCastrate,-getequiprefinerycnt(EQI_HAND_R); } 1473:2711,{ bonus bMatkRate,6; bonus bDex,2; bonus bCastrate,-getequiprefinerycnt(EQI_HAND_R); }
1474:2527,{ bonus2 bAddRace,RC_Dragon,5; } 1474:2527,{ bonus2 bAddRace,RC_Dragon,5; }
1474:2527:5467,{ bonus2 bAddRace,RC_Dragon,25; }
1477:2700,{ bonus2 bResEff,Eff_Confusion,9500; } 1477:2700,{ bonus2 bResEff,Eff_Confusion,9500; }
1479:2700,{ bonus2 bResEff,Eff_Confusion,9500; } 1479:2700,{ bonus2 bResEff,Eff_Confusion,9500; }
1480:2527:5467,{ bonus2 bAddRace,RC_Dragon,25; }
1535:4361,{ bonus bBreakArmorRate,900; bonus bBreakWeaponRate,900; } 1535:4361,{ bonus bBreakArmorRate,900; bonus bBreakWeaponRate,900; }
1559:5467,{ bonus bAspd,1; bonus bFlee2,3; }
1572:2716:2717,{ bonus bInt,5; bonus bMaxHP,700; bonus bAspdRate,5; } 1572:2716:2717,{ bonus bInt,5; bonus bMaxHP,700; bonus bAspdRate,5; }
1573:2334,{ bonus bMdef,8; bonus bMaxSPRate,10; bonus bInt,4; } 1573:2334,{ bonus bMdef,8; bonus bMaxSPRate,10; bonus bInt,4; }
1573:2372,{ bonus bMdef,8; bonus bMaxSPRate,10; bonus bInt,4; } 1573:2372,{ bonus bMdef,8; bonus bMaxSPRate,10; bonus bInt,4; }
@ -33,10 +39,12 @@
1629:5045,{ bonus bDex,2; bonus bInt,2; bonus bSPrecovRate,5; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R); } 1629:5045,{ bonus bDex,2; bonus bInt,2; bonus bSPrecovRate,5; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R); }
1631:2129,{ bonus2 bSkillAtk,"PR_MAGNUS",20; bonus3 bAutoSpellWhenHit,"PR_TURNUNDEAD",1,20; } 1631:2129,{ bonus2 bSkillAtk,"PR_MAGNUS",20; bonus3 bAutoSpellWhenHit,"PR_TURNUNDEAD",1,20; }
1636:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; } 1636:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; }
1657:2471:2569:15029,{ bonus bHealPower,25; } 1646:2161,{ set .@i,getequiprefinerycnt(EQI_HAND_L)*4; bonus2 bVariableCastrate,"WZ_STORMGUST",-.@i; bonus2 bVariableCastrate,"WL_FROSTMISTY",-.@i; bonus2 bVariableCastrate,"WL_JACKFROST",-.@i; }
1660:2471:2569:15029,{ bonus bHealPower,45; bonus3 bAutoSpellWhenHit,"AB_SILENTIUM",1,10; } 1657:2471:2569:15029,{ bonus bHealPower,25; bonus2 bSkillUseSP,"AL_HEAL",-20; bonus2 bSkillCooldown,"AB_SECRAMENT",-2000; bonus2 bSkillCooldown,"AB_LAUDAAGNUS",-2000; bonus2 bSkillCooldown,"AB_LAUDARAMUS",-2000; }
1660:2471:2569:15029,{ bonus bHealPower,45; bonus2 bSkillUseSP,"AL_HEAL",-50; bonus3 bAutoSpellWhenHit,"AB_SILENTIUM",1,100; bonus2 bSkillCooldown,"AB_CLEARANCE",-3000; bonus2 bSkillCooldown,"AB_LAUDAAGNUS",-3000; bonus2 bSkillCooldown,"AB_LAUDARAMUS",-3000; }
1718:1774,{ bonus bLongAtkRate,50; } 1718:1774,{ bonus bLongAtkRate,50; }
1723:2718,{ bonus bDex,1; bonus bMaxSP,50; bonus bSPrecovRate,10; } 1723:2718,{ bonus bDex,1; bonus bMaxSP,50; bonus bSPrecovRate,10; }
1724:5467,{ bonus bAspd,1; bonus bFlee2,3; }
1726:1774,{ bonus bLongAtkRate,50; } 1726:1774,{ bonus bLongAtkRate,50; }
1730:1752,{ bonus bLongAtkRate,25; } 1730:1752,{ bonus bLongAtkRate,25; }
1731:1754,{ bonus bLongAtkRate,25; } 1731:1754,{ bonus bLongAtkRate,25; }
@ -45,8 +53,8 @@
1734:1753,{ bonus bLongAtkRate,50; } 1734:1753,{ bonus bLongAtkRate,50; }
1741:2748,{ bonus bAtk,25; bonus3 bAddEff,Eff_Curse,200,ATF_WEAPON|ATF_LONG|ATF_TARGET; } 1741:2748,{ bonus bAtk,25; bonus3 bAddEff,Eff_Curse,200,ATF_WEAPON|ATF_LONG|ATF_TARGET; }
1746:1773,{ bonus bLongAtkRate,50; } 1746:1773,{ bonus bLongAtkRate,50; }
1775:18114,{ bonus bLongAtkRate,50; } 1775:18114,{ bonus bLongAtkRate,40; }
1776:18114,{ bonus bLongAtkRate,20; } 1776:18114,{ bonus bLongAtkRate,70; }
2001:2677,{ bonus bMatkRate,10; bonus bDex,2; bonus2 bSubRace,RC_Demon,10; bonus2 bSubRace,RC_Undead,10; } 2001:2677,{ bonus bMatkRate,10; bonus bDex,2; bonus2 bSubRace,RC_Demon,10; bonus2 bSubRace,RC_Undead,10; }
2001:2711,{ bonus bMatkRate,10; bonus bDex,2; bonus2 bSubRace,RC_Demon,10; bonus2 bSubRace,RC_Undead,10; } 2001:2711,{ bonus bMatkRate,10; bonus bDex,2; bonus2 bSubRace,RC_Demon,10; bonus2 bSubRace,RC_Undead,10; }
2007:2467:2859:15025,{ bonus2 bMagicAtkEle,Ele_Wind,40; bonus2 bMagicAtkEle,Ele_Earth,-30; bonus2 bSubEle,Ele_Earth,-50; } 2007:2467:2859:15025,{ bonus2 bMagicAtkEle,Ele_Wind,40; bonus2 bMagicAtkEle,Ele_Earth,-30; bonus2 bSubEle,Ele_Earth,-50; }
@ -66,10 +74,12 @@
2124:2702,{ bonus bAspdRate,10; bonus bShortWeaponDamageReturn,5; } 2124:2702,{ bonus bAspdRate,10; bonus bShortWeaponDamageReturn,5; }
2135:2426,{ bonus2 bAddEff,Eff_Blind,500; autobonus "{ bonus bFlee,20; }",200,10000,BF_WEAPON,"{ specialeffect2 EF_INCAGILITY; }"; } 2135:2426,{ bonus2 bAddEff,Eff_Blind,500; autobonus "{ bonus bFlee,20; }",200,10000,BF_WEAPON,"{ specialeffect2 EF_INCAGILITY; }"; }
2137:2353:5124,{ bonus bDef,2-getequiprefinerycnt(EQI_HAND_L)-getequiprefinerycnt(EQI_HEAD_TOP); bonus bMdef,5+getequiprefinerycnt(EQI_HAND_L)+getequiprefinerycnt(EQI_HEAD_TOP); } 2137:2353:5124,{ bonus bDef,2-getequiprefinerycnt(EQI_HAND_L)-getequiprefinerycnt(EQI_HEAD_TOP); bonus bMdef,5+getequiprefinerycnt(EQI_HAND_L)+getequiprefinerycnt(EQI_HEAD_TOP); }
2169:2491:2590:15051,{ bonus bMaxHPrate,20; bonus bMaxSPrate,10; } 2169:2491:2590:15051,{ bonus2 bAddDefClass,2311,30; bonus2 bAddDefClass,2312,30; bonus2 bAddDefClass,2320,30; bonus2 bAddDefClass,2321,30; bonus2 bAddDefClass,2322,30; bonus2 bAddDefClass,2317,30; bonus2 bAddDefClass,2318,30; bonus2 bAddDefClass,2327,30; bonus2 bAddDefClass,2319,30; bonus2 bAddDefClass,2330,30; bonus2 bAddDefClass,2329,30; bonus2 bAddDefClass,2333,30; bonus2 bAddDefClass,2332,30; bonus2 bAddDefClass,2309,30; bonus2 bAddDefClass,2310,30; bonus2 bAddDefClass,2315,30; bonus2 bAddDefClass,2316,30; bonus2 bAddDefClass,2314,30; bonus2 bAddDefClass,2313,30; bonus bMaxHPrate,20; bonus bMaxSPrate,10; }
2171:15053,{ bonus bAgi,2; } 2171:15053,{ bonus bAgi,2; }
2171:15056,{ bonus bAgi,2; } 2171:15056,{ bonus bAgi,2; }
2172:15054,{ bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; bonus bStr,2; }
2173:15055,{ bonus bFlee,10; bonus bFlee2,10; } 2173:15055,{ bonus bFlee,10; bonus bFlee2,10; }
2241:5136,{ bonus bMaxHP,700; bonus bMaxSP,50; bonus4 bAutoSpellWhenHit,"AL_INCAGI",10,30,1; }
//2269:5768,{ bonus bInt,1; if(getequiprefinerycnt(EQI_HEAD_TOP) > 6) bonus bMaxSPrate,getequiprefinerycnt(EQI_HEAD_TOP)-6; } //2269:5768,{ bonus bInt,1; if(getequiprefinerycnt(EQI_HEAD_TOP) > 6) bonus bMaxSPrate,getequiprefinerycnt(EQI_HEAD_TOP)-6; }
//2270:5768,{ bonus bStr,1; if(getequiprefinerycnt(EQI_HEAD_TOP) > 2) bonus bUseSPrate,2-getequiprefinerycnt(EQI_HEAD_TOP); } //2270:5768,{ bonus bStr,1; if(getequiprefinerycnt(EQI_HEAD_TOP) > 2) bonus bUseSPrate,2-getequiprefinerycnt(EQI_HEAD_TOP); }
2278:18527,{ bonus2 bAddMonsterDropItem,12192,20; } 2278:18527,{ bonus2 bAddMonsterDropItem,12192,20; }
@ -104,6 +114,7 @@
2390:2749,{ bonus bFlee2,5; } 2390:2749,{ bonus bFlee2,5; }
2394:2444:2549,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,5; bonus2 bResEff,Eff_Freeze,10000; bonus2 bSkillHeal2,"AM_POTIONPITCHER",3; bonus2 bSkillHeal2,"AL_HEAL",3; bonus2 bSkillHeal2,"PR_SANCTUARY",3; } 2394:2444:2549,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,5; bonus2 bResEff,Eff_Freeze,10000; bonus2 bSkillHeal2,"AM_POTIONPITCHER",3; bonus2 bSkillHeal2,"AL_HEAL",3; bonus2 bSkillHeal2,"PR_SANCTUARY",3; }
2399:2553,{ bonus bAgi,5; bonus bFlee,15; } 2399:2553,{ bonus bAgi,5; bonus bFlee,15; }
2399:2553:5467,{ bonus2 bSubRace,RC_Dragon,20; }
2408:2655,{ bonus bBaseAtk,50; bonus2 bAddDefClass,1196,20; bonus2 bAddDefClass,1197,20; } 2408:2655,{ bonus bBaseAtk,50; bonus2 bAddDefClass,1196,20; bonus2 bAddDefClass,1197,20; }
2424:2528,{ bonus bHPrecovRate,5; bonus bMaxHPrate,10; } 2424:2528,{ bonus bHPrecovRate,5; bonus bMaxHPrate,10; }
2425:2529,{ bonus bFlee,10; } 2425:2529,{ bonus bFlee,10; }
@ -114,20 +125,22 @@
2434:2530,{ bonus bFlee,10; } 2434:2530,{ bonus bFlee,10; }
2434:2551,{ bonus bFlee,10; } 2434:2551,{ bonus bFlee,10; }
2441:2546,{ bonus bFlee,5; } 2441:2546,{ bonus bFlee,5; }
2472:2570:15030:16013,{ bonus2 bAddRace,RC_Undead,15; bonus2 bMagicAddRace,RC_Undead,15; bonus2 bSkillAtk,"AB_ADORAMUS",100; } 2472:2570:15030:16013,{ bonus2 bAddRace,RC_Undead,15; bonus2 bMagicAddRace,RC_Undead,15; bonus2 bSkillAtk,"AB_ADORAMUS",200; bonus2 bSkillUseSP,"AB_ADORAMUS",-30; }
2472:2570:15030:16018,{ bonus2 bAddRace,RC_Undead,30; bonus2 bMagicAddRace,RC_Undead,30; bonus2 bSkillAtk,"AB_ADORAMUS",200; bonus bVariableCastrate,-50; } 2472:2570:15030:16018,{ bonus2 bAddRace,RC_Undead,30; bonus2 bMagicAddRace,RC_Undead,30; bonus2 bSkillAtk,"AB_ADORAMUS",200; bonus2 bSkillUseSP,"AB_ADORAMUS",-30; bonus2 bVariableCastrate,"AL_HOLYLIGHT",-50; bonus2 bVariableCastrate,"PR_TURNUNDEAD",-50; bonus2 bVariableCastrate,"PR_MAGNUS",-50; bonus2 bVariableCastrate,"AB_JUDEX",-50; bonus2 bVariableCastrate,"AB_ADORAMUS",-50; }
2475:2574:2883:15036,{ bonus bMaxHPRate,14; bonus2 bSkillAtk,"RK_HUNDREDSPEAR",50; skill "CR_AUTOGUARD",1; } 2475:2574:2883:15036,{ bonus bMaxHPRate,14; bonus2 bSubEle,Ele_Neutral,10; bonus2 bSkillAtk,"RK_HUNDREDSPEAR",50; skill "CR_AUTOGUARD",1; bonus bUseSPrate,10; }
2476:2575:2884:15037,{ bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; bonus2 bSkillAtk,"RK_SONICWAVE",100; bonus2 bSkillAtk,"RK_WINDCUTTER",100; autobonus "{ sc_start SC_CONCENTRATION,10000,getskilllv(\"LK_CONCENTRATION\")?getskilllv(\"LK_CONCENTRATION\"):1; bonus bAspd,2; }",1,10000,BF_WEAPON,"{}"; } 2476:2575:2884:15037,{ bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; bonus3 bAutoSpell,"RK_STORMBLAST",1,20; bonus2 bSkillAtk,"RK_WINDCUTTER",100; bonus2 bSkillAtk,"RK_SONICWAVE",100; autobonus3 "{ bonus bAspd,2; }",1000,10000,"LK_CONCENTRATION","{ specialeffect2 EF_ENHANCE; }"; }
2477:2577:2886:15038,{ bonus bCritical,15; bonus bFlee,10; bonus bCritAtkRate,40; bonus2 bSkillAtk,"GC_CROSSIMPACT",20; } 2477:2577:2886:15038,{ bonus bFlee,10; bonus bCritical,15; bonus bCritAtkRate,40; bonus2 bSkillAtk,"GC_CROSSIMPACT",20; bonus bUseSPrate,10; }
2478:2578:2887:15039,{ bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; bonus bMatk,10; if(readparam(bStr)>119) { bonus bBaseAtk,30; } bonus3 bAutoSpell,"ASC_BREAKER",getskilllv("ASC_BREAKER"),10; bonus bCritical,-20; } 2478:2578:2887:15039,{ bonus3 bAutoSpell,"ASC_BREAKER",(getskilllv("ASC_BREAKER"))?getskilllv("ASC_BREAKER"):1,20; if(readparam(bStr)>119) { bonus bBaseAtk,30; } bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; bonus bMatkRate,10; bonus bCritical,-20; }
2479:2580:2890:15042,{ bonus bAspd,2; bonus bLongAtkRate,30; bonus3 bAutoSpell,"AC_DOUBLE",3,10; bonus2 bSkillAtk,"RA_ARROWSTORM",50; } 2479:2580:2890:15042,{ bonus bAspd,2; bonus2 bSkillAtk,"RA_ARROWSTORM",50; bonus bLongAtkRate,30; bonus3 bAutoSpell,"AC_DOUBLE",(getskilllv("AC_DOUBLE") < 3)?3:getskilllv("AC_DOUBLE"),20; }
2480:2581:2891:15043,{ bonus bMaxHPRate,15; bonus2 bSkillAtk,"RA_CLUSTERBOMB",20; bonus bFlee2,20; bonus bLongAtkRate,-30; bonus bAspd,-7; } 2480:2581:2891:15043,{ bonus bMaxHPRate,15; bonus bFlee2,20; bonus2 bSkillAtk,"RA_CLUSTERBOMB",20; bonus bLongAtkRate,-30; bonus bAspd,-7; }
2483:2586:15046,{ bonus2 bSubRace,RC_DemiHuman,15; } 2483:2586:15046,{ bonus2 bSubRace,RC_DemiHuman,15; }
2484:2587:15047,{ bonus bDex,5; bonus2 bSubRace,RC_DemiHuman,15; } 2484:2587:15047,{ bonus bDex,5; bonus2 bSubRace,RC_DemiHuman,15; }
2485:2587:15048,{ bonus bInt,5; bonus bMdef,10; bonus2 bSubRace,RC_DemiHuman,15; } 2485:2587:15048,{ bonus bInt,5; bonus bMdef,10; bonus2 bSubRace,RC_DemiHuman,15; }
2518:2648:2649:5126,{ bonus bInt,5; bonus bMdef,11; bonus bMaxSPrate,20; bonus bNoCastCancel,0; bonus bVariableCastrate,25; } 2518:2648:2649:5126,{ bonus bInt,5; bonus bMdef,11; bonus bMaxSPrate,20; bonus bNoCastCancel,0; bonus bVariableCastrate,25; }
2519:2650:2651:5127,{ bonus bStr,2; bonus bLuk,9; bonus bCritical,13; bonus bBaseAtk,18; bonus bFlee2,13; } 2519:2650:2651:5127,{ bonus bStr,2; bonus bLuk,9; bonus bCritical,13; bonus bBaseAtk,18; bonus bFlee2,13; }
2527:13001,{ bonus2 bAddRace,RC_Dragon,5; } 2527:13001,{ bonus2 bAddRace,RC_Dragon,5; }
2527:5467:13001,{ bonus2 bAddRace,RC_Dragon,25; }
2527:5467:13030,{ bonus2 bAddRace,RC_Dragon,25; }
2607:2677,{ bonus2 bSkillAtk,"AL_HEAL",50; bonus2 bSkillAtk,"PR_MAGNUS",30; bonus bSPrecovRate,9; } 2607:2677,{ bonus2 bSkillAtk,"AL_HEAL",50; bonus2 bSkillAtk,"PR_MAGNUS",30; bonus bSPrecovRate,9; }
2607:2711,{ bonus2 bSkillAtk,"AL_HEAL",50; bonus2 bSkillAtk,"PR_MAGNUS",30; bonus bSPrecovRate,9; } 2607:2711,{ bonus2 bSkillAtk,"AL_HEAL",50; bonus2 bSkillAtk,"PR_MAGNUS",30; bonus bSPrecovRate,9; }
2607:2786,{ bonus2 bSkillAtk,"AL_HEAL",50; bonus2 bSkillAtk,"PR_MAGNUS",30; bonus bSPrecovRate,9; } 2607:2786,{ bonus2 bSkillAtk,"AL_HEAL",50; bonus2 bSkillAtk,"PR_MAGNUS",30; bonus bSPrecovRate,9; }
@ -150,15 +163,20 @@
2726:2727,{ bonus bUseSPrate,-25; } 2726:2727,{ bonus bUseSPrate,-25; }
2733:2772,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,3; bonus bHealPower,5; } 2733:2772,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,3; bonus bHealPower,5; }
2747:13061,{ bonus bHit,5; bonus bMatk,5; bonus2 bSkillUseSP,"SC_ENERVATION",20; bonus2 bSkillUseSP,"SC_GROOMY",20; } 2747:13061,{ bonus bHit,5; bonus bMatk,5; bonus2 bSkillUseSP,"SC_ENERVATION",20; bonus2 bSkillUseSP,"SC_GROOMY",20; }
2751:2888,{ bonus bAspdRate,3; bonus bVariableCastrate,-3; }
2777:2778:5479,{ bonus bMaxHP,300; bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,5; } 2777:2778:5479,{ bonus bMaxHP,300; bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,5; }
2779:2780:5482,{ bonus bMatkRate,10; bonus bInt,5; bonus2 bSubRace,RC_Angel,10; } 2779:2780:5482,{ bonus bMatkRate,10; bonus bInt,5; bonus2 bSubRace,RC_Angel,10; }
2779:2780:5577,{ bonus bMatkRate,10; bonus bInt,5; bonus2 bSubRace,RC_Angel,10; } 2779:2780:5577,{ bonus bMatkRate,10; bonus bInt,5; bonus2 bSubRace,RC_Angel,10; }
2959:18756,{ set .@i,3+(3*getequiprefinerycnt(EQI_HEAD_TOP)); autobonus "{ /* Active_Montransform ATROCE, SetDisappearSPAmount COMBIITEM_Shiba_Set 1 5 */ bonus bBaseAtk,30; }",.@i,5000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; autobonus2 "{ /* Active_Montransform ATROCE, SetDisappearSPAmount COMBIITEM_Shiba_Set 1 5 */ bonus bBaseAtk,30; }",.@i,5000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }"; }
2966:2968,{ bonus bAtkRate,4; bonus bMatkRate,4; } 2966:2968,{ bonus bAtkRate,4; bonus bMatkRate,4; }
2966:2969,{ bonus bAtkRate,4; bonus bMatkRate,4; } 2966:2969,{ bonus bAtkRate,4; bonus bMatkRate,4; }
2966:13092,{ bonus bBaseAtk,10*getequiprefinerycnt( (getequipid(EQI_HAND_R) == 13092) ? EQI_HAND_R : EQI_HAND_L ); } 2966:13092,{ bonus bBaseAtk,10*getequiprefinerycnt( (getequipid(EQI_HAND_R) == 13092) ? EQI_HAND_R : EQI_HAND_L ); }
2967:2968,{ bonus bAtkRate,4; bonus bMatkRate,4; } 2967:2968,{ bonus bAtkRate,4; bonus bMatkRate,4; }
2967:2969,{ bonus bAtkRate,4; bonus bMatkRate,4; } 2967:2969,{ bonus bAtkRate,4; bonus bMatkRate,4; }
2968:13092,{ bonus bMatk,10*getequiprefinerycnt( (getequipid(EQI_HAND_R) == 13092) ? EQI_HAND_R : EQI_HAND_L ); } 2968:13092,{ bonus bMatk,10*getequiprefinerycnt( (getequipid(EQI_HAND_R) == 13092) ? EQI_HAND_R : EQI_HAND_L ); }
2986:18872,{ bonus bBaseAtk,BaseLevel/4; }
2986:2987:18872,{ bonus2 bAddMonsterDropItem,22559,50; }
2987:18872,{ bonus bMatk,BaseLevel/4; }
4001:4197,{ bonus bFlee,18; } 4001:4197,{ bonus bFlee,18; }
4006:4266,{ bonus bFlee,18; } 4006:4266,{ bonus bFlee,18; }
4009:4179,{ bonus bFlee,18; } 4009:4179,{ bonus bFlee,18; }
@ -193,6 +211,7 @@
4311:4319:4331:4371,{ bonus bInt,1; bonus bStr,1; bonus bDef,2; bonus bSPrecovRate,10; bonus2 bSkillAtk,"PA_SHIELDCHAIN",10; bonus2 bSkillAtk,"PA_SACRIFICE",10; bonus bVariableCastrate,-10; if(BaseJob==Job_Crusader) bonus bDefEle,Ele_Holy; } 4311:4319:4331:4371,{ bonus bInt,1; bonus bStr,1; bonus bDef,2; bonus bSPrecovRate,10; bonus2 bSkillAtk,"PA_SHIELDCHAIN",10; bonus2 bSkillAtk,"PA_SACRIFICE",10; bonus bVariableCastrate,-10; if(BaseJob==Job_Crusader) bonus bDefEle,Ele_Holy; }
4323:4324,{ bonus3 bAutoSpell,"MG_FROSTDIVER",3,250; } 4323:4324,{ bonus3 bAutoSpell,"MG_FROSTDIVER",3,250; }
4435:4436,{ bonus2 bSPGainRace,RC_DemiHuman,2; } 4435:4436,{ bonus2 bSPGainRace,RC_DemiHuman,2; }
4545:18730,{ bonus bMatk,5; bonus bBaseAtk,5; }
5040:5442,{ bonus bAspdRate,3; bonus bVariableCastrate,3; } 5040:5442,{ bonus bAspdRate,3; bonus bVariableCastrate,3; }
5068:5653,{ bonus bStr,1; bonus bAtkRate,5; } 5068:5653,{ bonus bStr,1; bonus bAtkRate,5; }
5074:5653,{ bonus bStr,1; bonus bAspdRate,2; } 5074:5653,{ bonus bStr,1; bonus bAspdRate,2; }
@ -204,6 +223,10 @@
//5359:5657,{ bonus bLongAtkRate,getequiprefinerycnt(EQI_HEAD_TOP); } //5359:5657,{ bonus bLongAtkRate,getequiprefinerycnt(EQI_HEAD_TOP); }
5401:5653,{ bonus bInt,1; bonus bMatkRate,2; } 5401:5653,{ bonus bInt,1; bonus bMatkRate,2; }
//5470:5653,{ bonus bDex,1; bonus bLongAtkRate,3; } //5470:5653,{ bonus bDex,1; bonus bLongAtkRate,3; }
13027:15044,{ bonus3 bAddMonsterDropItem,929,RC_Brute,100+(getrefine()*10); bonus3 bAddMonsterDropItem,929,RC_DemiHuman,100+(getrefine()*10); bonus3 bAddMonsterDropItem,970,RC_Brute,20+(getrefine()*2); bonus3 bAddMonsterDropItem,970,RC_DemiHuman,20+(getrefine()*2); } //9024:18832,{ bonus3 bAutoSpell,"BS_ADRENALINE",2,(GetPetRelationship >= 3)?15:10; }
13027:15044,{ set .@i,getequiprefinerycnt(EQI_ARMOR)?getequiprefinerycnt(EQI_ARMOR):1; bonus3 bAddMonsterDropItem,929,RC_DemiHuman,70*.@i; bonus3 bAddMonsterDropItem,970,RC_DemiHuman,50*.@i; bonus3 bAddMonsterDropItem,929,RC_Brute,70*.@i; bonus3 bAddMonsterDropItem,970,RC_Brute,50*.@i; }
13034:13035,{ bonus bMaxSP,20; bonus bMaxHPRate,5; bonus bHit,10; bonus2 bAddSize,Size_Large,30; autobonus "{ bonus bAspdRate,100; }",1,7000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }"; } 13034:13035,{ bonus bMaxSP,20; bonus bMaxHPRate,5; bonus bHit,10; bonus2 bAddSize,Size_Large,30; autobonus "{ bonus bAspdRate,100; }",1,7000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }"; }
15088:18816:18818,{ bonus bMatk,BaseLevel/3; bonus2 bExpAddRace,RC_NonBoss,5; bonus2 bExpAddRace,RC_Boss,5; }
15088:18817:18819,{ bonus bBaseAtk,BaseLevel/3; bonus2 bExpAddRace,RC_NonBoss,5; bonus2 bExpAddRace,RC_Boss,5; }
18507:18539,{ bonus bUseSPrate,-3; } 18507:18539,{ bonus bUseSPrate,-3; }
18559:18560,{ bonus bCritAtkRate,5; }

9
db/re/item_db.txt
View File

@ -5260,8 +5260,8 @@
11500,Light_Yellow_Pot,Light Yellow Potion,0,550,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(175,235),0; },{},{} 11500,Light_Yellow_Pot,Light Yellow Potion,0,550,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(175,235),0; },{},{}
11501,Light_White_Pot,Light White Potion,0,1200,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(325,405),0; },{},{} 11501,Light_White_Pot,Light White Potion,0,1200,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(325,405),0; },{},{}
11502,Light_Blue_Pot,Light Blue Potion,0,5000,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 0,rand(40,60); },{},{} 11502,Light_Blue_Pot,Light Blue Potion,0,5000,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 0,rand(40,60); },{},{}
11503,WoE_White_Potion,WoE White Potion,0,0,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(400,500),0; },{},{} 11503,Siege_White_Potion,WoE White Potion,0,0,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(400,500),0; },{},{}
11504,WoE_Blue_Potion,WoE Blue Potion,0,0,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 0,rand(50,70); },{},{} 11504,Siege_Blue_Potion,WoE Blue Potion,0,0,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 0,rand(50,70); },{},{}
11505,Iris,Iris,0,0,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 0,150; },{},{} 11505,Iris,Iris,0,0,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal 0,150; },{},{}
11506,Fanta_Orange,Fanta Orange,0,800,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(50,70),rand(10,12); },{},{} 11506,Fanta_Orange,Fanta Orange,0,800,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(50,70),rand(10,12); },{},{}
11507,Fanta_Grape,Fanta Grape,0,800,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(50,70),rand(10,12); },{},{} 11507,Fanta_Grape,Fanta Grape,0,800,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(50,70),rand(10,12); },{},{}
@ -8105,8 +8105,8 @@
18556,Angel_Helmet,Angel Helmet,5,0,,0,,0,,0,0xFFFFFFFF,63,2,512,,0,0,3,{},{},{} 18556,Angel_Helmet,Angel Helmet,5,0,,0,,0,,0,0xFFFFFFFF,63,2,512,,0,0,3,{},{},{}
18557,Devil_Helmet,Devil Helmet,5,0,,0,,0,,0,0xFFFFFFFF,63,2,512,,0,0,12,{},{},{} 18557,Devil_Helmet,Devil Helmet,5,0,,0,,0,,0,0xFFFFFFFF,63,2,512,,0,0,12,{},{},{}
18558,Sinsuncho_Hat,Sinsuncho Hat,5,20,,1000,,0,,0,0xFFFFFFFF,63,2,256,,10,0,730,{},{},{} 18558,Sinsuncho_Hat,Sinsuncho Hat,5,20,,1000,,0,,0,0xFFFFFFFF,63,2,256,,10,0,730,{},{},{}
18559,Fafnir_Skin,Fafnir Skin,5,20,,100,,3,,0,0xFFFFFFFF,63,2,512,,50,0,152,{},{},{} 18559,Fafnir_Skin,Fafnir Skin,5,20,,100,,3,,0,0xFFFFFFFF,63,2,512,,50,0,152,{ bonus bCritical,3; bonus bHPrecovRate,-100; },{},{}
18560,Fafnir_Mask,Fafnir Mask,5,20,,300,,2,,0,0xFFFFFFFF,63,2,1,,50,0,180,{},{},{} 18560,Fafnir_Mask,Fafnir Mask,5,20,,300,,2,,0,0xFFFFFFFF,63,2,1,,50,0,180,{ bonus bCritical,2; },{},{}
18561,B_Feather_Beret,B Feather Beret,5,20,,300,,5,,1,0xFFFFFFFF,63,2,256,,40,1,731,{ bonus bVit,2; bonus bMdef,3; bonus2 bSubRace,RC_DemiHuman,10; },{},{} 18561,B_Feather_Beret,B Feather Beret,5,20,,300,,5,,1,0xFFFFFFFF,63,2,256,,40,1,731,{ bonus bVit,2; bonus bMdef,3; bonus2 bSubRace,RC_DemiHuman,10; },{},{}
18562,Bone_Hat,Bone Hat,5,20,,200,,3,,1,0xFFFFFFFF,63,2,256,,10,1,732,{ bonus bMdef,3; },{},{} 18562,Bone_Hat,Bone Hat,5,20,,200,,3,,1,0xFFFFFFFF,63,2,256,,10,1,732,{ bonus bMdef,3; },{},{}
18563,Heart_Wing_Hairband,Heart Wing Hairband,5,20,,300,,0,,1,0xFFFFFFFF,63,2,256,,50,1,733,{},{},{} 18563,Heart_Wing_Hairband,Heart Wing Hairband,5,20,,300,,0,,1,0xFFFFFFFF,63,2,256,,50,1,733,{},{},{}
@ -8300,6 +8300,7 @@
18816,Adv_Angel_School_Cap,Evoked Angel School Cap,5,20,,100,,4,,1,0xFFFFFFFE,63,2,256,,0,1,929,{ bonus bInt,2; bonus bVit,2; bonus bLuk,1; },{},{} 18816,Adv_Angel_School_Cap,Evoked Angel School Cap,5,20,,100,,4,,1,0xFFFFFFFE,63,2,256,,0,1,929,{ bonus bInt,2; bonus bVit,2; bonus bLuk,1; },{},{}
18817,Adv_Devil_School_Cap,Evoked Devil School Cap,5,20,,100,,4,,1,0xFFFFFFFE,63,2,256,,0,1,930,{ bonus bStr,2; bonus bVit,2; bonus bLuk,1; },{},{} 18817,Adv_Devil_School_Cap,Evoked Devil School Cap,5,20,,100,,4,,1,0xFFFFFFFE,63,2,256,,0,1,930,{ bonus bStr,2; bonus bVit,2; bonus bLuk,1; },{},{}
18818,Red_Pencil_In_Mouth,Red Pencil In Mouth,5,20,,100,,0,,0,0xFFFFFFFF,63,2,1,,0,0,931,{ bonus bUnbreakableHelm,0; },{},{} 18818,Red_Pencil_In_Mouth,Red Pencil In Mouth,5,20,,100,,0,,0,0xFFFFFFFF,63,2,1,,0,0,931,{ bonus bUnbreakableHelm,0; },{},{}
18819,Blue_Pencil_In_Mouth,Red Pencil In Mouth,5,20,,100,,0,,0,0xFFFFFFFF,63,2,1,,0,0,932,{ bonus bUnbreakableHelm,0; },{},{}
18821,Rainbow_Feather_Deco,Rainbow Feather Deco,5,20,,300,,5,,1,0xFFFFFFFF,63,2,256,,1,1,934,{ bonus bAtkRate,1; bonus bMatkRate,1; },{},{} 18821,Rainbow_Feather_Deco,Rainbow Feather Deco,5,20,,300,,5,,1,0xFFFFFFFF,63,2,256,,1,1,934,{ bonus bAtkRate,1; bonus bMatkRate,1; },{},{}
// //
18828,2012RMSCNO1,2012RMSCNO1,5,0,,1000,,20,,1,0xFFFFFFFF,63,2,256,,95,0,942,{ bonus bAllStats,5; bonus bMdef,5; },{},{} 18828,2012RMSCNO1,2012RMSCNO1,5,0,,1000,,20,,1,0xFFFFFFFF,63,2,256,,95,0,942,{ bonus bAllStats,5; bonus bMdef,5; },{},{}

100
db/re/item_noequip.txt
View File

@ -25,36 +25,84 @@
// you can even mix modes // you can even mix modes
//519,322 (256+64+2) you can't use Milk on PVP, and maps marked as 'restricted zone 2' and 'restricted zone 4' //519,322 (256+64+2) you can't use Milk on PVP, and maps marked as 'restricted zone 2' and 'restricted zone 4'
//PVP //----------------------------------------------------------------------------
14529,2 //Greed Scroll // Normal maps
//----------------------------------------------------------------------------
2483,1 //Siege_Greave
2484,1 //Siege_Boots
2485,1 //Siege_Shoes
2586,1 //Siege_Manteau
2587,1 //Siege_Muffler
15046,1 //Siege_Plate
15047,1 //Siege_Suits
15048,1 //Siege_Robe
1776,1 //Siege_Arrow_S
1775,1 //Siege_Arrow_A
1293,1 //Velum_Jamadhar
1294,1 //Velum_Scare
1395,1 //Velum_Buster
1492,1 //Velum_Glaive
2016,1 //Velum_Arc_Wand
21001,1 //Velum_Claymore
21002,1 //Velum_Katzbalger
18113,1 //Velum_Arbalest
18114,1 //Velum_CrossBow
1586,1 //Velum_Bible
1587,1 //Velum_Encyclopedia
1832,1 //Velum_Claw
13072,1 //Velum_Damascus
16020,1 //Velum_Stunner
16021,1 //Velum_Flail
1436,1 //Velum_Spear
1396,1 //Velum_Guillotine
11548,1 //Woe_White_Potion
11549,1 //Woe_Blue_Potion
11547,1 //Woe_Violet_Potion
12600,1 //Treasure_Box_Scroll
//GVG //----------------------------------------------------------------------------
12218,4 //LV5 Assumptio Scroll // PVP
14529,4 //Greed Scroll //----------------------------------------------------------------------------
14590,4 //Party Assumptio 5 Scroll 14529,2 //Greed_Scroll
//BATTLEGROUND //----------------------------------------------------------------------------
12218,8 //LV5 Assumptio Scroll // GVG
14590,8 //Party Assumptio 5 Scroll //----------------------------------------------------------------------------
12218,4 //Assumptio_5_Scroll
14529,4 //Greed_Scroll
14590,4 //Pty_Assumptio_Scroll
//----------------------------------------------------------------------------
// Battlegrounds
//----------------------------------------------------------------------------
12218,8 //Assumptio_5_Scroll
14590,8 //Pty_Assumptio_Scroll
//Zone 1 - Aldebaran Turbo Track //----------------------------------------------------------------------------
601,32 //Fly Wing // Zone 1 - Aldebaran Turbo Track
605,32 //Anodyne //----------------------------------------------------------------------------
506,32 //Green Potion 601,32 //Wing_Of_Fly
525,32 //Panacea 605,32 //Anodyne
506,32 //Green_Potion
525,32 //Panacea
//Zone 2 - Jail //----------------------------------------------------------------------------
601,64 //Fly Wing - not really needed here but ... // Zone 2 - Jail
602,64 //Butterfly Wing - also not needed //----------------------------------------------------------------------------
12212,64 //Giant Fly Wing 601,64 //Wing_Of_Fly
14582,64 602,64 //Wing_Of_Butterfly
14583,64 12212,64 //Giant_Fly_Wing
14584,64 14582,64 //WOB_Rune
14585,64 14583,64 //WOB_Schwaltz
14584,64 //WOB_Rachel
14585,64 //WOB_Local
//Zone 3 - Izlude Battle Arena //----------------------------------------------------------------------------
601,128 //Fly Wing // Zone 3 - Izlude Battle Arena
//----------------------------------------------------------------------------
601,128 //Wing_Of_Fly
//Zone 7 - Towns //----------------------------------------------------------------------------
14529,2048 //Greed Scroll // Zone 7 - Towns
//----------------------------------------------------------------------------
14529,2048 //Greed_Scroll

52
db/re/skill_nocast_db.txt
View File

@ -21,16 +21,22 @@
// Example: // Example:
// 8,6 = Endure cannot be used in PvP and GvG maps (2+4) // 8,6 = Endure cannot be used in PvP and GvG maps (2+4)
//Normal //----------------------------------------------------------------------------
// Normal
//----------------------------------------------------------------------------
2422,1 //WM_LULLABY_DEEPSLEEP 2422,1 //WM_LULLABY_DEEPSLEEP
2423,1 //WM_SIRCLEOFNATURE 2423,1 //WM_SIRCLEOFNATURE
2430,1 //WM_SATURDAY_NIGHT_FEVER 2430,1 //WM_SATURDAY_NIGHT_FEVER
2455,1 //SO_ARRULLO 2455,1 //SO_ARRULLO
//PVP //----------------------------------------------------------------------------
// PVP
//----------------------------------------------------------------------------
//GVG //----------------------------------------------------------------------------
// GVG
//----------------------------------------------------------------------------
26,4 //AL_TELEPORT 26,4 //AL_TELEPORT
27,4 //AL_WARP 27,4 //AL_WARP
87,4 //WZ_ICEWALL 87,4 //WZ_ICEWALL
@ -48,7 +54,9 @@
2284,4 //SC_FATALMENACE 2284,4 //SC_FATALMENACE
2300,4 //SC_DIMENSIONDOOR 2300,4 //SC_DIMENSIONDOOR
//BATTLEGROUND //----------------------------------------------------------------------------
// Battlegrounds
//----------------------------------------------------------------------------
26,8 //AL_TELEPORT 26,8 //AL_TELEPORT
27,8 //AL_WARP 27,8 //AL_WARP
87,8 //WZ_ICEWALL 87,8 //WZ_ICEWALL
@ -83,15 +91,21 @@
2284,8 //SC_FATALMENACE 2284,8 //SC_FATALMENACE
2300,8 //SC_DIMENSIONDOOR 2300,8 //SC_DIMENSIONDOOR
//mixed //----------------------------------------------------------------------------
// Mixed
//----------------------------------------------------------------------------
488,3 //CG_HERMODE 488,3 //CG_HERMODE
3013,3 //KO_KYOUGAKU 3013,3 //KO_KYOUGAKU
//Clone Forbidden/pointless skills //----------------------------------------------------------------------------
// Clone Forbidden/pointless skills
//----------------------------------------------------------------------------
77,16 //PR_TURNUNDEAD 77,16 //PR_TURNUNDEAD
79,16 //PR_MAGNUS 79,16 //PR_MAGNUS
//Zone 1 - Aldebaran Turbo Track //----------------------------------------------------------------------------
// Zone 1 - Aldebaran Turbo Track
//----------------------------------------------------------------------------
8,32 //SM_ENDURE 8,32 //SM_ENDURE
26,32 //AL_TELEPORT 26,32 //AL_TELEPORT
27,32 //AL_WARP 27,32 //AL_WARP
@ -111,21 +125,29 @@
2300,32 //SC_DIMENSIONDOOR 2300,32 //SC_DIMENSIONDOOR
2478,32 //GN_CARTBOOST 2478,32 //GN_CARTBOOST
//Zone 2 - Jail //----------------------------------------------------------------------------
// Zone 2 - Jail
//----------------------------------------------------------------------------
421,64 //TK_JUMPKICK 421,64 //TK_JUMPKICK
426,64 //TK_HIGHJUMP 426,64 //TK_HIGHJUMP
//Zone 3 - Izlude Battle Arena //----------------------------------------------------------------------------
// Zone 3 - Izlude Battle Arena
//----------------------------------------------------------------------------
219,128 //RG_INTIMIDATE 219,128 //RG_INTIMIDATE
26,128 //AL_TELEPORT 26,128 //AL_TELEPORT
2284,128 //SC_FATALMENACE 2284,128 //SC_FATALMENACE
2300,128 //SC_DIMENSIONDOOR 2300,128 //SC_DIMENSIONDOOR
//Zone 4 - WoE:SE //----------------------------------------------------------------------------
// Zone 4 - WoE:SE
//----------------------------------------------------------------------------
426,256 //TK_HIGHJUMP 426,256 //TK_HIGHJUMP
290,256 //SA_ABRACADABRA 290,256 //SA_ABRACADABRA
//Zone 5 - Sealed Shrine //----------------------------------------------------------------------------
// Zone 5 - Sealed Shrine
//----------------------------------------------------------------------------
12,512 //MG_SAFETYWALL 12,512 //MG_SAFETYWALL
26,512 //AL_TELEPORT 26,512 //AL_TELEPORT
219,512 //RG_INTIMIDATE 219,512 //RG_INTIMIDATE
@ -134,7 +156,9 @@
2284,512 //SC_FATALMENACE 2284,512 //SC_FATALMENACE
2300,512 //SC_DIMENSIONDOOR 2300,512 //SC_DIMENSIONDOOR
//Zone 6 - Endless Tower, Orc's Memory, Nidhoggur's Nest //----------------------------------------------------------------------------
// Zone 6 - Endless Tower, Orc's Memory, Nidhoggur's Nest
//----------------------------------------------------------------------------
26,1024 //AL_TELEPORT 26,1024 //AL_TELEPORT
87,1024 //WZ_ICEWALL 87,1024 //WZ_ICEWALL
219,1024 //RG_INTIMIDATE 219,1024 //RG_INTIMIDATE
@ -143,7 +167,9 @@
2284,1024 //SC_FATALMENACE 2284,1024 //SC_FATALMENACE
2300,1024 //SC_DIMENSIONDOOR 2300,1024 //SC_DIMENSIONDOOR
//Zone 7 - Towns //----------------------------------------------------------------------------
// Zone 7 - Towns
//----------------------------------------------------------------------------
232,2048 //AM_CANNIBALIZE 232,2048 //AM_CANNIBALIZE
233,2048 //AM_SPHEREMINE 233,2048 //AM_SPHEREMINE
491,2048 //CR_CULTIVATION 491,2048 //CR_CULTIVATION

6
npc/mapflag/nobranch.txt
View File

@ -290,7 +290,7 @@ que_qaru03 mapflag nobranch
que_qaru04 mapflag nobranch que_qaru04 mapflag nobranch
que_qaru05 mapflag nobranch que_qaru05 mapflag nobranch
// Episode 12 =========== // Episode 12 ==================
1@cata mapflag nobranch 1@cata mapflag nobranch
2@cata mapflag nobranch 2@cata mapflag nobranch
e_tower mapflag nobranch e_tower mapflag nobranch
@ -301,7 +301,7 @@ e_tower mapflag nobranch
5@tower mapflag nobranch 5@tower mapflag nobranch
6@tower mapflag nobranch 6@tower mapflag nobranch
// Episode 13.1 =========== // Episode 13.1 ================
mid_camp mapflag nobranch mid_camp mapflag nobranch
mid_campin mapflag nobranch mid_campin mapflag nobranch
man_fild01 mapflag nobranch man_fild01 mapflag nobranch
@ -323,7 +323,7 @@ bat_b02 mapflag nobranch
bat_a01 mapflag nobranch bat_a01 mapflag nobranch
bat_a02 mapflag nobranch bat_a02 mapflag nobranch
// Episode 13.2 =========== // Episode 13.2 ================
1@nyd mapflag nobranch 1@nyd mapflag nobranch
2@nyd mapflag nobranch 2@nyd mapflag nobranch
manuk mapflag nobranch manuk mapflag nobranch

4
npc/quests/quests_nameless.txt
View File

@ -7646,7 +7646,7 @@ payon,244,62,3 script Moonho Ahn 897,{
if (((.@input$ == "Odd") && (.@number == 1)) || ((.@input$ == "Even") && (.@number == 2))) { if (((.@input$ == "Odd") && (.@number == 1)) || ((.@input$ == "Even") && (.@number == 2))) {
set .@number_right_3,.@number_right_3+1; set .@number_right_3,.@number_right_3+1;
mes "[Moonho Ahn]"; mes "[Moonho Ahn]";
mes "^0000FF"+.@input+"^000000?"; mes "^0000FF"+.@input$+"^000000?";
mes "Okay, you won."; mes "Okay, you won.";
next; next;
if ((.@number_right_3 < 2) && (.@number_false_3 < 2)) { if ((.@number_right_3 < 2) && (.@number_false_3 < 2)) {
@ -7659,7 +7659,7 @@ payon,244,62,3 script Moonho Ahn 897,{
else if (((.@input$ == "Odd") && (.@number == 2)) || ((.@input$ == "Even") && (.@number == 1))) { else if (((.@input$ == "Odd") && (.@number == 2)) || ((.@input$ == "Even") && (.@number == 1))) {
set .@number_false_3,.@number_false_3+1; set .@number_false_3,.@number_false_3+1;
mes "[Moonho Ahn]"; mes "[Moonho Ahn]";
mes "Well, it's ^0000FF"+.@input+"^000000."; mes "Well, it's ^0000FF"+.@input$+"^000000.";
mes "Looks like I won."; mes "Looks like I won.";
next; next;
if ((.@number_right_3 < 2) && (.@number_false_3 <2)) { if ((.@number_right_3 < 2) && (.@number_false_3 <2)) {

13
npc/re/mapflag/night.txt
View File

@ -3,13 +3,14 @@
//===== By: ================================================== //===== By: ==================================================
//= rAthena Dev Team //= rAthena Dev Team
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.0 //= 1.1
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena SVN //= rAthena SVN
//===== Description: ========================================= //===== Description: =========================================
//= Enables night mode effects. //= Enables night mode effects.
//===== Additional Comments: ================================= //===== Additional Comments: =================================
//= 1.0 Renewal split. [Euphy] //= 1.0 Renewal split. [Euphy]
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================ //============================================================
// Episode 13 ==================== // Episode 13 ====================
@ -34,3 +35,13 @@ ma_scene01 mapflag nightenabled
eclage mapflag nightenabled eclage mapflag nightenabled
ecl_fild01 mapflag nightenabled ecl_fild01 mapflag nightenabled
ecl_hub01 mapflag nightenabled ecl_hub01 mapflag nightenabled
// Izlude duplicates ===========
izlude_a mapflag nightenabled
izlude_b mapflag nightenabled
izlude_c mapflag nightenabled
izlude_d mapflag nightenabled
prt_fild08a mapflag nightenabled
prt_fild08b mapflag nightenabled
prt_fild08c mapflag nightenabled
prt_fild08d mapflag nightenabled

21
npc/re/mapflag/nobranch.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= rAthena Dev Team //= rAthena Dev Team
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.0 //= 1.1
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena SVN //= rAthena SVN
//===== Description: ========================================= //===== Description: =========================================
@ -12,9 +12,10 @@
//= Red Pouch (12024), Poring Box (12109) //= Red Pouch (12024), Poring Box (12109)
//===== Additional Comments: ================================= //===== Additional Comments: =================================
//= 1.0 Renewal split. [Euphy] //= 1.0 Renewal split. [Euphy]
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================ //============================================================
// 3rd Class Job Maps & Paradise =========== // 3rd Class Job Maps & Paradise
moc_para01 mapflag nobranch moc_para01 mapflag nobranch
job3_arch01 mapflag nobranch job3_arch01 mapflag nobranch
job3_arch02 mapflag nobranch job3_arch02 mapflag nobranch
@ -34,23 +35,23 @@ job3_war01 mapflag nobranch
job3_war02 mapflag nobranch job3_war02 mapflag nobranch
jupe_core2 mapflag nobranch jupe_core2 mapflag nobranch
// Brasilis =========== // Brasilis ====================
brasilis mapflag nobranch brasilis mapflag nobranch
bra_in01 mapflag nobranch bra_in01 mapflag nobranch
// Episode 13.3 =========== // Episode 13.3 ================
dicastes01 mapflag nobranch dicastes01 mapflag nobranch
dicastes02 mapflag nobranch dicastes02 mapflag nobranch
dic_in01 mapflag nobranch dic_in01 mapflag nobranch
s_atelier mapflag nobranch s_atelier mapflag nobranch
// Episode 14.1 & Dewata =========== // Episode 14.1 & Dewata =======
mora mapflag nobranch mora mapflag nobranch
1@mist mapflag nobranch 1@mist mapflag nobranch
dewata mapflag nobranch dewata mapflag nobranch
dew_in01 mapflag nobranch dew_in01 mapflag nobranch
// Episode Zero & Malaya Port =========== // Episode Zero & Malaya Port ==
malangdo mapflag nobranch malangdo mapflag nobranch
mal_in01 mapflag nobranch mal_in01 mapflag nobranch
mal_in02 mapflag nobranch mal_in02 mapflag nobranch
@ -75,7 +76,7 @@ ma_zif09 mapflag nobranch
1@ma_c mapflag nobranch 1@ma_c mapflag nobranch
1@ma_b mapflag nobranch 1@ma_b mapflag nobranch
// Episode 14.2 =========== // Episode 14.2 ================
eclage mapflag nobranch eclage mapflag nobranch
ecl_in01 mapflag nobranch ecl_in01 mapflag nobranch
ecl_in02 mapflag nobranch ecl_in02 mapflag nobranch
@ -84,3 +85,9 @@ ecl_in04 mapflag nobranch
1@ecl mapflag nobranch 1@ecl mapflag nobranch
ecl_hub01 mapflag nobranch ecl_hub01 mapflag nobranch
que_avan01 mapflag nobranch que_avan01 mapflag nobranch
// Izlude duplicates ===========
izlude_a mapflag nobranch
izlude_b mapflag nobranch
izlude_c mapflag nobranch
izlude_d mapflag nobranch

7
npc/re/mapflag/nopenalty.txt
View File

@ -3,13 +3,14 @@
//===== By: ================================================== //===== By: ==================================================
//= rAthena Dev Team //= rAthena Dev Team
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.0 //= 1.1
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena SVN //= rAthena SVN
//===== Description: ========================================= //===== Description: =========================================
//= Same as 'noexppenalty' and 'nozenypenalty' combined. //= Same as 'noexppenalty' and 'nozenypenalty' combined.
//===== Additional Comments: ================================= //===== Additional Comments: =================================
//= 1.0 Renewal split. [Euphy] //= 1.0 Renewal split. [Euphy]
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================ //============================================================
// Towns ==================== // Towns ====================
@ -22,6 +23,10 @@ s_atelier mapflag nopenalty
mora mapflag nopenalty mora mapflag nopenalty
dewata mapflag nopenalty dewata mapflag nopenalty
dew_in01 mapflag nopenalty dew_in01 mapflag nopenalty
izlude_a mapflag nopenalty
izlude_b mapflag nopenalty
izlude_c mapflag nopenalty
izlude_d mapflag nopenalty
malangdo mapflag nopenalty malangdo mapflag nopenalty
mal_in01 mapflag nopenalty mal_in01 mapflag nopenalty
mal_in02 mapflag nopenalty mal_in02 mapflag nopenalty

7
npc/re/mapflag/nopvp.txt
View File

@ -3,13 +3,14 @@
//===== By: ================================================== //===== By: ==================================================
//= rAthena Dev Team //= rAthena Dev Team
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.0 //= 1.1
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena SVN //= rAthena SVN
//===== Description: ========================================= //===== Description: =========================================
//= Prevents PvP mode on a map. //= Prevents PvP mode on a map.
//===== Additional Comments: ================================= //===== Additional Comments: =================================
//= 1.0 Renewal split. [Euphy] //= 1.0 Renewal split. [Euphy]
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================ //============================================================
// Instances =================== // Instances ===================
@ -43,6 +44,10 @@ s_atelier mapflag pvp off
mora mapflag pvp off mora mapflag pvp off
dewata mapflag pvp off dewata mapflag pvp off
dew_in01 mapflag pvp off dew_in01 mapflag pvp off
izlude_a mapflag pvp off
izlude_b mapflag pvp off
izlude_c mapflag pvp off
izlude_d mapflag pvp off
malangdo mapflag pvp off malangdo mapflag pvp off
mal_in01 mapflag pvp off mal_in01 mapflag pvp off
mal_in02 mapflag pvp off mal_in02 mapflag pvp off

7
npc/re/mapflag/reset.txt
View File

@ -3,13 +3,14 @@
//===== By: ================================================== //===== By: ==================================================
//= rAthena Dev Team //= rAthena Dev Team
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.0 //= 1.1
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena SVN //= rAthena SVN
//===== Description: ========================================= //===== Description: =========================================
//= Maps where Neuralizer (12213) can be used. //= Maps where Neuralizer (12213) can be used.
//===== Additional Comments: ================================= //===== Additional Comments: =================================
//= 1.0 Renewal split. [Euphy] //= 1.0 Renewal split. [Euphy]
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================ //============================================================
brasilis mapflag reset brasilis mapflag reset
@ -17,6 +18,10 @@ dewata mapflag reset
dicastes01 mapflag reset dicastes01 mapflag reset
dicastes02 mapflag reset dicastes02 mapflag reset
eclage mapflag reset eclage mapflag reset
izlude_a mapflag reset
izlude_b mapflag reset
izlude_c mapflag reset
izlude_d mapflag reset
malangdo mapflag reset malangdo mapflag reset
malaya mapflag reset malaya mapflag reset
mora mapflag reset mora mapflag reset

32
npc/re/mapflag/restricted.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= rAthena Dev Team //= rAthena Dev Team
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.0 //= 1.1
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena SVN //= rAthena SVN
//===== Description: ========================================= //===== Description: =========================================
@ -11,29 +11,29 @@
//= and skills configured in skill_nocast_db.txt. //= and skills configured in skill_nocast_db.txt.
//===== Additional Comments: ================================= //===== Additional Comments: =================================
//= 1.0 Renewal split. [Euphy] //= 1.0 Renewal split. [Euphy]
//= 1.1 Copied towns into this file. [Euphy]
//============================================================ //============================================================
// Misty Forest Labyrinth =========== // Instances =====================
1@mist mapflag restricted 6 1@mist mapflag restricted 6
// Octopus Cave ===========
1@cash mapflag restricted 6 1@cash mapflag restricted 6
// Drain ===========
1@pump mapflag restricted 6 1@pump mapflag restricted 6
2@pump mapflag restricted 6 2@pump mapflag restricted 6
// Somatology Laboratory ===========
1@lhz mapflag restricted 6 1@lhz mapflag restricted 6
// Bangungot Hospital F2 ===========
1@ma_h mapflag restricted 6 1@ma_h mapflag restricted 6
// Buwaya Cave ===========
1@ma_c mapflag restricted 6 1@ma_c mapflag restricted 6
// Bakonawa Hideout ===========
1@ma_b mapflag restricted 6 1@ma_b mapflag restricted 6
// Inside Eclage ===========
1@ecl mapflag restricted 6 1@ecl mapflag restricted 6
// Towns =========================
brasilis mapflag restricted 7
dewata mapflag restricted 7
dicastes01 mapflag restricted 7
eclage mapflag restricted 7
izlude_a mapflag restricted 7
izlude_b mapflag restricted 7
izlude_c mapflag restricted 7
izlude_d mapflag restricted 7
malangdo mapflag restricted 7
malaya mapflag restricted 7
mora mapflag restricted 7

7
npc/re/mapflag/town.txt
View File

@ -3,19 +3,24 @@
//===== By: ================================================== //===== By: ==================================================
//= Epoque //= Epoque
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.0 //= 1.1
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena SVN //= rAthena SVN
//===== Description: ========================================= //===== Description: =========================================
//= Designates a map as a town, granting mailbox access. //= Designates a map as a town, granting mailbox access.
//===== Additional Comments: ================================= //===== Additional Comments: =================================
//= 1.0 Renewal split. [Euphy] //= 1.0 Renewal split. [Euphy]
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================ //============================================================
brasilis mapflag town brasilis mapflag town
dewata mapflag town dewata mapflag town
dicastes01 mapflag town dicastes01 mapflag town
eclage mapflag town eclage mapflag town
izlude_a mapflag town
izlude_b mapflag town
izlude_c mapflag town
izlude_d mapflag town
malangdo mapflag town malangdo mapflag town
malaya mapflag town malaya mapflag town
mora mapflag town mora mapflag town

9
sql-files/item_db_re.sql
View File

@ -5291,8 +5291,8 @@ REPLACE INTO `item_db_re` VALUES (11058,'Novice_Combi_Book','Novice Combi Book',
REPLACE INTO `item_db_re` VALUES (11500,'Light_Yellow_Pot','Light Yellow Potion',0,550,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(175,235),0;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (11500,'Light_Yellow_Pot','Light Yellow Potion',0,550,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(175,235),0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11501,'Light_White_Pot','Light White Potion',0,1200,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(325,405),0;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (11501,'Light_White_Pot','Light White Potion',0,1200,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(325,405),0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11502,'Light_Blue_Pot','Light Blue Potion',0,5000,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 0,rand(40,60);',NULL,NULL); REPLACE INTO `item_db_re` VALUES (11502,'Light_Blue_Pot','Light Blue Potion',0,5000,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 0,rand(40,60);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11503,'WoE_White_Potion','WoE White Potion',0,0,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(400,500),0;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (11503,'Siege_White_Potion','WoE White Potion',0,0,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(400,500),0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11504,'WoE_Blue_Potion','WoE Blue Potion',0,0,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 0,rand(50,70);',NULL,NULL); REPLACE INTO `item_db_re` VALUES (11504,'Siege_Blue_Potion','WoE Blue Potion',0,0,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 0,rand(50,70);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11505,'Iris','Iris',0,0,NULL,30,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 0,150;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (11505,'Iris','Iris',0,0,NULL,30,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal 0,150;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11506,'Fanta_Orange','Fanta Orange',0,800,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(50,70),rand(10,12);',NULL,NULL); REPLACE INTO `item_db_re` VALUES (11506,'Fanta_Orange','Fanta Orange',0,800,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(50,70),rand(10,12);',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (11507,'Fanta_Grape','Fanta Grape',0,800,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(50,70),rand(10,12);',NULL,NULL); REPLACE INTO `item_db_re` VALUES (11507,'Fanta_Grape','Fanta Grape',0,800,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(50,70),rand(10,12);',NULL,NULL);
@ -8136,8 +8136,8 @@ REPLACE INTO `item_db_re` VALUES (18555,'General_Helmet','General Helmet',5,20,N
REPLACE INTO `item_db_re` VALUES (18556,'Angel_Helmet','Angel Helmet',5,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'0',0,3,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (18556,'Angel_Helmet','Angel Helmet',5,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'0',0,3,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18557,'Devil_Helmet','Devil Helmet',5,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'0',0,12,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (18557,'Devil_Helmet','Devil Helmet',5,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'0',0,12,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18558,'Sinsuncho_Hat','Sinsuncho Hat',5,20,NULL,1000,NULL,0,NULL,0,0xFFFFFFFF,63,2,256,NULL,'10',0,730,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (18558,'Sinsuncho_Hat','Sinsuncho Hat',5,20,NULL,1000,NULL,0,NULL,0,0xFFFFFFFF,63,2,256,NULL,'10',0,730,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18559,'Fafnir_Skin','Fafnir Skin',5,20,NULL,100,NULL,3,NULL,0,0xFFFFFFFF,63,2,512,NULL,'50',0,152,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (18559,'Fafnir_Skin','Fafnir Skin',5,20,NULL,100,NULL,3,NULL,0,0xFFFFFFFF,63,2,512,NULL,'50',0,152,'bonus bCritical,3; bonus bHPrecovRate,-100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18560,'Fafnir_Mask','Fafnir Mask',5,20,NULL,300,NULL,2,NULL,0,0xFFFFFFFF,63,2,1,NULL,'50',0,180,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (18560,'Fafnir_Mask','Fafnir Mask',5,20,NULL,300,NULL,2,NULL,0,0xFFFFFFFF,63,2,1,NULL,'50',0,180,'bonus bCritical,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18561,'B_Feather_Beret','B Feather Beret',5,20,NULL,300,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,NULL,'40',1,731,'bonus bVit,2; bonus bMdef,3; bonus2 bSubRace,RC_DemiHuman,10;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (18561,'B_Feather_Beret','B Feather Beret',5,20,NULL,300,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,NULL,'40',1,731,'bonus bVit,2; bonus bMdef,3; bonus2 bSubRace,RC_DemiHuman,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18562,'Bone_Hat','Bone Hat',5,20,NULL,200,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'10',1,732,'bonus bMdef,3;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (18562,'Bone_Hat','Bone Hat',5,20,NULL,200,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'10',1,732,'bonus bMdef,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18563,'Heart_Wing_Hairband','Heart Wing Hairband',5,20,NULL,300,NULL,0,NULL,1,0xFFFFFFFF,63,2,256,NULL,'50',1,733,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (18563,'Heart_Wing_Hairband','Heart Wing Hairband',5,20,NULL,300,NULL,0,NULL,1,0xFFFFFFFF,63,2,256,NULL,'50',1,733,NULL,NULL,NULL);
@ -8331,6 +8331,7 @@ REPLACE INTO `item_db_re` VALUES (18815,'Devil_School_Cap','Devil School Cap',5,
REPLACE INTO `item_db_re` VALUES (18816,'Adv_Angel_School_Cap','Evoked Angel School Cap',5,20,NULL,100,NULL,4,NULL,1,0xFFFFFFFE,63,2,256,NULL,'0',1,929,'bonus bInt,2; bonus bVit,2; bonus bLuk,1;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (18816,'Adv_Angel_School_Cap','Evoked Angel School Cap',5,20,NULL,100,NULL,4,NULL,1,0xFFFFFFFE,63,2,256,NULL,'0',1,929,'bonus bInt,2; bonus bVit,2; bonus bLuk,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18817,'Adv_Devil_School_Cap','Evoked Devil School Cap',5,20,NULL,100,NULL,4,NULL,1,0xFFFFFFFE,63,2,256,NULL,'0',1,930,'bonus bStr,2; bonus bVit,2; bonus bLuk,1;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (18817,'Adv_Devil_School_Cap','Evoked Devil School Cap',5,20,NULL,100,NULL,4,NULL,1,0xFFFFFFFE,63,2,256,NULL,'0',1,930,'bonus bStr,2; bonus bVit,2; bonus bLuk,1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18818,'Red_Pencil_In_Mouth','Red Pencil In Mouth',5,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'0',0,931,'bonus bUnbreakableHelm,0;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (18818,'Red_Pencil_In_Mouth','Red Pencil In Mouth',5,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'0',0,931,'bonus bUnbreakableHelm,0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18819,'Blue_Pencil_In_Mouth','Red Pencil In Mouth',5,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'0',0,932,'bonus bUnbreakableHelm,0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18821,'Rainbow_Feather_Deco','Rainbow Feather Deco',5,20,NULL,300,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,934,'bonus bAtkRate,1; bonus bMatkRate,1;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (18821,'Rainbow_Feather_Deco','Rainbow Feather Deco',5,20,NULL,300,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',1,934,'bonus bAtkRate,1; bonus bMatkRate,1;',NULL,NULL);
# #
REPLACE INTO `item_db_re` VALUES (18828,'2012RMSCNO1','2012RMSCNO1',5,0,NULL,1000,NULL,20,NULL,1,0xFFFFFFFF,63,2,256,NULL,'95',0,942,'bonus bAllStats,5; bonus bMdef,5;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (18828,'2012RMSCNO1','2012RMSCNO1',5,0,NULL,1000,NULL,20,NULL,1,0xFFFFFFFF,63,2,256,NULL,'95',0,942,'bonus bAllStats,5; bonus bMdef,5;',NULL,NULL);

3
src/map/script.c
View File

@ -3322,7 +3322,8 @@ void op_2(struct script_state *st, int op)
if (leftref.type != C_NOP) if (leftref.type != C_NOP)
{ {
aFree(left->u.str); if (left->type == C_STR) // don't free C_CONSTSTR
aFree(left->u.str);
*left = leftref; *left = leftref;
} }
} }