Added all the shop keeper scripts in Ul'dah. Fixed some broken populace scripts. Changed .ini files, wrong default. Fixed a syntax error in CommandProcessor.cs.

FFXIVClassic Map Server/CommandProcessor.cs

@@ -88,7 +88,7 @@ namespace FFXIVClassic_Map_Server
             if (cmd.Any())
             {
                 // if client isnt null, take player to be the player actor
-                var player = client?.GetActor();
+                var player = client.GetActor();
 
                 if (cmd.Equals("help"))
                 {

data/lobby_config.ini

@@ -1,5 +1,5 @@
 [General]
-server_ip=192.168.0.2
+server_ip=127.0.0.1
 showtimestamp = true
 
 [Database]
@@ -8,4 +8,4 @@ host=127.0.0.1
 port=3306
 database=ffxiv_server
 username=root
-password=root
+password=

data/map_config.ini

@@ -1,5 +1,5 @@
 [General]
-server_ip=192.168.0.2
+server_ip=127.0.0.1
 showtimestamp = true
 
 [Database]
@@ -8,4 +8,4 @@ host=127.0.0.1
 port=3306
 database=ffxiv_server
 username=root
-password=root
+password=

data/scripts/base/chara/npc/object/BookShelf.lua

@@ -5,6 +5,6 @@ function init(npc)
 end
 
 function onEventStarted(player, npc, triggerName)
-	player:callClientFunction(player, "bookTalk");
+	callClientFunction(player, "bookTalk");
 	player:EndEvent();
 end

data/scripts/base/chara/npc/object/MateriaBook.lua

@@ -1,11 +1,10 @@
+require ("global")
+
 function init(npc)
 	return false, false, 0, 0;	
 end
 
 function onEventStarted(player, npc, triggerName)
-	player:RunEventFunction("materiabookTalk");
+	callClientFunction(player, "materiabookTalk");
-end
-
-function onEventUpdate(player, npc, step, menuOptionSelected)
 	player:EndEvent();
 end

data/scripts/base/chara/npc/object/ObjectItemStorage.lua

@@ -1,10 +1,11 @@
+require ("global")
+
 function init(npc)
 	return false, false, 0, 0;	
 end
 
 function onEventStarted(player, npc, triggerName)	
-	player:EndEvent();
-end
 	
-function onEventUpdate(player, npc)
+	player:EndEvent();
+	
 end

data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua

@@ -42,48 +42,116 @@ function onEventStarted(player, npc, triggerName)
 	callClientFunction(player, "welcomeTalk", shopInfo.welcomeText, player);	
 	
 	while (true) do
-		choice = callClientFunction(player, "selectMode", 1);
+	
+		tutorialId = -8;
+		
+		if (shopInfo.tutorialId ~= nil) then
+			tutorialAskMode = shopInfo.tutorialId;
+		end
+	
+		if (shopInfo.selectMode == nil or shopInfo.selectMode == 0) then
+			choice = callClientFunction(player, "selectMode", tutorialId);
+		elseif (shopInfo.selectMode == 1) then
+			choice = callClientFunction(player, "selectModeOfClassVendor");
+		elseif (shopInfo.selectMode == 2) then
+			choice = callClientFunction(player, "selectModeOfMultiWeaponVendor", tutorialId);
+		elseif (shopInfo.selectMode == 3) then
+			choice = callClientFunction(player, "selectModeOfMultiArmorVendor", tutorialId);
+		end
 				
 		if (choice == nil) then
 			break;	
-		elseif (choice == 1) then
-			callClientFunction(player, "openShopBuy", player, shopInfo.shopPack, shopInfo.shopCurrancy);
-			
-			while (true) do		
-				buyResult = callClientFunction(player, "selectShopBuy", player);
-				
-				if (buyResult == 0) then
-					callClientFunction(player, "closeShopBuy", player);					
-					break;
-				else
-					player:SendMessage(0x20, "", "Player bought a thing at slot " .. tostring(buyResult)..".");
-				end
-				
-			end
-			
-		elseif (choice == 2) then
-			callClientFunction(player, "openShopSell", player);
-
-			while (true) do		
-				sellResult = callClientFunction(player, "selectShopSell", player);
-				
-				if (sellResult == nil) then
-					callClientFunction(player, "closeShopSell", player);					
-					break;
-				else
-					player:SendMessage(0x20, "", "Player sold a thing at slot " .. tostring(sellResult)..".");
-				end
-				
-			end
-		elseif (choice == 3) then
-			callClientFunction(player, "selectFacility", 2, 35, 3);
-			callClientFunction(player, "confirmUseFacility", player, 35);			
-		elseif (choice == 4) then
-			callClientFunction(player, "startTutorial", nil, 29);			
 		end
+		
+		if (shopInfo.selectMode == nil or shopInfo.selectMode == 0) then
+			processNormalShop(player, choice);
+		elseif (shopInfo.selectMode == 1) then
+			processNormalShop(player, choice);
+		elseif (shopInfo.selectMode == 2) then
+			processMultiShop(player, choice);
+		elseif (shopInfo.selectMode == 3) then
+			processMultiShop(player, choice);
+		end
+		
 	end
 	
 	callClientFunction(player, "finishTalkTurn", player);
 	player:EndEvent();
 	
 end
+
+function processNormalShop(player, choice)
+	if (choice == 1) then
+		callClientFunction(player, "openShopBuy", player, shopInfo.shopPack, shopInfo.shopCurrancy);
+		
+		while (true) do		
+			buyResult = callClientFunction(player, "selectShopBuy", player);
+			
+			if (buyResult == 0) then
+				callClientFunction(player, "closeShopBuy", player);					
+				break;
+			else
+				player:SendMessage(0x20, "", "Player bought a thing at slot " .. tostring(buyResult)..".");
+			end
+			
+		end		
+	elseif (choice == 2) then
+		callClientFunction(player, "openShopSell", player);
+
+		while (true) do		
+			sellResult = callClientFunction(player, "selectShopSell", player);
+			
+			if (sellResult == nil) then
+				callClientFunction(player, "closeShopSell", player);					
+				break;
+			else
+				player:SendMessage(0x20, "", "Player sold a thing at slot " .. tostring(sellResult)..".");
+			end
+			
+		end
+	elseif (choice == 3) then
+		callClientFunction(player, "selectFacility", 2, 35, 3);
+		callClientFunction(player, "confirmUseFacility", player, 35);			
+	elseif (choice == 4) then
+		callClientFunction(player, "startTutorial", nil, shopInfo.classAskMode);			
+	end	
+end
+
+function processMultiShop(player, choice, sellType)
+
+	if (choice >= 1 and choice <= 4) then
+		callClientFunction(player, "openShopBuy", player, shopInfo.shopPack[choice], shopInfo.shopCurrancy);
+		
+		while (true) do		
+			buyResult = callClientFunction(player, "selectShopBuy", player);
+			
+			if (buyResult == 0) then
+				callClientFunction(player, "closeShopBuy", player);					
+				break;
+			else
+				player:SendMessage(0x20, "", "Player bought a thing at slot " .. tostring(buyResult)..".");
+			end
+			
+		end		
+	elseif (choice == 5) then
+		callClientFunction(player, "openShopSell", player);
+
+		while (true) do		
+			sellResult = callClientFunction(player, "selectShopSell", player);
+			
+			if (sellResult == nil) then
+				callClientFunction(player, "closeShopSell", player);					
+				break;
+			else
+				player:SendMessage(0x20, "", "Player sold a thing at slot " .. tostring(sellResult)..".");
+			end
+			
+		end
+	elseif (choice == 6) then
+		callClientFunction(player, "selectFacility", 2, 35, 3);
+		callClientFunction(player, "confirmUseFacility", player, 35);			
+	elseif (choice == 7) then
+		callClientFunction(player, "startTutorial", nil, shopInfo.classAskMode);			
+	end
+	
+end

data/scripts/unique/wil0Town01/PopulaceShopSalesman/allenaure.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 97,
+shopPack = 3010
+}

data/scripts/unique/wil0Town01/PopulaceShopSalesman/barryn.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 100,
+shopPack = 3013
+}

data/scripts/unique/wil0Town01/PopulaceShopSalesman/doesdornn.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 99,
+shopPack = 3012
+}

data/scripts/unique/wil0Town01/PopulaceShopSalesman/elgiva.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 98,
+shopPack = 3011
+}

data/scripts/unique/wil0Town01/PopulaceShopSalesman/eormengild.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 106,
+shopPack = 3007	
+}

data/scripts/unique/wil0Town01/PopulaceShopSalesman/etgar.lua

@@ -0,0 +1,7 @@
+
+shopInfo = {
+selectMode = 2,
+welcomeText = 281,
+shopPack = {5001, 5002, 5007, 5008},
+tutorialId = -1
+}

data/scripts/unique/wil0Town01/PopulaceShopSalesman/fabrellet.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 84,
+shopPack = 3018
+}

data/scripts/unique/wil0Town01/PopulaceShopSalesman/ganelon.lua

@@ -0,0 +1,7 @@
+
+shopInfo = {
+selectMode = 3,
+welcomeText = 281,
+shopPack = {5004, 5005, 5006, 5003},
+tutorialId = -1
+}

data/scripts/unique/wil0Town01/PopulaceShopSalesman/gugudi.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 103,
+shopPack = 3015
+}

data/scripts/unique/wil0Town01/PopulaceShopSalesman/helena.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 102,
+shopPack = 3016
+}

data/scripts/unique/wil0Town01/PopulaceShopSalesman/johannes.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 104,
+shopPack = 3017
+}

data/scripts/unique/wil0Town01/PopulaceShopSalesman/pimelle.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 112,
+shopPack = 3001	
+}

data/scripts/unique/wil0Town01/PopulaceShopSalesman/psonjha.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 96,
+shopPack = 3009
+}

data/scripts/unique/wil0Town01/PopulaceShopSalesman/quiloud.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 105,
+shopPack = 3004
+}

data/scripts/unique/wil0Town01/PopulaceShopSalesman/roserette.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 108,
+shopPack = 3006
+}

data/scripts/unique/wil0Town01/PopulaceShopSalesman/tataroga.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 101,
+shopPack = 3014
+}

data/scripts/unique/wil0Town01/PopulaceShopSalesman/wawapo.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 237,
+shopPack = 3023
+}

data/scripts/unique/wil0Town01/PopulaceShopSalesman/wysslorh.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 109,
+shopPack = 3005
+}

data/scripts/unique/wil0Town01a/PopulaceShopSalesman/jemimi.lua

@@ -0,0 +1,6 @@
+
+shopInfo = {
+welcomeText = 69,
+shopPack = 3020,
+tutorialId = 35
+}

data/scripts/unique/wil0Town01a/PopulaceShopSalesman/norbettaux.lua

@@ -0,0 +1,6 @@
+
+shopInfo = {
+welcomeText = 64,
+shopPack = 3021,
+tutorialId = 34
+}

data/scripts/unique/wil0Town01a/PopulaceShopSalesman/nortmoen.lua

@@ -0,0 +1,6 @@
+
+shopInfo = {
+welcomeText = 76,
+shopPack = 3022,
+tutorialId = 39
+}

data/scripts/unique/wil0Town01a/PopulaceShopSalesman/pamisolaux.lua

@@ -0,0 +1,6 @@
+
+shopInfo = {
+welcomeText = 54,
+shopPack = 3019,
+tutorialId = 32
+}

data/scripts/unique/wil0Town01a/PopulaceShopSalesman/waeksatz.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 265,
+shopPack = 3024	
+}

data/scripts/unique/wil0Town01a/PopulaceShopSalesman/wnhalki.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 111,
+shopPack = 3003
+}

data/scripts/unique/wil0Town01a/PopulaceShopSalesman/zagylswerd.lua

@@ -0,0 +1,5 @@
+
+shopInfo = {
+welcomeText = 110,
+shopPack = 3002	
+}