Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Atemo 2018-08-05 00:00:11 +02:00 committed by GitHub
parent 7593ae52dd
commit fce5919bce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
npc/re/cities/dewata.txt
View File

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

2
npc/re/custom/lasagna/lasagna_npcs.txt
View File

@ -2411,7 +2411,7 @@ lasagna,140,250,3 script The skittish fourth#wea 4_DR_F_01,{
close; 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) { if (checkweight(1001,1) == 0) {
mes "- Hold on a second here!! -"; mes "- Hold on a second here!! -";
mes "- You have too many items. -"; mes "- You have too many items. -";

4
npc/re/other/dimensional_gap.txt
View File

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

4
npc/re/quests/quests_15_1.txt
View File

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

2
npc/re/quests/quests_malangdo.txt
View File

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