/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2017, 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, 1996-2000
+ * Markus Armbruster, 2004-2016
*/
#include <config.h>
+#include "chance.h"
#include "commands.h"
int
int type;
int value;
int ovalue;
- int maxup;
+ int maxup, i, lim;
struct natstr *natp;
- int lneeded;
- int hneeded;
- int mneeded;
- int dneeded;
int wanted;
p = getstarg(player->argp[1],
maxup = wanted;
if (!maxup)
continue;
- lneeded = incp->in_lcms * maxup;
- if (sect.sct_item[I_LCM] < lneeded) {
- lneeded = sect.sct_item[I_LCM];
- maxup = lneeded / incp->in_lcms;
- if (maxup <= 0) {
- pr("Not enough lcms in %s\n",
- xyas(sect.sct_x, sect.sct_y, player->cnum));
- continue;
- }
+
+ lim = (sect. sct_mobil - 1) * 100 / incp->in_bmobil;
+ if (lim <= 0) {
+ pr("Not enough mobility in %s\n",
+ xyas(sect.sct_x, sect.sct_y, player->cnum));
+ continue;
}
- hneeded = incp->in_hcms * maxup;
- if (sect.sct_item[I_HCM] < hneeded) {
- hneeded = sect.sct_item[I_HCM];
- maxup = hneeded / incp->in_hcms;
- if (maxup <= 0) {
- pr("Not enough hcms in %s\n",
- xyas(sect.sct_x, sect.sct_y, player->cnum));
+ if (maxup > lim)
+ maxup = lim;
+
+ for (i = I_NONE + 1; i <= I_MAX; i++) {
+ if (!incp->in_mat[i])
continue;
- }
- }
- mneeded = incp->in_mcost * maxup;
- if ((sect.sct_mobil - 1) < mneeded) {
- mneeded = sect.sct_mobil - 1;
- if (mneeded < 0)
- mneeded = 0;
- maxup = mneeded / incp->in_mcost;
- if (maxup <= 0) {
- pr("Not enough mobility in %s\n",
+ lim = sect.sct_item[i] * 100 / incp->in_mat[i];
+ if (lim <= 0) {
+ pr("Not enough %s in %s\n",
+ ichr[i].i_name,
xyas(sect.sct_x, sect.sct_y, player->cnum));
- continue;
}
+ if (maxup > lim)
+ maxup = lim;
}
- dneeded = incp->in_dcost * maxup;
+ if (maxup <= 0)
+ continue;
+
natp = getnatp(player->cnum);
- if (player->dolcost + dneeded > natp->nat_money) {
+ lim = (natp->nat_money - player->dolcost) * 100 / incp->in_cost;
+ if (lim <= 0) {
pr("Not enough money left to improve %s by %d%%\n",
xyas(sect.sct_x, sect.sct_y, player->cnum), maxup);
break;
}
- lneeded = incp->in_lcms * maxup;
- hneeded = incp->in_hcms * maxup;
- mneeded = incp->in_mcost * maxup;
- dneeded = incp->in_dcost * maxup;
- player->dolcost += dneeded;
- sect.sct_item[I_LCM] -= lneeded;
- sect.sct_item[I_HCM] -= hneeded;
- sect.sct_mobil -= mneeded;
+ if (maxup > lim)
+ maxup = lim;
+
+ for (i = I_NONE + 1; i <= I_MAX; i++)
+ sect.sct_item[i] -= roundavg(maxup * incp->in_mat[i] / 100.0);
+ sect.sct_mobil -= roundavg(maxup * incp->in_bmobil / 100.0);
+ player->dolcost += maxup * incp->in_cost / 100.0;
ovalue = value;
value += maxup;
if (CANT_HAPPEN(value > 100))