Merge pull request #10 from DarkstarProject/master

12/11 pull
DarkstarProject · Dec 11, 2014 · 3e3ab76 · 3e3ab76
2 parents 6d0edcc + 61a8025
commit 3e3ab76
Show file tree

Hide file tree

Showing 163 changed files with 2,004 additions and 2,297 deletions.
diff --git a/scripts/globals/bluemagic.lua b/scripts/globals/bluemagic.lua
@@ -80,7 +80,7 @@ function BluePhysicalSpell(caster, target, spell, params)
     -- Calculate the final D value  -
     ---------------------------------
     -- worked out from http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage
-    -- Final D value = floor(D+fSTR+WSC) * Multiplier
+    -- Final D value ??= floor(D+fSTR+WSC) * Multiplier
 
     local D =  math.floor((magicskill * 0.11)) * 2 + 3;
     -- cap D

diff --git a/scripts/globals/conquest.lua b/scripts/globals/conquest.lua
@@ -586,7 +586,7 @@ switch (region): caseof {
   ---------------------------------
 	--print("RONFAURE");
 
-	local Doladepaiton = 17187538;
+	local Doladepaiton = 17187539;
 
 	npc  = {
 	--
@@ -679,7 +679,7 @@ switch (region): caseof {
   ---------------------------------
 	--print("GUSTABERG");
 
-	local Ennigreaud = 17212055;
+	local Ennigreaud = 17212056;
 
 	npc  = {
 	--
@@ -741,7 +741,7 @@ switch (region): caseof {
   ---------------------------------
 	--print("SARUTABARUTA");
 
-	local Naguipeillont = 17248838;
+	local Naguipeillont = 17248839;
 
 	npc  = {
 	--
@@ -834,7 +834,7 @@ switch (region): caseof {
   ---------------------------------
 	--print("FAUREGANDI");
 
-	local Parledaire = 17232201;
+	local Parledaire = 17232205;
 
 	npc  = {
 	--
@@ -865,7 +865,7 @@ switch (region): caseof {
   ---------------------------------
 	--print("VALDEAUNIA");
 
-	local Jeantelas = 17236282;
+	local Jeantelas = 17236286;
 
 	npc  = {
 	--
@@ -896,7 +896,7 @@ switch (region): caseof {
   ---------------------------------
 	--print("QUFIMISLAND");
 
-	local Pitoire = 17293706;
+	local Pitoire = 17293707;
 
 	npc  = {
 	--
@@ -927,7 +927,7 @@ switch (region): caseof {
   ---------------------------------
 	--print("LITELOR");
 
-	local Credaurion = 17273361;
+	local Credaurion = 17273362;
 
 	npc  = {
 	--

diff --git a/scripts/globals/excavation.lua b/scripts/globals/excavation.lua
@@ -15,7 +15,7 @@ require("scripts/globals/settings");
 
 -- Zone, {npcid,npcid,npcid,..}
 local npcid = {7,{16806337,16806338,16806339,16806340,16806341,16806342},    -- Attohwa Chasm
-		 68,{17056228,17056229,17056230},							   -- Aydeewa Subterrane
+		 68,{17056223,17056223,17056223},							   -- Aydeewa Subterrane
 		 117,{17257045,17257046,17257047,17257048,17257049,17257050},  -- Tahrongi Canyon
 		 173,{17486248,17486249,17486250,17486251,17486252,17486253},  -- Korroloka Tunnel
 		 198,{17588769,17588770,17588771,17588772,17588773,17588774}}; -- Maze of Shakhrami

diff --git a/scripts/globals/harvesting.lua b/scripts/globals/harvesting.lua
@@ -18,7 +18,7 @@ local npcid = {51,{16986711,16986712,16986713,16986714,16986715,16986716},  -- W
 		 52,{16990602,16990603,16990604,16990605,16990606,16990607},   -- Bhaflau Thickets
 		 89,{17142543,17142544,17142545,17142546,17142547,17142548},   -- Grauberg [S]
 		 95,{17167161,17167162,17167163,17167164,17167165,17167166},   -- West Sarutabaruta [S]
-		 115,{17248853,17248854,17248855,17248856,17248857,17248858},  -- West Sarutabaruta
+		 115,{17248854,17248855,17248856,17248857,17248858,17248859},  -- West Sarutabaruta
 		 123,{17281620,17281621,17281622},							   -- Yuhtunga Jungle
 		 124,{17285672,17285673,17285674},							   -- Yhoator Jungle
 		 145,{17371604,17371605,17371606,17371607,17371608,17371609}}; -- Giddeus

diff --git a/scripts/globals/logging.lua b/scripts/globals/logging.lua
@@ -13,15 +13,15 @@ require("scripts/globals/status");
 -------------------------------------------------
 
 -- Zone, {npcid,npcid,npcid,..}
-local npcid = {2,{16785765,16785766,16785767,16785768},				  -- Carpenter's Landing
+local npcid = {2,{16785768,16785769,16785770,16785771},				  -- Carpenter's Landing
 		 24,{16875845,16875846,16875847,16875848,16875849,16875850},  -- Lufaise Meadows
 		 25,{16879961,16879962,16879963,16879964,16879965,16879966},  -- Misareaux Coast
 		 65,{17044009,17044010,17044011,17044012,17044013,17044014},  -- Mamook
 		 79,{17101310,17101311,17101312,17101313,17101314,17101315},  -- Caedarva Mire
 		 81,{17109781,17109782,17109783,17109784,17109785,17109786},  -- East Ronfaure [S]
 		 82,{17113900,17113901,17113902,17113903,17113904,17113905},  -- Jugner Forest [S]
 		 96,{17171238,17171239,17171240,17171241,17171242,17171243},  -- Fort Karugo-Narugo [S]
-		 101,{17191521,17191522,17191523,17191524,17191525,17191526}, -- East Ronfaure
+		 101,{17191522,17191522,17191524,17191524,17191526,17191527}, -- East Ronfaure
 		 104,{17203855,17203856,17203857,17203858,17203859,17203860}, -- Jugner Forest
 		 118,{17261166,17261167,17261168,17261169,17261170,17261171}, -- Buburimu Peninsula
 		 123,{17281614,17281615,17281616,17281617,17281618,17281619}, -- Yuhtunga Jungle