* Added Expanded Super Novice support to custom Job Master, and Kagerou/Oboro as well in comments (npc\custom\jobmaster.txt)

* Clarified rare_drop_announce description, since a lot of people have had trouble with it for whatever reason (conf\battle\drops.conf)
* Fixed a minor "viewpoint" argument error, bugreport:6221 (npc\jobs\3-2\royal_guard.txt)
* Deleted custom Kiel Dungeon warper (npc\custom\quests\kiel_quest.txt)
* Deleted custom Bongun Sword quest (npc\custom\quests\bongunsword.txt)
* Deleted custom Book of the Devil quest (npc\custom\quests\bookofthedevil.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16418 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
euphyy 2012-07-12 18:57:02 +00:00
parent 1ca7aa6a44
commit 3fd7ebd258
8 changed files with 24 additions and 322 deletions

View File

@ -128,6 +128,7 @@ finding_ore_rate: 100
alchemist_summon_reward: 1
// Make broadcast ** Player1 won Pupa's Pupa Card (chance 0.01%) ***
// This can be set to any value between 0~10000.
// Note: It also announces STEAL skill usage with rare items
// 0 = don't show announces at all
// 1 = show announces for 0.01% drop chance items

View File

@ -64,8 +64,8 @@ Info: Not really a quest, but to
How to set: set MISC_QUEST,MISC_QUEST|128;
How to check: if(MISC_QUEST&128){}
Quest: Book of Devil
Info: The Lost Girl in Niflheim.
Quest: -
Info: -
How to set: set MISC_QUEST,MISC_QUEST | 256;
How to check: if(MISC_QUEST & 256){}

View File

@ -2300,8 +2300,6 @@ Lets say the ID of a party was saved as a global variable:
*getpartymember <party id>{,<type>};
Thank you to HappyDenn for all this information.
This command will find all members of a specified party and returns their names
(or character id or account id depending on the value of "type") into an array
of temporary global variables. There's actually quite a few commands like this
@ -3143,7 +3141,6 @@ This function works as a direct counterpart of 'getpetinfo':
---------------------------------------
*petstat(<flag>)
Returns current pet status, all are integers except name.
@ -4111,7 +4108,7 @@ quite a few item scripts. For more examples check just about any official script
---------------------------------------
*getitem2 <item id>,<amount>,<identify>,<refine>,<attribute>,<card1>,<card2>,<card3>,<card4>{,<account ID>};
*getitem2 "<Item name>",<amount>,<identify>,<refine>,<attribute>,<card1>,<card2>,<card3>,<card4>{,<account ID>};
*getitem2 "<item name>",<amount>,<identify>,<refine>,<attribute>,<card1>,<card2>,<card3>,<card4>{,<account ID>};
This command will give an amount of specified items to the invoking character.
If an optional account ID is specified, and the target character is currently
@ -4210,7 +4207,8 @@ this really cause.
---------------------------------------
*getnameditem <item name|item id>,<Character name|character ID>;
*getnameditem <item id>,<character name|character ID>;
*getnameditem "<item name>",<character name|character ID>;
-Note: there's a total of 4 possible combinations of this command.
E.g: item name and character name, or with character id, etc...
@ -4305,7 +4303,7 @@ database. If the name is not found, nothing will be deleted.
---------------------------------------
*delitem2 <item id>,<amount>,<identify>,<refine>,<attribute>,<card1>,<card2>,<card3>,<card4>{,<account ID>};
*delitem2 "<Item name>",<amount>,<identify>,<refine>,<attribute>,<card1>,<card2>,<card3>,<card4>{,<account ID>};
*delitem2 "<item name>",<amount>,<identify>,<refine>,<attribute>,<card1>,<card2>,<card3>,<card4>{,<account ID>};
This command will take a specified amount of items from the invoking/target character.
Check 'getitem2' to understand its expanded parameters.
@ -6412,7 +6410,7 @@ timer and ranking as will @pvpon GM command do.
---------------------------------------
*atcommand "<command line>";
*atcommand "<command>";
This command will run the given command line exactly as if it was typed in from
the keyboard by the player connected to the invoking character, and that
@ -6428,7 +6426,7 @@ one.
---------------------------------------
*charcommand <command>;
*charcommand "<command>";
This command will run the given command line exactly as if it was typed in from
the keyboard from a character that belonged to an account which had GM level 99.

View File

@ -3,13 +3,14 @@
//===== By: ==================================================
//= Euphy
//===== Current Version: =====================================
//= 1.1
//= 1.2
//===== Compatible With: =====================================
//= rAthena SVN r16114+
//===== Description: =========================================
//= A fully functional job changer.
//===== Additional Comments: =================================
//= 1.1 Fixed reset on Baby job change. [Euphy]
//= 1.2 Added Expanded Super Novice support and initial Kagerou/Oboro support. [Euphy]
//============================================================
prontera,153,193,6 script Job Master 123,{
@ -49,6 +50,18 @@ function Job_Menu; function A_An;
Job_Menu(((.@i==1)?4001:roclass(.@eac|EAJL_THIRD)));
mes "[Job Master]"; } }
set .@j1, roclass(.@eac|EAJL_2_1); set .@j2,roclass(.@eac|EAJL_2_2);
if ((.@eac&EAJ_UPPERMASK) == EAJ_SUPER_NOVICE) setarray .@exp[0],roclass(.@eac|EAJL_THIRD),99;
// Kagerou & Oboro pending skill completion.
// if (Class == Job_Ninja) setarray .@exp[0],.@j1,70;
if (.@exp[0] && .ThirdClass) {
if (BaseLevel < .Rebirth[0] || JobLevel < .@exp[1]) {
set .@blvl, .Rebirth[0]-BaseLevel; set .@jlvl, .@exp[1]-JobLevel;
mes "You need "+((.@blvl>0)?.@blvl+" more base levels "+((.@jlvl>0)?"/ ":""):"")+((.@jlvl>0)?.@jlvl+" more job levels ":"")+"to continue.";
close; }
mes "Switch to "+jobname(.@exp[0])+"?";
next;
Job_Menu(.@exp[0]);
close; }
if (.@eac&EAJL_2)
if (.@eac&(EAJL_UPPER|EAJL_BABY) || roclass(.@eac|EAJL_UPPER) == -1) {
mes "No more jobs are available.";
@ -96,7 +109,7 @@ function Job_Menu {
mes "Are you sure?";
next; }
else set .@i, getarg(0);
if (select(" ~ Change into ^0055FF"+jobname(.@i)+"^000000 class: ~ ^777777Go back^000000")==1) {
if (select(" ~ Change into ^0055FF"+jobname(.@i)+"^000000 class: ~ ^777777"+((getargcount() > 1)?"Go back":"Cancel")+"^000000")==1) {
mes "[Job Master]";
mes "You are now "+A_An(jobname(.@i))+"!";
if (.@i==4001 && .LastJob) set lastJob, Class;

View File

@ -1,153 +0,0 @@
//===== rAthena Script =======================================
//= Munak and Bongun accessory / Taming items Quest
//===== By: ==================================================
//= rAthena Team
//===== Current Version: =====================================
//= 1.2
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= Quest itms:Sword o'Chinese Exorcist,No Recipient,Her Heart
//===== Additional Comments: =================================
//= 1.0. merged 3 sep. files, fixed exploits [Lupus]
//= 1.1 Added missing next;'s [Evera]
//= 1.2 Added another missing next; [Evera]
//============================================================
comodo,135,227,5 script Sherri 93,{
mes "[Sherri]";
mes " ";
mes "*sighs*";
next;
mes "[Sherri]";
mes "Oh? Whats the matter? ...Well, I have finally managed to encase the soul of a handsome boy ...";
next;
mes "[Sherri]";
mes "...so why am I sad?";
mes " ";
mes "It's because I don't even know how his personality is... say, if you can find me a 'Girl's Diary' about him, I'll give you his diary!";
next;
mes "[Sherri]";
mes "Can you please help me?";
next;
menu "What do I need again?",-,"Here! I got what you need!",ExCreate,"Sorry, I can't help you.",ExEnd;
mes "[Sherri]";
mes "What I desire is...";
mes " ";
mes "A 'Girl's Diary' about him...";
close;
ExCreate:
mes "[Sherri]";
mes "Really!! You'll help me!";
next;
if(countitem(1558)<1) goto L_NoItem;//Items: Girl's_Diary,
delitem 1558,1;//Items: Girl's_Diary,
getitem 659,1;//Items: Her_Heart,
mes "[Sherri]";
mes "YES! I am forever in your debt!";
mes " ";
mes "Here is his diary as promised! Again - Thank you!";
next;
mes "[Sherri]";
mes "Wait! Here's his sword, I found it next to him. But it's broken... I know of a old man just west of Geffen who can fix such a sword!";
getitem 7110,1;//Items: Broken_Sword,
close;
L_NoItem:
mes "[Sherri]";
mes "Waahhhh, stop playing with my feelings!";
mes " ";
mes "Go away!";
close;
ExEnd:
mes "[Sherri]";
mes "*sighs*";
close;
}
izlude_in,115,76,5 script Evan 47,{
mes "[Evan]";
mes " ";
mes "*sighs*";
next;
mes "[Evan]";
mes "Oh? Whats the matter? ...Well, I have finally managed to encase the soul of a pretty girl ...";
next;
mes "[Evan]";
mes "...so why am I sad?";
mes " ";
mes "It's because I don't even know how she looks like...say, if you can find me and 'Old Portrait' of her, I'll give you her lover's lost letter!";
next;
mes "[Evan]";
mes "Whaddaya say? ..pal?";
next;
menu "What do I need again?",-,"Here! I got what you need!",ExCreate,"Sorry, I can't help you.",ExEnd;
mes "[Evan]";
mes "A picture of her lovely face...";
mes " ";
mes "An 'Old Portrait' preferrably...";
close;
ExCreate:
mes "[Evan]";
mes "Really!! You'll help me!";
next;
if(countitem(7014)<1) goto L_NoItem;//Items: Old_Portrait,
delitem 7014,1;//Items: Old_Portrait,
getitem 636,1;//Items: No_Recipient,
mes "[Evan]";
mes "YES! I am forever in your debt!";
mes " ";
mes "Here is lover's lost letter as promised! Again - Thank you!";
close;
L_NoItem:
mes "[Evan]";
mes "Waahhhh, stop playing with my feelings!";
mes " ";
mes "Go away!";
close;
ExEnd:
mes "[Evan]";
mes "*sighs*";
close;
}
gef_fild07,183,239,5 script Old Smith 120,{
mes "[Old Smith]";
mes "Ah, isn't it peaceful up here - I used to be one of the legendary Blacksmiths of midgard...sadly my skills have faded.";
next;
if(countitem(7110)<1) goto L_NoItemS;//Items: Broken_Sword,
mes "[Old Smith]";
mes "Hmm, it seems as if you need something. What would that be?";
next;
menu "Can you fix this broken sword?",-,"Nothing really...",ExEnd;
mes "[Old Smith]";
mes "Ahhh, this is a very old sword and yes I can fix it, I'll need an 'Oridecon' to mend the breaks though.";
next;
if(countitem(7110)<1 || countitem(984)<1) goto L_NoItem;//Items: Broken_Sword, Oridecon,
delitem 7110,1;//Items: Broken_Sword,
delitem 984,1;//Items: Oridecon,
getitem 10020,1;//Items: Sword_of_Chinese_Exorcist,
mes "[Old Smith]";
mes "Ah yes here we go!";
mes " ";
mes "Haha! Gramps still has that old magic touch, Here you go!";
close;
L_NoItem:
mes "[Old Smith]";
mes "Hmm, you seem to be missing something... probably that 'Oridecon'.";
close;
L_NoItemS:
ExEnd:
mes "[Old Smith]";
mes "...ah well, go out and live life young one. Time never stops!";
close;
}

View File

@ -1,90 +0,0 @@
//===== rAthena Script =======================================
//= Quest for Book of Devil (Baphomet Jr. taming item)
//===== By: ==================================================
//= rAthena Dev Team
//===== Current Version: =====================================
//= 1.2
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= Book of Devil (MISC_QUEST | 256)
//===== Additional Comments: =================================
//= 1.0 ????
//= 1.1 Optimized Book of Devil quest. used bit-wise var. [Lupus]
//= 1.2 Fixed name collision with 'Little Boy' in cities/lutie.txt [Ai4rei]
//============================================================
niflheim,184,199,5 script Little Girl#02 793,{
mes "[Sairin]";
if(MISC_QUEST & 256){
mes "Thanks again!";
close;
}
if(@niflheimlost == 2){
mes "You found him?";
mes "Oh thank you!";
mes "Please, take this as a token of my appreciation.";
getitem 642,1;//Items: Book of Devil,
set MISC_QUEST,MISC_QUEST | 256;
set @niflheimlost,0;
close;
}
if(@niflheimlost == 1){
M_YES:
set @niflheimlost,1;
mes "Please find him and tell him where I am! I saw him last in Niflheim Field, the first one...";
close;
}
mes "Sir, will you please help me?";
if(BaseJob==Job_Novice){
mes "Oh... you are lost, too...";
close;
}
next;
menu "Yes",-, "No",M_NO;
mes "[Sairin]";
mes "My friend and I went for a hike and ended up wandering into a strange field.";
next;
mes "[Sairin]";
mes "Suddenly, I found a doll. I picked it up, and it turned into a ghost!";
next;
mes "[Sairin]";
mes "I screamed and ran as fast as I could. When I stopped running, I ended up in this strange town..";
next;
mes "[Sairin]";
mes "No one here will help me, and there are ghosts everywhere! Could you help me find my friend?";
next;
menu "Sure",M_YES, "No",M_NO;
M_NO:
close;
}
nif_fild01,213,268,5 script Little Boy#02 797,{
if(MISC_QUEST & 256){
L_DONE:
set @niflheimlost,2;
mes "[Marius]";
mes "Thank you for helping us!";
close;
}
if(@niflheimlost == 2) goto L_PART2;
if(@niflheimlost == 1){
mes "[Marius]";
mes "Who are you?";
mes "...";
mes "You found Sairin?";
mes "She ran to Niflheim?";
next;
L_PART2:
mes "[Marius]";
mes "Could you tell her that I am on my way?";
mes "I am a little slow, and its very important that she knows.";
next;
menu "Yes",L_DONE, "No",-;
close;
}
mes "[Marius]";
mes "Sairin... where are you?";
close;
}

View File

@ -1,63 +0,0 @@
//===== rAthena Script =======================================
//= Custom Kiel Dungeon Warper
//===== By: ==================================================
//= Lupus
//===== Current Version: =====================================
//= 1.0
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= I't custom 8) But you have to pay every time you enter
//===== Additional Comments: =================================
//=
//============================================================
prontera,157,168,2 script Kiel Capry 68,{
mes "[Kiel Capry]";
mes callfunc("F_Hi");
mes "Help us! Everybody's evacuated! There's been an accident in my father's University...";
if(rand(2))close;
specialeffect 417;
next;
emotion e_wah;
mes "[Kiel Capry]";
mes "My father, ^FF0000Kiel Carlo^000000 is waiting for help in the broken elevator.";
if(rand(2))close;
next;
mes "[Kiel Capry]";
mes "What? Our home is located in the middle of ^FF0000Yuno field 08^000000...";
close;
}
kh_school,119,146,3 script Kiel Carlo 748,{
mes "[Kiel Carlo]";
mes callfunc("F_Hi");
mes "We have evacuated all the students!";
mes "What? Are you going to jump in the lift tunnel, right into the hands of those gone bad robots?";
mes "Well... we need money. Will you pay 10.000z?";
next;
emotion e_hmm;
menu "Yep.",M_GO, "No way!",-;
mes "[Kiel Carlo]";
mes "Well... "+callfunc("F_Bye");
close;
M_GO:
mes "[Kiel Carlo]";
mes "I refuse to let you enter if you don't meet these conditions:";
mes "1. You have to be 70 Base Level or higher.";
mes "2. You have to donate 10.000 zeny.";
next;
if(BaseLevel<70 || Zeny<10000){
mes "[Kiel Carlo]";
mes "Alas... I can't let you in.";
emotion e_sry;
close;
}
set Zeny,Zeny-10000;
warp "kh_kiehl02",rand(46,53),rand(9,12);
end;
}
kh_kiehl02,49,5,0 warp warpk06 1,1,kh_school,119,146

View File

@ -68,8 +68,6 @@
//npc: npc/custom/quests/dead_branch.txt
//npc: npc/custom/quests/berzebub.txt
//npc: npc/custom/quests/jewel_case.txt
//npc: npc/custom/quests/bongunsword.txt
//npc: npc/custom/quests/bookofthedevil.txt
// -- Godly Equipment Quests (be careful!)
//npc: npc/custom/quests/valhallen.txt
//npc: npc/custom/quests/kaho_balmung.txt
@ -95,8 +93,6 @@
// -- Custom quests from official Umbalian Quests
//npc: npc/custom/quests/sphinx_mask.txt
//npc: npc/custom/quests/umbalian_language.txt
// -- Custom Kiel Mansion Dungeon Quest
//npc: npc/custom/quests/kiel_quest.txt
// -- Unofficial Battlegrounds
//npc: npc/custom/battleground/bg_common.txt
//npc: npc/custom/battleground/bg_tierra_01.txt