# HG changeset patch
# User "Rex Tsai <chihchun@kalug.linux.org.tw>"
# Date 1225622188 -28800
# Node ID 270e608bb0b6ec7d38effb6e21809bb70ffca7b3
# Parent  dba0543daf3608e5e6c256e3427baa79bbd2357b# Parent  bff16e6ee3efda608dda7f7db1f9bad4cbbe05fe
branch merged.

diff -r bff16e6ee3ef -r 270e608bb0b6 freeland.pl
--- a/freeland.pl	Sun Nov 02 16:33:01 2008 +0800
+++ b/freeland.pl	Sun Nov 02 18:36:28 2008 +0800
@@ -7,10 +7,10 @@
 my @tradegoodText = qw/NULL 葡萄酒 大理石 水晶 硫磺/;
 my @wonderText = qw/NULL 赫菲斯拓斯的熔爐 蓋亞的神殿 狄奧尼索斯的花園 雅典娜的神殿 赫秘士的神殿 阿瑞斯的要塞 波賽頓的神殿 克羅瑟斯的神殿/;
 
-if($#ARGV != 1) {
-    die("Usage: $0 x y\n");
+if($#ARGV != 2) {
+    die("Usage: $0 x y tradegood (1 葡萄酒, 2 大理石, 3 水晶, 4 硫磺/)\n");
 }
-my ($x, $y) = @ARGV;
+my ($x, $y, $tradegood) = @ARGV;
 
 my @location = (($x + 6), ($x - 6), ($y + 6), ($y - 6));
 
@@ -27,7 +27,7 @@
 
 # 
 my @islands = Ikariam::Island->retrieve_from_sql(qq{
-        tradegood == 2
+        tradegood == $tradegood
     AND people < 16
     AND x <= $location[0]
     AND x >= $location[1]