summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-04-25 17:28:16 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2011-04-25 17:28:16 +0200
commite74d89e258e596e4155f81a7d7f324ffe8d6d8ca (patch)
tree756fff2aa6a9d63f132581e8147fcd805a8961f9
parente0b3ebe79edbbeb3f9f4642aa3b5d45ae23a048b (diff)
downloadserverdata-e74d89e258e596e4155f81a7d7f324ffe8d6d8ca.tar.gz
serverdata-e74d89e258e596e4155f81a7d7f324ffe8d6d8ca.tar.bz2
serverdata-e74d89e258e596e4155f81a7d7f324ffe8d6d8ca.tar.xz
serverdata-e74d89e258e596e4155f81a7d7f324ffe8d6d8ca.zip
changing name of warp towels
minor fix in stranger
-rw-r--r--db/item_db.txt22
-rw-r--r--npc/003-1_Beach/stranger.txt6
-rw-r--r--npc/items/warpTowels.txt4
3 files changed, 16 insertions, 16 deletions
diff --git a/db/item_db.txt b/db/item_db.txt
index 670a6fa1..681c873c 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -321,17 +321,17 @@
806, ReedBundle, Reed Bundle, 3, 20, 10, 7, , , , , , 2, , , , , {}, {}, ,
807, GrassSeed, Grass Seed, 3, 20, 10, 1, , , , , , 2, , , , , {}, {}, ,
#ID, Name, Label, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript}
-808, GreyWarpTowel, Enchanted Towel, 3, 1000, 500, 20, , , , , , , , , , , {}, {}
-809, WhiteWarpTowel, White Enchanted Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useWhiteWarpTowel";}, {}
-810, RedWarpTowel, Red Enchanted Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useRedWarpTowel";}, {}
-811, GreenWarpTowel, Green Enchanted Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useGreenWarpTowel";}, {}
-812, BlueWarpTowel, Blue Enchanted Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useBlueWarpTowel";}, {}
-813, YellowWarpTowel, Yellow Enchanted Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useYellowWarpTowel";}, {}
-814, PurpleWarpTowel, Purple Enchanted Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "usePurpleWarpTowel";}, {}
-815, OrangeWarpTowel, Orange Enchanted Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useOrangeWarpTowel";}, {}
-816, PinkWarpTowel, Pink Enchanted Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "usePinkWarpTowel";}, {}
-817, TealWarpTowel, Teal Enchanted Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useTealWarpTowel";}, {}
-818, LimeWarpTowel, Lime Enchanted Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useLimeWarpTowel";}, {}
+808, GreyWarpTowel, Hitchhiker's Towel, 3, 1000, 500, 20, , , , , , , , , , , {}, {}
+809, WhiteWarpTowel, White Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useWhiteWarpTowel";}, {}
+810, RedWarpTowel, Red Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useRedWarpTowel";}, {}
+811, GreenWarpTowel, Green Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useGreenWarpTowel";}, {}
+812, BlueWarpTowel, Blue Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useBlueWarpTowel";}, {}
+813, YellowWarpTowel, Yellow Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useYellowWarpTowel";}, {}
+814, PurpleWarpTowel, Purple Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "usePurpleWarpTowel";}, {}
+815, OrangeWarpTowel, Orange Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useOrangeWarpTowel";}, {}
+816, PinkWarpTowel, Pink Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "usePinkWarpTowel";}, {}
+817, TealWarpTowel, Teal Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useTealWarpTowel";}, {}
+818, LimeWarpTowel, Lime Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useLimeWarpTowel";}, {}
819, GemPowderWhite, Diamond Powder, 3, 1000, 500, 5, , , , , , , , , , , {}, {}
820, GemPowderRed, Ruby Powder, 3, 1000, 500, 5, , , , , , , , , , , {}, {}
821, GemPowderGreen, Emerald Powder, 3, 1000, 500, 5, , , , , , , , , , , {}, {}
diff --git a/npc/003-1_Beach/stranger.txt b/npc/003-1_Beach/stranger.txt
index b322eb5d..89409aa9 100644
--- a/npc/003-1_Beach/stranger.txt
+++ b/npc/003-1_Beach/stranger.txt
@@ -116,7 +116,7 @@ L_Right_Answer_Easy:
setarray @medium_questions$,
"What is the name of the rock group claiming to be the loudest band in the universe?",
- "What star is near Ford's home planet?s",
+ "What star is near Ford's home planet?",
"Which country does the human protagonist come from?",
"What is the name of the computer on The Heart of Gold?",
"What color has a Babel Fish?",
@@ -275,8 +275,8 @@ L_Dye_Towel:
// "Blue",L_Blue,
// "Green",L_Green,
// "Purple",L_Purple,
-// "Orange",L_Orange,
-// "Pink",L_Pink,
+ "Orange",L_Orange,
+ "Pink",L_Pink,
// "Lime",L_Lime,
// "Teal",L_Teal,
"I changed my mind.", L_Close;
diff --git a/npc/items/warpTowels.txt b/npc/items/warpTowels.txt
index 5ef5167b..eee05673 100644
--- a/npc/items/warpTowels.txt
+++ b/npc/items/warpTowels.txt
@@ -29,12 +29,12 @@ function script usePurpleWarpTowel {
end;
}
function script useOrangeWarpTowel {
- warp "003-1.gat",35,25;
+ warp "027-1.gat",70,100; // Graveyard
getitem "GreyWarpTowel", 1;
end;
}
function script usePinkWarpTowel {
- warp "003-1.gat",35,25;
+ warp "012-3.gat",448,66; // Terranite Cave
getitem "GreyWarpTowel", 1;
end;
}