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

Implemented Kagerou/Oboro job change quest.

Browse Source 
Uses official script structure, with iRO dialogue taken from M45T3Ryu/KO-Proyect@d78f847.

Added Kagerou/Oboro support to other Ninja-related files.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
This commit is contained in:
Euphy 2014-01-11 22:37:36 -05:00
parent a3dbbe21ce
commit b2d96cbc7f
9 changed files with 2901 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
db/re/item_db.txt
View File

@ -6658,11 +6658,11 @@
13308,Huuma_Blaze_I,Huuma Blaze Shuriken,5,0,,0,230,,1,0,0x02000000,63,2,34,4,0,0,22,{ bonus bUnbreakableWeapon,0; bonus bAtkEle,Ele_Fire; bonus bDex,2; },{},{}
13309,Huuma_Giant_Wheel_C,Huuma Giant Wheel Shuriken,5,0,,0,99,,1,0,0x02000000,63,2,34,4,1,0,22,{ bonus2 bAddSize,Size_All,80; },{},{}
13310,P_Huuma_Suriken1,P.Huuma Suriken I,5,0,,0,170,,1,0,0x02000000,63,2,34,3,60,0,22,{ bonus bMatk,50; },{},{}
13311,Huuma_Shadow,Sword Huuma Shuriken,5,5000,,1500,170,,1,0,0x02000000,56,2,34,3,99,1,22,{ bonus bStr,3; },{},{}
13312,Huuma_Job_Test,Prototype Huuma Shuriken,5,0,,3000,0,,1,0,0x02000000,56,2,34,4,99,1,22,{},{},{}
13313,Huuma_Swirling_Petal,Flower Huuma Shuriken,5,100000,,1500,150,,1,2,0x02000000,56,2,34,3,110,1,22,{ bonus bMatk,50; bonus bAtkEle,Ele_Fire; bonus2 bSkillAtk,"KO_HUUMARANKA",20; },{},{}
13314,Huuma_Fluttering_Snow,Wave Huuma Shuriken,5,100000,,1500,200,,1,0,0x02000000,56,2,34,4,110,1,22,{ bonus bMatk,50; bonus bAtkEle,Ele_Water; bonus3 bAutoSpell,"NJ_HYOUSYOURAKU",(getskilllv("NJ_HYOUSYOURAKU")?getskilllv("NJ_HYOUSYOURAKU"):1),30; },{},{}
13315,Huuma_Thunderstorm,Thunderstorm Huuma Shuriken,5,100000,,1500,200,,1,0,0x02000000,56,2,34,4,110,1,22,{ bonus bMatk,50; bonus bAtkEle,Ele_Wind; bonus3 bAutoSpell,"NJ_RAIGEKISAI",(getskilllv("NJ_RAIGEKISAI")?getskilllv("NJ_RAIGEKISAI"):1),30; },{},{}
13311,Huuma_Shadow,Sword Huuma Shuriken,5,5000,,1500,170,,1,0,0x02000000,63,2,34,3,99,1,22,{ bonus bStr,3; },{},{}
13312,Huuma_Job_Test,Prototype Huuma Shuriken,5,0,,3000,0,,1,0,0x02000000,63,2,34,4,99,1,22,{},{},{}
13313,Huuma_Swirling_Petal,Flower Huuma Shuriken,5,100000,,1500,150,,1,2,0x02000000,63,2,34,3,110,1,22,{ bonus bMatk,50; bonus bAtkEle,Ele_Fire; bonus2 bSkillAtk,"KO_HUUMARANKA",20; },{},{}
13314,Huuma_Fluttering_Snow,Wave Huuma Shuriken,5,100000,,1500,200,,1,0,0x02000000,63,2,34,4,110,1,22,{ bonus bMatk,50; bonus bAtkEle,Ele_Water; bonus3 bAutoSpell,"NJ_HYOUSYOURAKU",(getskilllv("NJ_HYOUSYOURAKU")?getskilllv("NJ_HYOUSYOURAKU"):1),30; },{},{}
13315,Huuma_Thunderstorm,Thunderstorm Huuma Shuriken,5,100000,,1500,200,,1,0,0x02000000,63,2,34,4,110,1,22,{ bonus bMatk,50; bonus bAtkEle,Ele_Wind; bonus3 bAutoSpell,"NJ_RAIGEKISAI",(getskilllv("NJ_RAIGEKISAI")?getskilllv("NJ_RAIGEKISAI"):1),30; },{},{}
13316,Upg_Huuma_Shuriken,Upg Huuma Shuriken,5,20,,1500,55,,1,1,0x02000000,63,2,34,3,1,1,22,{ bonus bBaseAtk,(getrefine()*10); bonus bMatk,(getrefine()*5); bonus bLongAtkRate,(getrefine()); if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*5); },{},{}
// More 1-Handed Swords
13400,Cutlas_,Cutlus,5,20,,900,150,,1,1,0x000654E2,63,2,2,4,40,1,2,{ skill "SM_BASH",5; bonus bStr,2; bonus bDef,1; },{},{}

2
doc/script_commands.txt
View File

@ -7535,7 +7535,7 @@ If parameter "HUNTING" is supplied:
*isbegin_quest(<ID>)
Return the state of the quest:
0 = Quest not started (not in quest log)
0 = Quest not started (not in quest log)
1 = Quest has been given (state is either "inactive" or "active")
2 = Quest completed

7
npc/jobs/1-1e/ninja.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= Legionaire, Kisuka
//===== Current Version: =====================================
//= 1.6
//= 1.7
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@ -15,6 +15,7 @@
//= 1.4 Fixed a minor bug [SinSloth]
//= 1.5 Updated to match AEGIS script and Added Quest Log commands. [Kisuka]
//= 1.6 Fixed AEGIS amatsu warp typo. [Kisuka]
//= 1.7 Kagerou/Oboro support (Class -> BaseClass) [Euphy]
//============================================================
alberta,30,65,3 script Akagi 730,{
@ -351,7 +352,7 @@ que_ng,30,65,3 script Cougar#nq 730,{
close;
}
} else {
if (Class == Job_Ninja) {
if (BaseClass == Job_Ninja) {
mes "[Cougar]";
mes "How have you been?";
mes "Train hard: you want";
@ -565,7 +566,7 @@ einbroch,184,194,3 script Suspicious Man#nq 881,{
mes "to beat him in a fair fight~";
close;
}
else if (NINJ_Q == 5 && Class == Job_Ninja) {
else if (NINJ_Q == 5 && BaseClass == Job_Ninja) {
mes "[Red Leopard Joe]";
mes "Oh, you're a Ninja~";
mes "I hope you continue to";

2
npc/other/gm_npcs.txt
View File

@ -100,6 +100,8 @@ List of GM Management NPCs (incomplete)
- sorcereryal
- Button Girl#wl
- Button Girl#sura
- Battle Test Control#ko
- Guide#ko_helper
--------------------------
- Soul Linker Var
- 1st Job Quest Reset

5
npc/quests/thana_quest.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= Muad_Dib
//===== Current Version: =====================================
//= 1.0a
//= 1.1
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@ -12,6 +12,7 @@
//===== Additional Comments: =================================
//= 1.0 Adapted from official release. [Euphy]
//= 1.0a Added 'npcskill' command. [Euphy]
//= 1.1 Kagerou/Oboro support (Class -> BaseClass) [Euphy]
//============================================================
hu_fild01,140,163,5 script Tower Keeper 852,3,3,{
@ -2291,7 +2292,7 @@ tha_t04,81,36,0 warp to 5th Floor 1,1,tha_t05,62,8
tha_t06,119,120,0 script to 7th Floor 45,1,1,{
end;
OnTouch:
if (eaclass()&(EAJL_2|EAJL_UPPER) || eaclass()&EAJL_THIRD || ((Class == Job_SuperNovice || Class == Job_Taekwon || Class == Job_Star_Gladiator || Class == Job_Soul_Linker || Class == Job_Ninja || Class == Job_Gunslinger) && BaseLevel > 94)) {
if (eaclass()&(EAJL_2|EAJL_UPPER) || eaclass()&EAJL_THIRD || ((Class == Job_SuperNovice || Class == Job_Taekwon || Class == Job_Star_Gladiator || Class == Job_Soul_Linker || BaseClass == Job_Ninja || Class == Job_Gunslinger) && BaseLevel > 94)) {
if (countitem(7425) > 0) {
mes "The shadow of a Black Key is gleaming in the center of the portal.";
mes "To pass this way, looks like I need something.";

2874
npc/re/jobs/2e/kagerou_oboro.txt Normal file
View File

File diff suppressed because it is too large Load Diff

9
npc/re/quests/eden/eden_quests.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.5
//= 1.6
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@ -19,6 +19,7 @@
//= 1.4a Added 'npcskill' command. [Euphy]
//= 1.4b Added 'disable_items' command. [Euphy]
//= 1.5 Added GM management function. [Euphy]
//= 1.6 Kagerou/Oboro support (Class -> BaseClass) [Euphy]
//============================================================
moc_para01,25,35,4 script Instructor Boya#para01 469,{
@ -3079,7 +3080,7 @@ moc_para01,112,96,5 script Administrator Michael 967,{
mes "I hope they're useful to you.";
close;
}
if (Class == Job_Novice || Class == Job_Novice_High || Class == Job_SuperNovice || Class == Job_Soul_Linker || Class == Job_Ninja) {
if (Class == Job_Novice || Class == Job_Novice_High || Class == Job_SuperNovice || Class == Job_Soul_Linker || BaseClass == Job_Ninja) {
mes "[Michael]";
mes "We only have 1 weapon for you.";
next;
@ -4538,7 +4539,7 @@ moc_para01,111,83,3 script Toren 813,{
1658,"Staff","One-handed, 60 Atk, 170 Matk, 4 Int", //P.Staff III
13066,"Dagger","One-handed, 165 Atk, 80 Matk"; //P.Dagger III
}
else if (Class == Job_Ninja) {
else if (BaseClass == Job_Ninja) {
mes "Ninja Class gets a choice of weapons, would you like to have a huuma suriken or a dagger?";
callsub L_Select,
13310,"Huuma Suriken","Two-handed, 170 Atk, 50 Matk", //P.Huuma Suriken I
@ -4854,7 +4855,7 @@ moc_para01,112,79,3 script Weapons Expert 851,{
1658,"Staff","One-handed, 60 Atk, 170 Matk, 4 Int", //P.Staff III
13066,"Dagger","One-handed, 165 Atk, 80 Matk"; //P.Dagger III
}
else if (Class == Job_Ninja) {
else if (BaseClass == Job_Ninja) {
mes "Ninja Class gets a choice of weapons, would you like to have a huuma suriken or a dagger?";
callsub L_Select,
13310,"Huuma Suriken","Two-handed, 170 Atk, 50 Matk", //P.Huuma Suriken I

2
npc/re/scripts_jobs.conf
View File

@ -10,6 +10,8 @@ npc: npc/re/jobs/1-1/mage.txt
npc: npc/re/jobs/1-1/merchant.txt
npc: npc/re/jobs/1-1/swordman.txt
npc: npc/re/jobs/1-1/thief.txt
// - 2e
npc: npc/re/jobs/2e/kagerou_oboro.txt
// - 3-1
npc: npc/re/jobs/3-1/archbishop.txt
npc: npc/re/jobs/3-1/mechanic.txt

10
sql-files/item_db_re.sql
View File

@ -6689,11 +6689,11 @@ REPLACE INTO `item_db_re` VALUES (13307,'Krieger_Huuma_Shuriken1','Glorious Shur
REPLACE INTO `item_db_re` VALUES (13308,'Huuma_Blaze_I','Huuma Blaze Shuriken',5,0,NULL,0,'230',NULL,1,0,0x02000000,63,2,34,4,'0',0,22,'bonus bUnbreakableWeapon,0; bonus bAtkEle,Ele_Fire; bonus bDex,2;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13309,'Huuma_Giant_Wheel_C','Huuma Giant Wheel Shuriken',5,0,NULL,0,'99',NULL,1,0,0x02000000,63,2,34,4,'1',0,22,'bonus2 bAddSize,Size_All,80;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13310,'P_Huuma_Suriken1','P.Huuma Suriken I',5,0,NULL,0,'170',NULL,1,0,0x02000000,63,2,34,3,'60',0,22,'bonus bMatk,50;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13311,'Huuma_Shadow','Sword Huuma Shuriken',5,5000,NULL,1500,'170',NULL,1,0,0x02000000,56,2,34,3,'99',1,22,'bonus bStr,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13312,'Huuma_Job_Test','Prototype Huuma Shuriken',5,0,NULL,3000,'0',NULL,1,0,0x02000000,56,2,34,4,'99',1,22,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13313,'Huuma_Swirling_Petal','Flower Huuma Shuriken',5,100000,NULL,1500,'150',NULL,1,2,0x02000000,56,2,34,3,'110',1,22,'bonus bMatk,50; bonus bAtkEle,Ele_Fire; bonus2 bSkillAtk,"KO_HUUMARANKA",20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13314,'Huuma_Fluttering_Snow','Wave Huuma Shuriken',5,100000,NULL,1500,'200',NULL,1,0,0x02000000,56,2,34,4,'110',1,22,'bonus bMatk,50; bonus bAtkEle,Ele_Water; bonus3 bAutoSpell,"NJ_HYOUSYOURAKU",(getskilllv("NJ_HYOUSYOURAKU")?getskilllv("NJ_HYOUSYOURAKU"):1),30;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13315,'Huuma_Thunderstorm','Thunderstorm Huuma Shuriken',5,100000,NULL,1500,'200',NULL,1,0,0x02000000,56,2,34,4,'110',1,22,'bonus bMatk,50; bonus bAtkEle,Ele_Wind; bonus3 bAutoSpell,"NJ_RAIGEKISAI",(getskilllv("NJ_RAIGEKISAI")?getskilllv("NJ_RAIGEKISAI"):1),30;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13311,'Huuma_Shadow','Sword Huuma Shuriken',5,5000,NULL,1500,'170',NULL,1,0,0x02000000,63,2,34,3,'99',1,22,'bonus bStr,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13312,'Huuma_Job_Test','Prototype Huuma Shuriken',5,0,NULL,3000,'0',NULL,1,0,0x02000000,63,2,34,4,'99',1,22,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13313,'Huuma_Swirling_Petal','Flower Huuma Shuriken',5,100000,NULL,1500,'150',NULL,1,2,0x02000000,63,2,34,3,'110',1,22,'bonus bMatk,50; bonus bAtkEle,Ele_Fire; bonus2 bSkillAtk,"KO_HUUMARANKA",20;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13314,'Huuma_Fluttering_Snow','Wave Huuma Shuriken',5,100000,NULL,1500,'200',NULL,1,0,0x02000000,63,2,34,4,'110',1,22,'bonus bMatk,50; bonus bAtkEle,Ele_Water; bonus3 bAutoSpell,"NJ_HYOUSYOURAKU",(getskilllv("NJ_HYOUSYOURAKU")?getskilllv("NJ_HYOUSYOURAKU"):1),30;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13315,'Huuma_Thunderstorm','Thunderstorm Huuma Shuriken',5,100000,NULL,1500,'200',NULL,1,0,0x02000000,63,2,34,4,'110',1,22,'bonus bMatk,50; bonus bAtkEle,Ele_Wind; bonus3 bAutoSpell,"NJ_RAIGEKISAI",(getskilllv("NJ_RAIGEKISAI")?getskilllv("NJ_RAIGEKISAI"):1),30;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (13316,'Upg_Huuma_Shuriken','Upg Huuma Shuriken',5,20,NULL,1500,'55',NULL,1,1,0x02000000,63,2,34,3,'1',1,22,'bonus bBaseAtk,(getrefine()*10); bonus bMatk,(getrefine()*5); bonus bLongAtkRate,(getrefine()); if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*5);',NULL,NULL);
# More 1-Handed Swords
REPLACE INTO `item_db_re` VALUES (13400,'Cutlas_','Cutlus',5,20,NULL,900,'150',NULL,1,1,0x000654E2,63,2,2,4,'40',1,2,'skill "SM_BASH",5; bonus bStr,2; bonus bDef,1;',NULL,NULL);