summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-11 21:03:27 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-11 21:03:27 +0000
commit188800ba29ac8cabde802180d116b100150b5f0d (patch)
tree4a3a48500db58ae4b7fe4486d48410ab348b6e67
parent9010ae8400d4fdeb19e2ef6c4901b9e3530b2e01 (diff)
downloadhercules-188800ba29ac8cabde802180d116b100150b5f0d.tar.gz
hercules-188800ba29ac8cabde802180d116b100150b5f0d.tar.bz2
hercules-188800ba29ac8cabde802180d116b100150b5f0d.tar.xz
hercules-188800ba29ac8cabde802180d116b100150b5f0d.zip
* Added secret bonus of slotted Skull Ring
* Fixed two prices of Socket Enchant NPC git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11413 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/Changelog.txt1
-rw-r--r--db/item_db.txt2
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/merchants/socket_enchant.txt4
4 files changed, 5 insertions, 3 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index bade2df37..0c3928db9 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -34,6 +34,7 @@
=======================
10/11
+ * Added secret bonus of slotted Skull Ring [Playtester]
* Rev. 11411 Added all out-standing monsters to the Monster Database. (Poring stats) [L0ne_W0lf]
- Added Several G_-type monsters. (Events?) as well as WoE:SE monsters.
- Commented out ALL custom monsters from mob_db2, mob_skill_db2, and mob_avail.
diff --git a/db/item_db.txt b/db/item_db.txt
index befdf7046..5f9b5a1b7 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1361,7 +1361,7 @@
2712,Collector's_Edition_Book,Collector's Edition Book,5,,10,300,,0,,1,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus bAgi,3; bonus bVit,3; bonus bLuk,3; },{},{}
//
//
-2715,Skul_Ring_,Skull Ring,5,10000,,100,,0,,1,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{}
+2715,Skul_Ring_,Skull Ring,5,10000,,100,,0,,1,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus2 bSubRace,RC_Undead,1; },{},{}
2716,Librarian_Gloves,Librarian Gloves,5,,,100,,0,,1,0x00812200,7,2,136,,0,0,0,{ bonus MaxSP,20; if (getiteminfo(getequipid(EQI_HAND_R),11) == 15 && isequipped(2717)) bonus bInt,5; bonus bMaxHP,700; bonus bAspdRate,5; },{},{}
2717,Pocket_Watch,Pocket Watch,5,,,100,,0,,0,0x00010204,7,2,136,,80,0,0,{},{},{}
2718,Lunatic_Brooch,Lunatic Brooch,5,,,100,,0,,1,0x00080808,7,2,136,,65,0,0,{},{},{}
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index d07784021..dbf416f23 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
Date Added
======
2007/10/11
+ * Fixed two prices of Socket Enchant NPC [Playtester]
* Updated Veins Field spawns [Playtester]
2007/10/10
* Updated Socket Enchant NPC [Playtester]
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 107fabdf9..2fe09fb03 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -123,7 +123,7 @@ payon,140,151,5 script Seiyablem 84,{
{
case 1: callfunc "Func_Socket",2,1413,1418,40,51,1000,984,5,999,10; break;
case 2: callfunc "Func_Socket",2,1239,13016,40,51,1000,984,5,999,10; break;
- case 3: callfunc "Func_Socket",2,1230,13017,40,51,1000,984,5,999,10; break;
+ case 3: callfunc "Func_Socket",2,1230,13017,40,51,2000,984,5,999,10; break;
case 4: callfunc "Func_Socket",2,1236,13018,40,51,1000,984,5,999,10; break;
case 5: callfunc "Func_Socket",2,13002,13019,40,51,1000,984,5,999,10; break;
case 6: callfunc "Func_Socket",2,1135,13400,40,51,1000,984,5,999,10; break;
@@ -218,7 +218,7 @@ payon,140,151,5 script Seiyablem 84,{
case 15: callfunc "Func_Socket",1,2251,5158,40,61,400,985,1; break;
case 16: callfunc "Func_Socket",1,2246,5159,40,61,400,985,1; break;
case 17: callfunc "Func_Socket",1,2605,2625,40,61,400,985,1; break;
- case 18: callfunc "Func_Socket",1,2264,5167,40,61,400,985,1; break;
+ case 18: callfunc "Func_Socket",1,2264,5167,40,61,300,985,1; break;
case 19: callfunc "Func_Socket",1,2287,5350,40,61,500,985,1; break;
case 20: callfunc "Func_Socket",1,2425,2434,40,61,500,985,1; break;
}