Skip to content

Commit

Permalink
* Updated Eden Quests 71-85 to its latest version. (translation: Muad…
Browse files Browse the repository at this point in the history 
…_Dib)

* Updated all 1st class training quests, mostly experience changes. (credits: Muad_Dib, partial revert of r17210)
* Added Pre-Renewal support to 1st class training quests. (bugreport:7808)
* Corrected level 10 AL_HEAL lines in 'npcskill' to use MVP heal.
* Corrected EXP checks in 'checkre' to use RENEWAL_EXP instead of RENEWAL.
* Fixed Hunter skill quest not accepting Rangers.
* Fixed a bug in Hall of Abyss. (bugreport:7815)
* Fix unable to move when cloaking in levels less than 3. (credits: Akinari, bugreport:7810)
* Idle timer now resets on continuous attacks, i.e. /noctrl or ctrl+click. (Hercules 19f0fcd)
* Idle timer is now initialized upon login, fixing a bug with the 'checkidle' command. (credits: Akinari)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17409 54d463be-8e91-2dee-dedb-b68131a5f0ec
  • Loading branch information
euphyy committed Jul 10, 2013
1 parent 81e3b03 commit 4589a4d
Show file tree
Hide file tree
Showing 25 changed files with 715 additions and 915 deletions.
4 changes: 3 additions & 1 deletion db/quest_db.txt
View file
Expand Up @@ -640,7 +640,9 @@
5052,0,0,0,0,0,0,0,"Traditional Weapon"
5053,0,0,0,0,0,0,0,"Traditional Weapon"
5054,0,0,0,0,0,0,0,"Traditional Weapon"

5055,0,2071,15,0,0,0,0,"Local Rising - Headless Horse"
5056,0,1584,15,0,0,0,0,"Local Rising - Tamruan"
5057,0,0,0,0,0,0,0,"Local Rising - Ready the Festival"
5058,0,0,0,0,0,0,0,"The mood of the players-(1)"
5059,0,0,0,0,0,0,0,"The mood of the players-(2)"
5060,180,0,0,0,0,0,0,"Cat Shock"
Expand Down
16 changes: 16 additions & 0 deletions npc/pre-re/quests/first_class/tu_archer.txt
View file
@@ -0,0 +1,16 @@
//===== rAthena Script =======================================
//= Archer Class Tutorial and Job Specific Quest
//===== By: ==================================================
//= Euphy
//===== Current Version: =====================================
//= 1.0
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= [Official Conversion]
//= Archer training quest.
//===== Additional Comments: =================================
//= 1.0 First version. [Euphy]
//============================================================

mjolnir_11,27,223,3 duplicate(Acolyte_Tu) Acolyte#tu 95
3 changes: 3 additions & 0 deletions npc/pre-re/scripts_athena.conf
View file
Expand Up @@ -76,6 +76,9 @@ npc: npc/pre-re/other/mercenary_rent.txt
//npc: npc/pre-re/quests/collection/quest_pupa.txt
//npc: npc/pre-re/quests/collection/quest_zhupolong.txt
// --------------------------------------------------------------
// - Quests-Tutorials for basic classes (1st class quests) ------
npc: npc/pre-re/quests/first_class/tu_archer.txt
// --------------------------------------------------------------
npc: npc/pre-re/quests/monstertamers.txt
npc: npc/pre-re/quests/mrsmile.txt
npc: npc/pre-re/quests/quests_13_1.txt
Expand Down
86 changes: 40 additions & 46 deletions npc/quests/first_class/tu_acolyte.txt
View file
Expand Up @@ -3,22 +3,23 @@
//===== By: ==================================================
//= Fix up by Jukka
//===== Current Version: =====================================
//= 1.7
//= 1.8
//===== Compatible With: =====================================
//= rAthena SVN (Testet in Trunk 88xx)
//= rAthena SVN
//===== Description: =========================================
//=
//= [Official Conversion]
//= Acolyte training quest.
//===== Additional Comments: =================================
//= 1.0 Fully working
//= 1.1 optimized [Lupus]
//= TODO: Test, Add correct misceffects numbers
//= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
//= 1.3 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//= 1.4 Misc. updates. [L0ne_W0lf]
//= 1.5 Adjusted EXP gains to Renewal values.
//= 1.6 Fixed a wrong placed curly bracket. [Joseph]
//= 1.6a Added 'npcskill' command. [Euphy]
//= 1.7 Fixed exp, texts, and requirements in pre-renewal [Daegaladh]
//= 1.8 Updated to match the official script. [Euphy]
//============================================================

// Priest Praupin
Expand Down Expand Up @@ -291,13 +292,10 @@ prt_monk,230,106,3 script Asthe#tu 79,{
next;
mes "[Asthe]";
mes "HEAL !!";
npcskill "AL_HEAL",10,99,60;
npcskill "AL_HEAL",11,99,60;
set tu_acolyte01, 3;
if(getskilllv("AL_HEAL") == 0){
if(checkre(3))
getexp 0,10;
else
getexp 0,100;
getexp 0,100;
specialeffect2 EF_CONE;
}
close;
Expand Down Expand Up @@ -386,17 +384,11 @@ prt_monk,230,106,3 script Asthe#tu 79,{
set tu_acolyte01, 5;
delitem 1504, 1; //Mace
if(Class == Job_Acolyte_High) {
if(checkre(3))
getexp 200,100;
else
getexp 2000,1000;
getexp 2000,1000;
specialeffect2 EF_CONE;
close;
} else {
if(checkre(3))
getexp 100,50;
else
getexp 1000,500;
getexp 1000,500;
specialeffect2 EF_CONE;
close;
}
Expand Down Expand Up @@ -785,8 +777,8 @@ prt_monk,230,106,3 script Asthe#tu 79,{
mes "[Asthe]";
mes "Well, please don't forget what I've taught you. I hope you look back with fondness at our time together amongst these beautiful flowers. May God bless you~";
set tu_acolyte01, 25;
if(checkre(3))
getexp 500,300;
if (checkre(3))
getexp 1000,1000;
else
getexp 5000,3000;
specialeffect2 EF_CONE;
Expand Down Expand Up @@ -842,8 +834,8 @@ monk_in,18,38,6 script Priest Gardron#tu 110,{
close;
}
} else if(tu_acolyte01 == 8){
if(countitem(checkre(0)?939:957) > 4){
mes "Oh..!";
if(countitem((checkre(0)?939:957)) > 4){
mes "Oh...!";
mes "You've returned!";
mes "Let's see... One...";
mes "Two... Three...";
Expand All @@ -864,45 +856,48 @@ monk_in,18,38,6 script Priest Gardron#tu 110,{
mes "Acolyte training.";
set tu_acolyte01, 9;
percentheal 100,100;
if(checkre(3))
getexp 200,200;
if (checkre(3))
getexp 1000,1000;
else
getexp 2000,2000;
specialeffect2 EF_CONE;
//getitem 505,1; //Blue_Potion
close;
} else {
if(checkre(0)) {
mes "A little while ago, a Prontera Sister sent me a message. Apparently,";
mes "the residents of Prontera are being plagued by Hornets.";
if (checkre(0)) {
mes "A few days ago, a sister in Prontera";
mes "sent me a telegram that citizens had been harmed";
mes "by Hornets in the western field,";
mes "so she asked the abbey to help with them.";
next;
mes "[Priest Gardron]";
mes "She has requested the convent for help, but we've got a big problem. We're running out of people here that can deal with this situation...";
mes "But at this time,";
mes "we are also short of hands...";
mes "so it's a big problem.";
next;
mes "[Priest Gardron]";
mes "....!";
emotion e_gasp;
next;
mes "[Priest Gardron]";
mes ""+strcharinfo(0)+",";
mes "may I ask";
mes "you to take care";
mes "of this task? Exterminate the Hornets west of Prontera.";
mes "May I entrust you, acolyte "+strcharinfo(0)+",";
mes "this urgent matter?";
mes "Please dispose of Hornets";
mes "which are causint trouble on ^FF0000the western field of Prontera^000000.";
next;
mes "[Priest Gardron]";
mes "Since you're still in basic training, I will give you some";
mes "help if you return with";
mes "^3131FF5 Bee Stings^000000.";
mes "I know that you are undergoing the discipline,";
mes "So I will give you something to help you";
mes "if you bring me ^3131FF 5^000000 ^3131FFBee Sting^000000.";
next;
mes "[Priest Gardron]";
mes "Now then...";
mes "Will you go to Prontera?";
next;
if(select("Let's go to Prontera!:Um, let me get ready first.")==1) {
if(select("Let's go to Prontera!:I'll be back after doing some preparation.") == 1) {
mes "[Priest Gardron]";
mes "Good, good.";
mes "I shall send you";
mes "there to fight the monsters west of Prontera so that you can return with 5 Bee Stings. May God bless you...";
mes "Okay, I will send you to Prontera.";
mes "Please dispose of Hornets and bring me 5 Bee Stings for confirmation.";
mes "My Lord, please protect this acolyte from evil monsters.";
close2;
warp "prontera",116,72;
end;
Expand Down Expand Up @@ -964,8 +959,7 @@ prt_monk,235,245,5 script Dog#tu 81,{
mes "Woof woof!^000000";
next;
if(tu_acolyte01 == 10){
set .@dog_food, 0;
while((1)){
while(1) {
switch(select("Give a treat.:Pet the dog.:End actions.")){
case 1:
set .@dog_food, .@dog_food + 1;
Expand Down Expand Up @@ -1051,7 +1045,6 @@ prt_monk,226,257,6 script Ill Girl#tu 93,{
mes "H-hurts...";
next;
select("Are you alright?");

mes "[Angelic]";
mes "My sister...";
mes "She was so beautiful...";
Expand Down Expand Up @@ -1079,8 +1072,9 @@ prt_monk,226,257,6 script Ill Girl#tu 93,{
next;
mes "["+strcharinfo(0)+"]";
mes "Are you alright?";
mes "................";
next;
specialeffect EF_CURSEATTACK ;
specialeffect EF_CURSEATTACK;
soundeffectall "_curse.wav",0;
emotion e_omg;
mes "["+strcharinfo(0)+"]";
Expand Down Expand Up @@ -1112,7 +1106,7 @@ prt_monk,226,257,6 script Ill Girl#tu 93,{
mes "["+strcharinfo(0)+"]";
mes "H...";
mes "Heal !!";
specialeffect EF_HEAL ;
specialeffect EF_HEAL;
next;
mes "^3355FFNothing happened.";
mes "It doesn't look like";
Expand All @@ -1137,8 +1131,8 @@ prt_monk,226,257,6 script Ill Girl#tu 93,{
mes "It seemed that this good";
mes "deed has improved your skills.^000000";
set tu_acolyte01, 13;
if(checkre(3))
getexp 0,100;
if (checkre(3))
getexp 0,500;
else
getexp 0,1000;
specialeffect2 EF_CONE;
Expand Down

0 comments on commit 4589a4d

Please sign in to comment.