summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/battle/feature.conf2
-rw-r--r--conf/map/battle/misc.conf2
-rw-r--r--npc/003-1/aahna.txt5
3 files changed, 2 insertions, 7 deletions
diff --git a/conf/map/battle/feature.conf b/conf/map/battle/feature.conf
index 305d12892..fc6b49ede 100644
--- a/conf/map/battle/feature.conf
+++ b/conf/map/battle/feature.conf
@@ -49,7 +49,7 @@ features: {
// Auction (Note 1)
// Feature became unstable on clients 2012 onwards (exact date not known),
// it has been fixed on clients 2013-05-15 onwards however.
- auction: true
+ auction: false
// Roulette (Note 1)
// Requires: 2014-10-22bRagexe or later
diff --git a/conf/map/battle/misc.conf b/conf/map/battle/misc.conf
index 339d2b72d..2f88dbe0e 100644
--- a/conf/map/battle/misc.conf
+++ b/conf/map/battle/misc.conf
@@ -130,7 +130,7 @@ at_mapflag: false
at_timeout: 0
// Auction system, fee per hour. Default is 12000
-auction_feeperhour: 200
+auction_feeperhour: 12000
// Auction maximum sell price
auction_maximumprice: 500000000
diff --git a/npc/003-1/aahna.txt b/npc/003-1/aahna.txt
index b336a6fdc..895d1e4cc 100644
--- a/npc/003-1/aahna.txt
+++ b/npc/003-1/aahna.txt
@@ -5,11 +5,6 @@
// This NPC serves no purpose currently. She is here to make Tulimshar more crowded.
003-1,53,128,0 script Aahna NPC_ELVEN_FEMALE,{
- if (is_admin()) {
- closedialog;
- openauction();
- close;
- }
mesn;
mesq l("Hello, What a lovely day for a stroll.");
close;