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

fixed 4 bugs in Blacksmith job quest, put some garbage var to clear. Fixed a typo in Bard Job q

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12791 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Lupus 2008-06-08 12:53:48 +00:00
parent a70ad818d9
commit cc74ee4126
4 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
npc/Changelog.txt
View File

@ -1,6 +1,8 @@
Date Added Date Added
====== ======
2008/06/08 2008/06/08
* Fixed 4 bugs: blacksmith.txt. Added a garbage variable to F_ClearGarbage [Lupus]
* Fixed one of Einbroch (east) kafras not displaying a name, bugreport:857 * Fixed one of Einbroch (east) kafras not displaying a name, bugreport:857
* Fixed Engel giving back 7 Sobbing Starlight on failing to refine it, bugreport:1473 * Fixed Engel giving back 7 Sobbing Starlight on failing to refine it, bugreport:1473
* Removed duplicated quest warp portal on /warps/dungeons/juperos.txt, bugreport:1486 * Removed duplicated quest warp portal on /warps/dungeons/juperos.txt, bugreport:1486

32
npc/jobs/2-1/blacksmith.txt
View File

@ -7,7 +7,7 @@
//= Optimized and further edited by kobra_k88. //= Optimized and further edited by kobra_k88.
//= Further bugfixed and tested by Lupus //= Further bugfixed and tested by Lupus
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 2.5 //= 2.6
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena SVN //= eAthena SVN
//===== Description: ========================================= //===== Description: =========================================
@ -36,6 +36,7 @@
//= 2.4d Fixed an incorrect answer in the quiz. (Trojal) [L0ne_W0lf] //= 2.4d Fixed an incorrect answer in the quiz. (Trojal) [L0ne_W0lf]
//= 2.4e Touched up a few issues as pointed out by Ultramage. [L0ne_W0lf] //= 2.4e Touched up a few issues as pointed out by Ultramage. [L0ne_W0lf]
//= 2.5 Krongast is in Lighthalzen. (DarkValmir) [L0ne_W0lf] //= 2.5 Krongast is in Lighthalzen. (DarkValmir) [L0ne_W0lf]
//= 2.6 Fixed 4 bugs [Lupus]
//============================================================== //==============================================================
ein_in01,18,28,4 script Guildsman#BLS 731,{ ein_in01,18,28,4 script Guildsman#BLS 731,{
@ -317,7 +318,7 @@ ein_in01,201,27,3 script Guildsman#alberta 63,{
next; next;
if (select("Yes.:Um, can I have some time to prepare?") == 1) { if (select("Yes.:Um, can I have some time to prepare?") == 1) {
L_AskQuestions: L_AskQuestions:
if (rand(1)) { if (rand(2)) {
mes "[Geschupenschte]"; mes "[Geschupenschte]";
mes "1. Which one of the following regions is matched incorrectly"; mes "1. Which one of the following regions is matched incorrectly";
mes "with its specialty item?"; mes "with its specialty item?";
@ -527,7 +528,7 @@ L_AskQuestions:
mes "Well, to make"; mes "Well, to make";
mes "this you will need..."; mes "this you will need...";
next; next;
switch(rand(1,6)) { switch(rand(1,5)) {
//Steel, Rotten_Bandage, Blue_Gemstone, Arc_Wand //Steel, Rotten_Bandage, Blue_Gemstone, Arc_Wand
case 1: setarray .@items[0], 999,1, 930,1, 717,2, 1610,1, 4; break; case 1: setarray .@items[0], 999,1, 930,1, 717,2, 1610,1, 4; break;
//Sparkling_Dust, Skel_Bone, Zargon, Gladius //Sparkling_Dust, Skel_Bone, Zargon, Gladius
@ -552,14 +553,6 @@ L_AskQuestions:
mes "Collecting these items will be your test. Coincidentally, it's also a bit of a good way for me to save money. I'll repeat what you'll need to bring back to me..."; mes "Collecting these items will be your test. Coincidentally, it's also a bit of a good way for me to save money. I'll repeat what you'll need to bring back to me...";
next; next;
mes "[Geschupenschte]"; mes "[Geschupenschte]";
mes "^8E6B23"+.@items[1]+" "+getitemname(.@items[0])+"^000000,";
mes "^8E6B23"+.@items[3]+" "+getitemname(.@items[2])+"^000000,";
mes "^8E6B23"+.@items[5]+" "+getitemname(.@items[4])+"^000000, and";
mes "^8E6B23"+.@items[7]+" "+getitemname(.@items[6])+"^000000, the kind";
mes "you can buy from";
mes "an NPC shop.";
next;
mes "[Geschupenschte]";
mes "Okay~"; mes "Okay~";
mes "Good luck"; mes "Good luck";
mes "on your first job!"; mes "on your first job!";
@ -1000,7 +993,7 @@ morocc,27,112,4 script Wickebine#BLS 725,{
mes "Tell him I'm satisfied with the quality of the workmanship."; mes "Tell him I'm satisfied with the quality of the workmanship.";
next; next;
getitem 1073,1; //Merchant_Voucher_1 getitem 1073,1; //Merchant_Voucher_1
Emotion e_lv; emotion e_lv;
mes "[Wickebine]"; mes "[Wickebine]";
mes "Here's the receipt."; mes "Here's the receipt.";
mes "I think you did"; mes "I think you did";
@ -1011,7 +1004,7 @@ morocc,27,112,4 script Wickebine#BLS 725,{
end; end;
} }
else if (BSMITH_Q == 14) { else if (BSMITH_Q == 14) {
Emotion e_lv; emotion e_lv;
cutin "Job_Black_hucke02",2; cutin "Job_Black_hucke02",2;
mes "[Wickebine]"; mes "[Wickebine]";
mes "Thanks for the delivery."; mes "Thanks for the delivery.";
@ -1037,7 +1030,7 @@ morocc,27,112,4 script Wickebine#BLS 725,{
mes "[Wickebine]"; mes "[Wickebine]";
mes "How long does it take for something to ship from Geschupenschte? Usually, the Geffen Blacksmith Guild is pretty prompt..."; mes "How long does it take for something to ship from Geschupenschte? Usually, the Geffen Blacksmith Guild is pretty prompt...";
next; next;
Emotion e_lv; emotion e_lv;
mes "[Wickebine]"; mes "[Wickebine]";
mes "Ooohh..."; mes "Ooohh...";
mes "This is very"; mes "This is very";
@ -1299,7 +1292,7 @@ hugel,168,183,1 script Bismarc#BLS 118,{
ein_in01,24,41,5 script Blacksmith Guildsman#moc 726,{ ein_in01,24,41,5 script Blacksmith Guildsman#moc 726,{
if (BSMITH_Q == 16) { if (BSMITH_Q == 16) {
Emotion e_hmm; emotion e_hmm;
mes "[Mitehmaeeuh]"; mes "[Mitehmaeeuh]";
mes "Oh...so you're the one who wants to be a blacksmith?"; mes "Oh...so you're the one who wants to be a blacksmith?";
mes "Nice, heh heh."; mes "Nice, heh heh.";
@ -1317,8 +1310,7 @@ ein_in01,24,41,5 script Blacksmith Guildsman#moc 726,{
mes "you fail. And I won't"; mes "you fail. And I won't";
mes "tell you what you missed."; mes "tell you what you missed.";
next; next;
set wizard_m2,rand(1,3); set .@blackss_te,0;
set blackss_te,0;
mes "[Mitehmaeeuh]"; mes "[Mitehmaeeuh]";
mes "Please listen"; mes "Please listen";
mes "and answer carefully..."; mes "and answer carefully...";
@ -1457,7 +1449,7 @@ ein_in01,24,41,5 script Blacksmith Guildsman#moc 726,{
next; next;
mes "[Mitehmaeeuh]"; mes "[Mitehmaeeuh]";
mes "You earned"; mes "You earned";
mes .@blackss_te +" points..."; mes ""+ .@blackss_te +" points...";
if (.@blackss_te > 70) { if (.@blackss_te > 70) {
mes "Very nice!"; mes "Very nice!";
mes "Congratulations!"; mes "Congratulations!";
@ -1487,7 +1479,7 @@ ein_in01,24,41,5 script Blacksmith Guildsman#moc 726,{
close; close;
} }
else if (BSMITH_Q == 17) { else if (BSMITH_Q == 17) {
Emotion e_hmm; emotion e_hmm;
mes "[Mitehmaeeuh]"; mes "[Mitehmaeeuh]";
mes "Yeap, you just passed the Blacksmith job test~"; mes "Yeap, you just passed the Blacksmith job test~";
next; next;
@ -1502,7 +1494,7 @@ ein_in01,24,41,5 script Blacksmith Guildsman#moc 726,{
close; close;
} }
else { else {
Emotion e_hmm; emotion e_hmm;
mes "[Mitehmaeeuh]"; mes "[Mitehmaeeuh]";
mes "I had to deal with the heat when I was in Morroc,"; mes "I had to deal with the heat when I was in Morroc,";
mes "and now I have to deal with the smog in this Einbroch!"; mes "and now I have to deal with the smog in this Einbroch!";

2
npc/jobs/2-2/bard.txt
View File

@ -94,7 +94,7 @@ comodo,226,123,5 script Wandering Bard 741,{
cutin "job_bard_aiolo01",2; cutin "job_bard_aiolo01",2;
mes "[Lalo]"; mes "[Lalo]";
if (sex) mes "Hi! Delightful Archer."; if (sex) mes "Hi! Delightful Archer.";
else mes "Hello! Beautif ul Archer Lady."; else mes "Hello! Beautiful Archer Lady.";
mes "How can a wanderer like me help you?"; mes "How can a wanderer like me help you?";
next; next;
switch(select("You have a nice voice.:Could you sing for me, please?:Nothing.")) { switch(select("You have a nice voice.:Could you sing for me, please?:Nothing.")) {

6
npc/other/Global_Functions.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= Lupus, kobra_k88 //= Lupus, kobra_k88
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 2.12 //= 2.13
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena 1.0 //= eAthena 1.0
//===== Description: ========================================= //===== Description: =========================================
@ -35,6 +35,7 @@
//= 2.10a Removed function F_CheckMaxCount. Not needed. [L0ne_W0lf] //= 2.10a Removed function F_CheckMaxCount. Not needed. [L0ne_W0lf]
//= 2.11 Updated function Job_Change to jobchange based on Upper value. [Paradox924X] //= 2.11 Updated function Job_Change to jobchange based on Upper value. [Paradox924X]
//= 2.12 Added more unused vars to F_ClearGarbage [Lupus] //= 2.12 Added more unused vars to F_ClearGarbage [Lupus]
//= 2.13 Added more unused vars to F_ClearGarbage [Lupus]
//============================================================ //============================================================
@ -94,6 +95,9 @@ function script F_ClearGarbage {
set RES_SKILL,0; set RES_SKILL,0;
//Here you put outdated variables from your outdated EVENTS //Here you put outdated variables from your outdated EVENTS
//e.g. Is XMAS done? Add the EVENT var clearing code here. //e.g. Is XMAS done? Add the EVENT var clearing code here.
//due to bugs in BS quest:
set wizard_m2,0;
return; return;
} }