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

* Documented OnTouch_ label.

Browse Source 
* Fixed some bugs in Rune Knight job quest (incl. bugreport:7083).
* Removed a duplicate item in custom Item Mall script (bugreport:7115).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17075 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
euphyy 2013-01-04 18:38:44 +00:00
parent cebcf7a332
commit 50f76a780d
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/script_commands.txt
View File

@ -896,6 +896,11 @@ This label will be executed if a trigger area is defined for the NPC object it's
in. If it isn't present, the execution will start from the beginning of the NPC in. If it isn't present, the execution will start from the beginning of the NPC
code. The RID of the triggering character object will be attached. code. The RID of the triggering character object will be attached.
OnTouch_:
Similar to OnTouch, but will only run one instance. Another character is
chosen once the triggering character leaves the area.
OnPCLoginEvent: OnPCLoginEvent:
OnPCLogoutEvent: OnPCLogoutEvent:
OnPCBaseLvUpEvent: OnPCBaseLvUpEvent:
@ -6290,8 +6295,7 @@ Type indicates what information to return:
These commands will make the NPC object in question move around the map. As they These commands will make the NPC object in question move around the map. As they
currently are, they are a bit buggy and are not useful for much more than making currently are, they are a bit buggy and are not useful for much more than making
an NPC move randomly around the map. (see 'npc/custom/devnpc.txt' for an example an NPC move randomly around the map.
of such usage)
'npcspeed' will set the NPCs walking speed to a specified value. As in the 'npcspeed' will set the NPCs walking speed to a specified value. As in the
@speed GM command, 200 is the slowest possible speed while 0 is the fastest @speed GM command, 200 is the slowest possible speed while 0 is the fastest

4
npc/custom/itemmall.txt
View File

@ -7,7 +7,7 @@
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena SVN //= rAthena SVN
//===== Description: ========================================= //===== Description: =========================================
//= A Shopstreet in Prontera where players can buy some Equipment. //= A Shop Street in Prontera.
//============================================================ //============================================================
prontera,147,240,5 shop Armor 99,2304:10000,2306:20000,2308:20000,2310:50000,2311:50000,2313:50000,2315:75000,2317:100000,2322:20000,2326:60000,2331:75000,2342:100000,2353:75000,2364:150000,2367:100000,2399:50000 prontera,147,240,5 shop Armor 99,2304:10000,2306:20000,2308:20000,2310:50000,2311:50000,2313:50000,2315:75000,2317:100000,2322:20000,2326:60000,2331:75000,2342:100000,2353:75000,2364:150000,2367:100000,2399:50000
@ -39,6 +39,6 @@ prontera,164,242,4 shop Headgear 03 832,5181:300000,5102:500000,5016:75000,5349:
prontera,164,240,4 shop Headgear 04 832,5200:75000,5205:100000,5211:75000,5226:50000,5238:75000,5239:75000,5240:75000,5241:75000,5242:75000,5243:50000,5325:75000,5254:100000,5255:65000,5257:50000,5297:100000,2202:45000,5258:35000,5298:50000,5276:50000,5273:50000,5275:50000,5274:50000,5259:50000,5271:250000,5272:50000,5284:50000,5286:75000,5288:50000,5289:50000,5291:55000,5292:55000,5294:55000,5352:50000,5324:100000,5359:50000,5360:50000 prontera,164,240,4 shop Headgear 04 832,5200:75000,5205:100000,5211:75000,5226:50000,5238:75000,5239:75000,5240:75000,5241:75000,5242:75000,5243:50000,5325:75000,5254:100000,5255:65000,5257:50000,5297:100000,2202:45000,5258:35000,5298:50000,5276:50000,5273:50000,5275:50000,5274:50000,5259:50000,5271:250000,5272:50000,5284:50000,5286:75000,5288:50000,5289:50000,5291:55000,5292:55000,5294:55000,5352:50000,5324:100000,5359:50000,5360:50000
prontera,164,238,4 shop Headgear 05 832,5340:50000,5341:50000,5342:50000,5343:50000,5344:50000,5345:50000,5354:50000,5355:50000,5361:65000,5365:50000,5373:75000,5374:350000,5379:50000,5383:60000,5384:88888,5390:88888,5388:50000,5411:50000,5393:75000,5397:35000,5399:50000,5800:175000,5801:300000,5802:150000 prontera,164,238,4 shop Headgear 05 832,5340:50000,5341:50000,5342:50000,5343:50000,5344:50000,5345:50000,5354:50000,5355:50000,5361:65000,5365:50000,5373:75000,5374:350000,5379:50000,5383:60000,5384:88888,5390:88888,5388:50000,5411:50000,5393:75000,5397:35000,5399:50000,5800:175000,5801:300000,5802:150000
prontera,151,284,4 shop Ammunition 880,1766:50,1755:20,1750:10,1754:20,1761:20,1752:20,1760:20,1759:20,1772:100,1757:30,1770:20,1769:30,1765:40,1763:30,1762:30,1767:30,1764:30,1751:20,1768:30,1753:30,1756:30,1758:30,1771:1000,13200:50,13202:100,13201:300,13206:500,13203:500,13207:500,13204:500,13205:500,13252:50,13254:500,13251:100,13253:300,13250:50,13256:50,13259:50,13258:50,13255:50,13257:50 prontera,151,284,4 shop Ammunition 880,1766:50,1755:20,1750:10,1754:20,1761:20,1752:20,1760:20,1759:20,1772:100,1757:30,1770:20,1769:30,1765:40,1763:30,1762:30,1767:30,1764:30,1751:20,1768:30,1753:30,1756:30,1758:30,1771:1000,13200:50,13202:100,13201:300,13206:500,13203:500,13207:500,13204:500,13205:500,13252:50,13254:500,13251:100,13253:300,13250:50,13256:50,13259:50,13258:50,13255:50,13257:50
prontera,153,284,4 shop Alchemist Dealer 880,715:600,716:600,717:600,1025:200,7136:500,7135:500,7136:500,7137:500,7138:500,7139:500 prontera,153,284,4 shop Alchemist Dealer 880,715:600,716:600,717:600,1025:200,7136:500,7135:500,7137:500,7138:500,7139:500
prontera,155,284,4 shop Street Dealer 880,678:5000,505:-1,506:40,610:4000,545:150,546:600,547:1650 prontera,155,284,4 shop Street Dealer 880,678:5000,505:-1,506:40,610:4000,545:150,546:600,547:1650
prontera,157,284,4 shop Sheepy Gonzales 895,12028:1000,12262:500,12016:750 prontera,157,284,4 shop Sheepy Gonzales 895,12028:1000,12262:500,12016:750

11
npc/re/jobs/3-1/rune_knight.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= L0ne_W0lf, Muad_Dib //= L0ne_W0lf, Muad_Dib
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.3a //= 1.4
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena SVN //= rAthena SVN
//===== Description: ========================================= //===== Description: =========================================
@ -14,6 +14,7 @@
//= 1.2 Added Energy Rune item reward. [Masao] //= 1.2 Added Energy Rune item reward. [Masao]
//= 1.3 Updated script, optimized. [Euphy] //= 1.3 Updated script, optimized. [Euphy]
//= 1.3a Added 'npcskill' command. [Euphy] //= 1.3a Added 'npcskill' command. [Euphy]
//= 1.4 Fixed a few bugs. [Euphy]
//============================================================ //============================================================
prt_in,162,24,3 script Splendid-Looking Knight 470,2,2,{ prt_in,162,24,3 script Splendid-Looking Knight 470,2,2,{
@ -735,7 +736,7 @@ job3_rune01,55,50,3 script Rune Knight, Renoa 469,2,2,{
set job_rune_edq,8; set job_rune_edq,8;
changequest 3205,3206; changequest 3205,3206;
close; close;
} else if (job_rune_edq == 8) { } else if (job_rune_edq > 7 && job_rune_edq < 11) {
mes "Well first, I'll give you an assignment. Let's start by studying. Go to the library and study these books."; mes "Well first, I'll give you an assignment. Let's start by studying. Go to the library and study these books.";
next; next;
mes "[Rune Knight, Renoa]"; mes "[Rune Knight, Renoa]";
@ -1049,8 +1050,6 @@ job3_rune01,43,44,1 script The Principles of Runes 844,{
set .@book1,1; set .@book1,1;
mes "A rune is a kind of symbol that's been used on the Rune-Midgard continent since ancient times. Up until now it has only been used by occult circles."; mes "A rune is a kind of symbol that's been used on the Rune-Midgard continent since ancient times. Up until now it has only been used by occult circles.";
next; next;
mes "A rune is a kind of symbol that's been used on the Rune-Midgard continent since ancient times. Up until now it has only been used by occult circles.";
next;
mes "Runes are used as a symbol system, however, by the story handed down orally, it's known to be used for fortune-telling or used to draw out the human sub consciousness."; mes "Runes are used as a symbol system, however, by the story handed down orally, it's known to be used for fortune-telling or used to draw out the human sub consciousness.";
next; next;
mes "Runes have their own system and types and can draw out various powers according to how they are arranged. But their power level can't currently be measured by known means."; mes "Runes have their own system and types and can draw out various powers according to how they are arranged. But their power level can't currently be measured by known means.";
@ -1104,9 +1103,9 @@ job3_rune01,50,36,1 script Runes, Make & Use 844,{
next; next;
mes "When you making a Rune stone with a Rune Furnace, the type of rune is determined by the magical energy put into it, and it cannot be changed."; mes "When you making a Rune stone with a Rune Furnace, the type of rune is determined by the magical energy put into it, and it cannot be changed.";
next; next;
mes "When making a rune stone by using Rune Mastery, it can be made into the rune property that you want but it's classified as a Rune Knights' own ability. "; mes "When making a rune stone by using Rune Mastery, it can be made into the rune property that you want but it's classified as a Rune Knights' own ability.";
next; next;
mes "When you operate the Rune Furnace , the magical energy of the body gets concentrated through it and it enables the change into a Rune Stone."; mes "When you operate the Rune Furnace, the magical energy of the body gets concentrated through it and it enables the change into a Rune Stone.";
next; next;
break; break;
case 2: case 2:

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

@ -302,7 +302,7 @@ que_lhz,94,119,3 script Researcher#ins2 865,{
que_lhz,147,224,3 script Researcher#ins3 865,{ que_lhz,147,224,3 script Researcher#ins3 865,{
if (lhz_dun04 == 4 || mobcount("que_lhz","#controllhz4::OnMyMobDead") > 0) { if (lhz_dun04 == 4 || mobcount("que_lhz","#controllhz4::OnMyMobDead") > 0) {
mes "[Wolfchev]"; mes "[Wolfchev]";
mes "Wolfchev is freaking out. He is of his mind."; mes "Wolfchev is freaking out. He is out of his mind.";
emotion e_turn; emotion e_turn;
close; close;
} else if (lhz_dun04 == 3) { } else if (lhz_dun04 == 3) {