/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
*
* Known contributors to this file:
* Steve McClure, 1998-2000
- * Markus Armbruster, 2004-2014
+ * Markus Armbruster, 2004-2016
*/
#include <config.h>
#include "chance.h"
#include "item.h"
-#include "lost.h"
+#include "optlist.h"
+#include "nat.h"
#include "news.h"
#include "plague.h"
+#include "prototypes.h"
+#include "sect.h"
#include "update.h"
static int infect_people(struct natstr *, struct sctstr *);
void
-do_plague(struct sctstr *sp, struct natstr *np, int etu)
+do_plague(struct sctstr *sp, int etu)
{
+ struct natstr *np = getnatp(sp->sct_own);
int pstage, ptime;
int n;
ptime = 0;
} else {
n = plague_people(np, sp->sct_item, &pstage, &ptime, etu);
- switch (n) {
- case PLG_DYING:
- wu(0, sp->sct_own, "PLAGUE deaths reported in %s.\n",
- ownxy(sp));
- nreport(sp->sct_own, N_DIE_PLAGUE, 0, 1);
- break;
- case PLG_INFECT:
- wu(0, sp->sct_own, "%s battling PLAGUE\n", ownxy(sp));
- break;
- case PLG_INCUBATE:
- /* Are we still incubating? */
- if (n == pstage) {
- /* Yes. Will it turn "infectious" next time? */
- if (ptime <= etu) {
- /* Yes. Report an outbreak. */
- wu(0, sp->sct_own,
- "Outbreak of PLAGUE in %s!\n", ownxy(sp));
- nreport(sp->sct_own, N_OUT_PLAGUE, 0, 1);
- }
- } else {
- /* It has already moved on to "infectious" */
- wu(0, sp->sct_own, "%s battling PLAGUE\n", ownxy(sp));
- }
- break;
- case PLG_EXPOSED:
- /* Has the plague moved to "incubation" yet? */
- if (n != pstage) {
- /* Yes. Will it turn "infectious" next time? */
- if (ptime <= etu) {
- /* Yes. Report an outbreak. */
- wu(0, sp->sct_own,
- "Outbreak of PLAGUE in %s!\n", ownxy(sp));
- nreport(sp->sct_own, N_OUT_PLAGUE, 0, 1);
- }
- }
- break;
- default:
- break;
- }
- }
- if (sp->sct_item[I_CIVIL] == 0 && sp->sct_item[I_MILIT] == 0
- && !has_units(sp->sct_x, sp->sct_y, sp->sct_own)) {
- makelost(EF_SECTOR, sp->sct_own, 0, sp->sct_x, sp->sct_y);
- sp->sct_own = 0;
- sp->sct_oldown = 0;
+ if (n != PLG_HEALTHY)
+ plague_report(sp->sct_own, n, pstage, ptime, etu,
+ "in", ownxy(sp));
}
+
sp->sct_pstage = pstage;
sp->sct_ptime = ptime;
}
/*
* Given the fact that plague exists, kill off
- * people if in plague state DYING. Increment
+ * people if in plague state PLG_DYING. Increment
* the plague time. Return "current" plague
* stage. No reports generated here anymore.
*/
}
return stage;
}
+
+void
+plague_report(natid victim, int new_pstage, int pstage, int ptime,
+ int etus, char *in_on, char *place)
+{
+ switch (new_pstage) {
+ case PLG_DYING:
+ wu(0, victim, "PLAGUE deaths reported %s %s\n", in_on, place);
+ nreport(victim, N_DIE_PLAGUE, 0, 1);
+ break;
+ case PLG_INFECT:
+ wu(0, victim, "%s battling PLAGUE\n", place);
+ break;
+ case PLG_INCUBATE:
+ /* Are we still incubating? */
+ if (new_pstage == pstage) {
+ /* Yes. Will it turn "infectious" next time? */
+ if (ptime <= etus) {
+ /* Yes. Report an outbreak. */
+ wu(0, victim,
+ "Outbreak of PLAGUE %s %s!\n", in_on, place);
+ nreport(victim, N_OUT_PLAGUE, 0, 1);
+ }
+ } else {
+ /* It has already moved on to "infectious" */
+ wu(0, victim, "%s battling PLAGUE\n", place);
+ }
+ break;
+ case PLG_EXPOSED:
+ /* Has the plague moved to "incubation" yet? */
+ if (new_pstage != pstage) {
+ /* Yes. Will it turn "infectious" next time? */
+ if (ptime <= etus) {
+ /* Yes. Report an outbreak. */
+ wu(0, victim,
+ "Outbreak of PLAGUE %s %s!\n", in_on, place);
+ nreport(victim, N_OUT_PLAGUE, 0, 1);
+ }
+ }
+ break;
+ default:
+ break;
+ }
+}