Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

http://eressea.upb.de/mantis/view.php?id=1011 

"Doppelte/irrefuehrende Meldung bei Vulkanausbruch"

Doppelmeldung entfernt.
This commit is contained in:
Enno Rehling 2006-10-07 20:48:41 +00:00
parent 8aea7fdb41
commit 2b104afe50
1 changed files with 54 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
src/common/gamecode/randenc.c
View File

@ -737,88 +737,83 @@ rrandneighbour(region *r)
void void
volcano_outbreak(region *r) volcano_outbreak(region *r)
{ {
attrib *a; attrib *a;
region *rn; region *rn;
unit *u, **up; unit *u, **up;
faction *f; faction *f;
for (u=r->units; u; u=u->next) { for (u=r->units; u; u=u->next) {
f = u->faction; f = u->faction;
freset(f, FL_DH); freset(f, FL_DH);
} }
rn = rrandneighbour(r); rn = rrandneighbour(r);
/* Vulkan-Region verwüsten */ /* Vulkan-Region verwüsten */
rsettrees(r, 2, 0); rsettrees(r, 2, 0);
rsettrees(r, 1, 0); rsettrees(r, 1, 0);
rsettrees(r, 0, 0); rsettrees(r, 0, 0);
a = a_find(r->attribs, &at_reduceproduction); a = a_find(r->attribs, &at_reduceproduction);
if (!a) a = a_add(&r->attribs, a_new(&at_reduceproduction)); if (!a) a = a_add(&r->attribs, a_new(&at_reduceproduction));
/* Produktion vierteln ... */ /* Produktion vierteln ... */
a->data.sa[0] = 25; a->data.sa[0] = 25;
/* Für 6-17 Runden */ /* Für 6-17 Runden */
a->data.sa[1] = (short)(a->data.sa[1] + 6 + rng_int()%12); a->data.sa[1] = (short)(a->data.sa[1] + 6 + rng_int()%12);
/* Personen bekommen 4W10 Punkte Schaden. */ /* Personen bekommen 4W10 Punkte Schaden. */
for (up=&r->units; *up;) { for (up=&r->units; *up;) {
unit * u = *up; unit * u = *up;
int dead = damage_unit(u, "4d10", true, false); int dead = damage_unit(u, "4d10", true, false);
if (dead) { if (dead) {
ADDMSG(&u->faction->msgs, msg_message("volcano_dead", ADDMSG(&u->faction->msgs, msg_message("volcano_dead",
"unit region dead", u, r, dead)); "unit region dead", u, r, dead));
} }
if (!fval(u->faction, FL_DH)) { if (!fval(u->faction, FL_DH)) {
fset(u->faction, FL_DH); fset(u->faction, FL_DH);
if (rn) { if (rn) {
ADDMSG(&u->faction->msgs, msg_message("volcanooutbreak", ADDMSG(&u->faction->msgs, msg_message("volcanooutbreak",
"regionv regionn", r, rn)); "regionv regionn", r, rn));
} else { } else {
ADDMSG(&u->faction->msgs, msg_message("volcanooutbreaknn", ADDMSG(&u->faction->msgs, msg_message("volcanooutbreaknn",
"region", r)); "region", r));
} }
} }
if (u==*up) up=&u->next; if (u==*up) up=&u->next;
} }
remove_empty_units_in_region(r); remove_empty_units_in_region(r);
/* Zufällige Nachbarregion verwüsten */ /* Zufällige Nachbarregion verwüsten */
if (rn) { if (rn) {
rsettrees(r, 2, 0); rsettrees(r, 2, 0);
rsettrees(r, 1, 0); rsettrees(r, 1, 0);
rsettrees(r, 0, 0); rsettrees(r, 0, 0);
a = a_find(rn->attribs, &at_reduceproduction); a = a_find(rn->attribs, &at_reduceproduction);
if (!a) a = a_add(&rn->attribs, a_new(&at_reduceproduction)); if (!a) a = a_add(&rn->attribs, a_new(&at_reduceproduction));
/* Produktion vierteln ... */ /* Produktion vierteln ... */
a->data.sa[0] = 25; a->data.sa[0] = 25;
/* Für 6-17 Runden */ /* Für 6-17 Runden */
a->data.sa[1] = (short)(a->data.sa[1] + 6 + rng_int()%12); a->data.sa[1] = (short)(a->data.sa[1] + 6 + rng_int()%12);
/* Personen bekommen 3W10 Punkte Schaden. */ /* Personen bekommen 3W10 Punkte Schaden. */
for (up=&rn->units; *up;) { for (up=&rn->units; *up;) {
unit * u = *up; unit * u = *up;
int dead = damage_unit(u, "3d10", true, false); int dead = damage_unit(u, "3d10", true, false);
if (dead) { if (dead) {
ADDMSG(&u->faction->msgs, msg_message("volcano_dead",
"unit region dead", u, rn, dead));
}
if (!fval(u->faction, FL_DH)) {
ADDMSG(&u->faction->msgs, msg_message("volcano_dead", ADDMSG(&u->faction->msgs, msg_message("volcano_dead",
"unit region dead", u, r, dead)); "unit region dead", u, r, dead));
fset(u->faction, FL_DH); }
} if (u==*up) up=&u->next;
if (u==*up) up=&u->next; }
} remove_empty_units_in_region(rn);
remove_empty_units_in_region(rn); }
}
} }
static void static void