summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-03-03 16:37:57 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-03-03 16:37:57 +0000
commit0da660374ee0ae4d4fb01f9905b230ac4208b90a (patch)
treea0d91e3d5579beb356f9383e8fe38216174399e2
parent9c32e75e2d552c22e0ff719bc77a435bea1391e8 (diff)
downloadhercules-0da660374ee0ae4d4fb01f9905b230ac4208b90a.tar.gz
hercules-0da660374ee0ae4d4fb01f9905b230ac4208b90a.tar.bz2
hercules-0da660374ee0ae4d4fb01f9905b230ac4208b90a.tar.xz
hercules-0da660374ee0ae4d4fb01f9905b230ac4208b90a.zip
Added Auction file. (Disabled until auctions work)
Removed auction NPCs from Lighthalzen, and fixed bugreport:1103. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12283 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/cities/lighthalzen.txt54
-rw-r--r--npc/other/auction.txt120
-rw-r--r--npc/scripts_athena.conf1
4 files changed, 128 insertions, 49 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 2cc632837..1a3019c11 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,8 @@
Date Added
======
2008/03/03
+ * rev 12283 Added Auction file. (Disabled until auctions work) [L0ne_W0lf]
+ * Removed auction NPCs from Lighthalzen, and fixed bugreport:1103.
* Rev 12281 Fixes a bug in the crusader job quest (bugreport:1101) [Paradox924X]
2008/03/02
* Rev 12280 Fixes a bug in the hunter job quest. (bugreport:1099) [L0ne_W0lf]
diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index 981eebeab..7a5ece4da 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= erKURITA, Au{R}oN (Translated by Alan), $ephiroth
//===== Current Version: =====================================
-//= 1.6
+//= 1.7
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -33,6 +33,8 @@
//= whitespace (empty lines after header and before end curly)
//= reduced usage of the command "goto", grammatical corrections.
//= Added additional missing NPCs.
+//= 1.7 Removed Auciton Staff as the offical auction file has been added. [L0ne_W0lf]
+//= Corrected Lucious so he checks the donation variable. (bugreport:1103) [L0ne_W0lf]
//=============================================================
lighthalzen,198,285,5 script Jiwon#zen5 862,{
@@ -593,8 +595,8 @@ lighthalzen,182,102,3 script Lucius#zen5 866,{
mes "donations. I'm glad to see";
mes "that there are still kind and";
mes "generous people in the world.";
- close;
if ($donatedzeny < 260000) {
+ next;
mes "[Lucius]";
mes "This should be enough";
mes "to send to the Poor Relief";
@@ -605,8 +607,8 @@ lighthalzen,182,102,3 script Lucius#zen5 866,{
set $donatedzeny,0;
getitem 603,1; //Old_Blue_Box
getitem 12016,1; //Speed_Up_Potion
- close;
}
+ close;
}
mes "[Lucius]";
mes "I understand. Still,";
@@ -2176,52 +2178,6 @@ lhz_in02,147,222,3 script Officer Guo#06::off_guo 85,{
lhz_in02,142,222,6 duplicate(off_guo) Suspect#6 870
-
-// Auction -----------------------------------------------------------------------
-
-lighthalzen,205,169,4 script Auction Guide 833,{
-
- mes "[Auction Guide]";
- mes "Trying to go to the acution";
- next;
- menu "Yes.",-,"No.",M_NO;
-
- mes "[Auction Guide]";
- mes "Have a good trip~";
- close2;
- warp "auction_02",43,24;
- end;
-
-M_NO:
- mes "[Auction Guide]";
- MES "Come visit next time.";
- close;
-}
-
-auction_02,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.",-,"No.",M_NO;
-
- //NEED TO ADD THE COMMAND FOR OPEN AUCTION WINDOW!!
- mes "Sorry, but at the moment the auction system is in development";//CUSTOM MSG!!
- close;
-
-M_NO:
- mes "[Auctioner]";
- mes "Okay then..";
- close;
-}
-auction_02,43,65,2 duplicate(as1) Auction Supervisor::asd1 874
-auction_02,56,46,2 duplicate(as1) Auction Supervisor::asd2 874
-//move this warp to warps
-auction_02,43,17,0 warp auc_light01 1,1,lighthalzen,209,169
-
-
// New -----------------------------------------------------------------------
lhz_in01,14,28,3 script Banquet Staff 109,{
diff --git a/npc/other/auction.txt b/npc/other/auction.txt
new file mode 100644
index 000000000..12f0be43f
--- /dev/null
+++ b/npc/other/auction.txt
@@ -0,0 +1,120 @@
+//===== eAthena Script =======================================
+//= Auction system
+//===== By: ==================================================
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= eAthena SVN
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Auction house releated NPCs, and warps
+//===== Additional Comments: =================================
+//= 1.0 First version, place holders only. [L0ne_W0lf]
+//============================================================
+
+// Auction House warpers
+//============================================================
+morocc,182,95,6 script Auction Hall Guide#moc 98,{
+ callfunc "F_AuctionWarper",1;
+}
+
+prontera,218,120,4 script Auction Hall Guide#prt 117,{
+ callfunc "F_AuctionWarper",2;
+}
+
+yuno,129,116,0 script Auction Hall Guide#yuno 90,{
+ callfunc "F_AuctionWarper",3;
+}
+
+lighthalzen,205,169,6 script Auction Hall Guide#lhz 833,{
+ callfunc "F_AuctionWarper",4;
+}
+
+function script F_AuctironWarper {
+ mes "[Auction Hall Guide]";
+ mes "Hello, would you";
+ mes "like to enter the";
+ mes "Auction Hall?";
+ next;
+ if (select("Yes.:No.") == 1) {
+ mes "[Auction Hall Guide]";
+ mes "Enjoy your auction.";
+ close2;
+ switch(getarg(0)) {
+ case 1:
+ warp "auction_01",179,53; end;
+ case 2:
+ warp "auction_01",21,43; end;
+ case 3:
+ warp "auction_02",151,23; end;
+ case 4:
+ warp "auction_02",43,24; end;
+ }
+ }
+ mes "[Auction Hall Guide]";
+ mes "Alright then,";
+ mes "See you later.";
+ mes "If you change your";
+ mes "mind, please come";
+ mes "and enjoy the auctions~";
+ close;
+}
+
+// Sign posts
+//============================================================
+morocc,180,97,6 script Information Post#moc::AuctionSign 837,{
+ mes "[Information]";
+ mes "Auction Warp Guide";
+ close;
+}
+
+prontera,216,120,4 duplicate(AuctionSign) Information Post#prt 837,{
+yuno,131,116,0 duplicate(AuctionSign) Information Post#yuno 837,{
+lighthalzen,207,169,6 duplicate(AuctionSign) Information Post#lhz 837
+
+// Warps
+//============================================================
+auction_01,180,49,0 warp auction_entrance_moc 1,1,morocc,182,92
+auction_01,22,37,0 warp auction_entrance_prt 1,1,prontera,214,120
+auction_02,151,17,0 warp auction_enterance_juno 1,1,yuno,132,119
+auction_02,43,17,0 warp auction_enterance_lhz 1,1,lighthalzen,209,169
+
+// Auction House NPCs
+//============================================================
+auction_01,182,68,6 script Auction Broker#moc1::AuctionBroker 98,{
+ mes "[Auction Broker]";
+ mes "Welcome to the Auction Hall.";
+ mes "Would you like to view the goods?";
+ next;
+ if (select("Yes.:No.") == 1) {
+ mes "[Auction Broker]";
+ mes "Wery well.";
+ mes "Please take";
+ mes "a look, and see";
+ mes "What's being offered~";
+ //OpenAuction
+ close;
+ }
+ mes "[Auction Broker]";
+ mes "Very wellm then.";
+ mes "If you change your";
+ mes "mind, then please";
+ mes "come and check";
+ mes "out the auctions~";
+ close;
+}
+
+auction_01,182,75,0 duplicate(AuctionBroker) Auction Broker#moc2 99
+auction_01,177,75,2 duplicate(AuctionBroker) Auction Broker#moc3 98
+auction_01,177,68,4 duplicate(AuctionBroker) Auction Broker#moc4 99
+auction_01,21,74,4 duplicate(AuctionBroker) Auction Broker#prt1 117
+auction_01,27,78,4 duplicate(AuctionBroker) Auction Broker#prt2 116
+auction_01,16,78,4 duplicate(AuctionBroker) Auction Broker#prt3 115
+auction_02,158,47,6 duplicate(AuctionBroker) Auction Broker#yuno1 90
+auction_02,145,47,2 duplicate(AuctionBroker) Auction Broker#yuno2 90
+auction_02,151,54,0 duplicate(AuctionBroker) Auction Broker#yuno3 90
+auction_02,152,41,4 duplicate(AuctionBroker) Auction Broker#yuno4 90
+auction_02,57,46,2 duplicate(AuctionBroker) Auction Broker#lhz1 874
+auction_02,31,46,6 duplicate(AuctionBroker) Auction Broker#lhz2 874
+auction_02,43,65,4 duplicate(AuctionBroker) Auction Broker#lhz3 833
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index e6e2877a8..efa856ff0 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -199,6 +199,7 @@ npc: npc/kafras/dts_warper.txt
//npc: npc/events/nguild/nguild_kafras.txt
// --------------------------------------------------------------
// --------------------------- Others ---------------------------
+//npc: npc/other/auction.txt
npc: npc/other/books.txt
npc: npc/other/bulletin_boards.txt
npc: npc/other/comodo_gambling.txt