summaryrefslogtreecommitdiff
path: root/npc/quests/juice_maker.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/quests/juice_maker.txt')
-rw-r--r--npc/quests/juice_maker.txt28
1 files changed, 13 insertions, 15 deletions
diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt
index 5f92a4829..27d5e22cb 100644
--- a/npc/quests/juice_maker.txt
+++ b/npc/quests/juice_maker.txt
@@ -4,21 +4,19 @@
//= kobra_k88
//===== Current Version: =====================================
//= 2.1
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
-//= [Aegis COnversion]
+//= [Official Conversion]
//= Learn where to turn apples, bananas, carrots, and grapes
//= into juice.
//= Condition if done: (MISC_QUEST & 1)
//===== Additional Comments: =================================
//= 1.9 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//= Added tracking variables in, which are unset when complete.
+//= Added tracking variables in, which are unset when complete.
//= 2.0 Added missing checkweight. [L0ne_W0lf]
//= 2.1 Fixed dialog for if your missing the needed items (He always said the dialog for grape juice). [Kisuka]
//============================================================
-prt_in,49,172,3 script Marianne#juice 53,{
+prt_in,49,172,3 script Marianne#juice 1_M_INNKEEPER,{
if (MISC_QUEST&1 || morison_meat == 15) {
mes "[Housewife Marianne]";
mes "Whew...!";
@@ -79,7 +77,7 @@ prt_in,49,172,3 script Marianne#juice 53,{
close;
}
-prt_in,47,173,3 script Morrison#juice 97,{
+prt_in,47,173,3 script Morrison#juice 4W_M_01,{
if (MISC_QUEST&1 || morison_meat == 15) {
mes "[Little Morrison]";
mes "Bleh... Forget it.";
@@ -169,7 +167,7 @@ prt_in,47,173,3 script Morrison#juice 97,{
close;
}
-payon_in03,188,146,5 script Marx Hansen#juice 86,{
+payon_in03,188,146,5 script Marx Hansen#juice 4_M_04,{
if (checkweight(1201,1) == 0) {
mes "- Wait a moment! -";
mes "- Currently you're carrying -";
@@ -271,7 +269,7 @@ payon_in03,188,146,5 script Marx Hansen#juice 86,{
}
delitem .@fruit,.@make;
delitem 713,.@make;
- set zeny,zeny-.@total_zeny;
+ Zeny -= .@total_zeny;
getitem .@juice,.@make;
mes "[Merchant Marx Hansen]";
@@ -336,17 +334,17 @@ payon_in03,188,146,5 script Marx Hansen#juice 86,{
}
}
-//============================================================
+//============================================================
// Old changelog
-//============================================================
+//============================================================
//= 1.1 fixed input number check [Lupus]
//= 1.2 fixed misplaced Grape<->Carrot juices [Lupus]
//= 1.3 added a loopless menu 'as many as possible' [Lupus]
//= 1.3a Turned the juice making part of the Juicer npc into a
-//= subfunc. Changed fruit amount needed to 1.[kobra_k88]
-//= Fixed exploits [Lupus]
+//= subfunc. Changed fruit amount needed to 1.[kobra_k88]
+//= Fixed exploits [Lupus]
//= 1.6 fixed typo (where did @ipnut came from?) [Lance]
//= 1.8 got rid of vars: 'MEAT',"MARIANNE","MORRISON"
-//= From now, all common quests start using bits of the
-//= same variable MISC_QUEST [Lupus]
-//============================================================
+//= From now, all common quests start using bits of the
+//= same variable MISC_QUEST [Lupus]
+//============================================================