- Diverses

src/common/kernel/resources.c

@@ -64,6 +64,7 @@ terraform_resources(region * r)
 			res->amount     = (int)(res->base * (1+(res->level-res->startlevel)*(res->divisor/100.0)));
 #ifdef RESOURCE_FACTOR
 			res->amount     = res->amount * RESOURCE_FACTOR;
+			if(res->amount == 0) res->amount = 1;
 #endif
 			assert(res->amount>0);
 			res->type->terraform(res, r);

src/common/kernel/save.c

@@ -572,7 +572,9 @@ factionorders(void)
 		/* Die Partei hat sich zumindest gemeldet, so daß sie noch
 		 * nicht als untätig gilt */
 
-		f->lastorders = turn;
+		/* TODO: +1 ist ein Workaround, weil turn erst in process_orders
+		 * incrementiert wird. */
+		f->lastorders = turn+1;
 
 	} else
 		log_warning(("Befehle für die ungültige Partei %s\n", fid));

src/eressea/korrektur.c

@@ -1909,9 +1909,6 @@ update_gmquests(void)
 		}
 		do_once("et02", secondfaction(f));
 	}
-	do_once("rq02", regatta_quest());
-	do_once("zq01", zero_quest());
-	do_once("rq03", regatta_quest());
 	do_once("renm", fix_foreign());
 }
 
@@ -2901,8 +2898,9 @@ check_phoenix(void)
 	/* it is not, so we create it */
 	r = random_land_region();
 	phoenix = createunit(r, findfaction(MONSTER_FACTION), 1, phoenix_race);
+	phoenix->name = strdup("Der Phönix");
 
-	/* generate an appropriate region message */
+	/* TODO: generate an appropriate region message */
 }
 #endif
 
@@ -2937,35 +2935,6 @@ korrektur(void)
 	update_gmquests(); /* test gm quests */
 	/* fix_unitrefs(); */
 	stats();
-	do_once("pers", convert_orders());
-	do_once("sql2", dump_sql());
-	do_once("fw02", fix_watchers());
-	do_once("fxh4", fix_plainherbs());
-#if NEW_RESOURCEGROWTH
-	/* do not remove do_once calls - old datafiles need them! */
-	do_once("rgrw", convert_resources());
-	do_once("rsfx", read_resfix());
-#endif
-	/* do_once("xepl", create_xe()); */
-#if GROWING_TREES
-	do_once("grtr", growing_trees());
-#endif
-
-	do_once("fgms", fix_gms());
-#if NEW_RESOURCEGROWTH
-	do_once("rndr", randomized_resources());
-#endif
-	do_once("idlo", fix_idleout());
-	do_once("szip", set_zip());
-	do_once("heal", heal_all());
-	do_once("fquc", fix_questcoors());
-	do_once("fsee", fix_seeds());
-	do_once("orc2", orc_conversion2());
-	do_once("witm", warn_items());
-	do_once("guaf", guard_conversion());
-	do_once("qpoi", questportal_init());
-	do_once("xini", xe_init());
-	do_once("rest", fix_restart_flag());
 	warn_password();
 	fix_road_borders();
 	if (turn>1000) curse_emptiness(); /*** disabled ***/
@@ -3024,14 +2993,6 @@ astral_penger(void)
 void
 korrektur_end(void)
 {
-	/* fix_balsamfiasko(); */
-	do_once("peng", astral_penger());
-
-#if PEASANT_ADJUSTMENT == 1
-	do_once("peas", peasant_adjustment());
-	do_once("orcc", orc_conversion());
-#endif
-	do_once("camm", give_cammo());
 }
 
 void

src/res/vinyambar-wdw.xml

@@ -6,7 +6,6 @@
 	<include file="en/strings.xml"></include>
 	<include file="messages.xml"></include>
 
-	<include file="vinyambar/wdw-races.xml"></include>
 	<include file="vinyambar/wdw-resources.xml"></include>
 
 	<include file="races.xml"></include>
@@ -26,7 +25,7 @@
 		<param name="GiveRestriction" value="0"></param>
 		<param name="database.gameid" value="3"></param>
 		<param name="hunger.long" value="0"></param>
-		<param name="alliance.skilllimit" value="15"></param>
+		<param name="allied.skilllimit" value="15"></param>
 	</game>
 	<strings>
 		<string name="mailto">

src/res/vinyambar/de/strings-classic.xml

@@ -1,6 +1,6 @@
 <strings>
 	<string name="newbie_info_1">
-		<text locale="de">Bitte denke daran, deine Befehle an vinyambar@eressea.amber.kn-bremen.de zu senden.</text>
+		<text locale="de">Bitte denke daran, deine Befehle mit dem Betreff WDW BEFEHLE an vinyambar@eressea.amber.kn-bremen.de zu senden.</text>
 	</string>
 	<string name="newbie_info_2">
 		<text locale="de">Weitere Informationen über das Spiel findest Du unter htpp://www.vinyambar.de/</text>

src/res/vinyambar/de/strings.xml

@@ -1,6 +1,6 @@
 <strings>
 	<string name="newbie_info_1">
-		<text locale="de">Bitte denke daran, deine Befehle an vinyambar@eressea.amber.kn-bremen.de zu senden.</text>
+		<text locale="de">Bitte denke daran, deine Befehle mit dem Betreff WDW BEFEHLE an vinyambar@eressea.amber.kn-bremen.de zu senden.</text>
 	</string>
 	<string name="newbie_info_2">
 		<text locale="de">Weitere Informationen über das Spiel findest Du unter http://www.vinyambar.de/</text>

src/scripts/wdw-run.lua

@@ -1,39 +1,14 @@
-function list_empty(list)
-  -- trickfunktion, die rausfindet, ob es schon eine partei gibt.
-  local _foo, _state, var_1 = list()
-  local begin = _foo(_state, var_1)
-  return begin == nil
-end
-
 function run_wdw()
-  -- load 'wdw-start', if it exists. otherwise, load the latest turn, 
+  local turnfile = "" .. get_turn()
-  -- and make a backup called 'wdw-start'.
+  if read_game(turnfile)~=0 then 
-  local file = "wdw-start"
+    print("could not read game")
-  local alliance, position, faction
+    return -1
-  if list_empty(factions) then
-    if read_game(file)~=0 then 
-      local turnfile = "" .. get_turn()
-      if read_game(turnfile)~=0 then 
-        print("could not read game")
-        return -1
-      end
-      if write_game(file)~=0 then 
-        print("could not write game")
-        return -1
-      end
-    end
   end
   
-  local outfile="wdw-setup"
-  -- run the alliances setup
-  if list_empty(alliances) then
-    dofile("wdw-setup.lua")
-  else
   -- run the turn (not yet)
-    read_orders(orders)
+  read_orders(orderfile)
-    process_orders()
+  process_orders()
-    outfile = "" .. get_turn()
+  outfile = "" .. get_turn()
-  end
 
   -- siegbedingungen ausgeben
   dofile("wdw-standings.lua")

src/scripts/wdw-setup.lua

@@ -5,7 +5,7 @@ function init_positions()
   positions = { 
     [11] = get_region(1,-12),
     [12] = get_region(10,-11),
-    [13] = get_region(7,-8),
+    [13] = get_region(-7,-8),
     [14] = get_region(13,1),
     [15] = get_region(5,10),
     [17] = get_region(-6,14),