From b4a3650f679b41e5e90c8a09fd95caa602a66f2a Mon Sep 17 00:00:00 2001 From: mekolat Date: Sun, 18 Jan 2015 16:40:27 -0500 Subject: fix some typos in xmas inn --- world/map/npc/030-2/_import.txt | 4 +- world/map/npc/030-2/gaurds.txt | 33 ------------ world/map/npc/030-2/guards.txt | 33 ++++++++++++ world/map/npc/030-2/present_helper.txt | 5 +- world/map/npc/030-2/roasted_acorns_helper.txt | 76 +++++++++++++++++++++++++++ world/map/npc/030-2/roasted_acrons_helper.txt | 76 --------------------------- 6 files changed, 113 insertions(+), 114 deletions(-) delete mode 100644 world/map/npc/030-2/gaurds.txt create mode 100644 world/map/npc/030-2/guards.txt create mode 100644 world/map/npc/030-2/roasted_acorns_helper.txt delete mode 100644 world/map/npc/030-2/roasted_acrons_helper.txt (limited to 'world/map/npc') diff --git a/world/map/npc/030-2/_import.txt b/world/map/npc/030-2/_import.txt index c2c641aa..c3867abf 100644 --- a/world/map/npc/030-2/_import.txt +++ b/world/map/npc/030-2/_import.txt @@ -9,11 +9,11 @@ npc: npc/030-2/bedding_helper.txt npc: npc/030-2/chief_helper.txt npc: npc/030-2/eljas.txt npc: npc/030-2/empty_boxes_helper.txt -npc: npc/030-2/gaurds.txt npc: npc/030-2/glitter_helper.txt +npc: npc/030-2/guards.txt npc: npc/030-2/mapflags.txt npc: npc/030-2/present_helper.txt -npc: npc/030-2/roasted_acrons_helper.txt +npc: npc/030-2/roasted_acorns_helper.txt npc: npc/030-2/shipping_helper.txt npc: npc/030-2/storage_helper.txt npc: npc/030-2/wrapping_paper_helper.txt diff --git a/world/map/npc/030-2/gaurds.txt b/world/map/npc/030-2/gaurds.txt deleted file mode 100644 index 3fdc1ffa..00000000 --- a/world/map/npc/030-2/gaurds.txt +++ /dev/null @@ -1,33 +0,0 @@ -// Annual Xmas Bouncers - -030-2.gat,85,43,0|script|Valjas|330 -{ - callfunc "XmasStates"; - callfunc "ThrowOutTheBum"; - mes "[Valjas]"; - mes "\"...\""; - close; -} - -030-2.gat,89,43,0|script|Halas|330 -{ - callfunc "XmasStates"; - callfunc "ThrowOutTheBum"; - mes "[Halas]"; - mes "\"...\""; - close; -} - -030-2.gat,89,84,0|script|Kilis|330,5,2 -{ - callfunc "XmasStates"; - callfunc "ThrowOutTheBum"; - mes "[Kilis]"; - mes "\"...\""; - close; - -OnTouch: - callfunc "XmasStates"; - callfunc "ThrowOutTheBum"; - end; -} diff --git a/world/map/npc/030-2/guards.txt b/world/map/npc/030-2/guards.txt new file mode 100644 index 00000000..3fdc1ffa --- /dev/null +++ b/world/map/npc/030-2/guards.txt @@ -0,0 +1,33 @@ +// Annual Xmas Bouncers + +030-2.gat,85,43,0|script|Valjas|330 +{ + callfunc "XmasStates"; + callfunc "ThrowOutTheBum"; + mes "[Valjas]"; + mes "\"...\""; + close; +} + +030-2.gat,89,43,0|script|Halas|330 +{ + callfunc "XmasStates"; + callfunc "ThrowOutTheBum"; + mes "[Halas]"; + mes "\"...\""; + close; +} + +030-2.gat,89,84,0|script|Kilis|330,5,2 +{ + callfunc "XmasStates"; + callfunc "ThrowOutTheBum"; + mes "[Kilis]"; + mes "\"...\""; + close; + +OnTouch: + callfunc "XmasStates"; + callfunc "ThrowOutTheBum"; + end; +} diff --git a/world/map/npc/030-2/present_helper.txt b/world/map/npc/030-2/present_helper.txt index 248c296a..0a027ca0 100644 --- a/world/map/npc/030-2/present_helper.txt +++ b/world/map/npc/030-2/present_helper.txt @@ -1,8 +1,8 @@ // Annual Xmas // Author: wushin -// Present Reclaimation +// Present Reclamation -030-2.gat,47,82,0|script|Jonanthan|328 +030-2.gat,47,82,0|script|Jonathan|328 { callfunc "XmasStates"; @@ -84,4 +84,3 @@ L_Close: set @present_name$, ""; close; } - diff --git a/world/map/npc/030-2/roasted_acorns_helper.txt b/world/map/npc/030-2/roasted_acorns_helper.txt new file mode 100644 index 00000000..f942c118 --- /dev/null +++ b/world/map/npc/030-2/roasted_acorns_helper.txt @@ -0,0 +1,76 @@ +// Annual Xmas +// author: Jenalya, wushin + +030-2.gat,89,23,0|script|Verneri|334 +{ + callfunc "XmasStates"; + + if((@xmas_state >= $@xmas_helpers_start_state) && ($@xmas_time)) + goto L_XmasMain; + goto L_OffSeason; + +L_OffSeason: + mes "[Verneri]"; + mes "\"Nothing like the getting past the holiday rush to make you dread next season.\""; + goto L_Close; + +L_XmasMain: + mes "[Verneri]"; + mes "\"Hm? I'm currently having a break. It's really nice here at the fireplace, isn't it?\""; + next; + mes "\"Ah, I remember when I was a child we used to roast acorns at the fireplace. We dunked them into Iron Potion and then put them over the fire for a while. That gave a tasty icing.\""; + menu + "Let's roast some.", L_LetsRoast, + "Children's stuff...", L_Close; + +L_LetsRoast: + mes "[Verneri]"; + mes "\"Well, if you get some Acorns and Iron Potions, we can do that.\""; + mes "\"With one Iron Potion we can ice about " + $@xmas_acorn_amount + " Acorns.\""; + next; + mes "[Verneri]"; + mes "\"Do you have everything we need? Shall we start?\""; + menu + "Sure!", L_Roast, + "I need to get the ingredients.", L_Close; + +L_Roast: + if (countitem("Acorn") < $@xmas_acorn_amount || countitem("IronPotion") < $@xmas_iron_potion_amount) + goto L_NoItems; + + getinventorylist; + if (@inventorylist_count > 100) + goto L_FullInv; + delitem "IronPotion", $@xmas_iron_potion_amount; + delitem "Acorn", $@xmas_acorn_amount; + + mes "Verneri takes the Iron Potion and the Acorns from you. He pours the potion into some bowl and adds the Acorns."; + mes "Then he puts the bowl over the fire, stirring it every now and then. After a while it starts to smell really tasty."; + next; + mes "[Verneri]"; + mes "\"Here we are! Let me take one of them, ok?\""; + mes "He carefully takes one of the roasted acorns and eats it."; + next; + + mes "[Verneri]"; + mes "\"Ouch, hot. But tasty! Some of them might be burnt, I'll throw those away.\""; + set XMASTIME, XMASTIME | $@xmas_helper_bit_acorns; + set @karma_bonus, $@xmas_karma_bonus; + callfunc "XmasNice"; + getitem "RoastedAcorn", rand(($@xmas_acorn_amount / 2), $@xmas_acorn_amount); + menu + "Let's roast some more.", L_Roast, + "Thank you.", L_Close; + +L_FullInv: + mes "\"You need some space to put the roasted acorns.\""; + goto L_Close; + +L_NoItems: + mes "[Verneri]"; + mes "\"You need to bring at least one Iron Potion and " + $@xmas_acorn_amount + " Acorns.\""; + goto L_Close; + +L_Close: + close; +} diff --git a/world/map/npc/030-2/roasted_acrons_helper.txt b/world/map/npc/030-2/roasted_acrons_helper.txt deleted file mode 100644 index f942c118..00000000 --- a/world/map/npc/030-2/roasted_acrons_helper.txt +++ /dev/null @@ -1,76 +0,0 @@ -// Annual Xmas -// author: Jenalya, wushin - -030-2.gat,89,23,0|script|Verneri|334 -{ - callfunc "XmasStates"; - - if((@xmas_state >= $@xmas_helpers_start_state) && ($@xmas_time)) - goto L_XmasMain; - goto L_OffSeason; - -L_OffSeason: - mes "[Verneri]"; - mes "\"Nothing like the getting past the holiday rush to make you dread next season.\""; - goto L_Close; - -L_XmasMain: - mes "[Verneri]"; - mes "\"Hm? I'm currently having a break. It's really nice here at the fireplace, isn't it?\""; - next; - mes "\"Ah, I remember when I was a child we used to roast acorns at the fireplace. We dunked them into Iron Potion and then put them over the fire for a while. That gave a tasty icing.\""; - menu - "Let's roast some.", L_LetsRoast, - "Children's stuff...", L_Close; - -L_LetsRoast: - mes "[Verneri]"; - mes "\"Well, if you get some Acorns and Iron Potions, we can do that.\""; - mes "\"With one Iron Potion we can ice about " + $@xmas_acorn_amount + " Acorns.\""; - next; - mes "[Verneri]"; - mes "\"Do you have everything we need? Shall we start?\""; - menu - "Sure!", L_Roast, - "I need to get the ingredients.", L_Close; - -L_Roast: - if (countitem("Acorn") < $@xmas_acorn_amount || countitem("IronPotion") < $@xmas_iron_potion_amount) - goto L_NoItems; - - getinventorylist; - if (@inventorylist_count > 100) - goto L_FullInv; - delitem "IronPotion", $@xmas_iron_potion_amount; - delitem "Acorn", $@xmas_acorn_amount; - - mes "Verneri takes the Iron Potion and the Acorns from you. He pours the potion into some bowl and adds the Acorns."; - mes "Then he puts the bowl over the fire, stirring it every now and then. After a while it starts to smell really tasty."; - next; - mes "[Verneri]"; - mes "\"Here we are! Let me take one of them, ok?\""; - mes "He carefully takes one of the roasted acorns and eats it."; - next; - - mes "[Verneri]"; - mes "\"Ouch, hot. But tasty! Some of them might be burnt, I'll throw those away.\""; - set XMASTIME, XMASTIME | $@xmas_helper_bit_acorns; - set @karma_bonus, $@xmas_karma_bonus; - callfunc "XmasNice"; - getitem "RoastedAcorn", rand(($@xmas_acorn_amount / 2), $@xmas_acorn_amount); - menu - "Let's roast some more.", L_Roast, - "Thank you.", L_Close; - -L_FullInv: - mes "\"You need some space to put the roasted acorns.\""; - goto L_Close; - -L_NoItems: - mes "[Verneri]"; - mes "\"You need to bring at least one Iron Potion and " + $@xmas_acorn_amount + " Acorns.\""; - goto L_Close; - -L_Close: - close; -} -- cgit v1.2.3-60-g2f50