summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-05-22 09:02:47 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2011-05-22 09:02:47 +0200
commit7ae58ec3faf83f88673e759e55a5ae4d2ecaaa33 (patch)
tree3fa489c6e174d16cb5d6a95e5640a0c8b6358625
parent856ab6deb68829d37e8fb8e8717aefacfe9f37e6 (diff)
downloadserverdata-7ae58ec3faf83f88673e759e55a5ae4d2ecaaa33.tar.gz
serverdata-7ae58ec3faf83f88673e759e55a5ae4d2ecaaa33.tar.bz2
serverdata-7ae58ec3faf83f88673e759e55a5ae4d2ecaaa33.tar.xz
serverdata-7ae58ec3faf83f88673e759e55a5ae4d2ecaaa33.zip
some fixes and modifications about towel event and warptowel:
fix bug in stranger npc change amount of gem powders given for one gem make warp towel loose its color randomly
-rw-r--r--npc/003-1_Beach/stranger.txt4
-rw-r--r--npc/018-2_Woodland_mining_camp/miners.txt15
-rw-r--r--npc/items/warpTowels.txt50
3 files changed, 61 insertions, 8 deletions
diff --git a/npc/003-1_Beach/stranger.txt b/npc/003-1_Beach/stranger.txt
index 69bc9624..9bc6d47d 100644
--- a/npc/003-1_Beach/stranger.txt
+++ b/npc/003-1_Beach/stranger.txt
@@ -212,7 +212,7 @@ L_Right_Answer_Hard:
next;
mes "\"What is the most important item for every hitchhiker to have?\"";
input @answer$;
- if (@answer != "Towel" && @answer != "towel")
+ if (@answer$ != "Towel" && @answer != "towel")
goto L_Wrong_Answer;
mes "[Stranger]";
@@ -227,7 +227,7 @@ L_Right_Answer_Hard:
next;
mes "\"Bring me some powder made from gemstones and a bottle of water, and I can prepare it for you.\"";
next;
- mes "\"Depending on the color it will bring you to different places. After the transport it will loose its color, but I can prepare it for you again.\"";
+ mes "\"Depending on the color it will bring you to different places. It might wear out after a while and it'll loose its color, but I can prepare it for you again.\"";
next;
mes "\"Since I'm not familar with this plane-, ahm, with this area, I can't tell which places you will end up in.\"";
close;
diff --git a/npc/018-2_Woodland_mining_camp/miners.txt b/npc/018-2_Woodland_mining_camp/miners.txt
index 5763ae62..1e337036 100644
--- a/npc/018-2_Woodland_mining_camp/miners.txt
+++ b/npc/018-2_Woodland_mining_camp/miners.txt
@@ -2,6 +2,9 @@
// Authors: Ali-G, enchilado, Jenalya
018-2.gat,85,23,0 script Malek 109,{
+
+ set @MIN_GEM_AMOUNT, 7;
+
if (Inspector == 10) goto L_NohMask;
mes "[Malek]";
@@ -119,12 +122,12 @@ L_Choose_Gem:
if (countitem(@gem$) < 1) goto L_no_gem;
if (@inventorylist_count == 100 && countitem(@gem$) > 1) goto L_TooMany;
delitem @gem$, 1;
- if (@gem$ == "GemRawWhite") getitem "GemPowderWhite", 5;
- if (@gem$ == "GemRawRed") getitem "GemPowderRed", 5;
- if (@gem$ == "GemRawGreen") getitem "GemPowderGreen", 5;
- if (@gem$ == "GemRawBlue") getitem "GemPowderBlue", 5;
- if (@gem$ == "GemRawYellow") getitem "GemPowderYellow", 5;
- if (@gem$ == "GemRawPurple") getitem "GemPowderPurple", 5;
+ if (@gem$ == "GemRawWhite") getitem "GemPowderWhite", @MIN_GEM_AMOUNT + rand(6) + rand(6);
+ if (@gem$ == "GemRawRed") getitem "GemPowderRed", @MIN_GEM_AMOUNT + rand(6);
+ if (@gem$ == "GemRawGreen") getitem "GemPowderGreen", @MIN_GEM_AMOUNT + rand(6);
+ if (@gem$ == "GemRawBlue") getitem "GemPowderBlue", @MIN_GEM_AMOUNT + rand(6);
+ if (@gem$ == "GemRawYellow") getitem "GemPowderYellow", @MIN_GEM_AMOUNT + rand(6);
+ if (@gem$ == "GemRawPurple") getitem "GemPowderPurple", @MIN_GEM_AMOUNT + rand(6);
mes "[Malek]";
mes "\"Here's your powder. Hope it's fine enough for you.\"";
diff --git a/npc/items/warpTowels.txt b/npc/items/warpTowels.txt
index eee05673..192ce838 100644
--- a/npc/items/warpTowels.txt
+++ b/npc/items/warpTowels.txt
@@ -1,50 +1,100 @@
function script useWhiteWarpTowel {
warp "020-1.gat",66,91; // Nivalis
+ if (rand(15))
+ goto L_Keep;
getitem "GreyWarpTowel", 1;
end;
+L_Keep:
+ getitem "WhiteWarpTowel", 1;
+ end;
}
function script useRedWarpTowel {
warp "009-1.gat",51,40; // Hurnscald
+ if (rand(15))
+ goto L_Keep;
getitem "GreyWarpTowel", 1;
end;
+L_Keep:
+ getitem "RedWarpTowel", 1;
+ end; end;
}
function script useGreenWarpTowel {
warp "003-1.gat",35,25;
+ if (rand(15))
+ goto L_Keep;
getitem "GreyWarpTowel", 1;
end;
+L_Keep:
+ getitem "GreenWarpTowel", 1;
+ end; end;
}
function script useBlueWarpTowel {
warp "003-1.gat",35,25;
+ if (rand(15))
+ goto L_Keep;
getitem "GreyWarpTowel", 1;
end;
+L_Keep:
+ getitem "BlueWarpTowel", 1;
+ end; end;
}
function script useYellowWarpTowel {
warp "001-1.gat",40,71; // Tulimshar
+ if (rand(15))
+ goto L_Keep;
getitem "GreyWarpTowel", 1;
end;
+L_Keep:
+ getitem "YellowWarpTowel", 1;
+ end; end;
}
function script usePurpleWarpTowel {
warp "003-1.gat",35,25;
+ if (rand(15))
+ goto L_Keep;
getitem "GreyWarpTowel", 1;
end;
+L_Keep:
+ getitem "PurpleWarpTowel", 1;
+ end; end;
}
function script useOrangeWarpTowel {
warp "027-1.gat",70,100; // Graveyard
+ if (rand(15))
+ goto L_Keep;
getitem "GreyWarpTowel", 1;
end;
+L_Keep:
+ getitem "OrangeWarpTowel", 1;
+ end; end;
}
function script usePinkWarpTowel {
warp "012-3.gat",448,66; // Terranite Cave
+ if (rand(15))
+ goto L_Keep;
getitem "GreyWarpTowel", 1;
end;
+L_Keep:
+ getitem "PinkWarpTowel", 1;
+ end; end;
}
function script useTealWarpTowel {
warp "003-1.gat",35,25;
+ if (rand(15))
+ goto L_Keep;
getitem "GreyWarpTowel", 1;
end;
+L_Keep:
+ getitem "TealWarpTowel", 1;
+ end; end;
}
function script useLimeWarpTowel {
warp "003-1.gat",35,25;
+ if (rand(15))
+ goto L_Keep;
getitem "GreyWarpTowel", 1;
end;
+L_Keep:
+ getitem "LimeWarpTowel", 1;
+ end; end;
}