Merge branch 'master' into cell_noskill

1 files changed, 8 insertions, 10 deletions

diff --git a/npc/other/fortune.txt b/npc/other/fortune.txt
index 23d65e88f..4482cda18 100644
--- a/npc/other/fortune.txt
+++ b/npc/other/fortune.txt
@@ -9,8 +9,8 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  L0ne_W0lf
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) L0ne_W0lf
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -57,23 +57,21 @@ payon_in03,117,128,5	script	Fortune Teller	4_M_BIBI,{
 			mes "Then...";
 			mes "Please pay your fee with all of your sincerity.";
 			next;
-			input .@input;
-			if (.@input == 0) {
+			input(.@input);
+			if (.@input <= 0) {
 				mes "[Lhimetorra]";
 				mes "Ah...?!";
 				mes "You have angered the monster spirits!";
 				close;
 			}
-			else if (.@input > Zeny) {
+			if (.@input > Zeny) {
 				mes "[Lhimetorra]";
 				mes "There's no need to overdo it. Just give with all your heart... *Tsk tsk*";
 				close;
 			}
-			else {
-				mes "[Lhimetorra]";
-				mes "I accept your heart and your devotion with my gratitude. Thoughts are more important than the amount when paying a fortune teller.";
-				Zeny -= .@input;
-			}
+			mes "[Lhimetorra]";
+			mes "I accept your heart and your devotion with my gratitude. Thoughts are more important than the amount when paying a fortune teller.";
+			Zeny -= .@input;
 			next;
 			mes "[Lhimetorra]";
 			mes "Then, I will begin to tell the fortune of your wish. Concentrate on yourself...";