From 003ed2ccc435a3d5ebf2d86f1e94367102aafb20 Mon Sep 17 00:00:00 2001 From: Streusel Date: Sat, 16 Feb 2013 03:13:03 -0800 Subject: -Updated & improved some job scripts -Updated script_commands.txt for update 2bc8562 -Moved Honeymoon Helper to Official coordinates -Updated guides/guides_izlude.txt to fit Honeymoon Helper coordinates --- doc/script_commands.txt | 29 ++++++++++++++++------------- npc/quests/quests_veins.txt | 2 +- npc/re/cities/jawaii.txt | 5 +++-- npc/re/cities/malangdo.txt | 8 ++++---- npc/re/guides/guides_izlude.txt | 2 +- npc/re/jobs/1-1/acolyte.txt | 10 +++++----- npc/re/jobs/1-1/archer.txt | 7 ++++--- npc/re/jobs/1-1/mage.txt | 8 ++++---- npc/re/jobs/1-1/merchant.txt | 7 ++++--- npc/re/jobs/1-1/swordman.txt | 7 ++++--- npc/re/jobs/1-1/thief.txt | 25 +++++++++++-------------- npc/re/jobs/3-1/guillotine_cross.txt | 15 ++++++++------- npc/re/quests/quests_dicastes.txt | 7 +++---- npc/re/quests/quests_veins.txt | 15 +++++++++++++++ npc/re/scripts_athena.conf | 1 + 15 files changed, 84 insertions(+), 64 deletions(-) create mode 100644 npc/re/quests/quests_veins.txt diff --git a/doc/script_commands.txt b/doc/script_commands.txt index cd08e618c..e1759966f 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -1,4 +1,4 @@ -//===== Hercules Documentation ================================ +//===== Hercules Documentation ================================ //= Hercules Script Commands //===== By: ================================================== //= Hercules Dev Team @@ -2162,7 +2162,7 @@ This function will return the basic stats of an invoking character, referred to by the parameter number. Instead of a number, you can use a parameter name if it is defined in 'db/const.txt'. -For reference, these things are defined: +Example parameters: StatusPoint, BaseLevel, SkillPoint, Class, Upper, Zeny, Sex, Weight, MaxWeight, JobLevel, BaseExp, JobExp, NextBaseExp, NextJobExp, Hp, MaxHp, Sp, MaxSp, @@ -2449,16 +2449,19 @@ This function returns the item ID of the item equipped in the equipment slot specified on the invoking character. If nothing is equipped there, it returns -1. Valid equipment slots are: -EQI_HEAD_TOP (1) - Upper head gear -EQI_ARMOR (2) - Armor (Where you keep your Jackets and Robes) -EQI_HAND_L (3) - What is in your Left hand. -EQI_HAND_R (4) - What is in your Right hand. -EQI_GARMENT (5) - The garment slot (Mufflers, Hoods, Manteaus) -EQI_SHOES (6) - What foot gear the player has on. -EQI_ACC_L (7) - Accessory 1. -EQI_ACC_R (8) - Accessory 2. -EQI_HEAD_MID (9) - Middle Headgear (masks and glasses) -EQI_HEAD_LOW (10) - Lower Headgear (beards, some masks) +EQI_HEAD_TOP (1) - Upper head gear +EQI_ARMOR (2) - Armor (Where you keep your Jackets and Robes) +EQI_HAND_L (3) - What is in your Left hand. +EQI_HAND_R (4) - What is in your Right hand. +EQI_GARMENT (5) - The garment slot (Mufflers, Hoods, Manteaus) +EQI_SHOES (6) - What foot gear the player has on. +EQI_ACC_L (7) - Accessory 1. +EQI_ACC_R (8) - Accessory 2. +EQI_HEAD_MID (9) - Middle Headgear (masks and glasses) +EQI_HEAD_LOW (10) - Lower Headgear (beards, some masks) +EQI_COSTUME_HEAD_LOW (11) - Lower Costume Headgear +EQI_COSTUME_HEAD_MID (12) - Middle Costume Headgear +EQI_COSTUME_HEAD_TOP (13) - Upper Costume Headgear Notice that a few items occupy several equipment slots, and if the character is wearing such an item, 'getequipid' will return it's ID number for either slot. @@ -6432,7 +6435,7 @@ placement of the illustration and takes following values: 3 - middle of screen in a movable window with an empty title bar 4 - middle of screen without the window header, but still movable -The picture is read from data\texture\유저인터페이스\illust, from both the GRF archive +The picture is read from data\texture\???????\illust, from both the GRF archive and data folder, and is required to be a bitmap. The file extension .bmp can be omitted. Magenta color (#ff00ff) is considered transparent. There is no limit placed on the size of the illustrations by the client, although loading of large diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt index b79d8ac30..e23f346d4 100644 --- a/npc/quests/quests_veins.txt +++ b/npc/quests/quests_veins.txt @@ -47,7 +47,7 @@ // Stone Quest //============================================================ -ve_fild05,257,130,4 script Wincing Old Man#ve 945,{ +ve_fild05,257,130,4 script ::WincingOldMan_veins 945,{ if ((MaxWeight - Weight) < 2000 || checkweight(1201,1) == 0) { mes "- Wait a moment! -"; mes "- Currently you are carrying -"; diff --git a/npc/re/cities/jawaii.txt b/npc/re/cities/jawaii.txt index 49263d22d..f6e6f70ec 100644 --- a/npc/re/cities/jawaii.txt +++ b/npc/re/cities/jawaii.txt @@ -9,7 +9,8 @@ //===== Description: ========================================= //= Jawaii town NPCs. //===== Additional Comments: ================================= -//= 1.0 First Version. Renewal coordinates by Masao. +//= 1.0 First Version. Renewal coordinates [Masao] +//= 1.1 Changed to Official coordinates [Streusel] //============================================================ -izlude,102,150,6 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Izlude 71 +izlude,180,224,6 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Izlude 71 diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt index 8eb84ad55..58e6be2f3 100644 --- a/npc/re/cities/malangdo.txt +++ b/npc/re/cities/malangdo.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Muad_Dib //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 First version. [Euphy] //= 1.1 Added entrance scripts. +//= 1.2 Added Official coordinates for Odgnalam [Streusel] //============================================================ // Entrance :: malangdo_go @@ -150,9 +151,8 @@ rachel,121,126,4 duplicate(Dolangmal) Dolangmal#7 553 lighthalzen,254,83,5 duplicate(Dolangmal) Dolangmal#8 553 mora,57,150,4 duplicate(Dolangmal) Dolangmal#9 553 -// Unofficial coordinates. -// Original pre-re: izlude,182,192,4 -izlude,197,213,4 script Odgnalam#iz 554,{ + +izlude,182,218,4 script Odgnalam#iz 554,{ if (strnpcinfo(4) == "izlude") mes "Receiving the warm sun of Izlude, the cat is sleeping."; else if (strnpcinfo(4) == "alberta") diff --git a/npc/re/guides/guides_izlude.txt b/npc/re/guides/guides_izlude.txt index 80eedaf91..4824ffdc8 100644 --- a/npc/re/guides/guides_izlude.txt +++ b/npc/re/guides/guides_izlude.txt @@ -127,7 +127,7 @@ mes "^8B4513Jawaii^000000, the paradise of newlyweds,"; mes "please speak to the ^B9062FNewlywed Helper^000000."; mes "Would you like to check any other locations?"; - viewpoint 1,102,150,9,0xFF0000; + viewpoint 1,180,224,9,0xFF0000; next; break; case 4: diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt index 6bc00e86e..4ab8837d3 100644 --- a/npc/re/jobs/1-1/acolyte.txt +++ b/npc/re/jobs/1-1/acolyte.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Description: ========================================= //= Job Change to Acolyte Class //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added back the npcs used for the priest quest. //= 1.2 Added Baby Job compatibility [Streusel] +//= 1.3 Rewrote bits [Euphy] //============================================================ prt_church,184,41,4 script Cleric#aco 60,{ if (Upper == 1) { @@ -62,13 +63,12 @@ prt_church,184,41,4 script Cleric#aco 60,{ next; switch(select("Change your job to acolyte.:Ask the requirements to be an acolyte.:Quit it.")) { case 1: - if(Class != Job_Novice && Class != Job_Baby) { + if(BaseJob != Job_Novice) { mes "[Father Mareusis]"; - if(Class == Job_Acolyte) { + if(BaseJob == Job_Acolyte) mes "Are you feeling okay today? I can tell by your attire that you are already an Acolyte. You're not joking around, are you?"; - }else{ + else mes "I'm sorry but it seems you already have your own job, aren't you?"; - } close; }else{ mes "[Father Mareusis]"; diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt index 4d98bbe49..8e8bedc5f 100644 --- a/npc/re/jobs/1-1/archer.txt +++ b/npc/re/jobs/1-1/archer.txt @@ -3,12 +3,13 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Description: ========================================= //= Job Change to Archer Class //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added Baby Job compatibility [Streusel] +//= 1.2 Rewrote bits [Euphy] //============================================================ payon_in02,64,71,4 script Archer Guildsman#archer 85,{ if (Upper == 1) { @@ -62,9 +63,9 @@ payon_in02,64,71,4 script Archer Guildsman#archer 85,{ next; switch(select("I want to be an Archer.:I need the requirements, please.:Nothing, thanks.")) { case 1: - if(Class != Job_Novice && Class != Job_Baby) { + if(BaseJob != Job_Novice) { mes "[Archer Guildsman]"; - if(Class == Job_Archer) { + if(BaseJob == Job_Archer) { mes "Haha, you are kidding me.."; }else{ mes "I feel sorry but only Novices can change their job."; diff --git a/npc/re/jobs/1-1/mage.txt b/npc/re/jobs/1-1/mage.txt index a25ec5635..b6cc20f2c 100644 --- a/npc/re/jobs/1-1/mage.txt +++ b/npc/re/jobs/1-1/mage.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added Baby Job compatibility [Streusel] +//= 1.2 Rewrote bits [Euphy] //============================================================ geffen_in,164,124,4 script Mage Guildsman#mage 123,{ if (Upper == 1) { @@ -53,9 +54,9 @@ geffen_in,164,124,4 script Mage Guildsman#mage 123,{ close; } } - if(Class != Job_Novice && Class != Job_Baby) { + if(BaseJob != Job_Novice) { mes "[Mage Guildsman]"; - if(Class == Job_Mage) { + if(BaseJob == Job_Mage) { mes "Hey, haven't you realized? You're already a Mage, silly!"; mes "One of these days you'll realize the power inside of you when you can make Fire with your mind!"; }else{ @@ -63,7 +64,6 @@ geffen_in,164,124,4 script Mage Guildsman#mage 123,{ } close; }else{ - mes "[Mage Guildsman]"; mes "Hey?"; next; switch(select("I want to be a Mage:What are the requirements to be a Mage?:Nothing, thanks.")) { diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt index 0edefd1ac..b08cf1a40 100644 --- a/npc/re/jobs/1-1/merchant.txt +++ b/npc/re/jobs/1-1/merchant.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added Baby Job compatibility [Streusel] +//= 1.2 Rewrote bits [Euphy] //============================================================ alberta_in,53,43,6 script Merchant#mer 86,{ if (Upper == 1) { @@ -58,9 +59,9 @@ alberta_in,53,43,6 script Merchant#mer 86,{ next; switch(select("I want to be a merchant.:I want to know more about merchants.:Ask him the requirements to be a merchant.:Nothing.")) { case 1: - if(Class != Job_Novice && Class != Job_Baby) { + if(BaseJob != Job_Novice) { mes "[Guildsman Mahnsoo]"; - if(Class == Job_Merchant) { + if(BaseJob == Job_Merchant) { mes ".....? Sorry? What are you saying?"; mes "You are already a merchant. Oh my.."; mes "Huh?! ...Do I need to laugh right now?!"; diff --git a/npc/re/jobs/1-1/swordman.txt b/npc/re/jobs/1-1/swordman.txt index 168b32b2e..db7b62d41 100644 --- a/npc/re/jobs/1-1/swordman.txt +++ b/npc/re/jobs/1-1/swordman.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added Baby Job compatibility [Streusel] +//= 1.2 Rewrote bits [Euphy] //============================================================ izlude_in,74,172,4 script Swordman#swd 119,{ if (Upper == 1) { @@ -81,9 +82,9 @@ izlude_in,74,172,4 script Swordman#swd 119,{ mes "In my opinion, Swordman is the best job ever!"; close; case 2: - if(Class != Job_Novice && Class != Job_Baby) { + if(BaseJob != Job_Novice) { mes "[Swordman Guildsman]"; - if(Class == Job_Swordman) { + if(BaseJob == Job_Swordman) { mes "You are already an excellent Swordman, aren't you?"; mes "Just devote yourself to be a great Swordman."; }else{ diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt index b23846b5f..e0ea4d5a9 100644 --- a/npc/re/jobs/1-1/thief.txt +++ b/npc/re/jobs/1-1/thief.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added Baby Job compatibility [Streusel] +//= 1.2 Rewrote bits [Euphy] //============================================================ moc_prydb1,39,129,2 script Thief Guide#thief 69,{ if (Upper == 1) { @@ -66,30 +67,26 @@ moc_prydb1,39,129,2 script Thief Guide#thief 69,{ mes "If you want to become a Thief, ask the sharp-eyed guy next to me."; close; } - if(Class != Job_Novice && Class != Job_Baby) { - if(Class == Job_Thief) { + if(BaseJob != Job_Novice) { + if(BaseJob == Job_Thief) { mes "[Thief Guildsman]"; mes "Hey~ if you have any trouble, get it out to me anytime, huh?"; close; }else{ + mes "[Thief Guildsman]"; + mes "What the heck...?"; if(Sex) { - mes "[Thief Guildsman]"; - mes "What the heck...?"; - mes "Huh.. you are a "+jobname(Class)+" blockhead...!"; + mes "Huh.. you are a "+jobname(Class)+" you blockhead...!"; next; mes "[Thief Guildsman]"; mes "Hey, brother."; - mes "Why are you here? Go back to your place~ go back~~"; - close; }else{ - mes "[Thief Guildsman]"; - mes "What the heck...?"; next; mes "[Thief Guildsman]"; mes "Hey, lady."; - mes "Why are you here? Go back to your place~ go back~~"; - close; } + mes "Why are you here? Go back to your place~ go back~~"; + close; } } mes "[Thief Guildsman]"; @@ -190,8 +187,8 @@ moc_prydb1,42,133,2 script Thief Guildsman#thief 118,{ mes "See you again."; close; } - if(Class != Job_Novice && Class != Job_Baby) { - if(Class == Job_Thief) { + if(BaseJob != Job_Novice) { + if(BaseJob == Job_Thief) { mes "[Brad]"; mes "I don't have any special events now. So go on your way and come back later."; }else{ diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index 4f350460a..7fa6177a3 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Muad_Dib //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena SVN r16945+ //===== Description: ========================================= @@ -14,6 +14,7 @@ //= 1.0a Added 'npcskill' command. [Euphy] //= 1.0b Moved warps to separate file. [Euphy] //= 1.1 Fixed some minor bugs. [Euphy] +//= 1.2 Moved "Girl" NPC off ve_fild05. [Euphy] //============================================================ que_job01,75,96,3 script Guild Member#3rdgc01 997,{ @@ -2646,7 +2647,7 @@ ra_in01,175,196,3 script Oresa Rava#3rdgc13 866,{ } } -ve_fild05,327,308,3 script Girl#3rdgc14 466,{ +ve_fild02,330,384,3 script Girl#3rdgc14 466,{ if (job_3rd_gc > 14 && job_3rd_gc < 18) { mes "[Renzak]"; if (job_3rd_gc == 15) { @@ -2744,7 +2745,7 @@ OnTouch: } else { mes "You don't have to come here."; close2; - warp "ve_fild05",341,303; + warp "ve_fild02",330,379; set $@3rdgc_room02, 0; } end; @@ -2752,7 +2753,7 @@ OnTimer900000: mapannounce "job3_guil03","Renzak : Withdraw!",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0 end; OnTimer901000: - mapwarp "job3_guil03","ve_fild05",341,303; + mapwarp "job3_guil03","ve_fild02",330,379; end; OnTimer902000: donpcevent "#3rdgc_event_master::OnReset"; @@ -3444,7 +3445,7 @@ job3_guil03,111,51,7 script Priest from Rachel 928,{ mes "Who are you?"; mes "Get out of here."; close2; - warp "ve_fild05",341,303; + warp "ve_fild02",330,379; end; OnInit: OnDisable: @@ -3471,7 +3472,7 @@ OnTimer40000: mapannounce "job3_guil03","Renzak : Don't lag!",bc_map,"0x4d4dff"; //FW_NORMAL 12 0 0 end; OnTimer60000: - mapwarp "job3_guil03","ve_fild05",341,303; + mapwarp "job3_guil03","ve_fild02",330,379; end; OnTimer61000: donpcevent "#3rdgc_guard::OnStop"; @@ -3902,7 +3903,7 @@ job3_guil03,1,8,0 script #GMhelper02_gc 844,{ donpcevent "#3rdgc_event01::OnEnable"; set $@3rdgc_room02, 0; close2; - mapwarp "job3_guil03","ve_fild05",341,303; + mapwarp "job3_guil03","ve_fild02",330,379; end; } case 2: diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 779e8f218..5229cbc2e 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -597,7 +597,7 @@ dic_in01,51,270,7 script Supply Dept. 1 Manager 449,{ mes "Cannot proceed because the weight of your items is too heavy. Let's try again after you get rid of some weight."; close; } - if (!isequipped(2782) < 1) { + if (!isequipped(2782)) { mes ""; mes " 𢲢"; next; @@ -878,7 +878,7 @@ dic_in01,40,193,1 script Papyrus#0001 453,{ mes "Your inventory is too heavy."; close; } - if (isequipped(2782)) { + if (!isequipped(2782)) { mes ""; mes " 𢲢"; next; @@ -6941,8 +6941,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 453,{ mes "But of course, since this is adding spells on top of its original magic, I cannot guarantee that you will get what you want on one try."; close; } - if (countitem(2844) < 1) //Luz de El Dicastes - { + if (countitem(2844) < 1) { //Light of El Dicastes mes "[Kareka]"; mes "Either you are not wearing or don't have the equipment to upgrade on you."; close; diff --git a/npc/re/quests/quests_veins.txt b/npc/re/quests/quests_veins.txt new file mode 100644 index 000000000..b4be40067 --- /dev/null +++ b/npc/re/quests/quests_veins.txt @@ -0,0 +1,15 @@ +//===== rAthena Script ======================================= +//= Quest NPCs located in Veins +//===== By: ================================================== +//= Euphy +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= rAthena SVN +//===== Description: ========================================= +//= Quests related to Veins. +//===== Additional Comments: ================================= +//= 1.0 First version. +//============================================================ + +ve_fild02,337,314,4 duplicate(WincingOldMan_veins) Wincing Old Man#ve 945 \ No newline at end of file diff --git a/npc/re/scripts_athena.conf b/npc/re/scripts_athena.conf index 5231a3980..cc12ddceb 100644 --- a/npc/re/scripts_athena.conf +++ b/npc/re/scripts_athena.conf @@ -80,3 +80,4 @@ npc: npc/re/quests/quests_dicastes.txt npc: npc/re/quests/quests_izlude.txt npc: npc/re/quests/quests_lighthalzen.txt npc: npc/re/quests/quests_malangdo.txt +npc: npc/re/quests/quests_veins.txt \ No newline at end of file -- cgit v1.2.3-60-g2f50