summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDastgir <dastgir@users.noreply.github.com>2015-03-31 14:50:49 +0530
committerDastgir <dastgir@users.noreply.github.com>2015-03-31 14:50:49 +0530
commitc4ceb661c05c11c0cd53e99a7af5c74bb5f66815 (patch)
tree191ee32bf18e1106e365c44c68b487e0dc4c387a
parent2776f6f2809950c86b966a2fdf3ace8717ae1167 (diff)
parentd672e10e359ff052f1455b24790d815c43299c4b (diff)
downloadhercules-c4ceb661c05c11c0cd53e99a7af5c74bb5f66815.tar.gz
hercules-c4ceb661c05c11c0cd53e99a7af5c74bb5f66815.tar.bz2
hercules-c4ceb661c05c11c0cd53e99a7af5c74bb5f66815.tar.xz
hercules-c4ceb661c05c11c0cd53e99a7af5c74bb5f66815.zip
Merge pull request #480 from zackdreaver/master
Added new items DB and corrected scripts (part 2)
-rw-r--r--db/re/item_combo_db.txt1
-rw-r--r--db/re/item_db.conf995
-rw-r--r--npc/cities/prontera.txt2
-rw-r--r--npc/kafras/dts_warper.txt2
4 files changed, 994 insertions, 6 deletions
diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt
index 040eb12bc..525a6e3db 100644
--- a/db/re/item_combo_db.txt
+++ b/db/re/item_combo_db.txt
@@ -204,6 +204,7 @@
18823:2153:1433,{ bonus2 bSkillAtk,LG_CANNONSPEAR,20; bonus2 bSkillAtk,LG_BANISHINGPOINT,20; bonus2 bSkillAtk,LG_SHIELDPRESS,20; }
15090:18820:20721:22033,{ bonus2 bSubEle,Ele_Neutral,15; bonus3 bAutoSpellWhenHit,"WL_DRAINLIFE",3,100; }
15091:18820:20721:22033,{ bonus2 bSubEle,Ele_Neutral,15; bonus bMaxHPrate,25; bonus bMaxSPrate,25; bonus bMatkRate,10; }
+15117:20744:22047,{ bonus bMaxHP,25; bonus bMaxSP,25; bonus bSpeedRate,25; if (getequiprefinerycnt(EQI_GARMENT)+getequiprefinerycnt(EQI_SHOES)+getequiprefinerycnt(EQI_ARMOR) >= 30) { bonus bMaxHP,5; bonus bMaxSP,5; } }
// Shadow Equipment
24012:24013:24014:24015:24016:24017,{ bonus bAllStats,3; }
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 5a3045d1c..7c02c7363 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -8416,6 +8416,8 @@ item_db: (
View: 16
Script: <"
bonus bCritical,getrefine();
+ if (isequipped(4317)) bonus bCritAtkRate,5;
+ if (isequipped(4521)) bonus bCritAtkRate,5;
">
},
// 1-Handed Axes
@@ -15008,6 +15010,27 @@ item_db: (
">
},
{
+ Id: 1668
+ AegisName: "Sword_Stick"
+ Name: "Sword Stick"
+ Type: 4
+ Buy: 20
+ Weight: 500
+ Atk: 120
+ Matk: 150
+ Range: 1
+ Slots: 2
+ Job: 0x800200
+ Upper: 63
+ Loc: 2
+ WeaponLv: 4
+ EquipLv: 80
+ View: 8
+ Script: <"
+ bonus bAspdRate,10;
+ ">
+},
+{
Id: 1669
AegisName: "Thanatos_Staff"
Name: "Thanatos Staff"
@@ -33087,6 +33110,18 @@ item_db: (
Refine: false
},
{
+ Id: 2971
+ AegisName: "Pocket_Watch__"
+ Name: "Pocket Watch"
+ Type: 4
+ Buy: 20
+ Job: 0x800200
+ Weight: 200
+ Loc: 136
+ Refine: false
+ EquipLv: 80
+},
+{
Id: 2986
AegisName: "Snake_Ring"
Name: "Snake Ring"
@@ -40274,6 +40309,110 @@ item_db: (
">
},
+{
+ Id: 4625
+ AegisName: "Timeholder_Card"
+ Name: "Timeholder Card"
+ Type: 6
+ Buy: 20
+ Weight: 10
+ Loc: 2
+ Script: <"
+ bonus bMatkRate,20;
+ bonus bUseSPrate,10;
+ ">
+},
+{
+ Id: 4626
+ AegisName: "Big_Ben_Card"
+ Name: "Big Ben Card"
+ Type: 6
+ Buy: 20
+ Weight: 10
+ Loc: 2
+ Script: <"
+ bonus2 bMagicAddRace,RC_Formless,5;
+ bonus2 bMagicAddRace,RC_Demon,5;
+ ">
+},
+{
+ Id: 4627
+ AegisName: "Big_Bell_Card"
+ Name: "Big Bell Card"
+ Type: 6
+ Buy: 20
+ Weight: 10
+ Loc: 2
+ Script: <"
+ bonus2 bAddRace,RC_Formless,10;
+ bonus2 bAddRace,RC_Demon,10;
+ ">
+},
+{
+ Id: 4628
+ AegisName: "Neo_Punk_Card"
+ Name: "Neo Punk Card"
+ Type: 6
+ Buy: 20
+ Weight: 10
+ Loc: 32
+ Script: <"
+ bonus2 bSubRace,RC_Formless,20;
+ bonus2 bSubRace,RC_Demon,20;
+ ">
+},
+{
+ Id: 4629
+ AegisName: "Arc_Elder_Card"
+ Name: "Arc Elder Card"
+ Type: 6
+ Buy: 20
+ Weight: 10
+ Loc: 4
+ Script: <"
+ bonus2 bSubEle,Ele_Neutral,15;
+ bonus2 bMagicAtkEle,Ele_Earth,(getrefine()*3);
+ ">
+},
+{
+ Id: 4630
+ AegisName: "Time_Keeper_Card"
+ Name: "Time Keeper Card"
+ Type: 6
+ Buy: 20
+ Weight: 10
+ Loc: 64
+ Script: <"
+ bonus3 bAutoSpell,NPC_WIDECURSE,2,20;
+ ">
+},
+{
+ Id: 4631
+ AegisName: "Owl_Viscount_Card"
+ Name: "Owl Viscount Card"
+ Type: 6
+ Buy: 20
+ Weight: 10
+ Loc: 136
+ Script: <"
+ bonus bAspdRate,3;
+ ">
+},
+{
+ Id: 4632
+ AegisName: "Owl_Marquees_Card"
+ Name: "Owl Marquees Card"
+ Type: 6
+ Buy: 20
+ Weight: 10
+ Loc: 136
+ Script: <"
+ if(getskilllv(SA_VIOLENTGALE)==5) {
+ bonus5 bAutoSpell,SA_VIOLENTGALE,5,20,BF_WEAPON,0;
+ }
+ else bonus5 bAutoSpell,SA_VIOLENTGALE,1,20,BF_WEAPON,0;
+ ">
+},
// Armor Enchant System
// ===================================================================
{
@@ -63466,6 +63605,22 @@ item_db: (
Buy: 0
},
{
+ Id: 6804
+ AegisName: "Organic_Pumpkin"
+ Name: "Organic Pumpkin"
+ Type: 3
+ Buy: 20
+ Weight: 10
+},
+{
+ Id: 6805
+ AegisName: "Inorganic_Pumpkin"
+ Name: "Inorganic Pumpkin"
+ Type: 3
+ Buy: 20
+ Weight: 10
+},
+{
Id: 6913
AegisName: "Sacred_Rosary"
Name: "Sacred Rosary"
@@ -108057,6 +108212,24 @@ item_db: (
">
},
{
+ Id: 15089
+ AegisName: "Menswear"
+ Name: "Menswear"
+ Type: 4
+ Buy: 20
+ Weight: 300
+ Def: 40
+ Job: 0xFFFFFFFE
+ Upper: 63
+ Loc: 16
+ EquipLv: 80
+ Script: <"
+ bonus bAspdRate,3+((getrefine()>=7)?2:0);
+ bonus bDelayrate,-3-((getrefine()>=7)?2:0);
+ bonus bVariableCastrate,-3-((getrefine()>=7)?2:0);
+ ">
+},
+{
Id: 15090
AegisName: "Gray_Armor"
Name: "Gray Armor"
@@ -108088,6 +108261,99 @@ item_db: (
bonus2 bSubEle,Ele_Holy,10+(getrefine()/2);
">
},
+{
+ Id: 15116
+ AegisName: "Armor_Of_Airship"
+ Name: "Armor Of Airship"
+ Type: 5
+ Buy: 20
+ Weight: 700
+ Def: 100
+ Loc: 16
+ EquipLv: 125
+ Script: <"
+ bonus bMaxHP,1000;
+ bonus bMaxSP,100;
+ bonus bMdef,10;
+ bonus bAllStats,1;
+ ">
+},
+{
+ Id: 15117
+ AegisName: "Tarlock's_Armor"
+ Name: "Tarlock's Armor"
+ Type: 5
+ Buy: 20
+ Weight: 750
+ Def: 70
+ Loc: 16
+ EquipLv: 125
+ Script: <"
+ bonus bMaxHP,500;
+ bonus bMaxSP,50;
+ bonus bMdef,10;
+ bonus bAllStats,1;
+ .@r = getrefine();
+ if(.@r>=7) {
+ bonus bMaxHP,500;
+ bonus bMaxSP,50;
+ }
+ if(.@r>=9) {
+ bonus bMaxHP,200;
+ bonus bMaxSP,20;
+ }
+ if(.@r>=12) {
+ bonus bMaxHP,300;
+ bonus bMaxSP,30;
+ }
+ ">
+},
+{
+ Id: 15123
+ AegisName: "Whikebain_Suit"
+ Name: "Whikebain Suit"
+ Type: 5
+ Buy: 10
+ Weight: 9000
+ Def: 56
+ Slots: 1
+ Job: 0x00001000
+ Upper: 56
+ Loc: 16
+ EquipLv: 105
+ Script: <"
+ bonus3 bAutoSpell,DC_WINKCHARM,1,20;
+ if(getrefine()>4) {
+ bonus bCritAtkRate,4;
+ }
+ if(getrefine()>6) {
+ bonus bCritAtkRate,6;
+ }
+ if (isequipped(1287)) {
+ if(getequiprefinerycnt(EQI_HAND_R)>6) {
+ autobonus2 "{ bonus bIgnoreDefRace,RC_NonBoss; }",20,3000,BF_WEAPON,"{}";
+ }
+ }
+ ">
+},
+{
+ Id: 15128
+ AegisName: "Excellion_Suit"
+ Name: "Excellion Suit"
+ Type: 5
+ Buy: 20
+ Weight: 1000
+ Def: 100
+ Loc: 16
+ EquipLv: 99
+ Script: <"
+ bonus bVit,6;
+ bonus bMaxHPrate,(getrefine()/3)*4;
+ if(BaseLevel>130) {
+ bonus bVit,4;
+ }
+ ">
+},
// More Maces
// ===================================================================
{
@@ -108621,6 +108887,27 @@ item_db: (
">
},
{
+ Id: 16024
+ AegisName: "Quadrille_"
+ Name: "Quadrille"
+ Type: 4
+ Buy: 20
+ Weight: 900
+ Atk: 165
+ Range: 1
+ Slots: 2
+ Job: 0x00000010
+ Loc: 2
+ WeaponLv: 4
+ EquipLv: 40
+ View: 8
+ Script: <"
+ bonus2 bAddRace,RC_Undead,10;
+ bonus2 bAddRace,RC_DemiHuman,10;
+ bonus2 bAddEle,Ele_Earth,10;
+ ">
+},
+{
Id: 16026
AegisName: "RWC_Memory_Mace"
Name: "RWC Memory Mace"
@@ -123639,6 +123926,38 @@ item_db: (
View: 1272
},
{
+ Id: 20141
+ AegisName: "Costume_Observer"
+ Name: "Costume Observer"
+ Type: 5
+ Loc: 2048
+ View: 337
+},
+{
+ Id: 20142
+ AegisName: "Costume_Machoman_Glasses"
+ Name: "Costume Machoman Glasses"
+ Type: 5
+ Loc: 2048
+ View: 92
+},
+{
+ Id: 20143
+ AegisName: "Costume_Candy_Cane_In_Mouth"
+ Name: "Costume Candy Cane In Mouth"
+ Type: 5
+ Loc: 4096
+ View: 665
+},
+{
+ Id: 20144
+ AegisName: "Costume_Ancient_Elven_Ear"
+ Name: "Costume Ancient Elven Ear"
+ Type: 5
+ Loc: 2048
+ View: 665
+},
+{
Id: 20145
AegisName: "Costume_Robo_Eye"
Name: "Costume Robo Eye"
@@ -123663,6 +123982,38 @@ item_db: (
View: 1034
},
{
+ Id: 20148
+ AegisName: "Costume_Musketeer_Hat"
+ Name: "Costume Musketeer Hat"
+ Type: 5
+ Loc: 2048
+ View: 466
+},
+{
+ Id: 20149
+ AegisName: "Costume_Hexagon_Glasses"
+ Name: "Costume Hexagon Glasses"
+ Type: 5
+ Loc: 2048
+ View: 822
+},
+{
+ Id: 20150
+ AegisName: "Costume_Wind_Fan"
+ Name: "Costume Wind Fan"
+ Type: 5
+ Loc: 4096
+ View: 1051
+},
+{
+ Id: 20151
+ AegisName: "Costume_Poison_Spore_Hat"
+ Name: "Costume Poison Spore Hat"
+ Type: 5
+ Loc: 1024
+ View: 899
+},
+{
Id: 20152
AegisName: "Costume_Straw_Rice_Bag"
Name: "Costume Straw Rice Bag"
@@ -123929,6 +124280,14 @@ item_db: (
View: 144
},
{
+ Id: 20185
+ AegisName: "Costume_Fashionable_Glasses"
+ Name: "Costume Fashionable Glasses"
+ Type: 5
+ Loc: 1024
+ View: 131
+},
+{
Id: 20186
AegisName: "Costume_Magni's_Cap"
Name: "Costume Magni's Cap"
@@ -123945,6 +124304,14 @@ item_db: (
View: 251
},
{
+ Id: 20189
+ AegisName: "Costume_Goibne's_Helm"
+ Name: "Costume Goibne's Helm"
+ Type: 5
+ Loc: 1024
+ View: 258
+},
+{
Id: 20190
AegisName: "Costume_Chick_Hat_J"
Name: "Costume Chick Hat J"
@@ -124255,6 +124622,22 @@ item_db: (
Type: 5
Loc: 1024
View: 603
+ Trade: {
+ nodrop: true
+ notrade: true
+ nocart: true
+ nogstorage: true
+ nomail: true
+ noauction: true
+ }
+},
+{
+ Id: 20229
+ AegisName: "Costume_New_Year_Hairpin"
+ Name: "Costume New Year Hairpin"
+ Type: 5
+ Loc: 1024
+ View: 1155
},
{
Id: 20230
@@ -124293,10 +124676,42 @@ item_db: (
AegisName: "Costume_Baphomet_Hat"
Name: "Costume Baphomet Hat"
Type: 5
- Loc: 1024
+ Loc: 7168
View: 1311
},
{
+ Id: 20235
+ AegisName: "Costume_Frozen_Rose"
+ Name: "Costume Frozen Rose"
+ Type: 5
+ Loc: 4096
+ View: 1025
+},
+{
+ Id: 20236
+ AegisName: "Costume_Arc_Angeling_Hat"
+ Name: "Costume Arc Angeling Hat"
+ Type: 5
+ Loc: 1024
+ View: 241
+},
+{
+ Id: 20237
+ AegisName: "Costume_Pink_Beanie"
+ Name: "Costume Pink Beanie"
+ Type: 5
+ Loc: 1024
+ View: 281
+},
+{
+ Id: 20238
+ AegisName: "Costume_Drooping_Blue_Cat"
+ Name: "Costume Drooping Blue Cat"
+ Type: 5
+ Loc: 1024
+ View: 277
+},
+{
Id: 20239
AegisName: "Costume_Large_Ribbon_Muffler"
Name: "Costume Large Ribbon Muffler"
@@ -124305,6 +124720,13 @@ item_db: (
View: 1312
},
{
+ Id: 20240
+ AegisName: "Costume_Gift_of_Snow"
+ Name: "Costume Gift of Snow"
+ Type: 5
+ Loc: 4096
+},
+{
Id: 20241
AegisName: "Costume_Eclipse_Hat"
Name: "Costume Eclipse Hat"
@@ -124457,6 +124879,14 @@ item_db: (
View: 1322
},
{
+ Id: 20260
+ AegisName: "Costume_Stardust"
+ Name: "Costume Stardust"
+ Type: 5
+ Loc: 1024
+ View: 81
+},
+{
Id: 20262
AegisName: "Costume_Fox_Ears_Drop_Ribbon"
Name: "Costume Fox Ears Drop Ribbon"
@@ -124465,6 +124895,14 @@ item_db: (
View: 1070
},
{
+ Id: 20263
+ AegisName: "Costume_Sleeping_Cat_Hat"
+ Name: "Costume Sleeping Cat Hat"
+ Type: 5
+ Loc: 1024
+ View: 838
+},
+{
Id: 20264
AegisName: "Costume_Blood_Sucker"
Name: "Costume Blood Sucker"
@@ -124473,6 +124911,14 @@ item_db: (
View: 893
},
{
+ Id: 20265
+ AegisName: "Costume_Bird_Nest_Hat"
+ Name: "Costume Bird Nest Hat"
+ Type: 5
+ Loc: 1024
+ View: 235
+},
+{
Id: 20266
AegisName: "Costume_Secret_Zipper"
Name: "Costume Secret Zipper"
@@ -124528,6 +124974,14 @@ item_db: (
Loc: 1024
View: 42
},
+{
+ Id: 20292
+ AegisName: "Costume_Black_Ramen_Hat"
+ Name: "Costume Black Ramen Hat"
+ Type: 5
+ Loc: 1024
+ View: 1338
+},
// New Garments (Costume)
// ===================================================================
{
@@ -124724,6 +125178,33 @@ item_db: (
View: 6
},
{
+ Id: 20744
+ AegisName: "Tarlock's_Cloak"
+ Name: "Tarlock's Cloak"
+ Type: 5
+ Buy: 20
+ Weight: 400
+ Def: 12
+ Slots: 1
+ Loc: 4
+ EquipLv: 125
+ Script: <"
+ bonus2 bSubEle,Ele_Neutral,10;
+ bonus bFlee,20;
+ bonus bVariableCastrate,-10;
+ .@r = getrefine();
+ if(.@r>=7) {
+ bonus bVariableCastrate,-10;
+ }
+ if(.@r>=9) {
+ bonus bVariableCastrate,-10;
+ }
+ if(.@r>=12) {
+ bonus bVariableCastrate,-5;
+ }
+ ">
+},
+{
Id: 20746
AegisName: "Costume_Rudra_Wings"
Name: "Costume Rudra Wings"
@@ -124809,6 +125290,31 @@ item_db: (
Loc: 4
View: 10
},
+{
+ Id: 20773
+ AegisName: "Excellion_Wing"
+ Name: "Excellion Wing"
+ Type: 5
+ Buy: 20
+ Weight: 900
+ Def: 40
+ Loc: 4
+ EquipLv: 99
+ Script: <"
+ bonus bFlee2,8;
+ bonus bFlee,getrefine()*2;
+ if(BaseLevel>130) {
+ bonus bFlee2,2;
+ }
+ if(isequipped(15128)) {
+ bonus bDelayrate,-10;
+ bonus bFlee2,6;
+ if(BaseLevel>130) {
+ bonus bDelayrate,-10;
+ }
+ }
+ ">
+},
// New Two-handed Swords
// ===================================================================
{
@@ -124886,11 +125392,15 @@ item_db: (
Range: 1
Slots: 2
Job: 0x00004082
- Upper: 63
Loc: 34
WeaponLv: 4
EquipLv: 48
View: 3
+ Script: <"
+ bonus bCritical,30;
+ bonus bAspdRate,8;
+ bonus2 bAddEff2,Eff_Curse,10;
+ ">
},
{
Id: 21004
@@ -124908,13 +125418,13 @@ item_db: (
WeaponLv: 3
EquipLv: 100
View: 3
+ Script: <" bonus bAspd,(getrefine()/2); ">
},
{
Id: 21005
AegisName: "Metal_Two_Hand_Sword"
Name: "Metal Two-Handed Sword"
Type: 4
- Buy: 20
Atk: 95
Range: 1
Slots: 1
@@ -124923,6 +125433,89 @@ item_db: (
Loc: 34
WeaponLv: 3
View: 3
+ Trade: {
+ nodrop: true
+ notrade: true
+ noselltonpc: true
+ nocart: true
+ nogstorage: true
+ nomail: true
+ noauction: true
+ }
+ Script: <"
+ bonus bAtk,getrefine()*6;
+ bonus bMatk,getrefine()*2;
+ if(BaseLevel>20) {
+ bonus bAtk,min(((BaseLevel-20)/10)*5,120);
+ }
+ ">
+},
+{
+ Id: 21006
+ AegisName: "TE_WoE_Two-Handed_Sword"
+ Name: "TE WoE Two-Handed Sword"
+ Type: 4
+ Atk: 150
+ Range: 1
+ Job: 0x00004082
+ Loc: 34
+ WeaponLv: 3
+ EquipLv: 40
+ Refine: false
+ View: 3
+ Trade: {
+ nodrop: true
+ notrade: true
+ noselltonpc: true
+ nocart: true
+ nostorage: true
+ nogstorage: true
+ nomail: true
+ noauction: true
+ }
+ Script: <"
+ bonus2 bAddEff,Eff_Bleeding,300;
+ bonus2 bAddRace,RC_DemiHuman,40;
+ ">
+},
+{
+ Id: 21007
+ AegisName: "Heavy_Sword"
+ Name: "Heavy Sword"
+ Type: 4
+ Buy: 20
+ Weight: 2500
+ Atk: 330
+ Range: 1
+ Slots: 1
+ Job: 0x00004080
+ Loc: 34
+ WeaponLv: 1
+ EquipLv: 150
+ View: 3
+ Script: <"
+ bonus bStr,20;
+ ">
+},
+{
+ Id: 21008
+ AegisName: "Small_Karasuma"
+ Name: "Small Karasuma"
+ Type: 4
+ Buy: 20
+ Weight: 1000
+ Atk: 170
+ Range: 1
+ Slots: 2
+ Job: 0x00004082
+ Loc: 34
+ WeaponLv: 4
+ EquipLv: 50
+ View: 3
+ Script: <"
+ bonus bCritAtkRate,getrefine()*2;
+ bonus3 bAutoSpell,NPC_CRITICALWOUND,1,50;
+ ">
},
{
Id: 21009
@@ -124952,8 +125545,132 @@ item_db: (
OnUnequipScript: <" heal -1000,0; ">
},
{
+ Id: 21010
+ AegisName: "Evil_Slayer_Slasher_Sword"
+ Name: "Evil Slayer Slasher Sword"
+ Type: 4
+ Buy: 20
+ Weight: 2000
+ Atk: 225
+ Range: 1
+ Slots: 1
+ Job: 0x00004082
+ Upper: 56
+ Loc: 34
+ WeaponLv: 3
+ EquipLv: 100
+ View: 3
+ Script: <"
+ if(getrefine()>=9) {
+ bonus bAtkRate,5;
+ }
+ if(getrefine()>=12) {
+ bonus bAtkRate,7;
+ }
+ ">
+},
+{
+ Id: 21011
+ AegisName: "Gigantic_Blade"
+ Name: "Gigantic Blade"
+ Type: 4
+ Buy: 20
+ Weight: 5000
+ Atk: 300
+ Range: 1
+ Slots: 1
+ Job: 0x00004082
+ Upper: 56
+ Loc: 34
+ WeaponLv: 4
+ EquipLv: 130
+ View: 3
+ Script: <"
+ bonus bUnbreakableWeapon,0;
+ bonus bAspdRate,-5;
+ if(readparam(bStr)<=110) bonus bAtk,-250;
+ bonus bCritAtkRate,getrefine();
+ ">
+},
+{
+ Id: 21012
+ AegisName: "Mashirubeken"
+ Name: "Mashirubeken"
+ Type: 4
+ Buy: 20
+ Weight: 2200
+ Atk: 200
+ Matk: 150
+ Range: 1
+ Slots: 2
+ Job: 0x00000080
+ Upper: 56
+ Loc: 34
+ WeaponLv: 4
+ EquipLv: 110
+ View: 3
+ Script: <"
+ if(isequipped(4388)) bonus3 bAutoSpell,MG_SOULSTRIKE,5,20+(getequiprefinerycnt(EQI_HAND_R));
+ if(isequipped(4335)) bonus3 bAutoSpell,WZ_EARTHSPIKE,5,20+(getequiprefinerycnt(EQI_HAND_R));
+ if(isequipped(4345)) bonus3 bAutoSpell,MG_LIGHTNINGBOLT,5,20+(getequiprefinerycnt(EQI_HAND_R));
+ if(isequipped(4350)) bonus3 bAutoSpell,MG_COLDBOLT,5,20+(getequiprefinerycnt(EQI_HAND_R));
+ if(isequipped(4380)) bonus3 bAutoSpell,MG_FIREBOLT,5,20+(getequiprefinerycnt(EQI_HAND_R));
+ ">
+},
+{
+ Id: 21013
+ AegisName: "Companion_Cavalry_Sword"
+ Name: "Companion Cavalry Sword"
+ Type: 4
+ Buy: 20
+ Weight: 2200
+ Atk: 210
+ Range: 1
+ Slots: 2
+ Job: 0x00000080
+ Upper: 56
+ Loc: 34
+ WeaponLv: 4
+ EquipLv: 110
+ View: 3
+ Script: <"
+ bonus2 bSkillUseSP,KN_AUTOCOUNTER,-2;
+ bonus2 bSkillUseSP,LK_PARRYING,-25;
+ if(isequipped(4072)) {
+ bonus2 bSubSize,Size_Large,15;
+ bonus2 bSubSize,Size_Small,15;
+ }
+ ">
+},
+{
+ Id: 21014
+ AegisName: "Infinity_Two-Handed_Sword"
+ Name: "Infinity Two-Handed Sword"
+ Type: 4
+ Buy: 20
+ Weight: 500
+ Atk: 230
+ Range: 1
+ Slots: 1
+ Job: 0x00004082
+ Upper: 56
+ Loc: 34
+ WeaponLv: 4
+ EquipLv: 100
+ View: 3
+ Trade: {
+ nodrop: true
+ notrade: true
+ noselltonpc: true
+ nocart: true
+ nogstorage: true
+ nomail: true
+ noauction: true
+ }
+},
+{
Id: 21015
- AegisName: "Crimson_wo-Handed_Sword"
+ AegisName: "Crimson_Two-Handed_Sword"
Name: "Crimson Two-Handed Sword"
Type: 4
Buy: 20
@@ -124992,6 +125709,28 @@ item_db: (
">
},
{
+ Id: 21018
+ AegisName: "Lindy_Hop"
+ Name: "Lindy Hop"
+ Type: 4
+ Buy: 20
+ Weight: 3400
+ Atk: 340
+ Range: 1
+ Slots: 2
+ Job: 0x00004082
+ Upper: 56
+ Loc: 34
+ WeaponLv: 4
+ EquipLv: 170
+ View: 3
+ Script: <"
+ bonus bUnbreakableWeapon,0;
+ bonus bAtkRate,getrefine()/2;
+ bonus bAspdRate,getrefine();
+ ">
+},
+{
Id: 21019
AegisName: "Onimaru"
Name: "Onimaru"
@@ -125011,11 +125750,251 @@ item_db: (
if(readparam(bStr)>=95) bonus bAtk,40;
if(readparam(bStr)>=108) bonus bAtk,40;
if(readparam(bStr)>=120) bonus bAtk,40;
+ if(getrefine()>=7) {
+ bonus3 bAutoSpell,NPC_WIDECURSE,5,10;
+ }
+ if(getrefine()>=9) {
+ skill LK_BERSERK,1;
+ }
">
},
// New Shoes
// ===================================================================
{
+ Id: 22000
+ AegisName: "Temporal_Boots_of_STR"
+ Name: "Temporal Boots of STR"
+ Type: 5
+ Buy: 20
+ Weight: 600
+ Def: 25
+ Upper: 56
+ Loc: 64
+ EquipLv: 99
+ Script: <"
+ bonus bMaxHP,300+((getrefine()/3)*100);
+ bonus bMaxSP,30+((getrefine()/3)*10);
+ bonus bAtk,(getrefine()/3)*7;
+ if(readparam(bStr)>=120) bonus bAtk,50;
+ ">
+},
+{
+ Id: 22001
+ AegisName: "Temporal_Boots_of_INT"
+ Name: "Temporal Boots of INT"
+ Type: 5
+ Buy: 20
+ Weight: 600
+ Def: 20
+ Upper: 56
+ Loc: 64
+ EquipLv: 99
+ Script: <"
+ bonus bMdef,5;
+ bonus bMaxHP,300+((getrefine()/3)*100);
+ bonus bMaxSP,30+((getrefine()/3)*10);
+ bonus bMatk,(getrefine()/3)*10;
+ if(readparam(bInt)>=120) bonus bMatk,60;
+ ">
+},
+{
+ Id: 22002
+ AegisName: "Temporal_Boots_of_AGI"
+ Name: "Temporal Boots of AGI"
+ Type: 5
+ Buy: 20
+ Weight: 600
+ Def: 25
+ Upper: 56
+ Loc: 64
+ EquipLv: 99
+ Script: <"
+ bonus bMaxHP,300+((getrefine()/3)*100);
+ bonus bMaxSP,30+((getrefine()/3)*10);
+ bonus bAspdRate,(getrefine()/3)*3;
+ if(readparam(bAgi)>=120) bonus bAspd,1;
+ ">
+},
+{
+ Id: 22003
+ AegisName: "Temporal_Boots_of_VIT"
+ Name: "Temporal Boots of VIT"
+ Type: 5
+ Buy: 20
+ Weight: 600
+ Def: 25
+ Upper: 56
+ Loc: 64
+ EquipLv: 99
+ Script: <"
+ bonus bMaxHP,300+((getrefine()/3)*100);
+ bonus bMaxSP,30+((getrefine()/3)*10);
+ if(readparam(bVit)>=120) bonus bMaxHPrate,8;
+ ">
+},
+{
+ Id: 22004
+ AegisName: "Temporal_Boots_of_DEX"
+ Name: "Temporal Boots of DEX"
+ Type: 5
+ Buy: 20
+ Weight: 600
+ Def: 25
+ Upper: 56
+ Loc: 64
+ EquipLv: 99
+ Script: <"
+ bonus bMaxHP,300+((getrefine()/3)*100);
+ bonus bMaxSP,30+((getrefine()/3)*10);
+ bonus bDex,(getrefine()/3)*3;
+ if(readparam(bDex)>=120) {
+ bonus bFixedCast,-500;
+ bonus bLongAtkRate,5;
+ }
+ ">
+},
+{
+ Id: 22005
+ AegisName: "Temporal_Boots_of_LUK"
+ Name: "Temporal Boots of LUK"
+ Type: 5
+ Buy: 20
+ Weight: 600
+ Def: 20
+ Upper: 56
+ Loc: 64
+ EquipLv: 99
+ Script: <"
+ bonus bMdef,5;
+ bonus bMaxHP,300+((getrefine()/3)*100);
+ bonus bMaxSP,30+((getrefine()/3)*10);
+ bonus bCritAtkRate,getrefine()/3;
+ if(readparam(bLuk)>=120) {
+ bonus bCritAtkRate,30;
+ }
+ ">
+},
+{
+ Id: 22006
+ AegisName: "Temporal_Boots_of_STR_"
+ Name: "Temporal Boots of STR"
+ Type: 5
+ Buy: 20
+ Weight: 600
+ Def: 25
+ Slots: 1
+ Upper: 56
+ Loc: 64
+ EquipLv: 99
+ Script: <"
+ bonus bMaxHP,300+((getrefine()/3)*100);
+ bonus bMaxSP,30+((getrefine()/3)*10);
+ bonus bAtk,(getrefine()/3)*7;
+ if(readparam(bStr)>=120) bonus bAtk,50;
+ ">
+},
+{
+ Id: 22007
+ AegisName: "Temporal_Boots_of_INT_"
+ Name: "Temporal Boots of INT"
+ Type: 5
+ Buy: 20
+ Weight: 600
+ Def: 20
+ Slots: 1
+ Upper: 56
+ Loc: 64
+ EquipLv: 99
+ Script: <"
+ bonus bMdef,5;
+ bonus bMaxHP,300+((getrefine()/3)*100);
+ bonus bMaxSP,30+((getrefine()/3)*10);
+ bonus bMatk,(getrefine()/3)*10;
+ if(readparam(bInt)>=120) bonus bMatk,60;
+ ">
+},
+{
+ Id: 22008
+ AegisName: "Temporal_Boots_of_AGI_"
+ Name: "Temporal Boots of AGI"
+ Type: 5
+ Buy: 20
+ Weight: 600
+ Def: 25
+ Slots: 1
+ Upper: 56
+ Loc: 64
+ EquipLv: 99
+ Script: <"
+ bonus bMaxHP,300+((getrefine()/3)*100);
+ bonus bMaxSP,30+((getrefine()/3)*10);
+ bonus bAspdRate,(getrefine()/3)*3;
+ if(readparam(bAgi)>=120) bonus bAspd,1;
+ ">
+},
+{
+ Id: 22009
+ AegisName: "Temporal_Boots_of_VIT_"
+ Name: "Temporal Boots of VIT"
+ Type: 5
+ Buy: 20
+ Weight: 600
+ Def: 25
+ Slots: 1
+ Upper: 56
+ Loc: 64
+ EquipLv: 99
+ Script: <"
+ bonus bMaxHP,300+((getrefine()/3)*100);
+ bonus bMaxSP,30+((getrefine()/3)*10);
+ if(readparam(bVit)>=120) bonus bMaxHPrate,8;
+ ">
+},
+{
+ Id: 22010
+ AegisName: "Temporal_Boots_of_DEX_"
+ Name: "Temporal Boots of DEX"
+ Type: 5
+ Buy: 20
+ Weight: 600
+ Def: 25
+ Slots: 1
+ Upper: 56
+ Loc: 64
+ EquipLv: 99
+ Script: <"
+ bonus bMaxHP,300+((getrefine()/3)*100);
+ bonus bMaxSP,30+((getrefine()/3)*10);
+ bonus bDex,(getrefine()/3)*3;
+ if(readparam(bDex)>=120) {
+ bonus bFixedCast,-500;
+ bonus bLongAtkRate,5;
+ }
+ ">
+},
+{
+ Id: 22011
+ AegisName: "Temporal_Boots_of_LUK_"
+ Name: "Temporal Boots of LUK"
+ Type: 5
+ Buy: 20
+ Weight: 600
+ Def: 20
+ Slots: 1
+ Upper: 56
+ Loc: 64
+ EquipLv: 99
+ Script: <"
+ bonus bMdef,5;
+ bonus bMaxHP,300+((getrefine()/3)*100);
+ bonus bMaxSP,30+((getrefine()/3)*10);
+ bonus bCritAtkRate,getrefine()/3;
+ if(readparam(bLuk)>=120) {
+ bonus bCritAtkRate,30;
+ }
+ ">
+},
+{
Id: 22014
AegisName: "Enhanced_Variant_Shoes"
Name: "Enhanced Variant Shoes"
@@ -125408,6 +126387,14 @@ item_db: (
Upper: 63
},
{
+ Id: 22515
+ AegisName: "Twisted_Key_of_Time"
+ Name: "Twisted Key of Time"
+ Type: 3
+ Buy: 10
+ Weight: 300
+},
+{
Id: 22540
AegisName: "Runstone_Lux"
Name: "Lux Anima Rune"
diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt
index 43389ff67..a01e8f662 100644
--- a/npc/cities/prontera.txt
+++ b/npc/cities/prontera.txt
@@ -23,7 +23,7 @@
// Prontera
//============================================================
-prontera,160,330,0 script Guard#pront::prtguard 8W_SOLDIER,{
+prontera,160,330,4 script Guard#pront::prtguard 8W_SOLDIER,{
mes "[Prontera Guard]";
mes "Welcome to Prontera.";
close;
diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt
index 3f2c6870d..e9ea4ee0d 100644
--- a/npc/kafras/dts_warper.txt
+++ b/npc/kafras/dts_warper.txt
@@ -443,7 +443,7 @@ function script F_VoteKafra {
mes " ";
mes " ";
if ($DTS_KafraWins == 0) {
- mes "FF0000Toy Factory, Level 2^000000";
+ mes "^FF0000Toy Factory, Level 2^000000";
}
else if ($DTS_KafraWins == 1) {
mes "^FF0000Toy Factory, Level 2^000000";