summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStreusel <advance_me@hotmail.de>2013-02-23 23:58:30 -0800
committerStreusel <advance_me@hotmail.de>2013-02-23 23:58:30 -0800
commitfa2751b503d41388cf82dbf882877db280b1bba7 (patch)
treed9b4bef1f96a72611562973667f0b4098736b3cd
parent137096757561eb466f2bc7cbb89d65ca70ba22a3 (diff)
downloadhercules-fa2751b503d41388cf82dbf882877db280b1bba7.tar.gz
hercules-fa2751b503d41388cf82dbf882877db280b1bba7.tar.bz2
hercules-fa2751b503d41388cf82dbf882877db280b1bba7.tar.xz
hercules-fa2751b503d41388cf82dbf882877db280b1bba7.zip
-Added renewal checks for exp distribution
-rw-r--r--db/quest_db.txt3
-rw-r--r--npc/quests/quests_ein.txt186
-rw-r--r--npc/quests/quests_nameless.txt99
-rw-r--r--npc/quests/quests_prontera.txt13
-rw-r--r--npc/quests/quests_rachel.txt29
-rw-r--r--npc/quests/quests_veins.txt23
6 files changed, 257 insertions, 96 deletions
diff --git a/db/quest_db.txt b/db/quest_db.txt
index bd5e1c33e..43cc547da 100644
--- a/db/quest_db.txt
+++ b/db/quest_db.txt
@@ -2334,7 +2334,6 @@
2301,0,0,0,0,0,0,0,"Training Center: Leave the boat"
2302,0,0,0,0,0,0,0,"Training Center: Formation"
-
// Port Malaya
7350,0,0,0,0,0,0,0,"Cautious Village"
7351,0,0,0,0,0,0,0,"Better than My Old Button"
@@ -2347,4 +2346,4 @@
7358,0,0,0,0,0,0,0,"Why do they want my Buttons?"
7360,0,0,0,0,0,0,0,"Deliver Holy Item to Old Man"
7363,0,0,0,0,0,0,0,"Deliver Holy Item to Little Kid"
-7364,0,0,0,0,0,0,0,"Deliver Holy Item to Middle-aged Man"
+7364,0,0,0,0,0,0,0,"Deliver Holy Item to Middle-aged Man" \ No newline at end of file
diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt
index 762787bde..299922954 100644
--- a/npc/quests/quests_ein.txt
+++ b/npc/quests/quests_ein.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Evera and The rAthena Dev Team
//===== Current Version: =====================================
-//= 2.5
+//= 2.6
//===== Description: =========================================
//= [Aegis conversion]
//= Oridecon/Mineral Quest
@@ -47,6 +47,7 @@
//= 2.5 Added quest log entries for:
//= - Factory Quest
//= - Murder Quest
+//= 2.6 Added renewal checks for exp distribution [Streusel]
//============================================================
// Oridecon Stone OR Mineral Stone Quest
@@ -3553,26 +3554,50 @@ ein_in01,67,242,3 script Zelmeto 851,{
set $EinPolution,$EinPolution+1;
completequest 8031;
set EinFactory,16;
- if (BaseLevel < 41) {
- getexp 62,0;
- }
- else if (BaseLevel < 51) {
- getexp 308,0;
- }
- else if (BaseLevel < 61) {
- getexp 660,0;
- }
- else if (BaseLevel < 71) {
- getexp 1851,0;
- }
- else if( BaseLevel < 81) {
- getexp 3206,0;
- }
- else if (BaseLevel < 91) {
- getexp 7603,0;
- }
- else if (BaseLevel < 99) {
- getexp 29068,0;
+ if(checkre(0)) {
+ if (BaseLevel < 41) {
+ getexp 61,0;
+ }
+ else if (BaseLevel < 51) {
+ getexp 307,0;
+ }
+ else if (BaseLevel < 61) {
+ getexp 660,0;
+ }
+ else if (BaseLevel < 71) {
+ getexp 1850,0;
+ }
+ else if( BaseLevel < 81) {
+ getexp 3206,0;
+ }
+ else if (BaseLevel < 91) {
+ getexp 7602,0;
+ }
+ else if (BaseLevel < 99) {
+ getexp 29067,0;
+ }
+ }else {
+ if (BaseLevel < 41) {
+ getexp 615,0;
+ }
+ else if (BaseLevel < 51) {
+ getexp 3075,0;
+ }
+ else if (BaseLevel < 61) {
+ getexp 6604,0;
+ }
+ else if (BaseLevel < 71) {
+ getexp 18508,0;
+ }
+ else if( BaseLevel < 81) {
+ getexp 32062,0;
+ }
+ else if (BaseLevel < 91) {
+ getexp 76026,0;
+ }
+ else if (BaseLevel < 99) {
+ getexp 290675,0;
+ }
}
next;
mes "[Zelmeto]";
@@ -4672,17 +4697,32 @@ einbech,165,105,7 script Buender Hikeman#ein 847,{
cutin "ein_hicman",255;
completequest 2078;
set Shinokas_Quest,11;
- if (BaseLevel < 70) {
- getexp 10000,8000;
- }
- else if ((BaseLevel > 69) && (BaseLevel < 80)) {
- getexp 30000,10000;
- }
- else if ((BaseLevel > 79) && (BaseLevel < 90)) {
- getexp 50000,30000;
- }
- else if ((BaseLevel > 89) && (BaseLevel < 100)) {
- getexp 70000,50000;
+ if(checkre(0)) {
+ if (BaseLevel < 70) {
+ getexp 10000,8000;
+ }
+ else if ((BaseLevel > 69) && (BaseLevel < 80)) {
+ getexp 30000,10000;
+ }
+ else if ((BaseLevel > 79) && (BaseLevel < 90)) {
+ getexp 50000,30000;
+ }
+ else if ((BaseLevel > 89) && (BaseLevel < 100)) {
+ getexp 70000,50000;
+ }
+ } else {
+ if (BaseLevel < 70) {
+ getexp 100000,80000;
+ }
+ else if ((BaseLevel > 69) && (BaseLevel < 80)) {
+ getexp 300000,100000;
+ }
+ else if ((BaseLevel > 79) && (BaseLevel < 90)) {
+ getexp 500000,300000;
+ }
+ else if ((BaseLevel > 89) && (BaseLevel < 100)) {
+ getexp 700000,500000;
+ }
}
end;
case 2:
@@ -5944,17 +5984,38 @@ ein_in01,31,138,3 script Calla#ein 90,{
mes "feel goooood~";
percentheal 100,0;
set EIN_LOVERQ,17;
- if (BaseLevel < 41) {
- getexp 61,0;
- }
- else if (BaseLevel < 61) {
- getexp 600,0;
- }
- else if (BaseLevel < 81) {
- getexp 3000,0;
+ if(checkre(0)) {
+ if (BaseLevel < 41) {
+ getexp 61,0;
+ }
+ else if (BaseLevel < 61) {
+ getexp 600,0;
+ }
+ else if (BaseLevel < 81) {
+ getexp 3000,0;
+ }
+ else if (BaseLevel < 99) {
+ getexp 20000,0;
+ }
+ } else {
+ if (BaseLevel < 41) {
+ getexp 3712,0;
+ }
+ else if (BaseLevel < 61) {
+ getexp 7425,0;
+ }
+ else if (BaseLevel < 71) {
+ getexp 14850,0;
+ }
+ else if (BaseLevel < 81) {
+ getexp 29700,0;
+ }
+ else if (BaseLevel < 91) {
+ getexp 59400,0;
+ }
+ else if (BaseLevel < 99) {
+ getexp 118800,0;
}
- else if (BaseLevel < 99) {
- getexp 20000,0;
}
next;
mes "[Calla]";
@@ -6412,17 +6473,38 @@ ein_in01,200,101,5 script Klitzer#ein 854,{
percentheal 100,0;
delitem 1901,1; //Violin
set EIN_LOVERQ,5;
- if (BaseLevel < 41) {
- getexp 61,0;
- }
- else if (BaseLevel < 61) {
- getexp 600,0;
- }
- else if (BaseLevel < 81) {
- getexp 3000,0;
+ if(checkre(0)) {
+ if (BaseLevel < 41) {
+ getexp 61,0;
+ }
+ else if (BaseLevel < 61) {
+ getexp 600,0;
+ }
+ else if (BaseLevel < 81) {
+ getexp 3000,0;
+ }
+ else if (BaseLevel < 99) {
+ getexp 20000,0;
+ }
+ } else {
+ if (BaseLevel < 41) {
+ getexp 3712,0;
+ }
+ else if (BaseLevel < 61) {
+ getexp 7425,0;
+ }
+ else if (BaseLevel < 71) {
+ getexp 14850,0;
+ }
+ else if (BaseLevel < 81) {
+ getexp 29700,0;
+ }
+ else if (BaseLevel < 91) {
+ getexp 59400,0;
+ }
+ else if (BaseLevel < 99) {
+ getexp 118800,0;
}
- else if (BaseLevel < 99) {
- getexp 20000,0;
}
next;
mes "[Klitzer]";
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index ae37edcea..a8d9c7f93 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 2.3
+//= 2.4
//===== Description: =========================================
//= [Aegis Conversion]
//= Collection of Nameless Island Quests
@@ -59,6 +59,7 @@
//= - Z-Gang Quest
//= 2.2a Fixed a few job constant typos. [Euphy]
//= 2.3 Removed Strange Machine [Streusel]
+//= 2.4 Added renewal checks for exp distribution [Streusel]
//============================================================
// Nameless Island and Cursed Monestary Access Quest
@@ -878,7 +879,10 @@ ra_temple,165,57,5 script Niren#ss 915,{
mes "comes from that place.";
delitem 7755,1; //Research_Note
set aru_monas,26;
- getexp 50000,0;
+ if(checkre(0))
+ getexp 50000,0;
+ else
+ getexp 500000,0;
close2;
}
}
@@ -1347,7 +1351,10 @@ ra_temple,165,57,5 script Niren#ss 915,{
mes "that you've seen that";
mes "expression on her face.^000000";
set aru_em,23;
- getexp 100000,0;
+ if(checkre(0))
+ getexp 100000,0;
+ else
+ getexp 1000000,0;
close2;
}
else if (aru_em > 21) {
@@ -1924,7 +1931,10 @@ nameless_n,259,218,3 script Larjes#Boat1 97,{
mes "This is huge!";
set aru_monas,24;
delitem 7726,1; //Token_Of_King
- getexp 100000,0;
+ if(checkre(0))
+ getexp 100000,0;
+ else
+ getexp 1000000,0;
close;
}
mes "[Larjes]";
@@ -6178,7 +6188,10 @@ prontera,148,326,3 script Chief Officer#edq 734,{
mes "Congratulations! ";
completequest 3134;
set zdan_edq,19;
- getexp 100000,0;
+ if(checkre(0))
+ getexp 100000,0;
+ else
+ getexp 1000000,0;
close;
}
mes "[Chief Officer]";
@@ -10693,31 +10706,59 @@ prontera,140,304,5 script Old Soldier 901,{
getitem 607,1; //Yggdrasilberry
next;
}
- else if ((BaseLevel > 65) && (BaseLevel < 75)) {
- getexp 5000,0;
- next;
- }
- else if ((BaseLevel > 74) && (BaseLevel < 81)) {
- getexp 18000,0;
- next;
- }
- else if ((BaseLevel > 80) && (BaseLevel < 86)) {
- getexp 36000,0;
- next;
- }
- else if ((BaseLevel > 85) && (BaseLevel < 91)) {
- getexp 50000,0;
- next;
- }
- else if ((BaseLevel > 90) && (BaseLevel < 96)) {
- getexp 80000,0;
- next;
- }
- else if ((BaseLevel > 95) && (BaseLevel < 150)) {
- getexp 100000,0;
- next;
+ if(checkre(0)) {
+ if ((BaseLevel > 65) && (BaseLevel < 75)) {
+ getexp 5000,0;
+ next;
+ }
+ else if ((BaseLevel > 74) && (BaseLevel < 81)) {
+ getexp 18000,0;
+ next;
+ }
+ else if ((BaseLevel > 80) && (BaseLevel < 86)) {
+ getexp 36000,0;
+ next;
+ }
+ else if ((BaseLevel > 85) && (BaseLevel < 91)) {
+ getexp 50000,0;
+ next;
+ }
+ else if ((BaseLevel > 90) && (BaseLevel < 96)) {
+ getexp 80000,0;
+ next;
+ }
+ else if ((BaseLevel > 95) && (BaseLevel < 150)) {
+ getexp 100000,0;
+ next;
+ }
+ } else {
+ if ((BaseLevel > 65) && (BaseLevel < 75)) {
+ getexp 50000,0;
+ next;
+ }
+ else if ((BaseLevel > 74) && (BaseLevel < 81)) {
+ getexp 180000,0;
+ next;
+ }
+ else if ((BaseLevel > 80) && (BaseLevel < 86)) {
+ getexp 360000,0;
+ next;
+ }
+ else if ((BaseLevel > 85) && (BaseLevel < 91)) {
+ getexp 500000,0;
+ next;
+ }
+ else if ((BaseLevel > 90) && (BaseLevel < 96)) {
+ getexp 800000,0;
+ next;
+ }
+ else if ((BaseLevel > 95) && (BaseLevel < 150)) {
+ getexp 200000,0;
+ next;
+ }
+
}
- else if (BaseLevel == 150) {
+ if (BaseLevel == 150) {
getitem 617,1; //Old_Violet_Box
next;
}
diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index b5a3dd705..fba2043f3 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
-//= 2.7
+//= 2.8
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -47,6 +47,7 @@
//= 2.5a Fixed requirements for PH D. Hat agian lol. [L0ne_W0lf]
//= 2.6 Replaced effect numerics with constants. [L0ne_W0lf]
//= 2.7 Corrected 'IProntera' typo. (bugreport:4522) [L0ne_W0lf]
+//= 2.8 Added renewal checks for exp distribution [Streusel]
//============================================================
// Prontera Culvert
@@ -2662,7 +2663,10 @@ prt_church,185,106,3 script Father Bamph 60,{
mes "adventurer. May safety accompany you on all of your journeys.";
if (prt_curse == 43) set prt_curse,44;
else set prt_curse,54;
- getexp 160000,0;
+ if(checkre(0))
+ getexp 160000,0;
+ else
+ getexp 1600000,0;
close;
}
else if (prt_curse > 43 && prt_curse < 50 && !aru_monas) {
@@ -2993,7 +2997,10 @@ prt_church,184,110,3 script Father Biscuss 60,{
mes "Church, I want to thank";
mes "you for all of your help.";
set prt_curse,36;
- getexp 160000,0;
+ if(checkre(0))
+ getexp 160000,0;
+ else
+ getexp 1600000,0;
close;
}
else if (prt_curse == 36) {
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index 5687f4e8d..ed77ef22d 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 3.4
+//= 3.5
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -63,6 +63,7 @@
//= 3.4 Added quest log entries for:
//= - Ice Necklace Quest
//= - Thor Volcano Base Quest addition.
+//= 3.5 Added renewal checks for exp distribution [Streusel]
//============================================================
// Lost Child Quest (Prerequisite to High Priest quest)
@@ -2620,9 +2621,15 @@ OnTouch:
mes "Who would be to blame?";
next;
set rach_vice,24;
+ if(checkre(0)) {
if (BaseLevel > 90) getexp 130000,0;
else if (BaseLevel > 75) getexp 85000,0;
else getexp 45000,0;
+ } else {
+ if (BaseLevel > 90) getexp 1400000,0;
+ else if (BaseLevel > 75) getexp 800000,0;
+ else getexp 400000,0;
+ }
mes "[" + strcharinfo(0) + "]";
mes "Somehow, I wish that";
mes "Katinshuell had the";
@@ -2924,7 +2931,10 @@ rachel,157,183,3 script Sincere Follower Urstia 916,{
mes "token of my appreication for";
mes " what you have done for me.";
delitem 7573,1; //Magic_Necklace_
- getexp 70000,0;
+ if(checkre(0))
+ getexp 70000,0;
+ else
+ getexp 700000,0;
completequest 2113;
set ice_necklace_q,6;
next;
@@ -4266,7 +4276,10 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{
if (countitem(12018) >= 20) {
cutin "ra_nemma04",2;
delitem 12018,20; //FireCracker";
- getexp 20000,0;
+ if(checkre(0))
+ getexp 20000,0;
+ else
+ getexp 200000,0;
set ra_tem_q,14;
mes "[Priestess Nemma]";
mes "Yay!";
@@ -5469,7 +5482,10 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{
set ra_tem_q,0;
cutin "",255;
specialeffect2 EF_ABSORBSPIRITS;
- getexp 90000,60000;
+ if(checkre(0))
+ getexp 90000,60000;
+ else
+ getexp 900000,600000;
end;
}
else if (MISC_QUEST & 8192) {
@@ -6025,7 +6041,10 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{
mes "peace between our nations.";
completequest 60213;
set aru_vol,27;
- getexp 20000,0;
+ if(checkre(0))
+ getexp 20000,0;
+ else
+ getexp 200000,0;
close2;
cutin "ra_gman",255;
end;
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index e23f346d4..eabbd5d46 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 2.1
+//= 2.2
//===== Description: =========================================
//= [Official Conversion]
//= Collection of Veins Quests
@@ -43,6 +43,7 @@
//= - Thor Volcano Base Quest
//= 2.0 Removed level requirement. (bugreport:4678) [L0ne_W0lf]
//= 2.1 Added missing changequest (3071-3076). [Joseph]
+//= 2.2 Added renewal checks for exp distribution [Streusel]
//============================================================
// Stone Quest
@@ -287,7 +288,10 @@ ve_fild05,257,130,4 script ::WincingOldMan_veins 945,{
mes "find these useful. Anyway,";
mes "I hope you like these rocks...";
set veins_stone,8;
- getexp 30000,0;
+ if(checkre(0))
+ getexp 30000,0;
+ else
+ getexp 300000,0;
getitem 985,3; //Elunium
close;
}
@@ -971,7 +975,10 @@ prt_church,89,108,6 script Bard#sch 741,{
mes "reward with our sincere thanks.";
set que_sch,26;
getitem 12106,1; //Accessory_Box
- getexp 60000,0;
+ if(checkre(0))
+ getexp 60000,0;
+ else
+ getexp 600000,0;
close;
}
else {
@@ -3040,7 +3047,10 @@ veins,327,185,3 script Kid#camelcamel 944,{
completequest 3083;
set rachel_camel,25;
specialeffect2 EF_ABSORBSPIRITS;
- getexp 100000,70000;
+ if(checkre(0))
+ getexp 100000,70000;
+ else
+ getexp 1000000,700000;
close;
}
else {
@@ -6081,7 +6091,10 @@ ve_in,281,214,3 script Bookshelf#vol 111,{
else {
getitem 12103,1; //Bloody_Dead_Branch
}
- getexp 80000,0;
+ if(checkre(0))
+ getexp 80000,0;
+ else
+ getexp 800000,0;
mes "^3355FFWell, you've done all";
mes "that you could here.";
mes "Now would be a good time";