summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------client-data0
-rw-r--r--world/map/db/const-aegis.txt1
-rw-r--r--world/map/db/item_db.conf34
-rw-r--r--world/map/db/item_db_head.txt21
4 files changed, 44 insertions, 12 deletions
diff --git a/client-data b/client-data
-Subproject d23f1a66e3005d211705b1f0ec4fd64253596c6
+Subproject 5b4960fa424bc5d180658d783ca561345deea72
diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt
index 63f7e01e..46ba2b98 100644
--- a/world/map/db/const-aegis.txt
+++ b/world/map/db/const-aegis.txt
@@ -719,6 +719,7 @@ YellowRoseHat 900
OrangeRoseHat 901
BlueRoseHat 902
BucketHat 905
+ImperialHelmet 911
TamOShanter 1173
CashiersShade 1174
AutumnMask 1175
diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf
index da175bca..f5835675 100644
--- a/world/map/db/item_db.conf
+++ b/world/map/db/item_db.conf
@@ -11572,10 +11572,10 @@ item_db: (
bonus bMatkRate, -52; // @EVOL2
bonus bDoubleAddRate, 20;
bonus bStr, 10;
- bonus bCritical, 15;
+ bonus bCritical, 8;
bonus bAspdRate, 10;
bonus bDef2Rate, -39;
- bonus bHit, -15;
+ bonus bHit, -10;
">
},
{
@@ -11867,6 +11867,36 @@ item_db: (
ViewSprite: 905
},
{
+ Id: 911
+ AegisName: "ImperialHelmet"
+ Name: "ImperialHelmet"
+ Type: "IT_ARMOR"
+ Buy: 90000
+ Sell: 45000
+ Weight: 1300
+ Matk: -52
+ Def: 25
+ Slots: 0
+ Loc: "EQP_HEAD_TOP"
+ EquipLv: 90
+ Refine: false
+ ViewSprite: 911
+ OnEquipScript: <"
+ callfunc "RequireStat", bStr, 70, EQI_HEAD_TOP;
+ callfunc "RequireStat", bVit, 50, EQI_HEAD_TOP;
+ callfunc "RequireStat", bLuk, 50, EQI_HEAD_TOP;
+ ">
+ Script: <"
+ bonus bMatkRate, -52; // @EVOL2
+ bonus bPerfectHitRate, 5;
+ bonus bDoubleAddRate, 5;
+ bonus bStr, 5;
+ bonus bCriticalDef 5;
+ bonus bMdef, 5;
+ bonus bAspdRate, 5;
+ ">
+},
+{
Id: 1173
AegisName: "TamOShanter"
Name: "TamOShanter"
diff --git a/world/map/db/item_db_head.txt b/world/map/db/item_db_head.txt
index 7bee1014..11632cdb 100644
--- a/world/map/db/item_db_head.txt
+++ b/world/map/db/item_db_head.txt
@@ -59,7 +59,7 @@
854, ElfNightcap, 5, 1000, 500, 50, 0, 3, 0, 5, 0, 2, 256, 0, 0, 0, 0, {}, {}
855, Sunglasses, 5, 1000, 500, 10, 0, 2, 0, 6, 0, 2, 256, 0, 0, 0, 0, {}, {}
856, KnitCap, 5, 1000, 500, 50, 0, 3, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {}
-877, BullHelmet, 5, 90000, 45000, 1300, 0, 19, 0, -52, 0, 2, 256, 0, 90, 0, 0, {}, {set @bStat, Str; set @minbStatVal, 70; callfunc "RequireStat"; set @bStat, Vit; set @minbStatVal, 50; callfunc "RequireStat"; set @bStat, Luk; set @minbStatVal, 50; callfunc "RequireStat"; bonus bDoubleAddRate, 20; bonus bStr, 10; bonus bCritical, 15; bonus bAspdRate, 10; bonus bDef2Rate, -39; bonus bHit, -15;}
+877, BullHelmet, 5, 90000, 45000, 1300, 0, 19, 0, -52, 0, 2, 256, 0, 90, 0, 0, {}, {set @bStat, Str; set @minbStatVal, 70; callfunc "RequireStat"; set @bStat, Vit; set @minbStatVal, 50; callfunc "RequireStat"; set @bStat, Luk; set @minbStatVal, 50; callfunc "RequireStat"; bonus bDoubleAddRate, 20; bonus bStr, 10; bonus bCritical, 8; bonus bAspdRate, 10; bonus bDef2Rate, -39; bonus bHit, -10;}
882, RedEggshellHat, 5, 7000, 3500, 15, 0, 9, 0, 0, 0, 2, 256, 0, 1, 0, 0, {}, {bonus bMdef, 3;}
883, BlueEggshellHat, 5, 7000, 3500, 15, 0, 9, 0, 0, 0, 2, 256, 0, 1, 0, 0, {}, {bonus bMdef, 3;}
884, YellowEggshellHat, 5, 7000, 3500, 15, 0, 9, 0, 0, 0, 2, 256, 0, 1, 0, 0, {}, {bonus bMdef, 3;}
@@ -78,14 +78,15 @@
902, BlueRoseHat, 5, 5000, 1000, 0, 0, 1, 0, 8, 0, 2, 256, 0, 0, 0, 0, {}, {}
905, BucketHat, 5, 1600, 800, 20, 0, 5, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {}
909, LeprechaunHead, 5, 10000, 5000, 100, 0, 10, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bLuk, 3;}
+911, ImperialHelmet, 5, 90000, 45000, 1300, 0, 25, 0, -52, 0, 2, 256, 0, 90, 0, 0, {}, {set @bStat, Str; set @minbStatVal, 70; callfunc "RequireStat"; set @bStat, Vit; set @minbStatVal, 50; callfunc "RequireStat"; set @bStat, Luk; set @minbStatVal, 50; callfunc "RequireStat"; bonus bPerfectHitRate, 5; bonus bDoubleAddRate, 5; bonus bStr, 5; bonus bCriticalDef 5; bonus bMdef, 5; bonus bAspdRate, 5;}
1173, TamOShanter, 5, 5000, 500, 20, 0, 9, 0, -2, 0, 2, 256, 0, 0, 0, 0, {}, {}
1174, CashiersShade, 5, 4000, 500, 15, 0, 2, 0, -10, 0, 2, 256, 0, 0, 0, 0, {}, {}
1175, AutumnMask, 5, 5000, 500, 10, 0, 1, 0, 4, 0, 2, 256, 0, 0, 0, 0, {}, {}
1190, NutcrackerHat, 5, 1000, 500, 20, 0, 5, 0, 2, 0, 2, 256, 0, 0, 0, 0, {}, {}
1196, Beret, 5, 1000, 500, 20, 0, 3, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bAgi, 2;}
1203, RangerHat, 5, 1000, 500, 20, 0, 2, 0, -1, 0, 2, 256, 0, 0, 0, 0, {}, {}
-1204, AntlerHat, 5, 1000, 500, 15, 0, 4, 0, 2, 0, 2, 256, 0, 0, 0, 0, {}, {}
//ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript}
+1204, AntlerHat, 5, 1000, 500, 15, 0, 4, 0, 2, 0, 2, 256, 0, 0, 0, 0, {}, {}
1205, ChristmasTreeHat, 5, 2000, 1000, 20, 0, 2, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {}
1206, SantaBeardHat, 5, 1000, 500, 20, 0, 5, 0, 2, 0, 2, 256, 0, 0, 0, 0, {}, {}
1214, BunnyEars, 5, 5000, 2000, 20, 0, 10, 0, 1, 0, 2, 256, 0, 0, 0, 0, {}, {}
@@ -105,8 +106,8 @@
1278, WitchHat, 5, 1000, 500, 50, 0, 5, 0, 5, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bInt, 3;}
1279, GoblinMask, 5, 1000, 500, 50, 0, 3, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {}
2130, RedDesertHat, 5, 2400, 600, 20, 0, 3, 0, -1, 0, 2, 256, 0, 0, 0, 0, {}, {}
-2131, GreenDesertHat, 5, 2400, 600, 20, 0, 3, 0, -1, 0, 2, 256, 0, 0, 0, 0, {}, {}
//ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript}
+2131, GreenDesertHat, 5, 2400, 600, 20, 0, 3, 0, -1, 0, 2, 256, 0, 0, 0, 0, {}, {}
2132, DarkBlueDesertHat, 5, 2400, 600, 20, 0, 3, 0, -1, 0, 2, 256, 0, 0, 0, 0, {}, {}
2133, YellowDesertHat, 5, 2400, 600, 20, 0, 3, 0, -1, 0, 2, 256, 0, 0, 0, 0, {}, {}
2134, LightBlueDesertHat, 5, 2400, 600, 20, 0, 3, 0, -1, 0, 2, 256, 0, 0, 0, 0, {}, {}
@@ -126,8 +127,8 @@
2148, PurpleCottonHeadband, 5, 3000, 500, 5, 0, 2, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {}
2149, DarkGreenCottonHeadband,5, 3000, 500, 5, 0, 2, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {}
2190, RedRabbitEars, 5, 7000, 3500, 15, 0, 5, 0, 4, 0, 2, 256, 0, 1, 0, 0, {}, {}
-2191, GreenRabbitEars, 5, 7000, 3500, 15, 0, 5, 0, 4, 0, 2, 256, 0, 1, 0, 0, {}, {}
//ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript}
+2191, GreenRabbitEars, 5, 7000, 3500, 15, 0, 5, 0, 4, 0, 2, 256, 0, 1, 0, 0, {}, {}
2192, DarkBlueRabbitEars, 5, 7000, 3500, 15, 0, 5, 0, 4, 0, 2, 256, 0, 1, 0, 0, {}, {}
2193, YellowRabbitEars, 5, 7000, 3500, 15, 0, 5, 0, 4, 0, 2, 256, 0, 1, 0, 0, {}, {}
2194, LightBlueRabbitEars, 5, 7000, 3500, 15, 0, 5, 0, 4, 0, 2, 256, 0, 1, 0, 0, {}, {}
@@ -147,8 +148,8 @@
2208, PurpleWizardHat, 5, 5000, 2500, 20, 0, 5, 0, 5, 0, 2, 256, 0, 1, 0, 0, {}, {bonus bInt, 3;}
2209, DarkGreenWizardHat, 5, 5000, 2500, 20, 0, 5, 0, 5, 0, 2, 256, 0, 1, 0, 0, {}, {bonus bInt, 3;}
2210, RedBowlerHat, 5, 2500, 1250, 30, 0, 10, 0, 2, 0, 2, 256, 0, 0, 0, 0, {}, {}
-2211, GreenBowlerHat, 5, 2500, 1250, 30, 0, 10, 0, 2, 0, 2, 256, 0, 0, 0, 0, {}, {}
//ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript}
+2211, GreenBowlerHat, 5, 2500, 1250, 30, 0, 10, 0, 2, 0, 2, 256, 0, 0, 0, 0, {}, {}
2212, DarkBlueBowlerHat, 5, 2500, 1250, 30, 0, 10, 0, 2, 0, 2, 256, 0, 0, 0, 0, {}, {}
2213, YellowBowlerHat, 5, 2500, 1250, 30, 0, 10, 0, 2, 0, 2, 256, 0, 0, 0, 0, {}, {}
2214, LightBlueBowlerHat, 5, 2500, 1250, 30, 0, 10, 0, 2, 0, 2, 256, 0, 0, 0, 0, {}, {}
@@ -168,8 +169,8 @@
2238, PurpleBowlerHatBrown, 5, 2500, 1250, 30, 0, 10, 0, 2, 0, 2, 256, 0, 0, 0, 0, {}, {}
2239, DarkGreenBowlerHatBrown,5, 2500, 1250, 30, 0, 10, 0, 2, 0, 2, 256, 0, 0, 0, 0, {}, {}
2260, RedBeret, 5, 1000, 500, 20, 0, 3, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bAgi, 2;}
-2261, GreenBeret, 5, 1000, 500, 20, 0, 3, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bAgi, 2;}
//ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript}
+2261, GreenBeret, 5, 1000, 500, 20, 0, 3, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bAgi, 2;}
2262, DarkBlueBeret, 5, 1000, 500, 20, 0, 3, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bAgi, 2;}
2263, YellowBeret, 5, 1000, 500, 20, 0, 3, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bAgi, 2;}
2264, LightBlueBeret, 5, 1000, 500, 20, 0, 3, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bAgi, 2;}
@@ -189,8 +190,8 @@
4030, BowlerHat, 5, 2500, 1250, 30, 0, 10, 0, 2, 0, 2, 256, 0, 0, 0, 0, {}, {}
4031, Monocle, 5, 5000, 2500, 20, 0, 2, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bDex, 1; bonus bLuk, 1; bonus bCritical, 10;}
4032, PanHat, 5, 1000, 500, 400, 0, 13, 0, -20, 0, 2, 256, 0, 0, 0, 0, {}, {}
-4033, ChefHat, 5, 1000, 500, 30, 0, 2, 0, 2, 0, 2, 256, 0, 0, 0, 0, {}, {}
//ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript}
+4033, ChefHat, 5, 1000, 500, 30, 0, 2, 0, 2, 0, 2, 256, 0, 0, 0, 0, {}, {}
4042, RedNose, 5, 4000, 1000, 4, 0, 2, 0, 7, 0, 2, 256, 0, 0, 0, 0, {}, {}
5128, DarkHelm, 5, 50000, 10000, 800, 0, 19, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bMaxHPrate, 10; bonus bHPrecovRate, 10; bonus bInt, -Int;}
5129, UnderworldMask, 5, 50000, 10000, 100, 0, 5, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {callfunc "UnderworldTroll"; bonus bAtkRange, 2; bonus bInt, -Int; bonus bAgi, 3; bonus bDex, 2;}
@@ -210,8 +211,8 @@
5231, RedPresentHat, 5, 1000, 1, 60, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {}
5232, GreenPresentHat, 5, 1000, 1, 60, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {}
5233, BluePresentHat, 5, 1000, 1, 60, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {}
-5234, YellowPresentHat, 5, 1000, 1, 60, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {}
//ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript}
+5234, YellowPresentHat, 5, 1000, 1, 60, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {}
5238, AFKCap, 5, 1000, 1, 60, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {}
5239, Aureole, 5, 1000, 1, 60, 0, 0, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bFlee, 50;}
5240, SmileyCap, 5, 1000, 1, 60, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {}
@@ -231,8 +232,8 @@
5259, BlinkingEvilHalloween, 5, 10000, 5000, 50, 0, 13, 0, 10, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bMdef, 5;}
5262, MovieCap, 5, 1000, 500, 50, 0, 3, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {}
5264, BlueWolfHelmet, 5, 1000, 500, 50, 0, 3, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {}
-5266, CloverHat, 5, 1000, 500, 50, 0, 5, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bLuk, 1;}
//ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript}
+5266, CloverHat, 5, 1000, 500, 50, 0, 5, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bLuk, 1;}
5267, AssassinMask, 5, 30000, 3000, 10, 0, 0, 0, -5, 0, 2, 256, 0, 0, 0, 0, {}, {callfunc "BrawlingItem"; bonus bMdef, 5; bonus bAgi, 9; bonus bDex, 1; bonus bMaxHP, 70; bonus bCritical, 15; bonus bAspdRate, 15; bonus bDoubleAddRate, 15;}
5280, LeprechaunHat, 5, 1600, 800, 20, 0, 5, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bLuk, 1;}
5281, PartyHatR, 5, 1600, 800, 20, 0, 5, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {}
@@ -252,5 +253,5 @@
5401, YellowHeadSlime, 5, 10000, 5000, 250, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bHPrecovRate, 7; bonus bMdef, 7; bonus bHit, -7;}
5402, RedHeadSlime, 5, 10000, 5000, 250, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bHPrecovRate, 7; bonus bMdef, 7; bonus bHit, -7;}
5403, GreenHeadSlime, 5, 10000, 5000, 250, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bHPrecovRate, 7; bonus bMdef, 7; bonus bHit, -7;}
-5404, BlueHeadSlime, 5, 10000, 5000, 250, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bHPrecovRate, 7; bonus bMdef, 7; bonus bHit, -7;}
//ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript}
+5404, BlueHeadSlime, 5, 10000, 5000, 250, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bHPrecovRate, 7; bonus bMdef, 7; bonus bHit, -7;}