diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-10-07 21:35:12 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-10-07 21:35:12 +0000 |
| commit | 033373a5a75599f8607107cb28b97cc6a653b0b5 (patch) | |
| tree | c520e925018ac7de37d05f690d357fcf55b56ec4 /npc/jobs | |
| parent | 692dd1e5737b01ef26ba889f60d013cb992c3cec (diff) | |
| download | hercules-033373a5a75599f8607107cb28b97cc6a653b0b5.tar.gz hercules-033373a5a75599f8607107cb28b97cc6a653b0b5.tar.bz2 hercules-033373a5a75599f8607107cb28b97cc6a653b0b5.tar.xz hercules-033373a5a75599f8607107cb28b97cc6a653b0b5.zip | |
* Merged changes from trunk [14895:14966/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14967 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/jobs')
| -rw-r--r-- | npc/jobs/2-1/blacksmith.txt | 2 | ||||
| -rw-r--r-- | npc/jobs/2-2/sage.txt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt index 04637210d..bab99664e 100644 --- a/npc/jobs/2-1/blacksmith.txt +++ b/npc/jobs/2-1/blacksmith.txt @@ -351,7 +351,7 @@ ein_in01,201,27,3 script Guildsman#alberta 63,{ mes "1. Which one of the following regions is matched incorrectly"; mes "with its specialty item?"; next; - if (select("Morroc - Thief Clothes:Alberta - Two Hand Axe:Comodo - Berserk Potion:Alberta - Swordmace") == 2) + if (select("Morroc - Thief Clothes:Alberta - Two Hand Axe:Comodo - Berserk Potion:Alberta - Swordmace") == 4) set .@black_q,.@black_q+10; mes "[Geschupenschte]"; mes "2. What status can"; diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index 6320e60d9..e1c601fe9 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -2680,7 +2680,8 @@ OnInit: OnEnable: enablenpc "Arena#2"; - disablenpc "Arena#1::OnReset"; + donpcevent "Arena#1::OnReset"; + disablenpc "Arena#1"; set .MyMobs,24; monster "job_sage",111,102,"Numerical Value",1063,1,"Arena#2::OnMyMobDead"; monster "job_sage",111,102,"Physics",1063,1,"Arena#2::OnMyMobDead"; |