summaryrefslogtreecommitdiff
path: root/world/map/npc/functions
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2011-11-15 21:06:07 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2011-11-16 19:44:03 +0100
commit206c3720a29b0db6c73ea534bd3f34bacaef17de (patch)
tree2d0e6a65117ad6ea1185dda7112a6f8679c781a1 /world/map/npc/functions
parent0f44cd07642a74953e5b03a10a1593c5d839c7a2 (diff)
downloadserverdata-206c3720a29b0db6c73ea534bd3f34bacaef17de.tar.gz
serverdata-206c3720a29b0db6c73ea534bd3f34bacaef17de.tar.bz2
serverdata-206c3720a29b0db6c73ea534bd3f34bacaef17de.tar.xz
serverdata-206c3720a29b0db6c73ea534bd3f34bacaef17de.zip
Made Constants case-sensitive
Diffstat (limited to 'world/map/npc/functions')
-rw-r--r--world/map/npc/functions/banker.txt26
-rw-r--r--world/map/npc/functions/clear_vars.txt8
-rw-r--r--world/map/npc/functions/dailyquest.txt2
-rw-r--r--world/map/npc/functions/debug.txt4
-rw-r--r--world/map/npc/functions/evil_obelisk.txt20
-rw-r--r--world/map/npc/functions/ferry.txt12
-rw-r--r--world/map/npc/functions/inn.txt4
-rw-r--r--world/map/npc/functions/water_bottle.txt4
8 files changed, 40 insertions, 40 deletions
diff --git a/world/map/npc/functions/banker.txt b/world/map/npc/functions/banker.txt
index 4b9e7050..863f3ce1 100644
--- a/world/map/npc/functions/banker.txt
+++ b/world/map/npc/functions/banker.txt
@@ -58,62 +58,62 @@ L_Dep_Input:
goto L_Nev;
L_Dep_5k:
- if (zeny<5000)
+ if (Zeny<5000)
goto L_NoMoney;
set @Amount, 5000;
goto L_Dep_Continue;
L_Dep_10k:
- if (zeny<10000)
+ if (Zeny<10000)
goto L_NoMoney;
set @Amount, 10000;
goto L_Dep_Continue;
L_Dep_25k:
- if (zeny<25000)
+ if (Zeny<25000)
goto L_NoMoney;
set @Amount, 25000;
goto L_Dep_Continue;
L_Dep_50k:
- if (zeny<50000)
+ if (Zeny<50000)
goto L_NoMoney;
set @Amount, 50000;
goto L_Dep_Continue;
L_Dep_100k:
- if (zeny<100000)
+ if (Zeny<100000)
goto L_NoMoney;
set @Amount, 100000;
goto L_Dep_Continue;
L_Dep_250k:
- if (zeny<250000)
+ if (Zeny<250000)
goto L_NoMoney;
set @Amount, 250000;
goto L_Dep_Continue;
L_Dep_500k:
- if (zeny<500000)
+ if (Zeny<500000)
goto L_NoMoney;
set @Amount, 500000;
goto L_Dep_Continue;
L_Dep_1kk:
- if (zeny<1000000)
+ if (Zeny<1000000)
goto L_NoMoney;
set @Amount, 1000000;
goto L_Dep_Continue;
L_Dep_All:
- if (zeny<1)
+ if (Zeny<1)
goto L_NoMoney;
- set @Amount, zeny;
+ set @Amount, Zeny;
L_Dep_Continue:
- if (zeny < @Amount)
+ if (Zeny < @Amount)
goto L_NoMoney;
- set zeny, zeny - @Amount;
+ set Zeny, Zeny - @Amount;
set #BankAccount, #BankAccount + @Amount;
goto L_Balance;
@@ -204,7 +204,7 @@ L_With_All:
L_With_Continue:
if (#BankAccount < @Amount)
goto L_NoMoney;
- set zeny, zeny + @Amount;
+ set Zeny, Zeny + @Amount;
set #BankAccount, #BankAccount - @Amount;
goto L_Balance;
diff --git a/world/map/npc/functions/clear_vars.txt b/world/map/npc/functions/clear_vars.txt
index 04af3e40..eed42a44 100644
--- a/world/map/npc/functions/clear_vars.txt
+++ b/world/map/npc/functions/clear_vars.txt
@@ -108,16 +108,16 @@ function|script|ClearVariables|{
return;
FixBank:
- if (zeny >= -#BankAccount)
+ if (Zeny >= -#BankAccount)
goto L_Fix_Full;
// Partial fix
- set #BankAccount, #BankAccount + zeny;
- set zeny, 0;
+ set #BankAccount, #BankAccount + Zeny;
+ set Zeny, 0;
return;
L_Fix_Full:
- set zeny, zeny + #BankAccount;
+ set Zeny, Zeny + #BankAccount;
set #BankAccount, 0;
return;
//Tulimshar and Mine Variables
diff --git a/world/map/npc/functions/dailyquest.txt b/world/map/npc/functions/dailyquest.txt
index b984050e..83de4f0c 100644
--- a/world/map/npc/functions/dailyquest.txt
+++ b/world/map/npc/functions/dailyquest.txt
@@ -66,7 +66,7 @@ L_Trade:
goto L_Not_Enough;
delitem @dq_name$, @dq_count;
- set zeny, zeny + @dq_money;
+ set Zeny, Zeny + @dq_money;
getexp @dq_exp, 0;
set DailyQuestPoints, DailyQuestPoints - @dq_cost;
diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt
index 2a5aadd4..0f1eb727 100644
--- a/world/map/npc/functions/debug.txt
+++ b/world/map/npc/functions/debug.txt
@@ -23,11 +23,11 @@ L_Level:
goto L_Leveltoohigh;
if (@lvl < 1)
goto L_Leveltoolow;
- if (Baselevel == @lvl)
+ if (BaseLevel == @lvl)
goto L_Samelvl;
set BaseLevel, @lvl;
resetstatus;
- message strcharinfo(0), "New level: " + Baselevel;
+ message strcharinfo(0), "New level: " + BaseLevel;
goto L_Begin;
L_Samelvl:
diff --git a/world/map/npc/functions/evil_obelisk.txt b/world/map/npc/functions/evil_obelisk.txt
index d7373bae..30fe927d 100644
--- a/world/map/npc/functions/evil_obelisk.txt
+++ b/world/map/npc/functions/evil_obelisk.txt
@@ -14,15 +14,15 @@ function|script|EvilObelisk|{
return;
L_JACKO:
- if (zeny < 200000)
+ if (Zeny < 200000)
goto L_NotEnough;
- set zeny, zeny - 200000;
+ set Zeny, Zeny - 200000;
set @mob_id, 1022;
set @mob_count, rand(2) + 1;
goto L_Summon;
L_GRAVEYARD1:
- if (zeny < 100000)
+ if (Zeny < 100000)
goto L_NotEnough;
set @temp, rand(2);
if(@temp == 0)
@@ -30,11 +30,11 @@ L_GRAVEYARD1:
if(@temp == 1)
set @mob_id, 1045; // Fallen
set @mob_count, rand(2) + 1;
- set zeny, zeny - 100000;
+ set Zeny, Zeny - 100000;
goto L_Summon;
L_GRAVEYARD2:
- if (zeny < 75000)
+ if (Zeny < 75000)
goto L_NotEnough;
set @temp, rand(2);
if(@temp == 0)
@@ -42,11 +42,11 @@ L_GRAVEYARD2:
if(@temp == 1)
set @mob_id, 1043; // Normal Skelly
set @mob_count, rand(2) + 1;
- set zeny, zeny - 75000;
+ set Zeny, Zeny - 75000;
goto L_Summon;
L_SKULL:
- if (zeny < 50000)
+ if (Zeny < 50000)
goto L_NotEnough;
set @temp, rand(2);
if(@temp == 0)
@@ -54,11 +54,11 @@ L_SKULL:
if(@temp == 1)
set @mob_id, 1023; // Fire
set @mob_count, rand(4) + 1;
- set zeny, zeny - 50000;
+ set Zeny, Zeny - 50000;
goto L_Summon;
L_SNAKE:
- if (zeny < 25000)
+ if (Zeny < 25000)
goto L_NotEnough;
set @temp, rand(4);
if(@temp == 0)
@@ -70,7 +70,7 @@ L_SNAKE:
if(@temp == 3)
set @mob_id, 1021; // Cave
set @mob_count, rand(4) + 1;
- set zeny, zeny - 25000;
+ set Zeny, Zeny - 25000;
goto L_Summon;
L_Summon:
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index 50ad9038..26da871d 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -33,30 +33,30 @@ L_MenuWithCandor:
L_Tulimshar:
if (@loc == DOCK_tulimshar)
goto L_AlreadyThere;
- if (zeny < @cost_tulimshar)
+ if (Zeny < @cost_tulimshar)
goto L_NotEnoughGP;
- set zeny, zeny - @cost_tulimshar;
+ set Zeny, Zeny - @cost_tulimshar;
warp "022-1.gat", 76, 72;
close;
L_Hurnscald:
if (@loc == DOCK_hurnscald)
goto L_AlreadyThere;
- if (zeny < @cost_hurnscald)
+ if (Zeny < @cost_hurnscald)
goto L_NotEnoughGP;
- set zeny, zeny - @cost_hurnscald;
+ set Zeny, Zeny - @cost_hurnscald;
warp "008-1.gat", 137, 64;
close;
L_Candor:
if (@loc == DOCK_candor)
goto L_AlreadyThere;
- if (zeny < @cost_candor)
+ if (Zeny < @cost_candor)
goto L_NotEnoughGP;
- set zeny, zeny - @cost_candor;
+ set Zeny, Zeny - @cost_candor;
warp "029-1.gat", 25, 37;
close;
diff --git a/world/map/npc/functions/inn.txt b/world/map/npc/functions/inn.txt
index b778669f..85df4122 100644
--- a/world/map/npc/functions/inn.txt
+++ b/world/map/npc/functions/inn.txt
@@ -8,9 +8,9 @@ function|script|Inn|{
"Yes", -,
"No", L_No;
- if (zeny < @cost)
+ if (Zeny < @cost)
goto L_NoMoney;
- set zeny, zeny - @cost;
+ set Zeny, Zeny - @cost;
heal 10000, 10000;
mes "[" + @npcname$ + "]";
diff --git a/world/map/npc/functions/water_bottle.txt b/world/map/npc/functions/water_bottle.txt
index 02dc35b2..e88c5965 100644
--- a/world/map/npc/functions/water_bottle.txt
+++ b/world/map/npc/functions/water_bottle.txt
@@ -13,7 +13,7 @@ function|script|WaterBottle|{
if (@empty < @count)
goto L_NotEnoughBottles;
- if (zeny < @cost)
+ if (Zeny < @cost)
goto L_NotEnoughMoney;
getinventorylist;
if (@inventorylist_count == 100
@@ -21,7 +21,7 @@ function|script|WaterBottle|{
&& @empty > @count)
goto L_NotEnoughSlots;
- set zeny, zeny - @cost;
+ set Zeny, Zeny - @cost;
delitem "EmptyBottle", @count;
getitem "BottleOfWater", @count;
close;