/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2018, 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:
* Dave Pare, 1986
+ * Markus Armbruster, 2004-2016
*/
#include <config.h>
#include "chance.h"
#include "commands.h"
#include "item.h"
-#include "land.h"
#include "news.h"
int
{
struct sctstr sect;
struct nstr_sect nstr;
- struct nstr_item ni;
- int nshot;
- double m;
+ int seceff, nshot;
+ double secstr, m;
i_type item;
struct ichrstr *ip;
- struct lndstr land;
int targets;
char *p;
- int mil, nsec;
char prompt[128];
char buf[1024];
while (nxtsct(&nstr, §)) {
if (!player->owner)
continue;
- mil = sect.sct_item[I_MILIT];
- nsec = 0;
- snxtitem_xy(&ni, EF_LAND, sect.sct_x, sect.sct_y);
- while (nxtitem(&ni, &land)) {
- mil += land.lnd_item[I_MILIT];
-
- if (lchr[(int)land.lnd_type].l_flags & L_SECURITY) {
- mil += land.lnd_item[I_MILIT];
- nsec++;
- }
- }
-
- if (sect.sct_item[item] == 0 || sect.sct_item[I_CIVIL] > mil * 10)
+ secstr = security_strength(§, &seceff);
+ if (sect.sct_item[item] == 0 || sect.sct_item[I_CIVIL] > secstr * 10)
continue;
nshot = sect.sct_item[item] > targets ? targets : sect.sct_item[item];
if (nshot > sect.sct_mobil * 5)
nshot = sect.sct_mobil * 5;
m = nshot / 5.0;
/*
- * Each security unit lowers the cost of
- * shooting a person by 10%. However, you
- * can't go lower than 50% of normal cost
+ * Security units reduce mobility cost of shooting people by
+ * 10% per 100% unit efficiency, up to a 50% reduction.
*/
- if (nsec > 5)
- nsec = 5;
- m *= 1.0 - nsec * 0.1;
+ if (seceff > 500)
+ seceff = 500;
+ m *= 1.0 - seceff / 1000.0;
if (nshot <= 0)
continue;
if (m < 0)