From 7906708766f64e80a3e8840f6d920f2d9a58fc1d Mon Sep 17 00:00:00 2001 From: brianluau Date: Fri, 8 Jan 2010 19:18:27 +0000 Subject: - Fixed a typo in Orc's Memory. - Fixed a weight check in quests_13_1. - Fixed some grouping variables in the sample PCRE npc. - Updated SQL item/mob databases to latest. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14216 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/instances/OrcsMemory.txt | 2 +- npc/quests/quests_13_1.txt | 4 ++-- npc/sample/npc_pcre.txt | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'npc') diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt index d9ca429cf..81b50b758 100644 --- a/npc/instances/OrcsMemory.txt +++ b/npc/instances/OrcsMemory.txt @@ -223,7 +223,7 @@ gef_fild10,238,202,6 script Mad Scientist#orc 865,{ } else if (mad < 1) { mes "[Mad Scientist]"; - mes "Haha, no Orcs are coming neat me!"; + mes "Haha, no Orcs are coming near me!"; mes "The power of the Dimensional Gorge is undefeatable!!"; next; switch(select("Orcs don't attack you?:You wish!")) { diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 57fd32017..4715f79ac 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -15637,8 +15637,8 @@ que_job01,82,95,3 script Bar Master#moc2_01 46,{ } } case 2: - set now_weight,-; - if (now_weight < 2000) { + set .@now_weight,MaxWeight-Weight; + if (.@now_weight < 2000) { mes "[Karred]"; mes "Are you sure you can even hold a glass of alcohol?"; mes "You're carrying too many things on you already."; diff --git a/npc/sample/npc_pcre.txt b/npc/sample/npc_pcre.txt index ba44099c8..906e076e3 100644 --- a/npc/sample/npc_pcre.txt +++ b/npc/sample/npc_pcre.txt @@ -235,8 +235,8 @@ Lquote27: // I can't Lquote28: switch(rand(2)) { - case 0: npctalk "Maybe you could "+$@p2$+" now"; break; - case 1: npctalk "What if you could "+$@p2$+" ?"; break; + case 0: npctalk "Maybe you could "+$@p3$+" now"; break; + case 1: npctalk "What if you could "+$@p3$+" ?"; break; } end; @@ -258,9 +258,9 @@ Lquote31: // why don't you Lquote32: switch(rand(3)) { - case 0: npctalk "Should you "+$@p2$+" yourself?"; break; - case 1: npctalk "Do you believe I don't "+$@p2$+""; break; - case 2: npctalk "Perhaps I will "+$@p2$+" in good time"; break; + case 0: npctalk "Should you "+$@p3$+" yourself?"; break; + case 1: npctalk "Do you believe I don't "+$@p3$+""; break; + case 2: npctalk "Perhaps I will "+$@p3$+" in good time"; break; } end; -- cgit v1.2.3-70-g09d2