Merge branch 'master' of gitorious.org:tmw-eathena-data/mainline

12 files changed, 34 insertions, 6 deletions

diff --git a/data/001-4.wlk b/data/001-4.wlk
new file mode 100644
index 00000000..0a762e12
--- /dev/null
+++ b/data/001-4.wlk
diff --git a/data/resnametable.txt b/data/resnametable.txt
index 5a055e85..2a144dc8 100644
--- a/data/resnametable.txt
+++ b/data/resnametable.txt
@@ -1,6 +1,7 @@
 001-1.gat#001-1.wlk#
 001-2.gat#001-2.wlk#
 001-3.gat#001-3.wlk#
+001-4.gat#001-4.wlk#
 002-1.gat#002-1.wlk#
 002-2.gat#002-2.wlk#
 002-3.gat#002-3.wlk#
diff --git a/db/item_db.txt b/db/item_db.txt
index 34ca19e0..88c1f51c 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -262,7 +262,7 @@
 1217,	CatEars,			Cat Ears,			5,	100,	50,	2,	,	1,	,	1,	0,	2,	256,	,	0,	0,	{},					{ bonus bAgi, 3; }					
 1218,	PaperBag,			Paper Bag,			5,	1000,	5,	1,	,	1,	,	-1,	0,	2,	256,	,	0,	0,	{},					{ bonus bAgi, -1; }					
 1219,	MoubootaurHead,			Moubootaur Head,		5,	10,	1,	20,	,	1,	,	0,	0,	2,	256,	,	0,	0,	{},					{}										
-1220,	Parsley,			Bunch of Parsley,		5,	3,	1,	1,	,	1,	,	0,	0,	2,	256,	,	0,	0,	{},					{ bonus bDeaf, 1; }										
+1220,	BunchOfParsley,			Bunch of Parsley,		5,	3,	1,	1,	,	1,	,	0,	0,	2,	256,	,	0,	0,	{},					{ bonus bDeaf, 1; }										
 																																						
 2050,	RedCottonShirt,			Red Cotton Shirt,		5,	10,	5,	100,	,	2,	,	-4,	0,	2,	512,	,	0,	0,	{},					{}										
 2051,	GreenCottonShirt,		Green Cotton Shirt,		5,	10,	5,	100,	,	2,	,	-4,	0,	2,	512,	,	0,	0,	{},					{}										
diff --git a/news.txt b/news.txt
index 4b01b82a..0cedbce4 100644
--- a/news.txt
+++ b/news.txt
@@ -1,3 +1,14 @@
+##3 Magic Fixes
+##3 2009-09-15
+ 
+##0 The second tier healing spell no longer works on
+##0 yourself, it will still take mana if you try to
+##0 cast it on dead players. We're working to fix
+##0 that. It will halt health regeneration when used.
+ 
+##0 Making lifestones now prioritizes bug legs, then
+##0 maggot slime, then the herbs.
+ 
 ##3 Technical updates
 ##3 2009-08-16
  
diff --git a/npc/001-1_Tulimshar/_warps.txt b/npc/001-1_Tulimshar/_warps.txt
index 751b0df8..ec36a41b 100644
--- a/npc/001-1_Tulimshar/_warps.txt
+++ b/npc/001-1_Tulimshar/_warps.txt
@@ -4,4 +4,4 @@
 001-1.gat,44,20	warp	toCentralTulimshar	3,-1,021-1.gat,55,145
 001-1.gat,125,20	warp	toCentralTulimshar	0,-1,021-1.gat,136,146
 001-1.gat,32,71	warp	ToInn	-1,-1,001-2.gat,25,34
-001-1.gat,75,41	warp	ToHouse	-1,-1,001-2.gat,71,72
+001-1.gat,75,41	warp	ToHouse	-1,-1,001-4.gat,71,72
diff --git a/npc/001-2_Tulimshar/_import.txt b/npc/001-2_Tulimshar/_import.txt
index 99123cba..6b8f78b6 100644
--- a/npc/001-2_Tulimshar/_import.txt
+++ b/npc/001-2_Tulimshar/_import.txt
@@ -2,7 +2,6 @@ map: 001-2.gat
 npc: npc/001-2_Tulimshar/_mobs.txt
 npc: npc/001-2_Tulimshar/_warps.txt
 npc: npc/001-2_Tulimshar/casino.txt
-npc: npc/001-2_Tulimshar/omar.txt
 npc: npc/001-2_Tulimshar/phaet.txt
 npc: npc/001-2_Tulimshar/shops.txt
 npc: npc/001-2_Tulimshar/troupe_leader.txt
diff --git a/npc/001-4_Omars_house/_import.txt b/npc/001-4_Omars_house/_import.txt
new file mode 100644
index 00000000..2a2d618c
--- /dev/null
+++ b/npc/001-4_Omars_house/_import.txt
@@ -0,0 +1,4 @@
+map: 001-4.gat
+npc: npc/001-4_Omars_house/_warps.txt
+npc: npc/001-4_Omars_house/omar.txt
+npc: npc/001-4_Omars_house/dedication.txt
diff --git a/npc/001-4_Omars_house/_warps.txt b/npc/001-4_Omars_house/_warps.txt
new file mode 100644
index 00000000..2f29349e
--- /dev/null
+++ b/npc/001-4_Omars_house/_warps.txt
@@ -0,0 +1,3 @@
+// 001-4 Omar's house warps
+
+001-4.gat,71,73	warp	ToOutdoor	-1,-1,001-1.gat,75,42
diff --git a/npc/001-4_Omars_house/dedication.txt b/npc/001-4_Omars_house/dedication.txt
new file mode 100644
index 00000000..edb0e388
--- /dev/null
+++ b/npc/001-4_Omars_house/dedication.txt
@@ -0,0 +1,9 @@
+// Dedication to Irene Christina
+
+001-4.gat,76,68,0	script	#IreneDedication	127,{
+	mes "~ Irene Christina ~";
+	mes "The song in this house is dedicated to Irene.";
+	mes "";
+	mes "She had seen only twenty hours of this world when she died in her father's arms.";
+	close;
+};
diff --git a/npc/001-2_Tulimshar/omar.txt b/npc/001-4_Omars_house/omar.txt
index 4f75574e..a6ac2277 100644
--- a/npc/001-2_Tulimshar/omar.txt
+++ b/npc/001-4_Omars_house/omar.txt
@@ -23,7 +23,7 @@ function	script	KadiyaSubquestConsts	{
 }
 
 
-001-2.gat,70,60,0	script	Omar	162,{
+001-4.gat,70,60,0	script	Omar	162,{
         callfunc "ElanoreFix";
 	callfunc "KadiyaSubquestConsts";
 
@@ -184,7 +184,7 @@ S_update_var:
 }
 
 
-001-2.gat,76,59,0	script	_______Kadiya	174,{
+001-4.gat,76,59,0	script	_______Kadiya	174,{
         callfunc "ElanoreFix";
         set @Q_MASK, NIBBLE_3_MASK;
         set @Q_SHIFT, NIBBLE_3_SHIFT;
diff --git a/npc/021-1_Tulimshar/bakery.txt b/npc/021-1_Tulimshar/bakery.txt
index 0cdb83ee..d7ca399f 100644
--- a/npc/021-1_Tulimshar/bakery.txt
+++ b/npc/021-1_Tulimshar/bakery.txt
@@ -7,7 +7,7 @@
 	mes "\"This bakery is the best!\"";
 	close;
 
-OnTimer60000:
+OnTimer300000:
 	npctalk "Come to the bakery!";
 	setnpctimer 0;
 	end;
diff --git a/npc/_import.txt b/npc/_import.txt
index 403fb447..624cac46 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -1,6 +1,7 @@
 import: npc/001-1_Tulimshar/_import.txt
 import: npc/001-2_Tulimshar/_import.txt
 import: npc/001-3_Tulimshar_arena/_import.txt
+import: npc/001-4_Omars_house/_import.txt
 import: npc/002-1_Sandstorm/_import.txt
 import: npc/002-3_Desert_mines/_import.txt
 import: npc/002-4_Desert_mines/_import.txt