From cf071d9846890a24d8d462f82da9b6d0f96d8fd2 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Fri, 17 May 2013 21:43:03 +0200 Subject: Run make maps to add 034-2. Submodule pointer updated. --- world/map/data/034-2.wlk | Bin 0 -> 5004 bytes world/map/data/resnametable.txt | 1 + world/map/npc/034-1/_warps.txt | 2 ++ world/map/npc/034-2/_import.txt | 5 +++++ world/map/npc/034-2/_mobs.txt | 8 ++++++++ world/map/npc/034-2/_warps.txt | 6 ++++++ world/map/npc/_import.txt | 1 + 7 files changed, 23 insertions(+) create mode 100644 world/map/data/034-2.wlk create mode 100644 world/map/npc/034-2/_import.txt create mode 100644 world/map/npc/034-2/_mobs.txt create mode 100644 world/map/npc/034-2/_warps.txt (limited to 'world') diff --git a/world/map/data/034-2.wlk b/world/map/data/034-2.wlk new file mode 100644 index 00000000..d5da4d31 Binary files /dev/null and b/world/map/data/034-2.wlk differ diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt index a865b707..13e5ff4a 100644 --- a/world/map/data/resnametable.txt +++ b/world/map/data/resnametable.txt @@ -84,6 +84,7 @@ 032-3.gat#032-3.wlk# 033-1.gat#033-1.wlk# 034-1.gat#034-1.wlk# +034-2.gat#034-2.wlk# 041-1.gat#041-1.wlk# 042-1.gat#042-1.wlk# 042-2.gat#042-2.wlk# diff --git a/world/map/npc/034-1/_warps.txt b/world/map/npc/034-1/_warps.txt index 9c0acf36..be29b7b1 100644 --- a/world/map/npc/034-1/_warps.txt +++ b/world/map/npc/034-1/_warps.txt @@ -5,3 +5,5 @@ 034-1.gat,16,103|warp|To Deep Snow Forest|-1,1,045-1.gat,176,133 034-1.gat,15,31|warp|To Deep Snow Forest|-1,0,045-1.gat,174,59 034-1.gat,95,18|warp|ToHighlands1|0,-1,046-1.gat,95,116 +034-1.gat,31,68|warp|To Trapper|-1,-1,034-2.gat,28,31 +034-1.gat,64,99|warp|To Cabin|-1,-1,034-2.gat,73,29 diff --git a/world/map/npc/034-2/_import.txt b/world/map/npc/034-2/_import.txt new file mode 100644 index 00000000..07dfa138 --- /dev/null +++ b/world/map/npc/034-2/_import.txt @@ -0,0 +1,5 @@ +// Map 034-2: Trappers Huts +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 034-2.gat +npc: npc/034-2/_mobs.txt +npc: npc/034-2/_warps.txt diff --git a/world/map/npc/034-2/_mobs.txt b/world/map/npc/034-2/_mobs.txt new file mode 100644 index 00000000..9cabee2a --- /dev/null +++ b/world/map/npc/034-2/_mobs.txt @@ -0,0 +1,8 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Trappers Huts mobs + + + +034-2.gat,0,0,0|script|Mob034-2|-1,{ + end; +} diff --git a/world/map/npc/034-2/_warps.txt b/world/map/npc/034-2/_warps.txt new file mode 100644 index 00000000..2e840d68 --- /dev/null +++ b/world/map/npc/034-2/_warps.txt @@ -0,0 +1,6 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Trappers Huts warps + +034-2.gat,28,32|warp|To Outside|-1,-1,034-1.gat,31,69 +034-2.gat,73,30|warp|To Outside|-1,-1,034-1.gat,64,100 +034-2.gat,30,33|warp|To Outside|-1,-1,034-1.gat,31,69 diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt index c16ab26e..05d7791e 100644 --- a/world/map/npc/_import.txt +++ b/world/map/npc/_import.txt @@ -83,6 +83,7 @@ import: npc/032-1/_import.txt import: npc/032-3/_import.txt import: npc/033-1/_import.txt import: npc/034-1/_import.txt +import: npc/034-2/_import.txt import: npc/041-1/_import.txt import: npc/042-1/_import.txt import: npc/042-2/_import.txt -- cgit v1.2.3-60-g2f50 From 01ce00d8fb7561691ed8c95cfd5fd560276b131f Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Fri, 17 May 2013 22:03:59 +0200 Subject: Run make maps again to update the warp I removed from 034-2. --- world/map/npc/034-2/_warps.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'world') diff --git a/world/map/npc/034-2/_warps.txt b/world/map/npc/034-2/_warps.txt index 2e840d68..3f06da7f 100644 --- a/world/map/npc/034-2/_warps.txt +++ b/world/map/npc/034-2/_warps.txt @@ -3,4 +3,3 @@ 034-2.gat,28,32|warp|To Outside|-1,-1,034-1.gat,31,69 034-2.gat,73,30|warp|To Outside|-1,-1,034-1.gat,64,100 -034-2.gat,30,33|warp|To Outside|-1,-1,034-1.gat,31,69 -- cgit v1.2.3-60-g2f50 From 79f1abf1dedadcb5683822151bd578dc093e19e8 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Fri, 17 May 2013 22:04:25 +0200 Subject: And run make maps after the change of the converter to also update resnametable. --- world/map/data/resnametable.txt | 3 --- 1 file changed, 3 deletions(-) (limited to 'world') diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt index 13e5ff4a..07f1f6a2 100644 --- a/world/map/data/resnametable.txt +++ b/world/map/data/resnametable.txt @@ -2,7 +2,6 @@ 001-2.gat#001-2.wlk# 001-3.gat#001-3.wlk# 002-1.gat#002-1.wlk# -002-2.gat#002-2.wlk# 002-3.gat#002-3.wlk# 002-4.gat#002-4.wlk# 003-1.gat#003-1.wlk# @@ -55,9 +54,7 @@ 020-3.gat#020-3.wlk# 021-1.gat#021-1.wlk# 021-2.gat#021-2.wlk# -021-8.gat#021-8.wlk# 022-1.gat#022-1.wlk# -023-1.gat#023-1.wlk# 024-1.gat#024-1.wlk# 024-2.gat#024-2.wlk# 024-3.gat#024-3.wlk# -- cgit v1.2.3-60-g2f50 From b9858ff72f5dc184b9fccc94c6210603879b6dad Mon Sep 17 00:00:00 2001 From: Stefan Dombrowski Date: Sat, 25 May 2013 08:17:57 +0200 Subject: Some fixes to item_db * Comment out the spear, like in client data * Adjust some prices, so they are not lower than the sell price * The label for BlackWizardHat does not say that it's red anymore * Changing some types from useable to gerneric, since there is no use script --- world/map/db/item_db.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'world') diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt index df7079fd..bd8e8550 100644 --- a/world/map/db/item_db.txt +++ b/world/map/db/item_db.txt @@ -97,7 +97,7 @@ //591, RESERVED, LongSword, , , , , , , , , , , , , , , {}, {} //592, RESERVED, Stiletto, , , , , , , , , , , , , , , {}, {} //593, RESERVED, Rapier, , , , , , , , , , , , , , , {}, {} -594, Spear, Spear, 4, 1000, 500, 200, 15, , 1, , 0, 2, 2, 1, 1, 1, {}, {callfunc "UnreleasedItem";} +//594, Spear, Spear, 4, 1000, 500, 200, 15, , 1, , 0, 2, 2, 1, 1, 1, {}, {callfunc "UnreleasedItem";} //595, RESERVED, HeavySpear, , , , , , , , , , , , , , , {}, {} //596, RESERVED, Pike, , , , , , , , , , , , , , , {}, {} //597, RESERVED, HeavyPike, , , , , , , , , , , , , , , {}, {} @@ -351,9 +351,9 @@ 835, HyvernStinger, Hyvern Stinger, 3, 100, 25, 10, , , , 0, 0, 2, , , 0, 0, {}, {} 836, GrubSlime, Grub Slime, 3, 40, 10, 2, , , , 0, 0, 2, , , 0, 0, {}, {} //837, RESERVED, WitchRoot, , , , , , , , , , , , , , , {}, {} -838, CranberryLollipop, Cranberry Lollipop, 0, 20, 50, 1, , , , , , 2, , , 0, , {itemheal 750, 0;}, {} -839, GrapeLollipop, Grape Lollipop, 0, 20, 50, 1, , , , , , 2, , , 0, , {itemheal 750, 0;}, {} -840, OrangeLollipop, Orange Lollipop, 0, 20, 50, 1, , , , , , 2, , , 0, , {itemheal 750, 0;}, {} +838, CranberryLollipop, Cranberry Lollipop, 0, 100, 50, 1, , , , , , 2, , , 0, , {itemheal 750, 0;}, {} +839, GrapeLollipop, Grape Lollipop, 0, 100, 50, 1, , , , , , 2, , , 0, , {itemheal 750, 0;}, {} +840, OrangeLollipop, Orange Lollipop, 0, 100, 50, 1, , , , , , 2, , , 0, , {itemheal 750, 0;}, {} 841, RedDottedWrap, Red Dotted Wrap, 3, 50, 25, 500, , , , , , , , , , , {}, {} 842, YellowDottedWrap, Yellow Dotted Wrap, 3, 50, 25, 500, , , , , , , , , , , {}, {} 843, BlueDottedWrap, Blue Dotted Wrap, 3, 50, 25, 500, , , , , , , , , , , {}, {} @@ -442,10 +442,10 @@ //1227, EnchantersAmulet, Enchanter's Amulet, , , , , , , , , , , , , , , {}, {} 1228, LightCrystal, Light Crystal, 3, 1000, 250, 10, , , , , , , , , , , {}, {} 1229, CaramelApple, Caramel Apple, 0, 500, 75, 5, , , , , , 2, , , 0, , {itemheal 1000, 0;}, {} -1230, LollipopColor1, Booberry Blue Lollipop, 0, 20, 50, 1, , , , , , 2, , , 0, , {itemheal 800, 0;}, {} -1231, LollipopColor2, Ghastly Green Lollipop, 0, 20, 50, 1, , , , , , 2, , , 0, , {itemheal 800, 0;}, {} -1232, LollipopColor3, Blood Red Lollipop, 0, 20, 50, 1, , , , , , 2, , , 0, , {itemheal 800, 0;}, {} -1233, FakeFangs, Cheap Plastic Fangs, 3, 20, 10000, 1, , , , , , 2, , , 0, , {}, {} +1230, LollipopColor1, Booberry Blue Lollipop, 0, 100, 50, 1, , , , , , 2, , , 0, , {itemheal 800, 0;}, {} +1231, LollipopColor2, Ghastly Green Lollipop, 0, 100, 50, 1, , , , , , 2, , , 0, , {itemheal 800, 0;}, {} +1232, LollipopColor3, Blood Red Lollipop, 0, 100, 50, 1, , , , , , 2, , , 0, , {itemheal 800, 0;}, {} +1233, FakeFangs, Cheap Plastic Fangs, 3, 20000, 10000, 1, , , , , , 2, , , 0, , {}, {} 1234, RedOrnament, Red Christmas Ornament, 3, 5000, 1, 1, , , , , , 2, , , 0, , {}, {} 1235, YellowOrnament, Yellow Christmas Ornament, 3, 5000, 1, 1, , , , , , 2, , , 0, , {}, {} 1236, GreenOrnament, Green Christmas Ornament, 3, 5000, 1, 1, , , , , , 2, , , 0, , {}, {} @@ -662,7 +662,7 @@ 2204, LightBlueWizardHat, Light Blue Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} #ID, Name, Label, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript} 2205, PinkWizardHat, Pink Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} -2206, BlackWizardHat, Red Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} +2206, BlackWizardHat, Black Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} 2207, OrangeWizardHat, Orange Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} 2208, PurpleWizardHat, Purple Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} 2209, DarkGreenWizardHat, Dark Green Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} @@ -726,11 +726,11 @@ 3003, JarofBlood, Jar of Blood, 3, 200, 100, 375, , , , , , , , , , , {}, {} 3004, Tongue, Tongue, 3, 5, 1, 5, , , , , , , , , , , {}, {} //3005 -3006, TonoriDelight, Tonori Delight, 0, 5, 1, 2, , , , , , 2, , , 0, , {}, {} -3007, Marshmallow, Marshmallow, 0, 5, 1, 2, , , , , , 2, , , 0, , {}, {} +3006, TonoriDelight, Tonori Delight, 3, 5, 1, 2, , , , , , 2, , , 0, , {}, {} +3007, Marshmallow, Marshmallow, 3, 5, 1, 2, , , , , , 2, , , 0, , {}, {} //3008 -3009, JellySkull, Jelly Skull, 0, 5, 1, 2, , , , , , 2, , , 0, , {}, {} -3010, CandyPumpkin, Candy Pumpkin, 0, 5, 1, 2, , , , , , 2, , , 0, , {}, {} +3009, JellySkull, Jelly Skull, 3, 5, 1, 2, , , , , , 2, , , 0, , {}, {} +3010, CandyPumpkin, Candy Pumpkin, 3, 5, 1, 2, , , , , , 2, , , 0, , {}, {} 3011, PumpkinSeeds, Pumpkin Seeds, 3, 5, 1, 1, , , , , , , , , , , {}, {} // No new additions to the 3000s please. Add to the bottom of the < 1000s for regular entries and the 2000s for dyed entries. 4000, AngryScorpionStinger, Angry Scorpion Stinger, 3, 50, 25, 1, , , , , , , , , , , {}, {} -- cgit v1.2.3-60-g2f50 From cdf80879bbe7c1d023b915bab64001cd4af26ba0 Mon Sep 17 00:00:00 2001 From: wushin Date: Sun, 26 May 2013 06:23:32 -0500 Subject: NPC changes --- world/map/npc/021-1/gate_guards.txt | 11 +++++--- world/map/npc/021-1/imec.txt | 2 +- world/map/npc/021-1/north_shops.txt | 41 +++++++++--------------------- world/map/npc/021-1/npcs.txt | 6 ++--- world/map/npc/021-1/royal_guards.txt | 13 ---------- world/map/npc/021-2/bank.txt | 7 +++++ world/map/npc/021-2/barber.txt | 11 ++++++++ world/map/npc/021-2/heathin.txt | 2 +- world/map/npc/021-2/hotel_receptionist.txt | 11 ++++++++ world/map/npc/021-2/inya.txt | 2 +- world/map/npc/021-2/jhedia.txt | 2 +- world/map/npc/021-2/workshop.txt | 11 -------- 12 files changed, 56 insertions(+), 63 deletions(-) delete mode 100644 world/map/npc/021-1/royal_guards.txt create mode 100644 world/map/npc/021-2/bank.txt create mode 100644 world/map/npc/021-2/barber.txt create mode 100644 world/map/npc/021-2/hotel_receptionist.txt delete mode 100644 world/map/npc/021-2/workshop.txt (limited to 'world') diff --git a/world/map/npc/021-1/gate_guards.txt b/world/map/npc/021-1/gate_guards.txt index 6af33f2f..ad0e80b4 100644 --- a/world/map/npc/021-1/gate_guards.txt +++ b/world/map/npc/021-1/gate_guards.txt @@ -21,20 +21,25 @@ } // Guards by the gates to East Tulimshar +021-1.gat,146,23,0|script|Guard|104,{ + mes "[Guard]"; + mes "\"I make sure less desirables don't enter the Noble District.\""; + close; +} 021-1.gat,156,42,0|script|Guard|104,{ mes "[Guard]"; - mes "\"It's still a mess in East Tulimshar. The volcano and earthquake did a lot of damage.\""; + mes "\"The volcano and earthquake did a lot of damage, but the citizens of Tulimshar sure did a good job of cleaning up.\""; close; } 021-1.gat,156,95,0|script|Guard|104,{ mes "[Guard]"; - mes "\"It can get quite dangerous east of town. But for now, the passage is closed.\""; + mes "\"The Palace is East of here. That is where you will find the Council of Wizards.\""; close; } // Near the bazaar, outside the government building -021-1.gat,58,135,0|script|Guard|123,{ +021-1.gat,55,136,0|script|Guard|123,{ mes "[Guard]"; mes "\"This is a government building. They have some clerical and tax offices in here. There is also a jail in the subbasement.\""; close; diff --git a/world/map/npc/021-1/imec.txt b/world/map/npc/021-1/imec.txt index 5ad150f8..ac541c87 100644 --- a/world/map/npc/021-1/imec.txt +++ b/world/map/npc/021-1/imec.txt @@ -10,7 +10,7 @@ OnInit: end; } -021-1.gat,128,36,0|script|Imec|162,{ +021-1.gat,120,33,0|script|Imec|162,{ set @state, ((QUEST_NorthTulimshar & $@ImecShopNT_MASK) >> $@ImecShopNT_SHIFT); set @money, 500; diff --git a/world/map/npc/021-1/north_shops.txt b/world/map/npc/021-1/north_shops.txt index 75df89e0..71b9e757 100644 --- a/world/map/npc/021-1/north_shops.txt +++ b/world/map/npc/021-1/north_shops.txt @@ -3,7 +3,18 @@ // More high-end stuff to satisfy the richer people in Royal Tulimshar // Some clothing -021-1.gat,136,38,0|shop|Inar|108,CottonShirt :-1,CottonShorts :-1,CottonBoots :-1,DesertShirt :-1,SilkRobe :-5,DesertHat :-4 +021-1.gat,135,38,0|shop|Inar|108,CottonShirt :-1,CottonShorts :-1,CottonBoots :-1,DesertShirt :-1,SilkRobe :-5,DesertHat :-4 + +021-1.gat,129,40,0|script|Well|400,{ + callfunc "WaterBottle"; +} + +// An officer (for security) +021-1.gat,128,36,0|script|Officer|150,{ + mes "[Officer]"; + mes "I'm here for extra security for this market."; + close; +} // A snobby store that won't sell to the player // takes part in quest given by 021-2/kylian.txt @@ -25,31 +36,3 @@ L_Close: close; } -// A barber (later we can make it so certain styles need to come from him, for a price) -021-1.gat,119,29,0|script|Issay|156,{ - mes "[Issay the Barber]"; - mes "\"Do you need a change of style?\""; - next; - callfunc "Barber"; - mes "[Issay the Barber]"; - mes "\"Come again!\""; - close; -} - -// Another banker -021-1.gat,122,32,0|script|Hydusun|149,{ - set @npcname$, "Hydusun"; - callfunc "Banker"; - close; -} - -021-1.gat,129,40,0|script|Well|400,{ - callfunc "WaterBottle"; -} - -// An officer (for security) -021-1.gat,130,38,0|script|Officer|150,{ - mes "[Officer]"; - mes "I'm here for extra security for this market."; - close; -} diff --git a/world/map/npc/021-1/npcs.txt b/world/map/npc/021-1/npcs.txt index 89a3111e..662a69e2 100644 --- a/world/map/npc/021-1/npcs.txt +++ b/world/map/npc/021-1/npcs.txt @@ -10,7 +10,7 @@ close; } -021-1.gat,75,67,0|script|Silvia|207,{ +021-1.gat,76,67,0|script|Silvia|207,{ set @npcname$, "Silvia"; mes "[" + @npcname$ + "]"; @@ -22,7 +22,7 @@ close; } -021-1.gat,45,77,0|script|Pauline|208,{ +021-1.gat,55,66,0|script|Pauline|208,{ set @npcname$, "Pauline"; mes "[" + @npcname$ + "]"; @@ -32,7 +32,7 @@ close; } -021-1.gat,49,123,0|script|Michel|215,{ +021-1.gat,51,123,0|script|Michel|215,{ set @npcname$, "Michel"; mes "[" + @npcname$ + "]"; diff --git a/world/map/npc/021-1/royal_guards.txt b/world/map/npc/021-1/royal_guards.txt deleted file mode 100644 index 1920e43b..00000000 --- a/world/map/npc/021-1/royal_guards.txt +++ /dev/null @@ -1,13 +0,0 @@ -// - -021-1.gat,141,23,0|script|Guard|126,{ - mes "[Guard]"; - mes "\"Stay away.\""; - close; -} - -021-1.gat,147,23,0|script|Guard|126,{ - mes "[Guard]"; - mes "\"Stay away.\""; - close; -} diff --git a/world/map/npc/021-2/bank.txt b/world/map/npc/021-2/bank.txt new file mode 100644 index 00000000..5ebbe5ea --- /dev/null +++ b/world/map/npc/021-2/bank.txt @@ -0,0 +1,7 @@ +// Another banker +021-2.gat,69,135,0|script|Hydusun|149,{ + set @npcname$, "Hydusun"; + callfunc "Banker"; + close; +} + diff --git a/world/map/npc/021-2/barber.txt b/world/map/npc/021-2/barber.txt new file mode 100644 index 00000000..d0ff401e --- /dev/null +++ b/world/map/npc/021-2/barber.txt @@ -0,0 +1,11 @@ +// A barber (later we can make it so certain styles need to come from him, for a price) +021-2.gat,72,101,0|script|Issay|156,{ + mes "[Issay the Barber]"; + mes "\"Do you need a change of style?\""; + next; + callfunc "Barber"; + mes "[Issay the Barber]"; + mes "\"Come again!\""; + close; +} + diff --git a/world/map/npc/021-2/heathin.txt b/world/map/npc/021-2/heathin.txt index 526e64e0..681f40df 100644 --- a/world/map/npc/021-2/heathin.txt +++ b/world/map/npc/021-2/heathin.txt @@ -1,6 +1,6 @@ //Items for NPC are incomplete. Makes "simple ring" which can be crafted into a useful ring by Inya and terranite armor. -021-2.gat,29,55,0|script|Heathin|147,{ +021-2.gat,70,129,0|script|Heathin|147,{ set @TARROW_REQ_TERRA_ORE, 1; set @TARROW_REQ_COAL, 5; diff --git a/world/map/npc/021-2/hotel_receptionist.txt b/world/map/npc/021-2/hotel_receptionist.txt new file mode 100644 index 00000000..0a7fcbb2 --- /dev/null +++ b/world/map/npc/021-2/hotel_receptionist.txt @@ -0,0 +1,11 @@ +// Tulimshar's main workshop + +// The receptionist +021-2.gat,22,63,0|script|Sonir|118,{ + mes "[Sonir]"; + mes "\"Welcome to The Wizards's Rest!\""; + next; + mes "[Sonir]"; + mes "\"We have limited housing on the second floor.\""; + close; +} diff --git a/world/map/npc/021-2/inya.txt b/world/map/npc/021-2/inya.txt index 946bdb33..4a70730c 100644 --- a/world/map/npc/021-2/inya.txt +++ b/world/map/npc/021-2/inya.txt @@ -1,7 +1,7 @@ //Gemstones: Diamond (white) , Ruby (red), Emerald (green), Sapphire (blue), Topaz (yellow), Amethyst (purple) //The power of the gems is important to future balance of these rings. Are they related to stats, tiers of power, schools of magic? -021-2.gat,43,62,0|script|Inya|106,{ +021-2.gat,80,134,0|script|Inya|106,{ mes "[Inya]"; mes "\"I am Inya, a jeweler of fine rings. If you have a Simple Ring and a gem, I can make a nice ring for you for 1,000,000 gold pieces.\""; diff --git a/world/map/npc/021-2/jhedia.txt b/world/map/npc/021-2/jhedia.txt index 32f043f3..1bffd0eb 100644 --- a/world/map/npc/021-2/jhedia.txt +++ b/world/map/npc/021-2/jhedia.txt @@ -1,6 +1,6 @@ // Ingot maker takes iron ore, gives ingots for future crafting purposes. -021-2.gat,23,55,0|script|Jhedia|160,{ +021-2.gat,70,124,0|script|Jhedia|160,{ set @Cost_Per_Ingot, 1000; set @Iron_Ore_Per, 5; diff --git a/world/map/npc/021-2/workshop.txt b/world/map/npc/021-2/workshop.txt deleted file mode 100644 index ed23ab5b..00000000 --- a/world/map/npc/021-2/workshop.txt +++ /dev/null @@ -1,11 +0,0 @@ -// Tulimshar's main workshop - -// The receptionist -021-2.gat,22,63,0|script|Sonir|118,{ - mes "[Sonir]"; - mes "\"This is Tulimshar's main workshop. Much crafting happens here.\""; - next; - mes "[Sonir]"; - mes "\"We also have limited housing on the second floor.\""; - close; -} \ No newline at end of file -- cgit v1.2.3-60-g2f50 From 3aa7d028d6ccd6b83143e1dc3349194b2ae63406 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 26 May 2013 15:55:23 +0200 Subject: Run make maps for map changes and npc position changes. Update submodule pointer. --- client-data | 2 +- world/map/data/021-1.wlk | Bin 29908 -> 29908 bytes world/map/data/021-2.wlk | Bin 40004 -> 40004 bytes world/map/data/022-1.wlk | Bin 19354 -> 19354 bytes world/map/npc/021-1/_import.txt | 1 - world/map/npc/021-1/_warps.txt | 4 ++++ world/map/npc/021-2/_import.txt | 4 +++- world/map/npc/021-2/_warps.txt | 9 ++++++++- 8 files changed, 16 insertions(+), 4 deletions(-) (limited to 'world') diff --git a/client-data b/client-data index 85e0d215..611b0956 160000 --- a/client-data +++ b/client-data @@ -1 +1 @@ -Subproject commit 85e0d215065bd09a39e88ee7a46620c748a23e81 +Subproject commit 611b0956753f6a9145fe08385480ee09c74da761 diff --git a/world/map/data/021-1.wlk b/world/map/data/021-1.wlk index 9f7730d8..5abd6a7d 100644 Binary files a/world/map/data/021-1.wlk and b/world/map/data/021-1.wlk differ diff --git a/world/map/data/021-2.wlk b/world/map/data/021-2.wlk index be26d54e..ba8feff6 100644 Binary files a/world/map/data/021-2.wlk and b/world/map/data/021-2.wlk differ diff --git a/world/map/data/022-1.wlk b/world/map/data/022-1.wlk index ce2d225a..56193c3f 100644 Binary files a/world/map/data/022-1.wlk and b/world/map/data/022-1.wlk differ diff --git a/world/map/npc/021-1/_import.txt b/world/map/npc/021-1/_import.txt index 30acb5b8..1ec734c5 100644 --- a/world/map/npc/021-1/_import.txt +++ b/world/map/npc/021-1/_import.txt @@ -13,6 +13,5 @@ npc: npc/021-1/inac.txt npc: npc/021-1/mapflags.txt npc: npc/021-1/north_shops.txt npc: npc/021-1/npcs.txt -npc: npc/021-1/royal_guards.txt npc: npc/021-1/weellos.txt npc: npc/021-1/workers.txt diff --git a/world/map/npc/021-1/_warps.txt b/world/map/npc/021-1/_warps.txt index 5d620e74..99134134 100644 --- a/world/map/npc/021-1/_warps.txt +++ b/world/map/npc/021-1/_warps.txt @@ -14,3 +14,7 @@ 021-1.gat,73,22|warp|To Tulimshar Port|3,-1,022-1.gat,73,109 021-1.gat,113,22|warp|To Tulimshar Port|3,-1,022-1.gat,113,109 021-1.gat,43,110|warp|to Store|-1,-1,021-2.gat,28,129 +021-1.gat,132,31|warp|to Tulimshar Forge|-1,-1,021-2.gat,79,138 +021-1.gat,133,24|warp|to Tulimshar Forge|-1,-1,021-2.gat,75,91 +021-1.gat,125,27|warp|to Tulimshar Forge|-1,-1,021-2.gat,124,67 +021-1.gat,125,31|warp|to Tulimshar Forge|-1,-1,021-2.gat,72,138 diff --git a/world/map/npc/021-2/_import.txt b/world/map/npc/021-2/_import.txt index bb80fc32..7b955fb5 100644 --- a/world/map/npc/021-2/_import.txt +++ b/world/map/npc/021-2/_import.txt @@ -4,11 +4,13 @@ map: 021-2.gat npc: npc/021-2/_mobs.txt npc: npc/021-2/_warps.txt npc: npc/021-2/bakery.txt +npc: npc/021-2/bank.txt +npc: npc/021-2/barber.txt npc: npc/021-2/government_building.txt npc: npc/021-2/heathin.txt +npc: npc/021-2/hotel_receptionist.txt npc: npc/021-2/inya.txt npc: npc/021-2/jhedia.txt npc: npc/021-2/kylian.txt npc: npc/021-2/mapflags.txt -npc: npc/021-2/workshop.txt npc: npc/021-2/yanis.txt diff --git a/world/map/npc/021-2/_warps.txt b/world/map/npc/021-2/_warps.txt index ad18520c..9e910208 100644 --- a/world/map/npc/021-2/_warps.txt +++ b/world/map/npc/021-2/_warps.txt @@ -2,7 +2,6 @@ // North Tulimshar Indoor warps 021-2.gat,27,30|warp|To Outside|-1,-1,021-1.gat,53,135 -021-2.gat,33,30|warp|To Outside|-1,-1,021-1.gat,55,135 021-2.gat,39,30|warp|To Outside|-1,-1,021-1.gat,57,135 021-2.gat,91,28|warp|To Outside|-1,-1,021-1.gat,103,101 021-2.gat,122,24|warp|To Roof|-1,-1,021-1.gat,103,97 @@ -14,3 +13,11 @@ 021-2.gat,46,57|warp|To Second Floor|0,-1,021-2.gat,46,96 021-2.gat,70,58|warp|To Main Room|-1,-1,021-2.gat,42,54 021-2.gat,28,130|warp|to Outside|-1,-1,021-1.gat,43,111 +021-2.gat,28,130|warp|to Outside|-1,-1,021-1.gat,43,111 +021-2.gat,84,93|warp|To First Floor|-1,0,021-2.gat,80,125 +021-2.gat,84,123|warp|To Second Floor|-1,0,021-2.gat,81,95 +021-2.gat,79,139|warp|to Outside|-1,-1,021-1.gat,132,32 +021-2.gat,72,139|warp|to Outside|-1,-1,021-1.gat,125,32 +021-2.gat,124,69|warp|to Outside|1,-1,021-1.gat,126,28 +021-2.gat,75,93|warp|to Outside|-1,-1,021-1.gat,132,25 +021-2.gat,33,30|warp|To Outside|-1,-1,021-1.gat,55,135 -- cgit v1.2.3-60-g2f50 From 636a98331a6d02d67d23e6c902c690e4fbb63df8 Mon Sep 17 00:00:00 2001 From: bh28 Date: Fri, 5 Apr 2013 06:51:00 +0200 Subject: Add Silksheet(891) to item_db --- world/map/db/item_db.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'world') diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt index bd8e8550..81a35ce8 100644 --- a/world/map/db/item_db.txt +++ b/world/map/db/item_db.txt @@ -405,6 +405,7 @@ 888, MagicGMTopHat, Magic GM Top Hat, 5, 4200, 1900, 30, , 60, , 20, 0, 2, 256, , 0, 0, {}, {set @minLvl, 60; callfunc "RestrictedItem"; bonus bMaxHP, 31000; bonus bFlee, -200; bonus bHPrecovRate, -400; bonus bCriticalDef, 250; bonus bMdef, 89;} 889, MurdererCrown, Murderer Crown, 5, 75000, 12000, 240, , 4, , 0, 0, 2, 256, , 0, 0, {}, {} 890, BeanieCopter, Beanie Copter, 5, 8000, 2000, 20, , 4, , 2, 0, 2, 256, , 0, 0, {}, {} +891, SilkSheet, Silk Sheet, 3, 1000, 250, 5, , , , , , , , , , , {}, {} // Add new entries above here. For dyed entries,add to the bottom of the 2000s. -- cgit v1.2.3-60-g2f50 From b65fb0f06e9eb680a3ad5ed3c51a87fd13ecdda8 Mon Sep 17 00:00:00 2001 From: bh28 Date: Fri, 5 Apr 2013 07:03:12 +0200 Subject: Modify NPC Lora Tay to accept silk sheets (010-2) --- world/map/npc/010-2/loratay.txt | 58 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) (limited to 'world') diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt index 978c3712..f761e7f4 100644 --- a/world/map/npc/010-2/loratay.txt +++ b/world/map/npc/010-2/loratay.txt @@ -2,6 +2,9 @@ set @ROBE_COCOONS_NR, 150; // must be multiple of ten set @ROBE_ZENY, 10000; + set @ROBE_SHEETS_NR, 6; // number of silk sheets required for the silk robe. Must be less than 10. + set @ROBE_SHEETS_ZENY, 6000; // price of the silk robe when bringing silk sheets. + set @Robe_with_sheets, 0; // will be set to 1 if silk robe is made with sheets set @FINEDRESS_COCOONS, 180; set @SORCERER_ROBE_SEW_ZENY, 25000; set @SORCERER_ROBE_NUM_COTTON_CLOTH, 2; @@ -683,13 +686,13 @@ L_robe: mes "[Lora Tay the Seamstress]"; mes "\"A robe? Well, as long as you're not asking me to make it out of cotton...\""; next; - if (countitem("SilkCocoon") == 0) + if (countitem("SilkCocoon")== 0 && countitem("SilkSheet")== 0) goto L_robe_nosilk; L_robe_menu: menu "Here, I have some silk cocoons!", -, - "Here, I have some silk sheets!", L_robe_nosilk, + "Here, I have some silk sheets!", L_robe_sheets, "Where can I find silk?", L_where_silk, "How much silk do you need?", L_how_much_silk, "Oh, never mind.", L_main_menu; @@ -723,10 +726,33 @@ L_robe_menu: goto L_TooMany; set Zeny, Zeny - @ROBE_ZENY; delitem "SilkCocoon", @ROBE_COCOONS_NR; - getitem "SilkRobe", 1; mes "[Lora Tay the Seamstress]"; mes "The seamstress puts your cocoons and GP away, takes your measurements and pulls out several silk sheets. She asks you to stretch out your arms, then pins the silk sheets in place all over your body."; next; + goto L_get_robe; + +L_robe_sheets: + set @Robe_with_sheets, 1; + mes "[Lora Tay the Seamstress]"; + mes "\"Let's see... " + @ROBE_SHEETS_NR + " silk cocoons and " + @ROBE_SHEETS_ZENY + " GP should just about cover that.\""; + next; + menu + "I'm not interested.", L_main_menu, + "Very well then, here you are.", -; + if (countitem("SilkSheet") < @ROBE_SHEETS_NR) + goto L_robe_missing_sheets; + if (Zeny < @ROBE_SHEETS_ZENY) + goto L_robe_sheet_missing_Zeny; + getinventorylist; + if (@inventorylist_count == 100 && countitem("SilkSheet") > @ROBE_SHEETS_NR) + goto L_TooMany; + set Zeny, Zeny - @ROBE_SHEETS_ZENY; + delitem "SilkSheet", @ROBE_SHEETS_NR; + mes "[Lora Tay the Seamstress]"; + mes "The seamstress puts your GP away, takes your measurements and puts the silk sheets on the table. She asks you to stretch out your arms, then pins the silk sheets in place all over your body."; + next; + +L_get_robe: mes "[Lora Tay the Seamstress]"; mes "She proceeds to make a number of mysterious marks on the sheets with a charcoal pen. Meanwhile, your arms are getting tired, but you're afraid to lower them-- she used a lot of pins to put everything into place, and you lost track of where they went..."; next; @@ -736,10 +762,18 @@ L_robe_menu: next; mes "[Lora Tay the Seamstress]"; mes "She then treats the seams with some odorless liquid, making them vanish completely. Finally she hands you the finished robe."; + getitem "SilkRobe", 1; + if (@Robe_with_sheets == 1) + goto L_robe_sheet_end; mes "\"Here you are now, this will fit. And don't you dare tell anyone that I did this! I'm not about to start a silk cocoon collection!\""; next; goto L_main_menu; +L_robe_sheet_end: + mes "\"Here you are now, this will fit. Thank you for bringing the sheets. People are so lazy nowadays! \""; + next; + goto L_main_menu; + L_robe_missing_cocoons: mes "[Lora Tay the Seamstress]"; mes "\"" + @ROBE_COCOONS_NR + " cocoons is what I said, not " + countitem("SilkCocoon") + "."; @@ -753,6 +787,19 @@ L_robe_missing_Zeny: next; goto L_main_menu; +L_robe_missing_sheets: + mes "[Lora Tay the Seamstress]"; + mes "\"" + @ROBE_SHEETS_NR + " silk sheets is what I said, not " + countitem("SilkSheet") + "."; + mes @ROBE_SHEETS_NR + " is " + (10-@ROBE_SHEETS_NR) + " less than you have fingers, in case that helps.\""; + next; + goto L_main_menu; + +L_robe_sheet_missing_Zeny: + mes "[Lora Tay the Seamstress]"; + mes "\"No, no no. The way this works is that you give me the GP first and I give you the robe afterwards. You're " + (@ROBE_SHEETS_ZENY - Zeny) + " GP short, so come back when you can afford the robe!\""; + next; + goto L_main_menu; + L_where_silk: mes "[Lora Tay the Seamstress]"; mes "\"Oh, Hetchel on the Tulimshar Marketplace can weave them for you.\""; @@ -776,6 +823,11 @@ L_robe_nosilk: goto L_main_menu; L_end: + set @ROBE_COCOONS_NR, 0; + set @ROBE_ZENY, 0; + set @ROBE_SHEETS_NR, 0; + set @ROBE_SHEETS_ZENY, 0; + set @Robe_with_sheets, 0; close; // Input: @items (array of items you want to choose from) -- cgit v1.2.3-60-g2f50 From ad6ada10b18c4d8bbd2951ba99dfaeab4b621349 Mon Sep 17 00:00:00 2001 From: bh28 Date: Sat, 6 Apr 2013 16:41:17 +0200 Subject: Add NPC Hetchel(376) to 021-1 --- world/map/npc/021-1/_import.txt | 1 + world/map/npc/021-1/hetchel.txt | 109 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 world/map/npc/021-1/hetchel.txt (limited to 'world') diff --git a/world/map/npc/021-1/_import.txt b/world/map/npc/021-1/_import.txt index 1ec734c5..9fa30a77 100644 --- a/world/map/npc/021-1/_import.txt +++ b/world/map/npc/021-1/_import.txt @@ -7,6 +7,7 @@ npc: npc/021-1/bakery.txt npc: npc/021-1/banu.txt npc: npc/021-1/eurni.txt npc: npc/021-1/gate_guards.txt +npc: npc/021-1/hetchel.txt npc: npc/021-1/hideandseek.txt npc: npc/021-1/imec.txt npc: npc/021-1/inac.txt diff --git a/world/map/npc/021-1/hetchel.txt b/world/map/npc/021-1/hetchel.txt new file mode 100644 index 00000000..9ccc8e9f --- /dev/null +++ b/world/map/npc/021-1/hetchel.txt @@ -0,0 +1,109 @@ +// Hetchel the Silk Weaver +// Hetchel is referred to by Lora Tay. +// She weaves and sells standard double elbow square silk sheets. +// She could also sell, dyed sheets, Silk robes from Lora Tay. +// (6000 with cocoons, 40000 (?) with no cocoons). +// +// Hetchel's workshop is actually under repair, Shé'll be back in 021-2 when workers have finished their job. +// +// @SHEET_COCOONS_NR : Number of cocoons required per sheet. +// Might ne calculated from @ROBE_COCOONS_NR/@ROBE_SHEETS_NR +// Actually: 150∕6 = 25 +// @SHEET_ZENY : Money to pay per sheet: A sixth of 10000-2*500-6000 + +021-1.gat,120,39,0|script|Hetchel|376,{ + set @SHEET_COCOONS_NR, 25; + set @SHEET_ZENY, 500; + mes "[Hetchel the weaver]"; + mes "\"Hello I am Hetchel, I weave fine textiles, what can I do for you?\""; + next; + +L_main_menu: + menu + "Sorry to bother, I'm new to this country, just visting.", L_end, + "I am looking for silk sheets, Lora Tay told me that I could find some in this market. Can you help?", -; +// "Do you have any silk robe I could buy?", L_robe, +// "Goodbye.", L_end; + next; + mes "[Hetchel the Weaver]"; + mes "\"Sure but you need to provide raw materials."; + mes "I'll need " + @SHEET_COCOONS_NR +" silk cocoons per sheet, "; + mes "and also " + @SHEET_ZENY +" GP per sheet for my work.\""; + next; + if (countitem("SilkCocoon") == 0) + goto L_sheet_no_cocoon; + +L_sheet_menu: + menu + "I have what you asked for.", -, + "Sorry I didn't pay attention enough, what do you need?", L_how_many_cocoons, + "Oops! Sorry, I'll come back soon with them.", L_end; + next; + +L_sheet: + if (countitem("SilkCocoon") < @SHEET_COCOONS_NR) + goto L_sheet_missing_cocoons; + if (Zeny < @SHEET_ZENY) + goto L_sheet_missing_Zeny; + getinventorylist; + if (@inventorylist_count == 100 && countitem("SilkCocoon") > @SHEET_COCOONS_NR) + goto L_TooMany; + set Zeny, Zeny - @SHEET_ZENY; + delitem "SilkCocoon", @SHEET_COCOONS_NR; + getitem "Silksheet", 1; + mes "[Hetchel the Weaver]"; + mes "\"Thank you, I hope the sheets will fit your needs.\""; + emotion EMOTE_HAPPY; + goto L_end; + +L_sheet_missing_cocoons: + mes "[Hetchel the Weaver]"; + mes "\"I'm sorry, but I need " + @SHEET_COCOONS_NR + ", not " + countitem("SilkCocoon") + "."; + goto L_end; + +L_sheet_missing_Zeny: + mes "[Hetchel the Weaver]"; + mes "\"No, no no. The way this works is that you give me the GP first and I give you the sheets afterwards."; + mes "You're " + (@SHEET_ZENY - Zeny) + " GP short, so come back when you can afford the sheet!\""; + goto L_end; + +L_how_many_cocoons: + mes "[Hetchel the Weaver]"; + mes "\"I need an average of " + @SHEET_COCOONS_NR + " cocoons per sheet"; + mes "and also " + @SHEET_ZENY + " GP per sheet for my work.\""; + next; + goto L_sheet_menu; + +L_sheet_no_cocoon: + mes "[Hetchel the Weaver]"; + mes "\"You don't have any cocoon? I'm sorry I can't do anything for you.\""; + menu + "I'll seek for them.", L_end, + "Where can I get cocoons?", -; + next; + mes "[Hetchel the Weaver]"; + mes "\"Silk cocoons come from Silkworms. Silkworms live in the woodland area around Hurnscald."; + mes "Silkworms like especially woods and dark areas. You can go there by ferry.\""; + goto L_end; + +//L_robe: +// mes "[Hetchel the Weaver]"; +// mes "\"I am not a seamstress but I have a few silk robes from Lora Tay left."; +// mes "It is not your size as Lora made them for me, but Tondar was kind enough"; +// mes "to cast a spell on it, so that it will fit to you as soon as you wear it."; +// mes "However his prices are not that low.\""; +// next; +// +//L_robe_menu: +// goto L_main_menu; + +L_TooMany: + mes "[Hetchel the Weaver]"; + mes "\"Your bag hasn't room enough. Store some things and come back.\""; + +L_end: + set @SHEET_COCOONS_NR, 0; + set @SHEET_ZENY, 0; + close; +} + -- cgit v1.2.3-60-g2f50 From 9ce2e39094a06bdb11620d10d82c9b99c7388423 Mon Sep 17 00:00:00 2001 From: bh28 Date: Mon, 8 Apr 2013 08:47:21 +0200 Subject: replaced wrong "cocoon" by "sheet" in sheet dialog --- world/map/npc/010-2/loratay.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'world') diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt index f761e7f4..f34d9c57 100644 --- a/world/map/npc/010-2/loratay.txt +++ b/world/map/npc/010-2/loratay.txt @@ -734,7 +734,7 @@ L_robe_menu: L_robe_sheets: set @Robe_with_sheets, 1; mes "[Lora Tay the Seamstress]"; - mes "\"Let's see... " + @ROBE_SHEETS_NR + " silk cocoons and " + @ROBE_SHEETS_ZENY + " GP should just about cover that.\""; + mes "\"Let's see... " + @ROBE_SHEETS_NR + " silk sheets and " + @ROBE_SHEETS_ZENY + " GP should just about cover that.\""; next; menu "I'm not interested.", L_main_menu, -- cgit v1.2.3-60-g2f50 From 4143369b3370271801a35363479b109610493d30 Mon Sep 17 00:00:00 2001 From: bh28 Date: Mon, 8 Apr 2013 18:54:02 +0200 Subject: Allowed to buy multiple sheets, Dialogs improvement. --- world/map/npc/021-1/hetchel.txt | 62 +++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 14 deletions(-) (limited to 'world') diff --git a/world/map/npc/021-1/hetchel.txt b/world/map/npc/021-1/hetchel.txt index 9ccc8e9f..8304153e 100644 --- a/world/map/npc/021-1/hetchel.txt +++ b/world/map/npc/021-1/hetchel.txt @@ -1,4 +1,6 @@ // Hetchel the Silk Weaver +// bh28, GPLv2 +// Graphics by ChefChelios CC BY SA // Hetchel is referred to by Lora Tay. // She weaves and sells standard double elbow square silk sheets. // She could also sell, dyed sheets, Silk robes from Lora Tay. @@ -6,28 +8,50 @@ // // Hetchel's workshop is actually under repair, Shé'll be back in 021-2 when workers have finished their job. // +// QUEST_WG_state: Global variable indicating winter gloves status. +// Lora Tay proposes silk Robe if (QUEST_WG_state>= 11). // @SHEET_COCOONS_NR : Number of cocoons required per sheet. // Might ne calculated from @ROBE_COCOONS_NR/@ROBE_SHEETS_NR // Actually: 150∕6 = 25 // @SHEET_ZENY : Money to pay per sheet: A sixth of 10000-2*500-6000 +// @SheetCount Number of sheets to buy (variable). 021-1.gat,120,39,0|script|Hetchel|376,{ set @SHEET_COCOONS_NR, 25; set @SHEET_ZENY, 500; + set @SheetCount 0; + + if (QUEST_WG_state < 11) + goto L_WG_quest_not_done; mes "[Hetchel the weaver]"; - mes "\"Hello I am Hetchel, I weave fine textiles, what can I do for you?\""; + mes "Hello I am Hetchel, I weave fine textiles, what can I do for you?"; + menu + "Sorry to bother, I'm just visting.", L_end, + "I am looking for silk sheets, Lora Tay told me that I could find some in this market. Can you help?", -; next; + goto L_main_menu; -L_main_menu: +L_WG_quest_not_done: + mes "[Hetchel the weaver]"; + mes "\"Hello I am Hetchel, I weave fine textiles."; + mes "My best client is Lora Tay, at Dimond's."; + mes "What can I do for you?\""; menu "Sorry to bother, I'm new to this country, just visting.", L_end, - "I am looking for silk sheets, Lora Tay told me that I could find some in this market. Can you help?", -; + "What are you selling?", -; + next; + +L_main_menu: + mes "[Hetchel the weaver]"; + mes "\"I have some silk sheets: double-elbow squares"; + menu + "I'm not interested at the moment, maybe later; thanks anyway.", L_end, + "Can I buy some?", -; // "Do you have any silk robe I could buy?", L_robe, // "Goodbye.", L_end; - next; mes "[Hetchel the Weaver]"; mes "\"Sure but you need to provide raw materials."; - mes "I'll need " + @SHEET_COCOONS_NR +" silk cocoons per sheet, "; + mes "I'll need " + @SHEET_COCOONS_NR +" silk cocoons per sheet,"; mes "and also " + @SHEET_ZENY +" GP per sheet for my work.\""; next; if (countitem("SilkCocoon") == 0) @@ -41,30 +65,35 @@ L_sheet_menu: next; L_sheet: - if (countitem("SilkCocoon") < @SHEET_COCOONS_NR) + mes "How many would you like?"; + input @SheetCount; + if (@SheetCount == 0) + goto L_zero_sheet; + if (countitem("SilkCocoon") < @SheetCount * @SHEET_COCOONS_NR) goto L_sheet_missing_cocoons; - if (Zeny < @SHEET_ZENY) + if (Zeny < @SheetCount * @SHEET_ZENY) goto L_sheet_missing_Zeny; getinventorylist; - if (@inventorylist_count == 100 && countitem("SilkCocoon") > @SHEET_COCOONS_NR) + if (@inventorylist_count == 100 && countitem("SilkCocoon") > @SheetCount * @SHEET_COCOONS_NR) goto L_TooMany; - set Zeny, Zeny - @SHEET_ZENY; - delitem "SilkCocoon", @SHEET_COCOONS_NR; - getitem "Silksheet", 1; + set Zeny, Zeny - @SheetCount * @SHEET_ZENY; + delitem "SilkCocoon", @SheetCount * @SHEET_COCOONS_NR; + getitem "Silksheet", @SheetCount; mes "[Hetchel the Weaver]"; - mes "\"Thank you, I hope the sheets will fit your needs.\""; + mes "\"Thank you, I hope the sheets will fit your needs."; + mes "Please greet Lora for me when you see her.\""; emotion EMOTE_HAPPY; goto L_end; L_sheet_missing_cocoons: mes "[Hetchel the Weaver]"; - mes "\"I'm sorry, but I need " + @SHEET_COCOONS_NR + ", not " + countitem("SilkCocoon") + "."; + mes "I'm sorry, but I need " + @SheetCount * @SHEET_COCOONS_NR + ", not " + countitem("SilkCocoon") + "."; goto L_end; L_sheet_missing_Zeny: mes "[Hetchel the Weaver]"; mes "\"No, no no. The way this works is that you give me the GP first and I give you the sheets afterwards."; - mes "You're " + (@SHEET_ZENY - Zeny) + " GP short, so come back when you can afford the sheet!\""; + mes "You're " + (@SheetCount * @SHEET_ZENY - Zeny) + " GP short, so come back when you can afford the sheets you asked for!\""; goto L_end; L_how_many_cocoons: @@ -97,6 +126,10 @@ L_sheet_no_cocoon: //L_robe_menu: // goto L_main_menu; +L_zero_sheet; + mes "It's the best way to get quickly served!"; + goto L_end; + L_TooMany: mes "[Hetchel the Weaver]"; mes "\"Your bag hasn't room enough. Store some things and come back.\""; @@ -104,6 +137,7 @@ L_TooMany: L_end: set @SHEET_COCOONS_NR, 0; set @SHEET_ZENY, 0; + set @SheetCount 0; close; } -- cgit v1.2.3-60-g2f50 From f61d61f46770638dadf1584aaefde63ee535d89d Mon Sep 17 00:00:00 2001 From: bh28 Date: Tue, 9 Apr 2013 19:50:51 +0200 Subject: minor error corrections (see comments) --- world/map/npc/021-1/hetchel.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'world') diff --git a/world/map/npc/021-1/hetchel.txt b/world/map/npc/021-1/hetchel.txt index 8304153e..02cd4bc6 100644 --- a/world/map/npc/021-1/hetchel.txt +++ b/world/map/npc/021-1/hetchel.txt @@ -1,6 +1,7 @@ // Hetchel the Silk Weaver -// bh28, GPLv2 -// Graphics by ChefChelios CC BY SA +// bh28, +// 2013-03, GPLv2. +// original graphics by ChefChelios CC BY SA & GPLv2 (cf. Client Data). // Hetchel is referred to by Lora Tay. // She weaves and sells standard double elbow square silk sheets. // She could also sell, dyed sheets, Silk robes from Lora Tay. @@ -43,7 +44,7 @@ L_WG_quest_not_done: L_main_menu: mes "[Hetchel the weaver]"; - mes "\"I have some silk sheets: double-elbow squares"; + mes "I have some silk sheets: double-elbow squares"; menu "I'm not interested at the moment, maybe later; thanks anyway.", L_end, "Can I buy some?", -; @@ -64,7 +65,6 @@ L_sheet_menu: "Oops! Sorry, I'll come back soon with them.", L_end; next; -L_sheet: mes "How many would you like?"; input @SheetCount; if (@SheetCount == 0) @@ -74,7 +74,7 @@ L_sheet: if (Zeny < @SheetCount * @SHEET_ZENY) goto L_sheet_missing_Zeny; getinventorylist; - if (@inventorylist_count == 100 && countitem("SilkCocoon") > @SheetCount * @SHEET_COCOONS_NR) + if (@inventorylist_count == 100 && countitem("SilkSheet") < 1 && countitem("SilkCocoon") > @SheetCount * @SHEET_COCOONS_NR) goto L_TooMany; set Zeny, Zeny - @SheetCount * @SHEET_ZENY; delitem "SilkCocoon", @SheetCount * @SHEET_COCOONS_NR; @@ -105,7 +105,7 @@ L_how_many_cocoons: L_sheet_no_cocoon: mes "[Hetchel the Weaver]"; - mes "\"You don't have any cocoon? I'm sorry I can't do anything for you.\""; + mes "You don't have any cocoon? I'm sorry I can't do anything for you."; menu "I'll seek for them.", L_end, "Where can I get cocoons?", -; @@ -126,13 +126,14 @@ L_sheet_no_cocoon: //L_robe_menu: // goto L_main_menu; -L_zero_sheet; +L_zero_sheet: + mes "[Hetchel the Weaver]"; mes "It's the best way to get quickly served!"; goto L_end; L_TooMany: mes "[Hetchel the Weaver]"; - mes "\"Your bag hasn't room enough. Store some things and come back.\""; + mes "Your bag hasn't room enough. Store some things and come back."; L_end: set @SHEET_COCOONS_NR, 0; -- cgit v1.2.3-60-g2f50 From 1465ef521f64120a483d51cb855725b87d0f3c76 Mon Sep 17 00:00:00 2001 From: bh28 Date: Thu, 11 Apr 2013 02:01:58 +0200 Subject: fixed dbl quote issues --- world/map/npc/021-1/hetchel.txt | 44 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'world') diff --git a/world/map/npc/021-1/hetchel.txt b/world/map/npc/021-1/hetchel.txt index 02cd4bc6..edde4ca9 100644 --- a/world/map/npc/021-1/hetchel.txt +++ b/world/map/npc/021-1/hetchel.txt @@ -1,7 +1,7 @@ // Hetchel the Silk Weaver // bh28, // 2013-03, GPLv2. -// original graphics by ChefChelios CC BY SA & GPLv2 (cf. Client Data). +// // Hetchel is referred to by Lora Tay. // She weaves and sells standard double elbow square silk sheets. // She could also sell, dyed sheets, Silk robes from Lora Tay. @@ -20,12 +20,12 @@ 021-1.gat,120,39,0|script|Hetchel|376,{ set @SHEET_COCOONS_NR, 25; set @SHEET_ZENY, 500; - set @SheetCount 0; + set @SheetCount, 0; if (QUEST_WG_state < 11) goto L_WG_quest_not_done; mes "[Hetchel the weaver]"; - mes "Hello I am Hetchel, I weave fine textiles, what can I do for you?"; + mes "\"Hello I am Hetchel, I weave fine textiles, what can I do for you?\""; menu "Sorry to bother, I'm just visting.", L_end, "I am looking for silk sheets, Lora Tay told me that I could find some in this market. Can you help?", -; @@ -43,14 +43,14 @@ L_WG_quest_not_done: next; L_main_menu: - mes "[Hetchel the weaver]"; - mes "I have some silk sheets: double-elbow squares"; + mes "[Hetchel]"; + mes "\"I have some silk sheets: double-elbow squares.\""; menu "I'm not interested at the moment, maybe later; thanks anyway.", L_end, "Can I buy some?", -; // "Do you have any silk robe I could buy?", L_robe, // "Goodbye.", L_end; - mes "[Hetchel the Weaver]"; + mes "[Hetchel]"; mes "\"Sure but you need to provide raw materials."; mes "I'll need " + @SHEET_COCOONS_NR +" silk cocoons per sheet,"; mes "and also " + @SHEET_ZENY +" GP per sheet for my work.\""; @@ -64,8 +64,8 @@ L_sheet_menu: "Sorry I didn't pay attention enough, what do you need?", L_how_many_cocoons, "Oops! Sorry, I'll come back soon with them.", L_end; next; - - mes "How many would you like?"; + mes "[Hetchel]"; + mes "\"How many would you like?\""; input @SheetCount; if (@SheetCount == 0) goto L_zero_sheet; @@ -79,44 +79,44 @@ L_sheet_menu: set Zeny, Zeny - @SheetCount * @SHEET_ZENY; delitem "SilkCocoon", @SheetCount * @SHEET_COCOONS_NR; getitem "Silksheet", @SheetCount; - mes "[Hetchel the Weaver]"; + mes "[Hetchel]"; mes "\"Thank you, I hope the sheets will fit your needs."; mes "Please greet Lora for me when you see her.\""; emotion EMOTE_HAPPY; goto L_end; L_sheet_missing_cocoons: - mes "[Hetchel the Weaver]"; - mes "I'm sorry, but I need " + @SheetCount * @SHEET_COCOONS_NR + ", not " + countitem("SilkCocoon") + "."; + mes "[Hetchel]"; + mes "\"I'm sorry, but I need " + @SheetCount * @SHEET_COCOONS_NR + ", not " + countitem("SilkCocoon") + ".\""; goto L_end; L_sheet_missing_Zeny: - mes "[Hetchel the Weaver]"; + mes "[Hetchel]"; mes "\"No, no no. The way this works is that you give me the GP first and I give you the sheets afterwards."; mes "You're " + (@SheetCount * @SHEET_ZENY - Zeny) + " GP short, so come back when you can afford the sheets you asked for!\""; goto L_end; L_how_many_cocoons: - mes "[Hetchel the Weaver]"; + mes "[Hetchel]"; mes "\"I need an average of " + @SHEET_COCOONS_NR + " cocoons per sheet"; mes "and also " + @SHEET_ZENY + " GP per sheet for my work.\""; next; goto L_sheet_menu; L_sheet_no_cocoon: - mes "[Hetchel the Weaver]"; - mes "You don't have any cocoon? I'm sorry I can't do anything for you."; + mes "[Hetchel]"; + mes "\"You don't have any cocoon? I'm sorry I can't do anything for you.\""; menu "I'll seek for them.", L_end, "Where can I get cocoons?", -; next; - mes "[Hetchel the Weaver]"; + mes "[Hetchel]"; mes "\"Silk cocoons come from Silkworms. Silkworms live in the woodland area around Hurnscald."; mes "Silkworms like especially woods and dark areas. You can go there by ferry.\""; goto L_end; //L_robe: -// mes "[Hetchel the Weaver]"; +// mes "[Hetchel]"; // mes "\"I am not a seamstress but I have a few silk robes from Lora Tay left."; // mes "It is not your size as Lora made them for me, but Tondar was kind enough"; // mes "to cast a spell on it, so that it will fit to you as soon as you wear it."; @@ -127,18 +127,18 @@ L_sheet_no_cocoon: // goto L_main_menu; L_zero_sheet: - mes "[Hetchel the Weaver]"; - mes "It's the best way to get quickly served!"; + mes "[Hetchel]"; + mes "\"It's the best way to get quickly served!\""; goto L_end; L_TooMany: - mes "[Hetchel the Weaver]"; - mes "Your bag hasn't room enough. Store some things and come back."; + mes "[Hetchel]"; + mes "\"Your bag hasn't room enough. Store some things and come back.\""; L_end: set @SHEET_COCOONS_NR, 0; set @SHEET_ZENY, 0; - set @SheetCount 0; + set @SheetCount, 0; close; } -- cgit v1.2.3-60-g2f50 From ae32c4ebdf701f01375b29cc9162193f90716c38 Mon Sep 17 00:00:00 2001 From: bh28 Date: Fri, 26 Apr 2013 19:19:14 +0200 Subject: Hetchel dialog: typo fix --- world/map/npc/021-1/hetchel.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'world') diff --git a/world/map/npc/021-1/hetchel.txt b/world/map/npc/021-1/hetchel.txt index edde4ca9..e7ca7bd9 100644 --- a/world/map/npc/021-1/hetchel.txt +++ b/world/map/npc/021-1/hetchel.txt @@ -27,7 +27,7 @@ mes "[Hetchel the weaver]"; mes "\"Hello I am Hetchel, I weave fine textiles, what can I do for you?\""; menu - "Sorry to bother, I'm just visting.", L_end, + "Sorry to bother, I'm just visiting.", L_end, "I am looking for silk sheets, Lora Tay told me that I could find some in this market. Can you help?", -; next; goto L_main_menu; -- cgit v1.2.3-60-g2f50 From 875935f65e21b91c78022a730fb1c6fa4e3adfbd Mon Sep 17 00:00:00 2001 From: tux9th Date: Fri, 31 May 2013 19:41:04 +0200 Subject: Fixed the NPC warps to have the same range as normal warps instead of the 3 by 3 square. --- world/map/npc/009-3/warp.txt | 2 +- world/map/npc/029-1/barrier.txt | 2 +- world/map/npc/029-3/barrier.txt | 2 +- world/map/npc/031-1/house.txt | 2 +- world/map/npc/031-3/labyrinth.txt | 2 +- world/map/npc/031-4/barrier.txt | 2 +- world/map/npc/056-2/barrier.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'world') diff --git a/world/map/npc/009-3/warp.txt b/world/map/npc/009-3/warp.txt index 7f709abd..9bb9ab28 100644 --- a/world/map/npc/009-3/warp.txt +++ b/world/map/npc/009-3/warp.txt @@ -1,4 +1,4 @@ -009-3.gat,162,80,0|script|#PVPCaveBarrier|45,1,1,{ +009-3.gat,162,80,0|script|#PVPCaveBarrier|45,0,0,{ mes "Do you want to enter the PVP cave? It costs 150GP."; menu "No.", L_Exit, diff --git a/world/map/npc/029-1/barrier.txt b/world/map/npc/029-1/barrier.txt index 85882c89..54ef3878 100644 --- a/world/map/npc/029-1/barrier.txt +++ b/world/map/npc/029-1/barrier.txt @@ -1,4 +1,4 @@ -029-1.gat,54,36,0|script|#CandorBarrier|45,1,1,{ +029-1.gat,54,37,0|script|#CandorBarrier|45,0,0,{ if ($@FIGHT_CAVE_STATUS == 1) goto L_Block; warp "029-3.gat", 46, 23; end; diff --git a/world/map/npc/029-3/barrier.txt b/world/map/npc/029-3/barrier.txt index acfb642c..bfd4e3be 100644 --- a/world/map/npc/029-3/barrier.txt +++ b/world/map/npc/029-3/barrier.txt @@ -1,4 +1,4 @@ -029-3.gat,45,20,0|script|#FightCaveBarrier|45,1,1,{ +029-3.gat,46,21,0|script|#FightCaveBarrier|45,0,0,{ if ($@FIGHT_CAVE_STATUS == 1) goto L_Block; warp "029-1.gat", 54, 39; end; diff --git a/world/map/npc/031-1/house.txt b/world/map/npc/031-1/house.txt index 70093c3f..b35d816f 100644 --- a/world/map/npc/031-1/house.txt +++ b/world/map/npc/031-1/house.txt @@ -2,7 +2,7 @@ // player can enter, if Cindy is already saved and the player has been invited, quest status > 2 // author: Jenalya -031-1.gat,95,80,0|script|#Door|45,1,1,{ +031-1.gat,95,80,0|script|#Door|45,0,0,{ set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; diff --git a/world/map/npc/031-3/labyrinth.txt b/world/map/npc/031-3/labyrinth.txt index ed06cf60..cf3bd520 100644 --- a/world/map/npc/031-3/labyrinth.txt +++ b/world/map/npc/031-3/labyrinth.txt @@ -1,7 +1,7 @@ // Conditional warp for yeti cave // Authors: Jenalya -031-3.gat,46,24,0|script|#YetiBarrier|45,1,1,{ +031-3.gat,46,24,0|script|#YetiBarrier|45,0,0,{ if ($@FIGHT_YETI_STATUS == 1) goto L_Blocked; warp "031-4.gat", 40, 69; end; diff --git a/world/map/npc/031-4/barrier.txt b/world/map/npc/031-4/barrier.txt index 243bb0d1..aa542b26 100644 --- a/world/map/npc/031-4/barrier.txt +++ b/world/map/npc/031-4/barrier.txt @@ -1,4 +1,4 @@ -031-4.gat,40,71,0|script|#YetiBarrier|45,1,1,{ +031-4.gat,40,71,0|script|#YetiBarrier|45,0,0,{ if ($@FIGHT_YETI_STATUS == 1) goto L_Block; warp "031-3.gat", 46, 27; end; diff --git a/world/map/npc/056-2/barrier.txt b/world/map/npc/056-2/barrier.txt index c72a17f7..dc26dbfb 100644 --- a/world/map/npc/056-2/barrier.txt +++ b/world/map/npc/056-2/barrier.txt @@ -1,4 +1,4 @@ -056-2.gat,23,33,0|script|#Barrier|45,1,1,{ +056-2.gat,23,33,0|script|#Barrier|45,0,0,{ if (Mirak_Bantime > gettimetick(2)) goto L_Block; if (BaseLevel < 25) -- cgit v1.2.3-60-g2f50 From 65a7a7f5b8a4367d98dbb10e3989b7124475c12c Mon Sep 17 00:00:00 2001 From: tux9th Date: Sun, 2 Jun 2013 19:54:36 +0200 Subject: Fixed warppoints in and out of Cindy's cave. --- world/map/npc/031-3/labyrinth.txt | 2 +- world/map/npc/031-4/barrier.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'world') diff --git a/world/map/npc/031-3/labyrinth.txt b/world/map/npc/031-3/labyrinth.txt index cf3bd520..39a8ba90 100644 --- a/world/map/npc/031-3/labyrinth.txt +++ b/world/map/npc/031-3/labyrinth.txt @@ -3,7 +3,7 @@ 031-3.gat,46,24,0|script|#YetiBarrier|45,0,0,{ if ($@FIGHT_YETI_STATUS == 1) goto L_Blocked; - warp "031-4.gat", 40, 69; + warp "031-4.gat", 40, 70; end; L_Blocked: diff --git a/world/map/npc/031-4/barrier.txt b/world/map/npc/031-4/barrier.txt index aa542b26..83daffd7 100644 --- a/world/map/npc/031-4/barrier.txt +++ b/world/map/npc/031-4/barrier.txt @@ -1,6 +1,6 @@ 031-4.gat,40,71,0|script|#YetiBarrier|45,0,0,{ if ($@FIGHT_YETI_STATUS == 1) goto L_Block; - warp "031-3.gat", 46, 27; + warp "031-3.gat", 46, 25; end; L_Block: -- cgit v1.2.3-60-g2f50 From 6e3f4486ee4696147244eb71bc6c3e9de8cf3273 Mon Sep 17 00:00:00 2001 From: tux9th Date: Wed, 5 Jun 2013 10:11:52 +0200 Subject: Edit: Evil Obelisk 018-3 and Function Evil Obelisk * Changed monster to areamonster, monsters will now spawn in an area defined * adapted logic * decreased costs --- world/map/npc/018-3/evil-obelisk.txt | 12 +++++- world/map/npc/functions/evil_obelisk.txt | 66 +++++++++++++++++++------------- 2 files changed, 49 insertions(+), 29 deletions(-) (limited to 'world') diff --git a/world/map/npc/018-3/evil-obelisk.txt b/world/map/npc/018-3/evil-obelisk.txt index c80e3b59..aec1345b 100644 --- a/world/map/npc/018-3/evil-obelisk.txt +++ b/world/map/npc/018-3/evil-obelisk.txt @@ -3,8 +3,16 @@ 018-3.gat,67,28,0|script|Evil Obelisk|185,{ callfunc "ClearVariables"; set @map$, "018-3.gat"; - set @x, 67; - set @y, 28; + set @x0, 56; + set @y0, 22; + set @x1, 77; + set @y1, 37; callfunc "EvilObelisk"; +//clearing vars + set @map$, ""; + set @x0, 0; + set @y0, 0; + set @x1, 0; + set @y1, 0; close; } diff --git a/world/map/npc/functions/evil_obelisk.txt b/world/map/npc/functions/evil_obelisk.txt index 30fe927d..f1447375 100644 --- a/world/map/npc/functions/evil_obelisk.txt +++ b/world/map/npc/functions/evil_obelisk.txt @@ -3,62 +3,67 @@ function|script|EvilObelisk|{ mes "(A mystical aura surrounds this stone. It seems to crave money.)"; next; + set @cost_jacko, 6500; + set @cost_gy1, 4000; + set @cost_gy2, 3000; + set @cost_skull, 2800; + set @cost_snake, 2500; + menu - "Pay it 200,000 gold", L_JACKO, - "Pay it 100,000 gold", L_GRAVEYARD1, - "Pay it 75,000 gold", L_GRAVEYARD2, - "Pay it 50,000 gold", L_SKULL, - "Pay it 25,000 gold", L_SNAKE, - "Don't pay it anything.", -; - close; - return; + "Don't pay it anything.", -, + "Pay it " + @cost_jacko + " gold.", L_JACKO, + "Pay it " + @cost_gy1 + " gold.", L_GRAVEYARD1, + "Pay it " + @cost_gy2 + " gold.", L_GRAVEYARD2, + "Pay it " + @cost_skull + " gold.", L_SKULL, + "Pay it " + @cost_snake + " gold.", L_SNAKE; + goto L_Close; L_JACKO: - if (Zeny < 200000) + if (Zeny < @cost_jacko) goto L_NotEnough; - set Zeny, Zeny - 200000; + set Zeny, Zeny - @cost_jacko; set @mob_id, 1022; - set @mob_count, rand(2) + 1; + set @mob_count, rand(1,2); goto L_Summon; L_GRAVEYARD1: - if (Zeny < 100000) + if (Zeny < @cost_gy1) goto L_NotEnough; set @temp, rand(2); if(@temp == 0) set @mob_id, 1036; // Zombie if(@temp == 1) set @mob_id, 1045; // Fallen - set @mob_count, rand(2) + 1; - set Zeny, Zeny - 100000; + set @mob_count, rand(1,2); + set Zeny, Zeny - @cost_gy1; goto L_Summon; L_GRAVEYARD2: - if (Zeny < 75000) + if (Zeny < @cost_gy2) goto L_NotEnough; set @temp, rand(2); if(@temp == 0) set @mob_id, 1044; // Lady Skelly if(@temp == 1) set @mob_id, 1043; // Normal Skelly - set @mob_count, rand(2) + 1; - set Zeny, Zeny - 75000; + set @mob_count, rand(1,2); + set Zeny, Zeny - @cost_gy2; goto L_Summon; L_SKULL: - if (Zeny < 50000) + if (Zeny < @cost_skull) goto L_NotEnough; set @temp, rand(2); if(@temp == 0) set @mob_id, 1024; // Poison if(@temp == 1) set @mob_id, 1023; // Fire - set @mob_count, rand(4) + 1; - set Zeny, Zeny - 50000; + set @mob_count, rand(1,4); + set Zeny, Zeny - @cost_skull; goto L_Summon; L_SNAKE: - if (Zeny < 25000) + if (Zeny < @cost_snake) goto L_NotEnough; set @temp, rand(4); if(@temp == 0) @@ -69,17 +74,24 @@ L_SNAKE: set @mob_id, 1010; // Normal if(@temp == 3) set @mob_id, 1021; // Cave - set @mob_count, rand(4) + 1; - set Zeny, Zeny - 25000; + set @mob_count, rand(1,4); + set Zeny, Zeny - @cost_snake; goto L_Summon; L_Summon: - monster @map$, @x, @y, "Evil", @mob_id, @mob_count; - close; - return; + areamonster @map$, @x0, @y0, @x1, @y1, "Evil", @mob_id, @mob_count; + goto L_Close; L_NotEnough: mes "You don't have that much money"; - close; + goto L_Close; + +L_Close: + set @cost_jacko, 0; + set @cost_gy1, 0; + set @cost_gy2, 0; + set @cost_skull, 0; + set @cost_snake, 0; return; + } -- cgit v1.2.3-60-g2f50 From f6fb3f2faa0d23180b64bd5463c321e6c88855e3 Mon Sep 17 00:00:00 2001 From: tux9th Date: Wed, 5 Jun 2013 22:24:22 +0200 Subject: run 'make maps' for client-data changes. update submodule pointer. --- client-data | 2 +- world/map/data/008-1.wlk | Bin 19444 -> 19444 bytes world/map/data/010-1.wlk | Bin 18004 -> 18004 bytes world/map/data/034-2.wlk | Bin 5004 -> 5304 bytes 4 files changed, 1 insertion(+), 1 deletion(-) (limited to 'world') diff --git a/client-data b/client-data index 354cc04c..710f6c7c 160000 --- a/client-data +++ b/client-data @@ -1 +1 @@ -Subproject commit 354cc04c7fc4466043b9e63713c663aeed5ca45e +Subproject commit 710f6c7cc0bf07aca19dccc5eab69411dc30bf3d diff --git a/world/map/data/008-1.wlk b/world/map/data/008-1.wlk index 63cde59b..c6d58b43 100644 Binary files a/world/map/data/008-1.wlk and b/world/map/data/008-1.wlk differ diff --git a/world/map/data/010-1.wlk b/world/map/data/010-1.wlk index e87cfc56..2abcbead 100644 Binary files a/world/map/data/010-1.wlk and b/world/map/data/010-1.wlk differ diff --git a/world/map/data/034-2.wlk b/world/map/data/034-2.wlk index d5da4d31..21fcee6d 100644 Binary files a/world/map/data/034-2.wlk and b/world/map/data/034-2.wlk differ -- cgit v1.2.3-60-g2f50 From 5197641f55377872b8799c92c05793423aeab041 Mon Sep 17 00:00:00 2001 From: tux9th Date: Fri, 7 Jun 2013 18:04:32 +0200 Subject: run 'make maps' for client-data changes. update submodule pointer for client-data. --- client-data | 2 +- world/map/data/021-1.wlk | Bin 29908 -> 29908 bytes world/map/data/021-2.wlk | Bin 40004 -> 40004 bytes world/map/npc/021-1/_warps.txt | 16 ++++++++-------- world/map/npc/021-2/_warps.txt | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'world') diff --git a/client-data b/client-data index 36725d98..a2fd108c 160000 --- a/client-data +++ b/client-data @@ -1 +1 @@ -Subproject commit 36725d9851d49c316b657c78f10d4000399b6ad5 +Subproject commit a2fd108c1ca8cf389575eca833fc12c18d7e0975 diff --git a/world/map/data/021-1.wlk b/world/map/data/021-1.wlk index 5abd6a7d..2e18e65f 100644 Binary files a/world/map/data/021-1.wlk and b/world/map/data/021-1.wlk differ diff --git a/world/map/data/021-2.wlk b/world/map/data/021-2.wlk index ba8feff6..82581b05 100644 Binary files a/world/map/data/021-2.wlk and b/world/map/data/021-2.wlk differ diff --git a/world/map/npc/021-1/_warps.txt b/world/map/npc/021-1/_warps.txt index 99134134..618c057a 100644 --- a/world/map/npc/021-1/_warps.txt +++ b/world/map/npc/021-1/_warps.txt @@ -7,14 +7,14 @@ 021-1.gat,55,134|warp|To Government Building|-1,-1,021-2.gat,33,29 021-1.gat,57,134|warp|To Government Building|-1,-1,021-2.gat,39,29 021-1.gat,103,100|warp|To Tulimshar Bakery|-1,-1,021-2.gat,91,27 -021-1.gat,103,96|warp|toBakery|-1,-1,021-2.gat,122,23 +021-1.gat,103,96|warp|To Bakery|-1,-1,021-2.gat,122,23 021-1.gat,49,64|warp|To Tulimshar Canyon|3,-1,024-1.gat,86,73 -021-1.gat,53,99|warp|To Tulimshar Forge|-1,-1,021-2.gat,25,66 -021-1.gat,52,95|warp|To Tulimshar Forge|-1,-1,021-2.gat,23,98 +021-1.gat,53,99|warp|To Wizard's Rest|-1,-1,021-2.gat,25,66 +021-1.gat,52,95|warp|To Wizard's Rest|-1,-1,021-2.gat,23,98 021-1.gat,73,22|warp|To Tulimshar Port|3,-1,022-1.gat,73,109 021-1.gat,113,22|warp|To Tulimshar Port|3,-1,022-1.gat,113,109 -021-1.gat,43,110|warp|to Store|-1,-1,021-2.gat,28,129 -021-1.gat,132,31|warp|to Tulimshar Forge|-1,-1,021-2.gat,79,138 -021-1.gat,133,24|warp|to Tulimshar Forge|-1,-1,021-2.gat,75,91 -021-1.gat,125,27|warp|to Tulimshar Forge|-1,-1,021-2.gat,124,67 -021-1.gat,125,31|warp|to Tulimshar Forge|-1,-1,021-2.gat,72,138 +021-1.gat,43,110|warp|To Store|-1,-1,021-2.gat,28,129 +021-1.gat,132,31|warp|To Tulimshar Forge|-1,-1,021-2.gat,79,138 +021-1.gat,133,24|warp|To Tulimshar Forge|-1,-1,021-2.gat,75,92 +021-1.gat,125,27|warp|To Tulimshar Forge|-1,-1,021-2.gat,124,68 +021-1.gat,125,31|warp|To Tulimshar Forge|-1,-1,021-2.gat,72,138 diff --git a/world/map/npc/021-2/_warps.txt b/world/map/npc/021-2/_warps.txt index 9e910208..4614f970 100644 --- a/world/map/npc/021-2/_warps.txt +++ b/world/map/npc/021-2/_warps.txt @@ -12,12 +12,12 @@ 021-2.gat,46,97|warp|To First Floor|0,-1,021-2.gat,46,58 021-2.gat,46,57|warp|To Second Floor|0,-1,021-2.gat,46,96 021-2.gat,70,58|warp|To Main Room|-1,-1,021-2.gat,42,54 -021-2.gat,28,130|warp|to Outside|-1,-1,021-1.gat,43,111 -021-2.gat,28,130|warp|to Outside|-1,-1,021-1.gat,43,111 +021-2.gat,28,130|warp|To Outside|-1,-1,021-1.gat,43,111 +021-2.gat,28,130|warp|To Outside|-1,-1,021-1.gat,43,111 021-2.gat,84,93|warp|To First Floor|-1,0,021-2.gat,80,125 021-2.gat,84,123|warp|To Second Floor|-1,0,021-2.gat,81,95 -021-2.gat,79,139|warp|to Outside|-1,-1,021-1.gat,132,32 -021-2.gat,72,139|warp|to Outside|-1,-1,021-1.gat,125,32 -021-2.gat,124,69|warp|to Outside|1,-1,021-1.gat,126,28 -021-2.gat,75,93|warp|to Outside|-1,-1,021-1.gat,132,25 +021-2.gat,79,139|warp|To Outside|-1,-1,021-1.gat,132,32 +021-2.gat,72,139|warp|To Outside|-1,-1,021-1.gat,125,32 +021-2.gat,124,69|warp|To Outside|-1,-1,021-1.gat,125,28 +021-2.gat,75,93|warp|To Outside|-1,-1,021-1.gat,133,25 021-2.gat,33,30|warp|To Outside|-1,-1,021-1.gat,55,135 -- cgit v1.2.3-60-g2f50 From d9bc31e7ef957ad76f2e49269ccbfbe0cc82fd2b Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Fri, 7 Jun 2013 21:47:24 +0200 Subject: Add news entry about the upcoming release. --- world/map/news.d/19-double-exp-drop.txt | 21 +++++++++++++++++++++ world/map/news.html | 24 ++++++++++++++++++++++++ world/map/news.txt | 23 +++++++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 world/map/news.d/19-double-exp-drop.txt (limited to 'world') diff --git a/world/map/news.d/19-double-exp-drop.txt b/world/map/news.d/19-double-exp-drop.txt new file mode 100644 index 00000000..85140414 --- /dev/null +++ b/world/map/news.d/19-double-exp-drop.txt @@ -0,0 +1,21 @@ +{date:2013-06-07} + +This weekend we're temporarily doubling both the +experience rate and the drop rates for all monsters, +to give the chance to recover from the rollback +we had due to filesystem corruption. + +There are also some bug fixes and new content: + +The craftsmen of Tulimshar have finally moved to the +renovated Forge at the Northern Market, so the +Wizard's Inn is back to offering a calm stay for visitors. + +In the woodland area the mysterious Evil Obelisk which +summons beings from the astral plane for the mundane +price of gold has drastically reduced its demands. + +On the technical side, in case of network congestion, +you will no longer be kicked with an invalid packet error. + +{author: TMW Development Team} diff --git a/world/map/news.html b/world/map/news.html index 9760aa1a..e017ff80 100644 --- a/world/map/news.html +++ b/world/map/news.html @@ -1,6 +1,30 @@

+2013-06-07 +

+This weekend we're temporarily doubling both the +experience rate and the drop rates for all monsters, +to give the chance to recover from the rollback +we had due to filesystem corruption. +

+There are also some bug fixes and new content: +

+The craftsmen of Tulimshar have finally moved to the +renovated Forge at the Northern Market, so the +Wizard's Inn is back to offering a calm stay for visitors. +

+In the woodland area the mysterious Evil Obelisk which +summons beings from the astral plane for the mundane +price of gold has drastically reduced its demands. +

+On the technical side, in case of network congestion, +you will no longer be kicked with an invalid packet error. +

+- TMW Development Team +

+
+

2013-04-28

We're having a bugfix release today. diff --git a/world/map/news.txt b/world/map/news.txt index be962a6d..f54b41ca 100644 --- a/world/map/news.txt +++ b/world/map/news.txt @@ -1,3 +1,26 @@ +##32013-06-07##0 + +This weekend we're temporarily doubling both the +experience rate and the drop rates for all monsters, +to give the chance to recover from the rollback +we had due to filesystem corruption. + +There are also some bug fixes and new content: + +The craftsmen of Tulimshar have finally moved to the +renovated Forge at the Northern Market, so the +Wizard's Inn is back to offering a calm stay for visitors. + +In the woodland area the mysterious Evil Obelisk which +summons beings from the astral plane for the mundane +price of gold has drastically reduced its demands. + +On the technical side, in case of network congestion, +you will no longer be kicked with an invalid packet error. + +-##2 TMW Development Team##0 + + ##32013-04-28##0 We're having a bugfix release today. -- cgit v1.2.3-60-g2f50 From a35cbf1e55aa58ca113060e87f695797c92ca6b2 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Fri, 7 Jun 2013 20:03:48 -0700 Subject: Really fix the random spawn points bug --- world/map/npc/020-1/soul-menhir.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'world') diff --git a/world/map/npc/020-1/soul-menhir.txt b/world/map/npc/020-1/soul-menhir.txt index 68a81acc..7370a2ab 100644 --- a/world/map/npc/020-1/soul-menhir.txt +++ b/world/map/npc/020-1/soul-menhir.txt @@ -9,8 +9,8 @@ set @y, 0; callfunc "SoulMenhir"; set @map$, ""; - cleararray @Xs[0], 0, 7; - cleararray @Ys[0], 0, 7; + cleararray @Xs[0], 0, 8; + cleararray @Ys[0], 0, 8; set @x, 0; set @y, 0; close; -- cgit v1.2.3-60-g2f50 From 1156ff97245e5adc82131aaa064d6923fa1ad889 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Fri, 7 Jun 2013 21:57:54 -0600 Subject: Fix Nivalis menhir to behave like the others. --- world/map/npc/020-1/soul-menhir.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'world') diff --git a/world/map/npc/020-1/soul-menhir.txt b/world/map/npc/020-1/soul-menhir.txt index 7370a2ab..cdcc05c1 100644 --- a/world/map/npc/020-1/soul-menhir.txt +++ b/world/map/npc/020-1/soul-menhir.txt @@ -3,14 +3,14 @@ 020-1.gat,63,89,0|script|Soul Menhir|346,{ callfunc "ClearVariables"; set @map$, "020-1.gat"; - setarray @Xs, 62, 63, 64, 62, 64, 62, 63, 64; - setarray @Ys, 88, 88, 88, 89, 89, 90, 90, 90; + setarray @Xs, 62, 63, 64, 62, 64, 62, 64; + setarray @Ys, 88, 88, 88, 89, 89, 90, 90; set @x, 0; set @y, 0; callfunc "SoulMenhir"; set @map$, ""; - cleararray @Xs[0], 0, 8; - cleararray @Ys[0], 0, 8; + cleararray @Xs[0], 0, 7; + cleararray @Ys[0], 0, 7; set @x, 0; set @y, 0; close; -- cgit v1.2.3-60-g2f50 From 009a16690902c6f55d9a094c3a53ecece319c403 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sat, 8 Jun 2013 11:12:20 -0700 Subject: Rewrite news.php * Refactor stuff into functions. * Bump min Mana version to 0.5.1. * Detect old ManaPlus versions also. * Give a 403 Forbidden error to old clients (still sends the body). --- world/map/news.php | 124 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 107 insertions(+), 17 deletions(-) (limited to 'world') diff --git a/world/map/news.php b/world/map/news.php index d5208e44..398395b5 100644 --- a/world/map/news.php +++ b/world/map/news.php @@ -1,40 +1,130 @@ -- cgit v1.2.3-60-g2f50 From c67d6bb3d1eea2e585a7501b2bb4946728663222 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sat, 8 Jun 2013 11:53:50 -0700 Subject: Add a one-line message, since the client ignores the body --- world/map/news.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'world') diff --git a/world/map/news.php b/world/map/news.php index 398395b5..48ba5e00 100644 --- a/world/map/news.php +++ b/world/map/news.php @@ -8,7 +8,7 @@ $cur_version = '0.6.1'; // utility functions function failure_headers() { - header('HTTP/1.0 403 Forbidden'); + header('HTTP/1.0 403 Upgrade your client'); common_headers(); } -- cgit v1.2.3-60-g2f50 From fa2ffc29c1ef2c33ff0a9c1baf7026a4d9ffe0b6 Mon Sep 17 00:00:00 2001 From: tux9th Date: Sun, 9 Jun 2013 09:59:50 +0200 Subject: Update Game Rules: * linguistic changes to the german translation. * new spanish translation done by Narus. * new swedish translation done by veryape. --- world/map/npc/functions/game_rules.txt | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'world') diff --git a/world/map/npc/functions/game_rules.txt b/world/map/npc/functions/game_rules.txt index 01fc163c..7cc2bd63 100644 --- a/world/map/npc/functions/game_rules.txt +++ b/world/map/npc/functions/game_rules.txt @@ -30,13 +30,13 @@ L_English: goto L_End; L_German: - mes "Wir bitten um das Einhalten der folgenden Regeln:"; + mes "Wir bitten um das Einhalten folgender Regeln:"; mes "1. Keine Beleidigungen, Schimpfwörter, Schmähungen oder Rufmord."; mes "2. Keine 'bots' (automatisierte Spieler). Dies beinhaltet JEGLICHE Teilnahme am Spiel während der Abwesenheit des Spielers. Es beinhaltet auch das automatisierte Folgen anderer Spieler."; mes "3. Kein 'spamming' oder 'flooding' (schnelles Wiederholen von Nachrichten oder Aufforderungen zum Warenhandel)."; mes "4. Kein Betteln."; - mes "5. Englisch ist die einzige zulässige Sprache im öffentlichen Raum."; - mes "6. Behandelt andere so, wie Ihr behandelt werden wollt."; + mes "5. Englisch ist die einzig zulässige Sprache im öffentlichen Raum."; + mes "6. Behandele andere so, wie du selbst behandelt werden willst."; mes "Jegliche Regelverstöße können bestraft werden, entweder durch ein Zurücksetzen der Charaktereigenschaften und -besitztümer auf den Ausgangszustand, oder durch einen temporären oder permanenten Ausschluss aus dem Spiel."; next; mes "Automatisiertes Spielverhalten liegt vor, wenn ein sich bewegender/kämpfender Spieler nicht intelligent auf Gesprächsaufforderungen reagiert."; @@ -86,30 +86,29 @@ L_French: goto L_End; L_Spanish: - mes "ATTENTION: this translation is outdated. Please refer to the English version and submit a patch."; - mes "Los jugadores que infringan las normas siguientes pueden ser censurados( incluso de forma permanente) o se podran resetear sus cuentas a la discrecion de los administradores:"; - mes "1. No abuse de otros jugadores (incluye insultos, palabras mal sonantes , y demas dirigidos a una o varias personas en particular)"; - mes "2. No utilizar programas automaticos ( se entiende por esto cualquier actividad realizada sin que el jugador este tocando el teclado fisicamente)"; + mes "Los jugadores que infringan las siguientes reglas pueden ser bloqueados (incluso permanentemente) o sus personajes reseteados segun la discrecion de los administradores."; + mes "1. No abuse de otros jugadores (esto incluye insultos, palabras mal sonantes, burlas, etc. dirigidas a una o varias personas)"; + mes "2. No utilizar programas automaticos (esto hace referencia a cualquier tipo de actividad llevada a cabo sin que el jugador este tocando el teclado directamente o al seguimiento automatico)"; mes "3. No envie mensajes publicitarios o inunde el chat de mensajes (incluyendo los mensajes referidos al comercio en el juego)"; - mes "4. Esta prohibida cualquier forma de mendicidad"; - mes "5. Hable solamente en Ingles en el chat publico"; - mes "6. Trata a los demas de la misma manera que te gustaria ser tratado"; + mes "4. No mendigar."; + mes "5. Escriba unicamente en Ingles en el chat publico"; + mes "6. Trate a los demas de la misma forma que le gustaria ser tratado"; next; - mes "El uso de programas automaticos se investigara hablando con jugadores que esten moviendose y/o atacando."; + mes "El uso de programas automaticos para jugar sin estar frente al teclado se determinara hablando con los jugadores que esten moviendose y/o atacando."; + mes "El seguimiento automatizado sera determinado por observacion."; next; goto L_End; L_Swedish: - mes "ATTENTION: this translation is outdated. Please refer to the English version and submit a patch."; - mes "Spelare som bryter mot dessa regler riskerar att helt sonika bli utkastade (antingen under kort period eller permanent), den som kastats ut kan be en GM om att starta om sitt konto."; - mes "1. Skymfa inte andra (svordomar och annat riktat till att skada en eller flera individer)"; - mes "2. Inga bottar (med bottande avses ALLA aktiviteter som sker bortom tangentbordet)"; + mes "Spelare som bryter mot dessa regler riskerar att bli utkastade eller portade (antingen under kort period eller permanent), den som blivit portad/bannlyst ut kan be en GM om att starta om sitt konto."; + mes "1. Förolämpa inte medspelare (svordomar och annat riktat till att skada en eller flera individer)"; + mes "2. Inga bottar (med bottande avses ALLA aktiviteter som sker när spelaren inte aktivt spelar eller styr sin karraktär)"; mes "3. Inget spammande/floodande (inklusive meddelanden om byteshandel)"; mes "4. Tigg inte"; mes "5. Prata bara engelska i den offentliga chatten"; mes "6. Behandla andra som du vill bli behandlad"; next; - mes "Hysta misstankar om bottande kontrolleras genom att prata med spelaren under dess kringvandrande eller attackerande."; + mes "Vid misstankar om bottande kontrolleras detta genom att prata med spelaren under dess kringvandrande eller attackerande."; next; goto L_End; -- cgit v1.2.3-60-g2f50