summaryrefslogtreecommitdiff
path: root/npc/re/cities/mora.txt
diff options
context:
space:
mode:
authorKenpachi2k13 <3476227+Kenpachi2k13@users.noreply.github.com>2020-05-03 09:14:56 +0200
committerGitHub <noreply@github.com>2020-05-03 09:14:56 +0200
commitcd593de68b02d77766fcb3b7b2a869096ceb7183 (patch)
tree2245738ce70d50031b927fed560815458658c7c2 /npc/re/cities/mora.txt
parentf70a887b188dbd88c45c9992cd18a33b6886005f (diff)
parentf40cc839413cc82aed445d39cc3aa204dce87780 (diff)
downloadhercules-cd593de68b02d77766fcb3b7b2a869096ceb7183.tar.gz
hercules-cd593de68b02d77766fcb3b7b2a869096ceb7183.tar.bz2
hercules-cd593de68b02d77766fcb3b7b2a869096ceb7183.tar.xz
hercules-cd593de68b02d77766fcb3b7b2a869096ceb7183.zip
Merge branch 'master' into cell_noskill
Diffstat (limited to 'npc/re/cities/mora.txt')
-rw-r--r--npc/re/cities/mora.txt20
1 files changed, 11 insertions, 9 deletions
diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt
index a58ee4463..660629507 100644
--- a/npc/re/cities/mora.txt
+++ b/npc/re/cities/mora.txt
@@ -9,10 +9,10 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
-//= Copyright (C) Flaid
-//= Copyright (C) SuperHulk
-//= Copyright (C) Euphy
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Flaid
+//= Copyright (C) SuperHulk
+//= Copyright (C) Euphy
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
@@ -452,16 +452,18 @@ mora,140,186,3 script Raffle Philosopher 4_M_RAFLE_OLD,{
mes "You can pay me in the currencies listed below.";
mes "Enter the sum you're willing to pay. Enter 0 if you don't want to pay anything.";
next;
- input .@input;
+ input(.@input);
if (.@input == 0) {
mes "[Raffle Philosopher]";
mes "So you don't want to hear a quote, eh?";
close;
- } else if (.@input < 100 || .@input > 1000000) {
+ }
+ if (.@input < 100 || .@input > 1000000) {
mes "[Raffle Philosopher]";
mes "You can pay between ^FF0000100 and 1000000^000000.";
close;
- } else if (Zeny < .@input) {
+ }
+ if (Zeny < .@input) {
mes "[Raffle Philosopher]";
mes "So you think this is what my time is worth?";
close;
@@ -908,7 +910,7 @@ mora,140,186,3 script Raffle Philosopher 4_M_RAFLE_OLD,{
mes "I wonder what you think";
mes "about what I've told you.";
next;
- input .@inputstr$;
+ input(.@inputstr$);
mes "[Raffle Philosopher]";
mes "So you think that "+.@inputstr$+".";
next;
@@ -1146,7 +1148,7 @@ mora,43,127,3 script Innkeeper#mora_inn 4_M_RAFLE_OR,{
close;
}
case 3:
- input .@inputstr$;
+ input(.@inputstr$);
mes "["+strcharinfo(PC_NAME)+"]";
mes "I come from a place called "+.@inputstr$+".";
next;