summaryrefslogtreecommitdiff
path: root/npc/cities/umbala.txt
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-12-18 05:22:33 +0100
committerHaru <haru@dotalux.com>2015-12-18 05:22:33 +0100
commit8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a (patch)
tree54669433655bb853309ea1cae12da049622324fa /npc/cities/umbala.txt
parent53abb8cdf92cd3d153b0a3d5b99b55cbd631f36c (diff)
parent0828824948c77bbfc357e08e8a5a0a96671b1ca6 (diff)
downloadhercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.gz
hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.bz2
hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.xz
hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.zip
Merge branch 'dastgir-ScriptCleanup2' into hercules
Closes #920 as merged
Diffstat (limited to 'npc/cities/umbala.txt')
-rw-r--r--npc/cities/umbala.txt28
1 files changed, 14 insertions, 14 deletions
diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt
index e6f2cb56f..8f0c39658 100644
--- a/npc/cities/umbala.txt
+++ b/npc/cities/umbala.txt
@@ -293,8 +293,8 @@ umbala,70,106,3 script Utan Kid#um 4_F_UMGIRL,{
mes "Thank you so much, yay~!";
if (Zeny > 1000) {
Zeny -= 1000;
- if (checkweight(517,1)) {
- getitem 517,1; //Meat
+ if (checkweight(Meat,1)) {
+ getitem Meat,1;
}
emotion e_swt2;
}
@@ -354,8 +354,8 @@ umbala,70,106,3 script Utan Kid#um 4_F_UMGIRL,{
mes "Um~baumbah~ um~baumbah~";
if (Zeny > 1000) {
Zeny -= 1000;
- if (checkweight(517,1)) {
- getitem 517,1; //Meat
+ if (checkweight(Meat,1)) {
+ getitem Meat,1;
}
emotion e_swt2;
}
@@ -390,15 +390,15 @@ umbala,59,243,5 script Utan Kid#1 4_M_UMKID,{
emotion e_rock;
next;
if (select("Give him Meat.:Refuse.") == 1) {
- if (countitem(517) > 0) {
+ if (countitem(Meat) > 0) {
mes "[Kotan]";
mes "Whoa, are you really giving me";
mes "Meat? Thanks! I will pay you";
mes "back with these.";
- delitem 517,1; //Meat
- getitem 909,2; //Jellopy
- getitem 914,2; //Fluff
- getitem 705,2; //Clover
+ delitem Meat,1;
+ getitem Jellopy,2;
+ getitem Fluff,2;
+ getitem Clover,2;
emotion e_scissors;
close;
}
@@ -428,14 +428,14 @@ umbala,59,243,5 script Utan Kid#1 4_M_UMKID,{
emotion e_rock;
next;
if (select("Umbah:Umbaboo") == 1) {
- if (countitem(517) > 0) {
+ if (countitem(Meat) > 0) {
mes "[???]";
mes "Umbaumbaumbabababah.";
mes "Umbababahum.";
- delitem 517,1; //Meat
- getitem 909,2; //Jellopy
- getitem 914,2; //Fluff
- getitem 705,2; //Clover
+ delitem Meat,1;
+ getitem Jellopy,2;
+ getitem Fluff,2;
+ getitem Clover,2;
emotion e_scissors;
close;
}