summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt4
-rw-r--r--npc/jobs/2-2/alchemist.txt5
-rw-r--r--npc/other/Global_Functions.txt2
-rw-r--r--npc/quests/counteragent_mixture.txt4
-rw-r--r--npc/quests/juice_maker.txt25
-rw-r--r--npc/quests/quests_alberta.txt16
6 files changed, 32 insertions, 24 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index dd023f141..38cba84ac 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -31,6 +31,10 @@ Evera
Date Added
======
+05/30
+ * Re-made some quest to use 1 variable instead of 2 or 3... [Lupus]
+ - Juice Maker, Morgenstein+Alchemist Job Quest, Tempestra
+ Make a habbit to clean your global_reg_value table from event vars & old garbage
05/29
* Changed DTS warper vote count to use 1 variable. [Evera]
05/27
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index 4bee67f69..6848a8346 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -4,7 +4,7 @@
//= nestor_zulueta (Fusion)
//= converted by Darkchild
//===== Current Version: =====================================
-//= 2.0
+//= 2.1
//===== Compatible With: =====================================
//= eAthena 1.0 +
//===== Description: =========================================
@@ -23,6 +23,7 @@
//= to go. [Lupus]
//= 1.6a fixed some wrong answers, thanks to zlider for info [Lupus]
//= 2.0 Changed numbers to constants. [Vicious]
+//= 2.1 Got rid of 'al_morgen' var [Lupus]
//============================================================
@@ -774,7 +775,7 @@ L_Start:
mes "If you dont have business here just go away. Ok!!!";
close;
L_Check:
- if(al_morgen != 1) goto L_NotRdy;
+ if(MORGEN != 3) goto L_NotRdy;
mes "Yes, cut the Tentacle..";
mes "and mix some Sticku Mucus,";
mes "Jellopy solution in the test tube Darn, where did the Medicine Bowl go...";
diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt
index 5725b1c0c..b064d538b 100644
--- a/npc/other/Global_Functions.txt
+++ b/npc/other/Global_Functions.txt
@@ -47,7 +47,7 @@ function script F_ClearJobVar {
set WIZ_Q,0; set WIZ_Q2,0;
// 2-2 Jobs ------------------------------
set ROGUE_Q,0; set ROGUE_Q2,0;
- set ALCH_Q,0; set ALCH_Q2,0; set al_morgen,0;
+ set ALCH_Q,0; set ALCH_Q2,0;
set CRUS_Q,0;
set MONK_Q,0; set JOB_MONK_C,0;
set SAGE_Q,0; set SAGE_Q2,0;
diff --git a/npc/quests/counteragent_mixture.txt b/npc/quests/counteragent_mixture.txt
index dbe02e3c4..d24bb0f04 100644
--- a/npc/quests/counteragent_mixture.txt
+++ b/npc/quests/counteragent_mixture.txt
@@ -4,7 +4,7 @@
//= kobra_k88
//= added some dialogs for Morgenstein by Komurka
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -18,6 +18,7 @@
//= 1.5 Fixed Spelling mistakes. [Nexon]
//= 1.6 Fixed some bugs, also related to Alch Job quest [Lupus]
//= 1,7 Fixed exploit [Lupus]
+//= 1.8 Got rid of 'al_morgen' var [Lupus]
//============================================================
@@ -163,7 +164,6 @@ M_Menu:
mes "I can make one for you right now,if you want?? Ahhh... Talking about my experiments and research makes me.... 'excited'.......";
mes "You too can feel my 'excitement' if you wish..... Ahhhhh.... I can make you feel...";
set MORGEN,3;
- if(ALCH_Q == 4) set al_morgen,1;
close;
L_1:
diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt
index f9fa059b6..93fd97968 100644
--- a/npc/quests/juice_maker.txt
+++ b/npc/quests/juice_maker.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.6
+//= 1.7
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -17,14 +17,15 @@
//= subfunc. Changed fruit amount needed to 1.[kobra_k88]
//= Fixed exploits [Lupus]
//= 1.6 fixed typo (where did @ipnut came from?) [Lance]
+//= 1.7 got rid of 2 vars: 'MEAT',"MARIANNE" [Lupus]
//============================================================
// Morrison ------------------------------------------------
prt_in.gat,47,173,2 script Morrison 97,{
mes "[Little Morrison]";
- if(MEAT > 10) goto L_Candy;
- if(MARIANNE == 1) goto L_GoAway;
+ if(MORRISON > 10) goto L_GoAway;
+ if(MORRISON == 10) goto L_Candy;
mes "Wahhhhh!!! Wahh... NO more! NO more!";
mes "I won't... eat anymore stupid ^0000ffFruit^000000 things!!";
@@ -33,7 +34,7 @@ prt_in.gat,47,173,2 script Morrison 97,{
menu "Talk",M_Talk,"Cancel",M_End;
M_Talk:
- if(countitem(517) > 0) goto L_Meat; //Meat
+ if(countitem(517)) goto L_Meat; //Meat
mes "[Little Morrison]";
mes "Arhhggg!! I'VE HAD ENOUGH!!! I can't eat anymore ^0000ffFruits^000000! They";
@@ -65,8 +66,7 @@ prt_in.gat,47,173,2 script Morrison 97,{
sM_Give:
if(countitem(517) == 0) goto L_GoAway; //Meat
delitem 517,1; //Meat
- set MORRISON,1;
- set MEAT,MEAT + 1;
+ set MORRISON,MORRISON+1;
mes "[Little Morrison]";
mes "Whoah~!!! It's real Meat, Meat!";
mes "Mmmm! It makes my mouth water.";
@@ -75,7 +75,7 @@ prt_in.gat,47,173,2 script Morrison 97,{
close;
sM_Ignore:
- set MORRISON,2;
+ set MORRISON,11;
mes "[Little Morrison]";
mes "Boo...";
mes "Boo... Fine... Alright, Alright~!!! Selfish meanie!";
@@ -103,7 +103,7 @@ L_Candy:
next;
getitem 529,3;
getitem 530,1;
- set MEAT,0;
+ set MORRISON,0;
mes "[Little Morrison]";
mes "It is from my secret stash of Candy that I hide from my Mom. Since";
mes "you gave me some Meat, I will give you some candy." ;
@@ -114,8 +114,8 @@ L_Candy:
// Housewife Marianne ---------------------------------------------------
prt_in.gat,49,172,2 script Housewife Marianne 53,{
mes "[Housewife Marianne]";
- if(MORRISON == 1) goto L_GaveMeat;
- if(MORRISON == 2) goto L_Juice;
+ if(MORRISON > 10) goto L_Juice;
+ if(MORRISON) goto L_GaveMeat;
mes "Morrison!! Please eat some fruit will ya? Fruit~!";
mes "*Sob*~!! Like father like son...";
@@ -159,8 +159,7 @@ L_GaveMeat:
close;
L_Juice:
- set MORRISON,0;
- set MARIANNE,1;
+ set MORRISON,20;
mes "Thank you for not giving my son any meat. I'm trying to feed him";
mes "^0000ffFruits^000000 and vegetables, but this child doesn't want to eat";
mes "anything except Meat...";
@@ -186,7 +185,7 @@ L_Juice:
// Juicer Marx Hansen ---------------------------------------------------------
payon_in03.gat,188,146,5 script Juicer Marx Hansen 86,{
mes "[Juicer Marx Hansen]";
- if(MARIANNE == 1) goto L_Juice;
+ if(MORRISON == 20) goto L_Juice;
mes "Welcome to my shop. What brings you here?";
next;
menu "Conversation",-,"I am just looking around",M_End;
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 45fe29c9b..86ed34041 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -17,6 +17,7 @@
//= 1.1 Fixed Spore Doll exploit [Lupus], 1.2 Gramp's Tiger skin label bug
//= 1.3 Fixed item ID 7031 -> 7013
//= 1.4 Fixed a bug, Fixed Exploits, Optimized [Lupus]
+//= 1.5 Turned TEMPESTRA -> @TEMPESTRA, fixed a typo [Lupus]
//============================================================
@@ -26,8 +27,11 @@
//=======================================================================================================//
alberta.gat,117,134,8 script Elin 96,{
mes "[Elin]";
- if(Sex == 0) mes "Hello, miss. Since you're a girl, you must like dolls, don't you?";
- if(Sex == 1) mes "Hello, mister. Hmm, since you're a boy, you don't like dolls, do you?";
+ if(Sex){
+ mes "Hello, mister. Hmm, since you're a boy, you don't like dolls, do you?";
+ }else{
+ mes "Hello, miss. Since you're a girl, you must like dolls, don't you?";
+ }
next;
mes "[Elin]";
mes "I LOVE dolls!!";
@@ -500,7 +504,7 @@ alberta.gat,135,79,3 script Tempestra 71,{
mes "[Tempestra]";
mes "Ah...... Such a cool breeze. It's good to be next to the sea. I think it was the right choice for me to take a break from my business and come here.";
emotion e_ho;
- if(TEMPESTRA == 1) goto sM_Menu;
+ if(@TEMPESTRA) goto sM_Menu;
next;
mes "[Tempestra]";
mes "Oh the sun is so bright today. I'm glad I brought my hat. If my skin is exposed to the sun like this everyday, I'm sure to get a sunburn.";
@@ -512,7 +516,7 @@ alberta.gat,135,79,3 script Tempestra 71,{
if(countitem(503) < 1) goto L_NoPot;
delitem 503, 1;
- set TEMPESTRA, 1;
+ set @TEMPESTRA, 1;
mes "[Tempestra]";
mes "Oooh! Thank you so much. I'm so glad to meet such a friendly person here....";
emotion e_thx;
@@ -623,7 +627,7 @@ alberta.gat,135,79,3 script Tempestra 71,{
next;
mes "[Tempestra]";
mes "Hmm... If you have:";
- mes "^5555FF1 Amblem of the Sun God";
+ mes "^5555FF1 Emblem of the Sun God";
mes "10 Gold";
mes "40 Steel";
mes "50 Coal";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-17 20:32:03 +0000