/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
* ---
*
* work.c: Implementation of the work command
- *
+ *
* Known contributors to this file:
- *
+ * Markus Armbruster, 2009-2010
*/
#include <config.h>
+#include "chance.h"
#include "commands.h"
#include "land.h"
#include "optlist.h"
if (!snxtitem(&ni, EF_LAND, player->argp[1], NULL))
return RET_SYN;
p = getstarg(player->argp[2], "Amount: ", buf);
- if (p == 0 || *p == 0)
+ if (!p || !*p)
return RET_SYN;
work_amt = atoi(p);
if ((work_amt < 0) || (work_amt > land_mob_max)) {
}
cost = 0.0;
w = buildeff(§, w, &cost);
+ if (w == 0) {
+ pr("%s can't change efficiency in %s\n",
+ prland(&land), xyas(land.lnd_x, land.lnd_y, player->cnum));
+ continue;
+ }
if (player->dolcost + cost > natp->nat_money) {
pr("You can't afford to work that much in %s!\n",
xyas(land.lnd_x, land.lnd_y, player->cnum));
break;
}
player->dolcost += cost;
- eff_amt = ((6 * w) / (land.lnd_effic / 100.0));
land.lnd_mission = 0;
- land.lnd_mobil -= eff_amt;
+ land.lnd_mobil -= roundavg(w * 600.0 / land.lnd_effic);
nunits++;
pr("%s %s efficiency at %s to %d\n",
prland(&land),
sect.sct_type == sect.sct_newtype ? "raised" : "lowered",
xyas(land.lnd_x, land.lnd_y, player->cnum),
- (int)sect.sct_effic);
+ sect.sct_effic);
putland(land.lnd_uid, &land);
putsect(§);
}
int n, hcms, lcms;
int effdone = 0;
- work_cost = 0;
if (sp->sct_type != sp->sct_newtype) {
/*
* Tear down existing sector.