From c403a431463ccbe64acfcd8ad607f7da7ef9012b Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sat, 9 Apr 2005 09:11:41 +0000
Subject: [PATCH] startbedingungen nur noch an einer stelle. immer 4200 silber,
 30 logs, 30 stone.

---
 src/res/equipment.xml   |  4 +++-
 src/scripts/default.lua | 16 +++++++++-------
 src/scripts/eressea.lua | 41 ++++++++++++++++++++++++-----------------
 3 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/res/equipment.xml b/src/res/equipment.xml
index 6e8238c18..88f57f64c 100644
--- a/src/res/equipment.xml
+++ b/src/res/equipment.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0"?>
 <equipment>
+<!-- removed. only used by the mapper's seed function.
  <item name="conquesttoken" amount="1"/>
  <item name="log" amount="30"/>
  <item name="stone" amount="30"/>
- <item name="money" amount="2000"/>
+ <item name="money" amount="4200"/>
+-->
 </equipment>
 
diff --git a/src/scripts/default.lua b/src/scripts/default.lua
index 2f71d017a..2fd3dfb43 100644
--- a/src/scripts/default.lua
+++ b/src/scripts/default.lua
@@ -25,20 +25,22 @@ function process(orders)
     return -1
   end
 
+  -- run the turn:
+  read_orders(orders)  
+
+  plan_monsters()
+  process_orders()
+  
   -- initialize starting equipment for new players
   -- probably not necessary, since mapper sets new players, not server
   add_equipment("conquesttoken", 1);
   add_equipment("wood", 30);
   add_equipment("stone", 30);
-  add_equipment("money", 2000 + get_turn() * 10);
+  add_equipment("money", 4200);
 
-  -- run the turn:
-  read_orders(orders)  
-  plan_monsters()
+  -- use newfactions file to place out new players
+  autoseed(basepath .. "/newfactions")
 
-  --
-  process_orders()
-  
   write_passwords()
   write_reports()
 
diff --git a/src/scripts/eressea.lua b/src/scripts/eressea.lua
index 4faf59ba9..e06fc13ae 100644
--- a/src/scripts/eressea.lua
+++ b/src/scripts/eressea.lua
@@ -6,6 +6,21 @@ function loadscript(name)
   end
 end
 
+function change_locales()
+  local localechange = { }
+  -- local localechange = { en = { "y7hq" } }
+  
+  for loc, flist in localechange do
+    for index, name in flist do
+      f = get_faction(atoi36(name))
+      if f ~= nil then
+        f.locale = loc
+        print("LOCALECHANGE ", f, loc)
+      end
+    end
+  end
+end
+
 function run_scripts()
   scripts = { 
     "eternath.lua",
@@ -44,13 +59,6 @@ function process(orders)
     return -1
   end
 
-  -- initialize starting equipment for new players
-  -- probably not necessary, since mapper sets new players, not server
-  add_equipment("conquesttoken", 1);
-  add_equipment("wood", 30);
-  add_equipment("stone", 30);
-  add_equipment("money", 2000 + get_turn() * 10);
-
   -- run the turn:
   read_orders(orders)
   run_scripts()
@@ -58,17 +66,16 @@ function process(orders)
   plan_monsters()
   process_orders()
 
-  localechange = { en = { "y7hq" } }
-  for loc, flist in localechange do
-	  for index, name in flist do
-      f = get_faction(atoi36(name))
-      if f ~= nil then
-        f.locale = loc
-        print("LOCALECHANGE ", f, loc)
-      end
-    end
-  end
+  change_locales()
   
+  -- initialize starting equipment for new players
+  -- probably not necessary, since mapper sets new players, not server
+  add_equipment("conquesttoken", 1);
+  add_equipment("log", 30);
+  add_equipment("stone", 30);
+  add_equipment("money", 4200);
+
+  -- use newfactions file to place out new players
   autoseed(basepath .. "/newfactions")
 
   write_passwords()