Merge pull request #62 from wushin/Xmas-Annual

Annual Xmas Event

2 files changed, 20 insertions, 3 deletions

diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt
index 42227b27..75527618 100644
--- a/world/map/db/item_db.txt
+++ b/world/map/db/item_db.txt
@@ -420,9 +420,22 @@
 902,    BlueRoseHat,                    Blue Rose Hat,                      5,      5000,       1000,       0,          0,      1,      0,      8,      0,      2,      256,        0,      0,      0,      {},                                                                     {}
 903,    SlingShot,                      Sling Shot,                         4,      500,        50,         10,         5,      0,      3,      0,      0,      2,      34,         1,      1,      11,     {},                                                                     {set @LauncherType, AMMO_SLING; callfunc "CheckLauncher";}
 904,    SlingBullet,                    Sling Bullet,                       10,     1,          0,          1,          5,      0,      0,      0,      0,      2,      32768,      0,      0,      0,      {},                                                                     {set @AmmoType, AMMO_SLING; callfunc "CheckAmmo";}
-
 // Add new entries above here. For dyed entries, add to the bottom of the 2000s.
 
+1183,   AmberChristmasSweater,          Amber Christmas Sweater,            5,      2000,       1000,       35,         0,      6,      0,      -12,    0,      2,      512,        0,      0,      0,      {},                                                                     {}
+1184,   FunkyChristmasSweater,          Funky Christmas Sweater,            5,      2000,       1000,       35,         0,      6,      0,      -12,    0,      2,      512,        0,      0,      0,      {},                                                                     {}
+1185,   PinkChristmasSweater,           Pink Christmas Sweater,             5,      8000,       4000,       30,         0,      5,      0,      0,      0,      2,      512,        0,      0,      0,      {},                                                                     {}
+1186,   DarkChristmasSweater,           Dark Christmas Sweater,             5,      2000,       1000,       35,         0,      6,      0,      -12,    0,      2,      512,        0,      0,      0,      {},                                                                     {}
+1187,   BlueChristmasSweater,           Blue Christmas Sweater,             5,      8000,       4000,       30,         0,      5,      0,      0,      0,      2,      512,        0,      0,      0,      {},                                                                     {}
+1188,   RedStockings,                   Red Stockings,                      5,      7000,       2000,       10,         0,      1,      0,      2,      0,      2,      64,         0,      0,      0,      {},                                                                     {}
+1189,   PollettEgg,                     PollettEgg,                         0,      250,        25,         4,          0,      0,      0,      0,      0,      2,      0,          0,      0,      0,      {itemheal 75, 10;},                                                     {}
+1190,   NutcrackerHat,                  NutcrackerHat,                      5,      1000,       500,        20,         0,      5,      0,      2,      0,      2,      256,        0,      0,      0,      {},                                                                     {}
+1191,   WhiteWrap,                      White Wrap,                         3,      50,         25,         5,          0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
+1192,   YellowWrap,                     Yellow Wrap,                        3,      50,         25,         5,          0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
+1193,   BlueWrap,                       Blue Wrap,                          3,      50,         25,         5,          0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
+1194,   PurpleWrap,                     Purple Wrap,                        3,      50,         25,         5,          0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
+1195,   GreenWrap,                      Green Wrap,                         3,      50,         25,         5,          0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
+//1196, Open
 1197,   SkeletonCharm,                  Skeleton Charm,                     5,      0,          0,          10,         0,      0,      0,      0,      0,      2,      128,        0,      0,      0,      {},                                                                     { callfunc "CheckMunro"; }
 1198,   JackOSoul,                      Jack O Soul,                        3,      100000,     1,          1,          0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
 1199,   Arrow,                          Arrow,                              10,     2,          1,          1,          20,     0,      0,      0,      0,      2,      32768,      0,      0,      0,      {},                                                                     {set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";}
diff --git a/world/map/db/mob_db.txt b/world/map/db/mob_db.txt
index 8e336d48..663360e0 100644
--- a/world/map/db/mob_db.txt
+++ b/world/map/db/mob_db.txt
@@ -94,7 +94,7 @@
 1082,   Serqet,                 Serqet,                 10,     100,        0,      0,          2,      1,      10,     15,     0,      5,      1,      1,      1,      0,      15,     5,      1,      1,      1,      3,      20,     129,    2000,   1872,   672,    480,    0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0
 1083,   HuntsmanSpider,         HuntsmanSpider,         30,     1500,       0,      0,          363,    1,      125,    150,    10,     45,     20,     15,     10,     10,     45,     10,     1,      1,      1,      0,      45,     175,    575,    1250,   672,    480,    638,    100,        526,    500,    640,    300,    518,    1000,   719,    500,    0,      0,      0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      2,      30
 1084,   CrotcherScorpion,       CrotcherScorpion,       25,     1200,       0,      0,          86,     1,      75,     175,    15,     45,     15,     30,     10,     10,     25,     25,     1,      1,      1,      0,      45,     133,    750,    1350,   672,    480,    523,    300,        518,    1000,   509,    300,    512,    300,    535,    500,    0,      0,      0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      2,      30
-1085,   IceSkull,               IceSkull,               180,    5000,       0,      0,          412,    2,      75,     175,    35,     15,     30,     30,     20,     20,     25,     60,     1,      1,      1,      3,      21,     141,    600,    1600,   672,    480,    631,    1000,       4026,   5000,   0,      0,      0,      0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      2,      30
+1085,   IceSkull,               IceSkull,               180,    7000,       0,      0,          412,    2,      75,     400,    40,     15,     30,     30,     20,     20,     25,     34,     1,      1,      1,      3,      21,     141,    600,    1600,   672,    480,    632,    500,        510,    1000,   862,    5000,   648,    1000,   876,    35,     0,      0,      0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      2,      30
 1086,   FeyElement,             FeyElement,             50,     5000,       0,      12500,      901,    5,      50,     125,    25,     50,     20,     70,     10,     20,     80,     1,      1,      1,      1,      0,      84,     165,    330,    740,    672,    400,    834,    5000,       680,    1000,   680,    1000,   681,    1000,   681,    1000,   682,    1000,   682,    1000,       683,    1000,   0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      4,      50
 1087,   Larvern,                Larvern,                20,     550,        0,      0,          26,     1,      50,     200,    30,     65,     35,     20,     50,     0,      70,     20,     1,      1,      1,      0,      25,     139,    1500,   1500,   672,    480,    836,    2000,       518,    1000,   807,    300,    806,    300,    0,      0,      0,      0,      0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      2,      30
 1088,   Hyvern,                 Hyvern,                 40,     2250,       0,      0,          346,    1,      50,     125,    0,      10,     10,     45,     5,      0,      35,     35,     1,      1,      1,      0,      85,     133,    250,    800,    672,    480,    835,    2000,       518,    1000,   657,    600,    529,    3000,   0,      0,      0,      0,      0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      2,      30
@@ -103,7 +103,7 @@
 1091,   BlueSlime,              BlueSlime,              40,     2000,       0,      0,          77,     1,      100,    150,    20,     40,     40,     30,     50,     10,     50,     40,     1,      1,      1,      0,      61,     131,    1200,   1872,   672,    480,    4026,   200,        4005,   20,     501,    500,    862,    700,    863,    100,    864,    500,    0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      1,      20
 1092,   SlimeBlast,             SlimeBlast,             10,     100,        0,      0,          8,      1,      10,     10,     10,     10,     10,     10,     10,     10,     10,     10,     1,      1,      1,      0,      61,     175,    250,    1872,   672,    480,    0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      1,      20
 1093,   WhiteSlime,             WhiteSlime,             20,     200,        0,      0,          15,     1,      80,     120,    10,     10,     20,     30,     10,     10,     30,     20,     1,      1,      1,      0,      61,     137,    500,    1872,   672,    480,    4026,   200,        4002,   20,     541,    500,    863,    100,    864,    200,    0,      0,      0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      1,      20
-1094,   Reinboo,                Reinboo,                35,     1100,       0,      0,          29,     2,      40,     75,     35,     5,      15,     5,      15,     0,      40,     10,     2,      2,      1,      3,      20,     129,    600,    1872,   672,    480,    512,    1000,       736,    1200,   737,    1200,   738,    1200,   739,    1200,   869,    50,     0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      1,      30
+1094,   Reinboo,                Reinboo,                35,     1100,       0,      0,          29,     2,      40,     75,     35,     5,      15,     5,      15,     0,      40,     10,     2,      2,      1,      3,      20,     129,    600,    1872,   672,    480,    512,    1000,       736,    1200,   737,    1200,   738,    1200,   739,    1200,   869,    50,     4042,   10,         0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      1,      30
 1095,   WhiteBell,              WhiteBell,              1,      1,          0,      0,          1,      1,      0,      0,      1,      0,      0,      0,      0,      0,      0,      0,      1,      1,      1,      3,      22,     0,      800,    800,    672,    480,    861,    5000,       0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0
 1096,   SoulSnake,              SoulSnake,              115,    850,        0,      0,          56,     1,      75,     90,     4,      6,      20,     11,     10,     10,     35,     10,     1,      1,      1,      0,      20,     137,    900,    1300,   672,    480,    0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      2,      30
 1097,   SoulEater,              SoulEater,              90,     6800,       0,      0,          1467,   1,      129,    354,    12,     10,     35,     18,     3,      8,      71,     65,     1,      1,      1,      0,      29,     175,    340,    1800,   672,    950,    0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      2,      30
@@ -120,5 +120,9 @@
 1108,   AngryFireGoblin,        AngryFireGoblin,        30,     320,        0,      0,          4,      1,      25,     40,     0,      10,     3,      3,      3,      2,      10,     50,     1,      1,      1,      3,      23,     133,    800,    1872,   672,    480,    505,    800,        501,    150,    518,    800,    502,    150,    521,    70,     522,    10,     701,    500,        0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      2,      30
 1109,   AngrySeaSlime,          AngrySeaSlime,          80,     1200,       0,      0,          23,     1,      40,     70,     13,     17,     3,      30,     3,      0,      35,     35,     1,      1,      1,      0,      41,     135,    1500,   1872,   672,    480,    535,    800,        657,    800,    518,    500,    510,    1000,   700,    100,    1199,   5000,   568,    100,        541,    50,     0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0
 1110,   AngryGreenSlime,        AngryGreenSlime,        60,     1000,       0,      0,          126,    1,      100,    160,    20,     30,     20,     30,     10,     10,     30,     30,     1,      1,      1,      0,      21,     175,    1200,   1872,   672,    480,    502,    200,        4004,   20,     501,    100,    521,    250,    522,    200,    526,    500,    503,    500,        535,    750,    0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      1,      20
+1111,   CandiedSlime,           CandiedSlime,           50,     800,        0,      800,        250,    3,      50,     50,     20,     30,     20,     30,     10,     10,     30,     30,     1,      1,      1,      0,      21,     175,    1200,   1872,   672,    480,    510,    1000,       509,    1000,   515,    200,    516,    200,    538,    200,    512,    200,    508,    500,        514,    750,    0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      1,      20
+1112,   Santaboo,               Santaboo,               50,     2200,       0,      0,          150,    2,      80,     125,    50,     10,     25,     10,     25,     0,      60,     30,     2,      2,      1,      3,      20,     129,    600,    1872,   672,    480,    512,    1000,       736,    1200,   737,    1200,   738,    1200,   739,    1200,   511,    50,     4042,   10,         0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      1,      30
+1113,   Pollett,                Pollett,                30,     500,        0,      0,          7,      1,      6,      10,     1,      5,      1,      2,      1,      0,      20,     25,     1,      1,      1,      3,      20,     129,    800,    1600,   672,    480,    4026,   1000,       4023,   500,    700,    300,    862,    100,    0,      0,      0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      3,      40
+1114,   Nutcracker,             Nutcracker,             110,    6000,       0,      0,          1300,   1,      81,     281,    20,     42,     40,     20,     10,     5,      60,     40,     1,      1,      1,      0,      29,     133,    400,    872,    672,    900,    569,    1000,       660,    750,    539,    750,    503,    250,    640,    200,    4004,   200,    0,      0,          0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      2,      30,
 
 //ID,   Name,                   Jname,                  LV,     HP,         SP,     EXP,        JEXP,   Range1, ATK1,   ATK2,   DEF,    MDEF,   STR,    AGI,    VIT,    INT,    DEX,    LUK,    Range2, Range3, Scale,  Race,   Element,Mode,   Speed,  Adelay, Amotion,Dmotion,Drop1id,Drop1per,   Drop2id,Drop2%, Drop3id,Drop3%, Drop4id,Drop4%, Drop5id,Drop5%, Drop6id,Drop6%, Drop7id,Drop7%,     Drop8id,Drop8%, Item1,  Item2,  MEXP,   ExpPer, MVP1id, MVP1per,MVP2id, MVP2per,MVP3id, MVP3per,mutationcount,mutationstrength