summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/other/lighthalzen_auction.txt116
-rw-r--r--npc/quests/quests_umbala.txt2
3 files changed, 60 insertions, 59 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 8d2bad5b4..833a58c0d 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -30,6 +30,7 @@ Playtester
Date Added
======
10/05
+ * Fixed typo [Vicious]
* Umbala: Added official chance of failure to Create Essence (u may get a Garlet instead) [Lupus]
- Added official random amount to Dismantle Stone
10/04
diff --git a/npc/other/lighthalzen_auction.txt b/npc/other/lighthalzen_auction.txt
index 464a67f54..8d8ae9121 100644
--- a/npc/other/lighthalzen_auction.txt
+++ b/npc/other/lighthalzen_auction.txt
@@ -1,59 +1,59 @@
-//===== eAthena Script =======================================
-//= Auction NPC
-//===== By: ==================================================
-//= Au{R}o
-//===== Current Version: =====================================
-//= 1.01
-//===== Compatible With: =====================================
-//= eAthena 1.0+
-//===== Description: =========================================
-//= Auction System
-//===== Additional Comments: =================================
-//= Converted from Aegis
-//= 1.0 Add NPC dialogue (FACING PROBABLY INCORRECT) [Au{R}oN]
-//============================================================
-
-//=======================WARPER===============================
-lighthalzen.gat,205,169,4 script Auction Guide 833,{
-
- mes "[Auction Guide]";
- mes "Trying to go to the acution";
- next;
- menu "Yes.",WA_yes,"No.",WA_no;
-WA_yes:
- mes "[Auction Guide]";
- mes "Have a good trip~";
- close2;
- warp "auction_02.gat",43,24;
- end;
-
-WA_no:
- mes "[Auction Guide]";
- MES "Come visit next time.";
- close;
-}
-
-//=======================AUCTION NPC==========================
-auction_02.gat,31,46,9 script Auction Supervisor::as1 874,{
-
- mes "[Auctioner]";
- mes "Welcome.";
- mes "Is there an item that you're";
- mes "looking for...?";
- next;
- menu "Yes.",AU_yes,"No.",AU_no;
-AU_yes;
- //NEED TO ADD THE COMMAND FOR OPEN AUCTION WINDOW!!
- mes "Sorry, but at the moment the auction system is in development";//CUSTOM MSG!!
- close;
-
-AU_no;
- mes "[Auctioner]";
- mes "Okay then..";
- close;
-}
-auction_02.gat,43,65,2 duplicate(as1) Auction Supervisor::as1 874
-auction_02.gat,56,46,2 duplicate(as1) Auction Supervisor::as2 874
-
-//=======================WARP=================================
+//===== eAthena Script =======================================
+//= Auction NPC
+//===== By: ==================================================
+//= Au{R}o
+//===== Current Version: =====================================
+//= 1.01
+//===== Compatible With: =====================================
+//= eAthena 1.0+
+//===== Description: =========================================
+//= Auction System
+//===== Additional Comments: =================================
+//= Converted from Aegis
+//= 1.0 Add NPC dialogue (FACING PROBABLY INCORRECT) [Au{R}oN]
+//============================================================
+
+//=======================WARPER===============================
+lighthalzen.gat,205,169,4 script Auction Guide 833,{
+
+ mes "[Auction Guide]";
+ mes "Trying to go to the acution";
+ next;
+ menu "Yes.",WA_yes,"No.",WA_no;
+WA_yes:
+ mes "[Auction Guide]";
+ mes "Have a good trip~";
+ close2;
+ warp "auction_02.gat",43,24;
+ end;
+
+WA_no:
+ mes "[Auction Guide]";
+ MES "Come visit next time.";
+ close;
+}
+
+//=======================AUCTION NPC==========================
+auction_02.gat,31,46,9 script Auction Supervisor::as1 874,{
+
+ mes "[Auctioner]";
+ mes "Welcome.";
+ mes "Is there an item that you're";
+ mes "looking for...?";
+ next;
+ menu "Yes.",AU_yes,"No.",AU_no;
+AU_yes:
+ //NEED TO ADD THE COMMAND FOR OPEN AUCTION WINDOW!!
+ mes "Sorry, but at the moment the auction system is in development";//CUSTOM MSG!!
+ close;
+
+AU_no:
+ mes "[Auctioner]";
+ mes "Okay then..";
+ close;
+}
+auction_02.gat,43,65,2 duplicate(as1) Auction Supervisor::asd1 874
+auction_02.gat,56,46,2 duplicate(as1) Auction Supervisor::asd2 874
+
+//=======================WARP=================================
auction_02.gat,43,17,0 warp auc_light01 1,1,lighthalzen.gat,209,169 \ No newline at end of file
diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt
index b70947bea..b4a539b81 100644
--- a/npc/quests/quests_umbala.txt
+++ b/npc/quests/quests_umbala.txt
@@ -759,7 +759,7 @@ um_in.gat,44,71,2 script Utan Tribe Shaman 782,{
}
delitem .@need,.@amount;
if(!rand(10)){
- getitem,910,1; //if failed get Garlet
+ getitem 910,1; //if failed get Garlet
mes "Your inner power has failed";
mes "to convert these objects";
mes "from nature into elemental essence...";