Kaynağa Gözat

Corrected npc's name (warnings from emotion command) (#3388)

Atemo 6 yıl önce
ebeveyn
işleme
fce5919bce

+ 2 - 2
npc/re/cities/dewata.txt

@@ -701,7 +701,7 @@ OnTouch:
 	next;
 	mes "[Sweet Husband]";
 	mes "No matter how pretty the flower is, you are always more beautiful~";
-	emotion ET_CHUP, getnpcid(0, "Sweet Married Couple#dew1");
+	emotion ET_CHUP, getnpcid(0, "Sweet Married Couple#1");
 	next;
 	mes "[Sweet Wife]";
 	mes "Really? I'm that pretty? I love you, sweetie~";
@@ -710,7 +710,7 @@ OnTouch:
 	mes "[Sweet Married Couple]";
 	mes "Hahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahaha";
 	mes "Hohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohoho";
-	emotion ET_SMILE, getnpcid(0, "Sweet Married Couple#dew1");
+	emotion ET_SMILE, getnpcid(0, "Sweet Married Couple#1");
 	emotion ET_SMILE;
 	next;
 	mes "Come on now, this bores me. Let's move on.";

+ 1 - 1
npc/re/custom/lasagna/lasagna_npcs.txt

@@ -2411,7 +2411,7 @@ lasagna,140,250,3	script	The skittish fourth#wea	4_DR_F_01,{
 	close;
 }
 
-lasagna,140,245,3	script	The sensitive-minded el	4_CAT_SAILOR3,{
+lasagna,140,245,3	script	The sensitive-minded ela	4_CAT_SAILOR3,{
 	if (checkweight(1001,1) == 0) {
 		mes "- Hold on a second here!! -";
 		mes "- You have too many items. -";

+ 2 - 2
npc/re/other/dimensional_gap.txt

@@ -230,8 +230,8 @@ OnTimer39000:
 	npctalk "Right.. I should have entered with another group!", "Party Member#SHADOW";
 	end;
 OnTimer40500:
-	emotion ET_KIK, getnpcid(0, "Party Member#CRU::OnChat24");
-	npctalk "Hey. Are you pissed off?", "Party Member#CRU::OnChat24";
+	emotion ET_KIK, getnpcid(0, "Party Member#CRU");
+	npctalk "Hey. Are you pissed off?", "Party Member#CRU";
 	end;
 OnTimer42000:
 	npctalk "Not at all.", "Party Member#GUILL";

+ 2 - 2
npc/re/quests/quests_15_1.txt

@@ -6439,7 +6439,7 @@ lhz_in01,275,251,3	script	Luke Lapez#ep152i01	4_M_EDEN_GUARDER,{
 	cutin "",255;
 	npctalk "So much for the damn escort...", "Luke Lapez#ep152i01";
 	sleep 400;
-	emotion ET_FRET, getnpcid(0, "Commander Arquien#ep152");
+	emotion ET_FRET, getnpcid(0, "Commander Arquien#ep152i");
 	sleep 200;
 	emotion ET_THINK, getnpcid(0, "Luke Lapez#ep152i01");
 	end;
@@ -6535,7 +6535,7 @@ lhz_in01,270,257,4	script	Rekenber Chairman#e152i	4_M_REKENBER,{
 		mes "The time, that accident or whatever you call it.";
 		mes "When I found a seemingly artificial obstacle during the juperos excavation..";
 		mes "Ian suddenly disappeared.";
-		emotion ET_SURPRISE, getnpcid(0, "Commander Arquien#ep152");
+		emotion ET_SURPRISE, getnpcid(0, "Commander Arquien#ep152i");
 		next;
 		cutin "verus_ian01.bmp",2;
 		mes "[Ian Atnad]";

+ 1 - 1
npc/re/quests/quests_malangdo.txt

@@ -3491,7 +3491,7 @@ malangdo,125,147,3	script	Patrol Leader#ml	545,{
 	close;
 }
 
-malangdo,129,146,3	script	Crime Prevention Staff	545,{
+malangdo,129,146,3	script	Crime Prevention Staff#ml	545,{
 	if (malang_bad_guys > 11) {
 		mes "[Crime Prevention Staff]";
 		mes "A work to do means happy things!";