- http://eressea.upb.de/mantis/bug_view_page.php?bug_id=0000130

VERKAUFE ALLES verbessert
- http://eressea.upb.de/mantis/bug_view_page.php?bug_id=0000192
  Keine opponent-Auswahl mehr im Kampf

- LUA:
  unit.weight und unit.capacity (read-only)

- Reporterzeugung:
  Parteiliste nur noch in parteien.full

Stringfix (Fräcke)

src/common/gamecode/economy.c

@@ -135,7 +135,6 @@ scramble(void *data, int n, size_t width)
 static void
 expandorders(region * r, request * requests)
 {
-	int i, j;
 	unit *u;
 	request *o;
 
@@ -147,16 +146,18 @@ expandorders(region * r, request * requests)
 
 	norders = 0;
 
-	for (o = requests; o; o = o->next)
+  for (o = requests; o; o = o->next) {
     if (o->qty > 0) {
       norders += o->qty;
+    }
 	}
 
 	if (norders > 0) {
+    int i = 0;
 		oa = (request *) calloc(norders, sizeof(request));
-			i = 0;
 		for (o = requests; o; o = o->next) {
 			if (o->qty > 0) {
+        int j;
 				for (j = o->qty; j; j--) {
 					oa[i] = *o;
 					oa[i].unit->n = 0;
@@ -333,16 +334,17 @@ recruit(unit * u, struct order * ord, request ** recruitorders)
 		return;
 	}
 
+  if (!(u->faction->race->ec_flags & ECF_REC_HORSES) && fval(r, RF_ORCIFIED)) {
 #if RACE_ADJUSTMENTS
-	if (fval(r, RF_ORCIFIED) && u->faction->race != new_race[RC_URUK] &&
+    if (u->faction->race != new_race[RC_URUK])
 #else
-	if (fval(r, RF_ORCIFIED) && u->faction->race != new_race[RC_ORC] &&
+    if (u->faction->race != new_race[RC_ORC])
 #endif
-		!(u->faction->race->ec_flags & ECF_REC_HORSES)) {
+    {
       cmistake(u, ord, 238, MSG_EVENT);
       return;
     }
-
+  }
 
 	recruitcost = u->faction->race->recruitcost;
 	if (recruitcost) {
@@ -1792,7 +1794,7 @@ static int tax_per_size[7] =
 {0, 6, 12, 18, 24, 30, 36};
 
 static void
-expandselling(region * r, request * sellorders)
+expandselling(region * r, request * sellorders, int limit)
 {
 	int money, price, j, max_products;
 	/* int m, n = 0; */
@@ -1872,6 +1874,7 @@ expandselling(region * r, request * sellorders)
 			i=0;
 			for (search=luxurytypes;search!=ltype;search=search->next) ++i;
 		}
+    if (counter[i]>=limit) continue;
 		if (counter[i]+1 > max_products && multi > 1) --multi;
 		price = ltype->price * multi;
 
@@ -1955,8 +1958,8 @@ expandselling(region * r, request * sellorders)
 		if (a==NULL) continue;
 		for (itm=(item*)a->data.v; itm; itm=itm->next) {
 			if (itm->number) {
-				add_message(&u->faction->msgs, new_message(u->faction,
+				ADDMSG(&u->faction->msgs, msg_message("sellamount", 
-					"sellamount%u:unit%i:amount%X:resource", u, itm->number, itm->type->rtype));
+          "unit amount resource", u, itm->number, itm->type->rtype));
 			}
 		}
 		a_remove(&u->attribs, a);
@@ -1964,19 +1967,19 @@ expandselling(region * r, request * sellorders)
 	}
 }
 
-static void
+static boolean
 sell(unit * u, request ** sellorders, struct order * ord)
 {
+  boolean unlimited = true;
 	const item_type * itype;
 	const luxury_type * ltype=NULL;
 	int n;
-	request *o;
   region * r = u->region;
 	const char *s;
 
 	if (u->ship && is_guarded(r, u, GUARD_CREWS)) {
 		cmistake(u, ord, 69, MSG_INCOME);
-		return;
+		return false;
 	}
 	/* sellorders sind KEIN array, weil für alle items DIE SELBE resource
 	* (das geld der region) aufgebraucht wird. */
@@ -1986,18 +1989,19 @@ sell(unit * u, request ** sellorders, struct order * ord)
 	s = getstrtoken();
 
   if (findparam(s, u->faction->locale) == P_ANY) {
+    unlimited = false;
 		n = rpeasants(r) / TRADE_FRACTION;
 		if (rterrain(r) == T_DESERT && buildingtype_exists(r, bt_find("caravan")))
 			n *= 2;
 		if (n==0) {
 			cmistake(u, ord, 303, MSG_COMMERCE);
-			return;
+			return false;
 		}
 	} else {
 		n = atoi(s);
 		if (n==0) {
 			cmistake(u, ord, 27, MSG_COMMERCE);
-			return;
+			return false;
 		}
 	}
 	/* Belagerte Einheiten können nichts verkaufen. */
@@ -2005,19 +2009,19 @@ sell(unit * u, request ** sellorders, struct order * ord)
 	if (besieged(u)) {
 		add_message(&u->faction->msgs,
 			msg_feedback(u, ord, "error60", ""));
-		return;
+		return false;
 	}
 	/* In der Region muß es eine Burg geben. */
 
 	if (u->race == new_race[RC_INSECT]) {
 		if (rterrain(r) != T_SWAMP && rterrain(r) != T_DESERT && !rbuildings(r)) {
 			cmistake(u, ord, 119, MSG_COMMERCE);
-			return;
+			return false;
 		}
 	} else {
 		if (!rbuildings(r)) {
 			cmistake(u, ord, 119, MSG_COMMERCE);
-			return;
+			return false;
 		}
 	}
 
@@ -2027,21 +2031,23 @@ sell(unit * u, request ** sellorders, struct order * ord)
 
 	if (!n) {
 		cmistake(u, ord, 54, MSG_COMMERCE);
-		return;
+		return false;
 	}
 	s=getstrtoken();
 	itype = finditemtype(s, u->faction->locale);
 	if (itype!=NULL) ltype = resource2luxury(itype->rtype);
 	if (ltype==NULL) {
 		cmistake(u, ord, 126, MSG_COMMERCE);
-		return;
+		return false;
 	}
 	else {
 		attrib * a;
+    request *o;
 		int k, available;
+
 		if (!r_demand(r, ltype)) {
 			cmistake(u, ord, 263, MSG_COMMERCE);
-			return;
+			return false;
 		}
 		available = new_get_pooled(u, itype->rtype, GET_DEFAULT);
 
@@ -2058,7 +2064,7 @@ sell(unit * u, request ** sellorders, struct order * ord)
 
 		if (n <= 0) {
 			cmistake(u, ord, 264, MSG_COMMERCE);
-			return;
+			return false;
 		}
 		/* Hier wird request->type verwendet, weil die obere limit durch
 		* das silber gegeben wird (region->money), welches für alle
@@ -2089,6 +2095,7 @@ sell(unit * u, request ** sellorders, struct order * ord)
 		addlist(sellorders, o);
 
 		if (n) fset(u, UFL_TRADER);
+    return unlimited;
 	}
 }
 /* ------------------------------------------------------------- */
@@ -2897,6 +2904,7 @@ produce(void)
   * lehren vor lernen. */
 
   for (r = regions; r; r = r->next) {
+    boolean limited = true;
 
     assert(rmoney(r) >= 0);
     assert(rpeasants(r) >= 0);
@@ -2931,7 +2939,9 @@ produce(void)
             buy(u, &buyorders, ord);
             break;
           case K_SELL:
-            sell(u, &sellorders, ord);
+            /* sell returns true if the sale is not limited
+             * by the region limit */
+            limited = !sell(u, &sellorders, ord) & limited;
             break;
           }
         }
@@ -3014,7 +3024,11 @@ produce(void)
     * können. */
 
     if (buyorders) expandbuying(r, buyorders);
-    if (sellorders) expandselling(r, sellorders);
+
+    if (sellorders) {
+      int limit = rpeasants(r) / TRADE_FRACTION;
+      expandselling(r, sellorders, limited?limit:INT_MAX);
+    }
 
     /* Die Spieler sollen alles Geld verdienen, bevor sie beklaut werden
     * (expandstealing). */

src/common/gamecode/report.c

@@ -3408,6 +3408,7 @@ report_summary(summary * s, summary * o, boolean full)
 	}
 	fprintf(F, "Neue Spieler:\t %d\n", newplayers);
 
+	if (full) {
     if (factions)
       fprintf(F, "\nParteien:\n\n");
 
@@ -3431,6 +3432,7 @@ report_summary(summary * s, summary * o, boolean full)
         }
       }
     }
+  }
 
   fclose(F);
 

src/common/kernel/battle.c

@@ -1367,7 +1367,7 @@ static troop
 select_opponent(battle * b, troop at, int minrow, int maxrow)
 {
   fighter * af = at.fighter;
-  troop dt = af->person[at.index].opponent;
+  troop dt;
 
   if (af->unit->race->flags & RCF_FLY) {
     /* flying races ignore min- and maxrow and can attack anyone fighting
@@ -1377,6 +1377,8 @@ select_opponent(battle * b, troop at, int minrow, int maxrow)
   }
   minrow = max(minrow, FIGHT_ROW);
 
+#ifdef FIXED_OPPONENTS
+  dt = af->person[at.index].opponent;
   if (dt.fighter!=NULL && dt.index<dt.fighter->alive-dt.fighter->removed) {
     fighter * df = dt.fighter;
     int row = get_unitrow(df);
@@ -1388,7 +1390,9 @@ select_opponent(battle * b, troop at, int minrow, int maxrow)
       return dt;
     }
   }
+#endif
   dt = select_enemy(b, at.fighter, minrow, maxrow);
+#ifdef FIXED_OPPONENTS
   if (dt.fighter!=NULL) {
     fighter * df = dt.fighter;
     troop ot = df->person[dt.index].opponent;
@@ -1396,6 +1400,7 @@ select_opponent(battle * b, troop at, int minrow, int maxrow)
       df->person[dt.index].opponent = at;
     }
   }
+#endif
   return dt;
 }
 

src/common/kernel/battle.h

@@ -165,7 +165,10 @@ extern "C" {
       int last_action : 8;		 /* In welcher Runde haben wir zuletzt etwas getan */
       struct weapon * missile; /* missile weapon */
       struct weapon * melee;   /* melee weapon */
+#undef FIXED_OPPONENTS
+#ifdef FIXED_OPPONENTS
       struct troop opponent;   /* default opponent */
+#endif
     } * person;
     int flags;
     struct {

src/common/kernel/eressea.c

@@ -2388,7 +2388,7 @@ init_locales(void)
 
 /* TODO: soll hier weg */
 extern building_type bt_caldera;
-extern attrib_type at_traveldir_new;
+extern attrib_type at_shiptrail;
 
 attrib_type at_germs = {
 	"germs",
@@ -2460,7 +2460,7 @@ remove_empty_factions(boolean writedropouts)
 		/* monster (0) werden nicht entfernt. alive kann beim readgame
 		 * () auf 0 gesetzt werden, wenn monsters keine einheiten mehr
 		 * haben. */
-		if (f->alive == 0 && f->no != MONSTER_FACTION) {
+		if ((f->units==NULL || f->alive == 0) && f->no != MONSTER_FACTION) {
 			ursprung * ur = f->ursprung;
 			while (ur && ur->id!=0) ur=ur->next;
 			if (!quiet) printf("\t%s\n", factionname(f));
@@ -3157,7 +3157,7 @@ attrib_init(void)
 {
 	/* Alle speicherbaren Attribute müssen hier registriert werden */
 	at_register(&at_unitdissolve);
-	at_register(&at_traveldir_new);
+	at_register(&at_shiptrail);
 	at_register(&at_familiar);
 	at_register(&at_familiarmage);
 	at_register(&at_clone);

src/common/kernel/movement.c

@@ -62,7 +62,6 @@
 
 /* TODO: boder_type::move() must be able to change target (wisps) */
 extern border_type bt_wisps;
-extern item_type it_demonseye;
 /* ------------------------------------------------------------- */
 
 typedef struct traveldir {
@@ -82,19 +81,19 @@ static attrib_type at_traveldir = {
 
 
 static void
-a_traveldir_new_init(attrib *a)
+shiptrail_init(attrib *a)
 {
 	a->data.v = calloc(1, sizeof(traveldir));
 }
 
 static void
-a_traveldir_new_finalize(attrib *a)
+shiptrail_finalize(attrib *a)
 {
 	free(a->data.v);
 }
 
 static int
-a_traveldir_new_age(attrib *a)
+shiptrail_age(attrib *a)
 {
 	traveldir *t = (traveldir *)(a->data.v);
 
@@ -104,7 +103,7 @@ a_traveldir_new_age(attrib *a)
 }
 
 static int
-a_traveldir_new_read(attrib *a, FILE *f)
+shiptrail_read(attrib *a, FILE *f)
 {
 	traveldir *t = (traveldir *)(a->data.v);
 	int       no, age, dir;
@@ -117,19 +116,19 @@ a_traveldir_new_read(attrib *a, FILE *f)
 }
 
 static void
-a_traveldir_new_write(const attrib *a, FILE *f)
+shiptrail_write(const attrib *a, FILE *f)
 {
 	  traveldir *t = (traveldir *)(a->data.v);
 	  fprintf(f, "%d %d %d ", t->no, (int)t->dir, t->age);
 }
 
-attrib_type at_traveldir_new = {
+attrib_type at_shiptrail = {
 	"traveldir_new",
-	a_traveldir_new_init,
+	shiptrail_init,
-	a_traveldir_new_finalize,
+	shiptrail_finalize,
-	a_traveldir_new_age,
+	shiptrail_age,
-	a_traveldir_new_write,
+	shiptrail_write,
-	a_traveldir_new_read
+	shiptrail_read
 };
 
 static int
@@ -473,9 +472,8 @@ travelthru(const unit * u, region * r)
 }
 
 static void
-leave_trail(unit * u, region * from, region_list *route)
+leave_trail(ship * sh, region * from, region_list *route)
 {
-  ship * sh = u->ship;
   region * r = from;
   
   while (route!=NULL) {
@@ -486,7 +484,7 @@ leave_trail(unit * u, region * from, region_list *route)
     * if we use this kind of direction-attribute */
     if (dir<MAXDIRECTIONS && dir>=0) {
       traveldir * td = NULL;
-      attrib * a = a_find(r->attribs, &at_traveldir_new);
+      attrib * a = a_find(r->attribs, &at_shiptrail);
 
       while (a!=NULL) {
         td = (traveldir *)a->data.v;
@@ -495,7 +493,7 @@ leave_trail(unit * u, region * from, region_list *route)
       }
 
       if (a==NULL) {
-        a = a_add(&(r->attribs), a_new(&at_traveldir_new));
+        a = a_add(&(r->attribs), a_new(&at_shiptrail));
         td = (traveldir *)a->data.v;
         td->no = sh->no;
       }
@@ -536,7 +534,7 @@ move_ship(ship * sh, region * from, region * to, region_list * route)
 
     if (u->ship == sh) {
       if (!trail) {
-        leave_trail(u, from, route);
+        leave_trail(sh, from, route);
         trail = true;
       }
       if (route!=NULL) travel_route(u, from, route);
@@ -631,6 +629,7 @@ drifting_ships(region * r)
     while (*shp) {
       ship * sh = *shp;
       region * rnext = NULL;
+      region_list * route = NULL;
       unit * captain;
       int d_offset;
 
@@ -679,9 +678,12 @@ drifting_ships(region * r)
 
       /* Das Schiff und alle Einheiten darin werden nun von r
       * nach rnext verschoben. Danach eine Meldung. */
-      sh = move_ship(sh, r, rnext, NULL);
+      add_regionlist(&route, rnext);
+      sh = move_ship(sh, r, rnext, route);
+      free_regionlist(route);
 
       if (sh!=NULL) {
+
         fset(sh, SF_DRIFTED);
 
         if (rnext->terrain != T_OCEAN && !flying_ship(sh)) {
@@ -1814,19 +1816,7 @@ move(unit * u, boolean move_on_land)
     followers += travel(u, r2, 0, &route);
   }
 
-  if (i_get(u->items, &it_demonseye)) {
+  fset(u, UFL_LONGACTION);
-    direction_t d;
-    for (d=0;d!=MAXDIRECTIONS;++d) {
-      region * rc = rconnect(r2,d);
-      if (rc) {
-        sprintf(buf, "Im %s ist eine ungeheure magische Präsenz zu verspüren.",
-          locale_string(u->faction->locale, directions[dir_invert(d)]));
-        addmessage(rc, NULL, buf, MSG_EVENT, ML_IMPORTANT);
-      }
-    }
-  }
-
-  if (u->region!=r) fset(u, UFL_LONGACTION);
   set_order(&u->thisorder, NULL);
 
   if (fval(u, UFL_FOLLOWED) && route!=NULL) {
@@ -2000,7 +1990,7 @@ age_traveldir(region *r)
 static direction_t
 hunted_dir(attrib *at, int id)
 {
-  attrib *a = a_find(at, &at_traveldir_new);
+  attrib *a = a_find(at, &at_shiptrail);
 
   while (a!=NULL) {
     traveldir *t = (traveldir *)(a->data.v);
@@ -2234,9 +2224,6 @@ move_pirates(void)
   for (r = regions; r; r = r->next) {
     unit ** up = &r->units;
 
-    /* Abtreiben von beschädigten, unterbemannten, überladenen Schiffen */
-    drifting_ships(r);
-
     while (*up) {
       unit *u = *up;
 
@@ -2319,7 +2306,13 @@ movement(void)
         }
         /* else *up is already the next unit */
       }
-      if (!repeat) r = r->next;
+      if (!repeat) {
+        if (ships==0) {
+          /* Abtreiben von beschädigten, unterbemannten, überladenen Schiffen */
+          drifting_ships(r);
+        }
+        r = r->next;
+      }
     }
   }
 

src/eressea/lua/unit.cpp

@@ -12,6 +12,7 @@
 #include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/magic.h>
+#include <kernel/movement.h>
 #include <kernel/order.h>
 #include <kernel/race.h>
 #include <kernel/region.h>
@@ -73,6 +74,19 @@ unit_orders(const unit& u) {
   return eressea::list<std::string, order *, bind_orders>(u.orders);
 }
 
+class bind_items {
+public:
+  static item * next(item * node) { return node->next; }
+  static std::string value(item * node) { 
+    return std::string(node->type->rtype->_name[0]);
+  }
+};
+
+static eressea::list<std::string, item *, bind_items>
+unit_items(const unit& u) {
+  return eressea::list<std::string, item *, bind_items>(u.items);
+}
+
 static unit *
 add_unit(faction * f, region * r)
 {
@@ -385,6 +399,17 @@ unit_setscript(struct unit& u, const functor<void>& f)
   setscript(&u.attribs, fptr);
 }
 
+static int
+unit_weight(const struct unit& u)
+{
+  return weight(&u);
+}
+
+static int
+unit_capacity(const struct unit& u)
+{
+  return walkingcapacity(&u);
+}
 
 void
 bind_unit(lua_State * L) 
@@ -402,22 +427,28 @@ bind_unit(lua_State * L)
     .property("faction", &unit_getfaction, &unit_setfaction)
     .def_readwrite("hp", &unit::hp)
     .def_readwrite("status", &unit::status)
+    .property("weight", &unit_weight)
+    .property("capacity", &unit_capacity)
 
     // orders:
     .def("add_order", &unit_addorder)
     .def("clear_orders", &unit_clearorders)
     .property("orders", &unit_orders, return_stl_iterator)
 
-    // key-attribute:
+    // key-attributes for named flags:
     .def("set_flag", &set_flag)
     .def("get_flag", &get_flag)
 
     // items:
     .def("get_item", &unit_getitem)
     .def("add_item", &unit_additem)
+    .property("items", &unit_items, return_stl_iterator)
+
+    // skills:
     .def("get_skill", &unit_getskill)
     .def("eff_skill", &unit_effskill)
     .def("set_skill", &unit_setskill)
+
     .def("set_brain", &unit_setscript)
     .def("set_racename", &unit_setracename)
     .def("add_spell", &unit_addspell)

src/res/eressea/de/strings.xml

@@ -70,7 +70,7 @@
   </string>
 
   <string name="wente_dress_p">
-    <text locale="de">Frack</text>
+    <text locale="de">Fräcke</text>
     <text locale="en">tuxedos</text>
   </string>