- Updated 'getinventorylist' to also return expire_time in the array @inventorylist_expire[]. (topic:243292)

- Updated SQL item/mob databases to latest.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14275 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 17 insertions, 15 deletions

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index e4160fc54..de0def790 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -2522,6 +2522,7 @@ recreate these items perfectly if they are destroyed. Here's what you get:
 @inventorylist_card3[]       inscribed on the items, so you can explicitly check
 @inventorylist_card4[]       if the character owns an item made by a specific 
                              craftsman.
+@inventorylist_expire[]    - expire time (Unix timestamp). 0 means never expires.
 @inventorylist_count       - the number of items in these lists.
 
 This could be handy to save/restore a character's inventory, since no other 
@@ -5605,7 +5606,7 @@ will be warped.
 This command can also keep track of who just got warped. It does this by setting 
 special variables:
 
-$@warpwaitingpc[] is an array containing the character id numbers of the 
+$@warpwaitingpc[] is an array containing the account_id numbers of the 
                   characters who were just warped.
 $@warpwaitingpcnum contains the number of the character it just warped.
 
diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql
index f280acc90..b1c895a62 100644
--- a/sql-files/item_db.sql
+++ b/sql-files/item_db.sql
@@ -554,7 +554,7 @@ REPLACE INTO `item_db` VALUES (1169,'Executioner_','Executioner',4,20,NULL,2200,
 REPLACE INTO `item_db` VALUES (1170,'Katzbalger','Katzbalger',4,20,NULL,2000,175,NULL,1,0,0x00004082,7,2,34,4,48,1,3,'bonus bVit,5; bonus bDef,10;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1171,'Zweihander_','Zweihander',4,20,NULL,2200,200,NULL,1,2,0x00004082,7,2,34,4,48,1,3,'bonus bUnbreakableWeapon,0;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1172,'Claymore_','Claymore',4,74000,NULL,2500,180,NULL,1,2,0x00004080,7,2,34,3,33,1,3,NULL,NULL,NULL);
-REPLACE INTO `item_db` VALUES (1173,'Muramasa_C','Refined Muramasa',4,1,NULL,0,204,NULL,1,0,0x00004082,7,2,34,4,1,0,3,'bonus bCritical,30; bonus bAspdRate,8; bonus2 bAddEff2,Eff_Curse,10;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (1173,'Muramasa_C','Refined Muramasa',4,1,NULL,0,204,NULL,1,0,0x00004082,7,2,34,4,1,0,3,'bonus bCritical,30; bonus bAspdRate,8;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1174,'Executioner_C','Refined Executioner',4,2,NULL,0,190,NULL,1,0,0x00004082,7,2,34,4,1,0,3,'bonus bIgnoreDefRace,RC_DemiHuman; bonus2 bAddRace,RC_DemiHuman,20; bonus2 bSubRace,RC_DemiHuman,-10; bonus bAtkEle,Ele_Dark;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1175,'Altas_Weapon','Blade of Atroce',4,20,NULL,2000,200,NULL,1,1,0x00004082,2,2,34,4,55,1,3,'bonus bCritical,10; if(readparam(bStr)>=80) bonus bBreakArmorRate,500;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1176,'Muscle_Cutter','Muscle Cutter',4,20,NULL,2200,160,NULL,1,2,0x00004082,2,2,34,4,55,1,3,'bonus2 bAddEff,Eff_Bleeding,800; bonus3 bAutoSpell,\"AL_DECAGI\",1,30;',NULL,NULL);
@@ -942,7 +942,7 @@ REPLACE INTO `item_db` VALUES (1724,'Dragon_Wing','Dragon Wing',4,20,NULL,1200,1
 REPLACE INTO `item_db` VALUES (1725,'Bow_Of_Minstrel','Minstrel Bow',4,20,NULL,1700,120,NULL,5,1,0x00080800,7,2,34,4,70,1,11,'bonus bInt,2; bonus bSPrecovRate,10;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1726,'Hunter_Bow_','Hunter Bow',4,64000,NULL,1500,125,NULL,5,1,0x00000800,7,2,34,3,33,1,11,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (1727,'Balistar_','Ballista',4,124000,NULL,3500,145,NULL,5,1,0x00080800,7,2,34,4,77,1,11,NULL,NULL,NULL);
-REPLACE INTO `item_db` VALUES (1728,'Balistar_C','Refined Ballista',4,1,NULL,0,194,NULL,5,0,0x00080800,7,2,34,4,1,0,11,NULL,NULL,NULL);
+REPLACE INTO `item_db` VALUES (1728,'Balistar_C','Refined Ballista',4,1,NULL,0,194,NULL,5,0,0x00080800,7,2,34,4,1,0,11,'bonus bLongAtkRate,20;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1729,'Bow_Of_Rudra_C','Refined Rudra Bow',4,2,NULL,0,185,NULL,5,0,0x000A0808,7,2,34,4,1,0,11,'bonus bAtkEle,Ele_Holy; bonus bInt,5; skill \"AL_CURE\",1; skill \"AL_HEAL\",1;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1730,'Burning_Bow','Burning Bow',4,20,NULL,1400,95,NULL,5,1,0x000A0808,7,2,34,3,55,1,11,'bonus2 bSubEle,Ele_Fire,10; if(isequipped(1752)) bonus bLongAtkRate,25;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1731,'Frozen_Bow','Freezing Bow',4,20,NULL,1400,100,NULL,5,1,0x000A0808,7,2,34,3,55,1,11,'bonus2 bAddEff,Eff_Freeze,1000; if(isequipped(1754)) bonus bLongAtkRate,25;',NULL,NULL);
@@ -1040,7 +1040,7 @@ REPLACE INTO `item_db` VALUES (1922,'Oriental_Lute_','Oriental Lute',4,20,NULL,1
 REPLACE INTO `item_db` VALUES (1923,'BF_Instrument1','Valorous Battlefield Guitar',4,0,NULL,0,50,NULL,1,0,0x00080000,7,1,2,3,80,1,13,'bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1924,'BF_Instrument2','Brave Battlefield Guitar',4,0,NULL,0,50,NULL,1,0,0x00080000,7,1,2,3,80,1,13,'bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bSkillAtk,\"CG_ARROWVULCAN\",20; bonus bUnbreakableWeapon,0;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1925,'Chello','Cello',4,20,NULL,700,110,NULL,1,3,0x00080000,2,1,002,3,70,1,13,'bonus bAgi,2; bonus bDex,3; bonus2 bAddSkillBlow,\"BA_MUSICALSTRIKE\",2; bonus2 bAddSkillBlow,\"CG_ARROWVULCAN\",3;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (1926,'Harp_Of_Nepenthes','Harp of Nepentis',4,20,NULL,1000,120,NULL,1,2,0x00080000,2,1,2,4,60,1,13,'bonus bInt,2; bonus3 bAddEffOnSkill,\"BA_MUSICALSTRIKE\",Eff_Stun,100; if( getrefine() >= 9 ) { bonus3 bAddEffOnSkill,\"BA_MUSICALSTRIKE\",Eff_Stun,200; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (1926,'Harp_Of_Nepenthes','Harp of Nepentis',4,20,NULL,1000,120,NULL,1,2,0x00080000,2,1,2,4,60,1,13,'bonus bInt,2; bonus3 bAddEffOnSkill,\"BA_MUSICALSTRIKE\",Eff_Stun,100; if( getrefine() > 9 ) { bonus3 bAddEffOnSkill,\"BA_MUSICALSTRIKE\",Eff_Stun,200; }',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1927,'Krieger_Instrument1','Glorious Guitar',4,0,NULL,0,50,NULL,1,0,0x00180000,7,1,2,4,80,1,13,'bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if(getrefine() > 5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-4)*(getrefine()-4); bonus2 bIgnoreDefRate,RC_DemiHuman,5; } if(getrefine() > 8) bonus4 bAutoSpellOnSkill,\"CG_ARROWVULCAN\",\"CG_TAROTCARD\",5,100;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1928,'Berserk_Guitar_I','Berserk Guitar',4,0,NULL,0,40,NULL,1,0,0x00080000,2,1,2,4,0,1,13,'bonus bAspdRate,100; bonus bHPrecovRate,-100; bonus2 bHPLossRate,50,5000; bonus bDex,-readparam(bDex);',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1929,'Guitar_C','Guitar',4,0,NULL,0,177,NULL,1,0,0x00080000,7,1,2,3,1,0,13,'bonus2 bAddSize,0,40; bonus2 bAddSize,1,40; bonus2 bAddSize,2,40;',NULL,NULL);
@@ -4522,7 +4522,7 @@ REPLACE INTO `item_db` VALUES (13033,'Assasin_Dagger_','Assassin Dagger',4,20,NU
 REPLACE INTO `item_db` VALUES (13034,'Twilight_Desert','Desert Twilight',4,20,NULL,600,130,NULL,1,2,0x00001000,2,2,2,2,70,1,1,'if (isequipped(13035)) { bonus bMaxSP,20; bonus bMaxHPRate,5; bonus bHit,10; bonus2 bAddSize,2,30; autobonus \"{ bonus bAspdRate,100; }\",1,7000,0,\"{ specialeffect2 EF_POTION_BERSERK; }\"; }',NULL,NULL);
 REPLACE INTO `item_db` VALUES (13035,'Sandstorm','Sandstorm',4,20,NULL,600,50,NULL,1,4,0x00001000,2,2,2,2,70,1,1,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (13036,'BF_Dagger1','Brave Assassin\'s Damascus',4,0,NULL,0,120,NULL,1,0,0x028F5EEF,7,2,2,3,80,1,1,'bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,75; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if (Class == Job_Ninja || Class == Job_Rogue || Class == Job_Stalker) bonus bMatkRate,15;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13037,'BF_Dagger2','Valorous Assassin\'s Damascus',4,0,NULL,0,120,NULL,1,0,0x029E7CEB,7,2,2,3,80,1,1,'bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bUnbreakableWeapon,0; autobonus \"{ bonus bDefRatioAtkRace,RC_NonBoss; }\",10,6000,BF_WEAPON,\"{ specialeffect2 EF_HASTEUP; }\"; if (Class == Job_Ninja || Class == Job_Rogue || Class == Job_Stalker) bonus bMatkRate,15;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (13037,'BF_Dagger2','Valorous Assassin\'s Damascus',4,0,NULL,0,120,NULL,1,0,0x029E7CEB,7,2,2,3,80,1,1,'bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bUnbreakableWeapon,0; autobonus \"{ bonus bDefRatioAtkRace,RC_Boss; bonus bDefRatioAtkRace,RC_NonBoss; }\",10,6000,BF_WEAPON,\"{ specialeffect2 EF_HASTEUP; }\"; if (Class == Job_Ninja || Class == Job_Rogue || Class == Job_Stalker) bonus bMatkRate,15;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (13038,'Dagger_Of_Hunter','Dagger of Hunter',4,20,NULL,700,120,NULL,1,3,0x00020000,2,2,2,3,70,1,1,'bonus bStr,1; bonus bAgi,2; bonus bDex,1; bonus4 bAutoSpellOnSkill,\"RG_BACKSTAP\",\"SM_BASH\",100,10; bonus2 bSkillAtk,\"RG_BACKSTAP\",20;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (13039,'Ivory_Knife','Ivory Knife',4,20,NULL,700,130,NULL,1,2,0x000F5EEE,2,2,2,3,50,1,1,'bonus bAgi,2; bonus bAspdRate,3; bonus2 bAddEff,Eff_Bleeding,300; bonus3 bAutoSpell,\"NPC_CRITICALWOUNDS\",1,30;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (13040,'N_Cutter','Novice Cutter',4,1,NULL,0,50,NULL,1,0,0xFE9F7EEF,7,2,2,1,1,0,1,NULL,NULL,NULL);
@@ -4615,7 +4615,7 @@ REPLACE INTO `item_db` VALUES (13403,'Solar_Sword_C','Refined Solar Sword',4,NUL
 REPLACE INTO `item_db` VALUES (13404,'Platinum_Shotel','Platinum Shotel',4,20,NULL,1500,130,NULL,1,1,0x000654E2,7,2,2,4,55,1,2,'bonus bCritical,50;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (13405,'Curved_Sword','Curved Blade',4,20,NULL,800,125,NULL,1,2,0x000654E2,7,2,2,4,55,1,2,'bonus bAspdRate,10; bonus2 bAddEff,Eff_Curse,300;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (13406,'Edger','Edger',4,20,NULL,0,120,NULL,1,0,0x000654E3,7,2,2,1,2,1,2,'bonus2 bAddRace,RC_Boss,50; bonus2 bAddRace,RC_NonBoss,50;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13407,'Nagan_C','Refined Nagan',4,NULL,NULL,0,148,NULL,1,0,0x000654E2,7,2,2,4,40,1,2,'bonus bDoubleRate,40; bonus2 bAddRace,RC_DemiHuman,5;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (13407,'Nagan_C','Refined Nagan',4,NULL,NULL,0,148,NULL,1,0,0x000654E2,7,2,2,4,40,1,2,'bonus bDoubleRate,25; bonus2 bAddRace,RC_DemiHuman,40;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (13408,'Fire_Brand_C','Refined Fireblend',4,NULL,NULL,0,120,NULL,1,0,0x000654E2,7,2,2,4,40,1,2,'bonus bAtkEle,Ele_Fire; bonus bInt,2; skill \"MG_FIREBOLT\",5; bonus3 bAutoSpell,\"MG_FIREBOLT\",5,100;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (13409,'Immaterial_Sword_C','Refined Immaterial Sword',4,NULL,NULL,0,160,NULL,1,0,0x000654E2,7,2,2,4,40,1,2,'bonus bAtkEle,Ele_Ghost; bonus2 bSPVanishRate,45,30; bonus bSPDrainValue,-1; bonus bUnbreakableWeapon,0;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (13410,'BF_Sword1','Valorous Gladiator Blade',4,0,NULL,0,115,NULL,1,0,0x000654E3,7,2,2,3,80,1,2,'bonus bStr,1; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,75; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0;',NULL,NULL);
diff --git a/sql-files/mob_db.sql b/sql-files/mob_db.sql
index 017168903..ece4e6bd0 100644
--- a/sql-files/mob_db.sql
+++ b/sql-files/mob_db.sql
@@ -463,10 +463,10 @@ REPLACE INTO `mob_db` VALUES (1391,'GALAPAGO','Galapago','Galapago',61,9145,0,32
 REPLACE INTO `mob_db` VALUES (1392,'ROTAR_ZAIRO','Rotar Zairo','Rotar Zairo',25,1209,0,351,215,10,109,137,4,34,1,62,45,26,55,5,10,12,2,0,44,0x2085,155,2416,2016,432,0,0,0,0,0,0,0,0,7126,500,2312,1,7053,1000,999,450,984,1,912,2500,910,5500,0,0,0,0,4192,1);
 REPLACE INTO `mob_db` VALUES (1393,'G_MUMMY','Mummy','Mummy',37,5176,0,0,0,1,305,360,0,10,28,19,32,0,63,20,10,12,1,1,49,0x3885,300,1772,72,384,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);
 REPLACE INTO `mob_db` VALUES (1394,'G_ZOMBIE','Zombie','Zombie',15,534,0,0,0,1,67,79,0,10,1,8,7,0,15,0,10,12,1,1,29,0x3885,400,2612,912,288,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);
-REPLACE INTO `mob_db` VALUES (1395,'CRYSTAL_1','Wind Crystal','Wind Crystal',1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,665,4900,5097,7000,532,6500,558,5000,607,200,0,0,0,0);
-REPLACE INTO `mob_db` VALUES (1396,'CRYSTAL_2','Earth Crystal','Earth Crystal',1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,667,4900,5097,7000,531,6500,558,5000,608,250,0,0,0,0);
-REPLACE INTO `mob_db` VALUES (1397,'CRYSTAL_3','Fire Crystal','Fire Crystal',1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,664,4900,5097,7000,534,6500,558,5000,604,300,0,0,0,0);
-REPLACE INTO `mob_db` VALUES (1398,'CRYSTAL_4','Water Crystal','Water Crystal',1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,666,4900,5097,7000,533,6500,558,5000,603,100,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1395,'CRYSTAL_1','Wind Crystal','Wind Crystal',1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,665,4900,5097,7000,532,6500,558,5000,607,200,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1396,'CRYSTAL_2','Earth Crystal','Earth Crystal',1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,667,4900,5097,7000,531,6500,558,5000,608,250,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1397,'CRYSTAL_3','Fire Crystal','Fire Crystal',1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,664,4900,5097,7000,534,6500,558,5000,604,300,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1398,'CRYSTAL_4','Water Crystal','Water Crystal',1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,666,4900,5097,7000,533,6500,558,5000,603,100,0,0,0,0);
 REPLACE INTO `mob_db` VALUES (1399,'EVENT_BAPHO','Baphomet','Baphomet',68,1264000,0,87250,27895,3,1847,2267,35,45,1,152,96,85,120,95,10,12,2,6,67,0x37B5,130,768,768,576,43625,10000,607,5500,526,5000,732,5000,1417,550,1306,680,1145,480,2110,640,2327,1500,2111,500,2621,1720,2256,1550,0,0,0,0);
 REPLACE INTO `mob_db` VALUES (1400,'KARAKASA','Karakasa','Karakasa',30,3092,0,489,322,1,141,183,1,5,1,45,12,20,49,60,10,12,1,0,60,0x81,155,1638,2016,576,0,0,0,0,0,0,0,0,7151,5000,7150,4268,1019,3200,7111,2200,912,4074,746,30,13012,5,0,0,0,0,4286,1);
 REPLACE INTO `mob_db` VALUES (1401,'SHINOBI','Shinobi','Shinobi',69,12700,0,4970,3010,2,460,1410,34,21,85,85,25,25,100,100,10,12,1,7,67,0x3695,150,1003,1152,336,0,0,0,0,0,0,0,0,7156,5335,2337,2,7053,2200,2654,100,2336,1,7157,2000,13013,5,0,0,0,0,4230,1);
@@ -978,7 +978,7 @@ REPLACE INTO `mob_db` VALUES (1873,'BEELZEBUB','Beelzebub','Beelzebub',98,666666
 REPLACE INTO `mob_db` VALUES (1874,'BEELZEBUB_','Beelzebub','Beelzebub',98,6666666,0,6666666,6666666,2,10000,13410,40,40,6,110,200,250,166,66,10,12,2,6,88,0x37B5,100,212,504,432,3333333,10000,607,5500,617,5000,617,5000,7754,9000,2423,2000,1565,2000,2000,2000,2702,2000,985,5432,742,5500,0,0,0,0,4145,1);
 REPLACE INTO `mob_db` VALUES (1875,'TRISTAN_3RD','Tristan III','Dead King',80,43000,0,1,1,2,1366,1626,25,30,5,10,10,69,70,1,10,12,1,1,89,0x3695,175,1816,1152,360,0,0,0,0,0,0,0,0,7754,9000,938,9000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
 REPLACE INTO `mob_db` VALUES (1876,'E_LORD_OF_DEATH','Lord of the Dead','Lord of the Dead',99,99000000,0,131343,43345,3,3430,4232,75,73,120,120,120,169,150,106,10,12,2,6,67,0x37B5,180,1446,1296,360,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);
-REPLACE INTO `mob_db` VALUES (1877,'CRYSTAL_5','Crystal','Crystal',1,15,0,0,0,0,0,10,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,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,0,0,0);
+REPLACE INTO `mob_db` VALUES (1877,'CRYSTAL_5','Crystal','Crystal',1,15,0,0,0,0,0,10,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,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,0,0,0);
 REPLACE INTO `mob_db` VALUES (1878,'E_SHINING_PLANT','Shining Plant','Shining Plant',1,20,0,0,0,1,1,1,100,99,0,0,0,0,0,90,7,12,0,3,26,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,7864,3000,906,1500,511,500,507,2000,508,1500,914,500,0,0,0,0,0,0,0,0);
 REPLACE INTO `mob_db` VALUES (1879,'ECLIPSE_P','Eclipse Pet','Eclipse',6,1800,0,0,0,1,20,26,0,40,1,36,6,0,11,80,10,12,1,2,60,0x37B5,200,1456,456,336,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);
 #  Moscovia monsters
@@ -1058,10 +1058,10 @@ REPLACE INTO `mob_db` VALUES (1948,'G_YGNIZEM','Ygnizem','Egnigem Cenia',58,1120
 REPLACE INTO `mob_db` VALUES (1949,'B_S_GUARDIAN_','Camp Guardian','Camp Guardian',86,152533,0,0,0,2,7590,1550,60,33,110,40,54,65,125,65,14,16,2,7,80,0x20A5,170,140,384,288,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);
 REPLACE INTO `mob_db` VALUES (1950,'B_B_GUARDIAN_','Camp Guardian','Camp Guardian',80,80404,0,0,0,12,1840,680,40,62,95,80,33,90,165,55,14,16,2,7,80,0x20A5,170,76,384,288,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);
 #  Ravies Sister's 'Valyrie's Gift' monsters.
-REPLACE INTO `mob_db` VALUES (1951,'CRYSTAL_6','Crystal','Crystal',1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,665,4900,0,0,532,6500,558,5000,607,200,0,0,0,0);
-REPLACE INTO `mob_db` VALUES (1952,'CRYSTAL_7','Crystal','Crystal',1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,667,4900,0,0,531,6500,558,5000,608,250,0,0,0,0);
-REPLACE INTO `mob_db` VALUES (1953,'CRYSTAL_8','Crystal','Crystal',1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,664,4900,0,0,534,6500,558,5000,604,300,0,0,0,0);
-REPLACE INTO `mob_db` VALUES (1954,'CRYSTAL_9','Crystal','Crystal',1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,666,4900,0,0,533,6500,558,5000,603,100,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1951,'CRYSTAL_6','Crystal','Crystal',1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,665,4900,0,0,532,6500,558,5000,607,200,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1952,'CRYSTAL_7','Crystal','Crystal',1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,667,4900,0,0,531,6500,558,5000,608,250,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1953,'CRYSTAL_8','Crystal','Crystal',1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,664,4900,0,0,534,6500,558,5000,604,300,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1954,'CRYSTAL_9','Crystal','Crystal',1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,666,4900,0,0,533,6500,558,5000,603,100,0,0,0,0);
 #  ?
 REPLACE INTO `mob_db` VALUES (1955,'TREASURE_BOX_I','Treasure Chest','Treasure Chest',1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,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);
 #  Endless Tower
diff --git a/src/map/script.c b/src/map/script.c
index 640fa6bdb..a8f024deb 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -10504,6 +10504,7 @@ BUILDIN_FUNC(getinventorylist)
 				sprintf(card_var, "@inventorylist_card%d",k+1);
 				pc_setreg(sd,add_str(card_var)+(j<<24),sd->status.inventory[i].card[k]);
 			}
+			pc_setreg(sd,add_str("@inventorylist_expire")+(j<<24),sd->status.inventory[i].expire_time);
 			j++;
 		}
 	}