summaryrefslogtreecommitdiff
path: root/npc/other/arena
diff options
context:
space:
mode:
Diffstat (limited to 'npc/other/arena')
-rw-r--r--npc/other/arena/arena_party.txt4
-rw-r--r--npc/other/arena/arena_point.txt98
-rw-r--r--npc/other/arena/arena_room.txt11
3 files changed, 55 insertions, 58 deletions
diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt
index c3133af30..67c69f8e8 100644
--- a/npc/other/arena/arena_party.txt
+++ b/npc/other/arena/arena_party.txt
@@ -1059,7 +1059,7 @@ prt_are_in,77,135,3 script Staff#party-2 1_F_02,{
donpcevent "Ponox::OnStart";
}
specialeffect(EH_HIT5, AREA, playerattached());
- donpcevent "cast#pt::OnNomal1";
+ donpcevent "cast#pt::OnNomal1";
warp "arena_room",100,75;
end;
} else {
@@ -1078,7 +1078,7 @@ prt_are_in,77,135,3 script Staff#party-2 1_F_02,{
next;
switch( select( "Ok.","Let me think." ) ) {
case 1:
- input .@arnparty$;
+ input(.@arnparty$);
mes "[Staff]";
mes "You have entered ^3131FF"+.@arnparty$+"^000000. Is it correct?";
next;
diff --git a/npc/other/arena/arena_point.txt b/npc/other/arena/arena_point.txt
index 5292ebab3..c2ef52e6a 100644
--- a/npc/other/arena/arena_point.txt
+++ b/npc/other/arena/arena_point.txt
@@ -80,70 +80,66 @@ prt_are_in,103,11,3 script Arena Point Manager 4_M_JOB_HUNTER,{
mes "value you may enter is 20.";
mes "To cancel, enter ''^3355FF0^000000.''";
next;
- input .@input;
- if (.@input == 0) {
+ input(.@input);
+ if (.@input <= 0) {
mes "[Arena Point Manager]";
mes "You have";
mes "canceled";
mes "this service.";
close;
}
- else if (.@input > 20) {
+ if (.@input > 20) {
mes "[Arena Point Manager]";
mes "Your request exceeds";
mes "the maximum limit. Please";
mes "enter a value no greater than 20.";
close;
}
- else {
- .@want_point1 = 10 * .@input;
- .@want_point = 5 * .@input;
- .@my_arena_all = arena_point + .@want_point;
- .@my_turbo_all = tt_point - .@want_point1;
- if (.@my_arena_all > 28999) {
- mes "[Arena Point Manager]";
- mes "You will exceed the";
- mes "maximum amount of";
- mes "Arena Points if we proceed";
- mes "with this conversion of your";
- mes "Turbo Track Points. You cannot";
- mes "have more than 29,000 Arena Points.";
- next;
- mes "[Arena Point Manager]";
- mes "Please spend some of";
- mes "your Arena Points before";
- mes "using this service again.";
- mes "Thank you for your patronage.";
- close;
- }
- if (.@my_turbo_all < 0) {
- mes "[Arena Point Manager]";
- mes "I'm sorry, but";
- mes "you don't have enough";
- mes "Turbo Track Points to";
- mes "perform this Arena";
- mes "Point conversion.";
- close;
- }
- else {
- mes "[Arena Point Manager]";
- mes "You have converted";
- mes "10 Turbo Track Points";
- mes "into 5 Arena Points " + .@input + " times.";
- mes "A total of " + .@want_point1 + " Turbo Track Points were converted into";
- mes "" + .@want_point +" Arena Points.";
- tt_point -= .@want_point1;
- arena_point += .@want_point;
- next;
- mes "[Arena Point Manager]";
- mes "" + strcharinfo(PC_NAME) + ",";
- mes "you now have";
- mes "^4682B4" + arena_point + "^000000 Arena Points";
- mes "and ^00688B" + tt_point + "^000000 Turbo Track Points.";
- mes "Thank you for your patronage.";
- close;
- }
+ .@want_point1 = 10 * .@input;
+ .@want_point = 5 * .@input;
+ .@my_arena_all = arena_point + .@want_point;
+ .@my_turbo_all = tt_point - .@want_point1;
+ if (.@my_arena_all > 28999) {
+ mes "[Arena Point Manager]";
+ mes "You will exceed the";
+ mes "maximum amount of";
+ mes "Arena Points if we proceed";
+ mes "with this conversion of your";
+ mes "Turbo Track Points. You cannot";
+ mes "have more than 29,000 Arena Points.";
+ next;
+ mes "[Arena Point Manager]";
+ mes "Please spend some of";
+ mes "your Arena Points before";
+ mes "using this service again.";
+ mes "Thank you for your patronage.";
+ close;
+ }
+ if (.@my_turbo_all < 0) {
+ mes "[Arena Point Manager]";
+ mes "I'm sorry, but";
+ mes "you don't have enough";
+ mes "Turbo Track Points to";
+ mes "perform this Arena";
+ mes "Point conversion.";
+ close;
}
+ mes "[Arena Point Manager]";
+ mes "You have converted";
+ mes "10 Turbo Track Points";
+ mes "into 5 Arena Points " + .@input + " times.";
+ mes "A total of " + .@want_point1 + " Turbo Track Points were converted into";
+ mes "" + .@want_point +" Arena Points.";
+ tt_point -= .@want_point1;
+ arena_point += .@want_point;
+ next;
+ mes "[Arena Point Manager]";
+ mes "" + strcharinfo(PC_NAME) + ",";
+ mes "you now have";
+ mes "^4682B4" + arena_point + "^000000 Arena Points";
+ mes "and ^00688B" + tt_point + "^000000 Turbo Track Points.";
+ mes "Thank you for your patronage.";
+ close;
case 6:
mes "[Arena Point Manager]";
mes "You have";
diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt
index b8806e112..b70ce7e4c 100644
--- a/npc/other/arena/arena_room.txt
+++ b/npc/other/arena/arena_room.txt
@@ -520,9 +520,9 @@ sec_in02,72,180,3 script Arena Manager#arena 4_NFWISP,{
//mes "If not, please enter a value for minutes first and then seconds.";
mes "Please enter a value for minutes first and then seconds.";
next;
- input .@arenamin;
+ input(.@arenamin, 0);
setd .@min$,.@arenamin;
- input .@arenasec;
+ input(.@arenasec, 0);
setd .@sec$,.@arenasec;
mes "[Arena Manager]";
mes "Current "+.@mode$+" ranker's play time has been rearranged to ^FF0000"+getd(.@min$)+"^000000 minutes and ^FF0000"+getd(.@sec$)+"^000000 seconds.";
@@ -1011,12 +1011,13 @@ function script Func_Are_Rew {
mes "You can exchange ^3131FF"+getarg(2)+" arena points with "+getarg(1)+" "+getitemname(getarg(0))+"^000000.";
mes "If you wish to cancel, please enter 0. If you don't, please enter how many ^3131FFtimes^000000 of arena points you wish to spend.";
next;
- input .@reward;
- if (.@reward == 0) {
+ input(.@reward);
+ if (.@reward <= 0) {
mes "[Givu]";
mes "You have canceled your request.";
close;
- } else if (.@reward > 1500) {
+ }
+ if (.@reward > 1500) {
mes "[Givu]";
mes "You have exceeded the maximum capacity.";
close;
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-06-03 00:04:23 +0000