empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

setsector setresource: Switch to edit_sect()

Browse source 
One copy of the code suffices.

"Fertility content" becomes just "Fertility" in messages.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-01-26 15:54:54 +01:00
parent f52a7e2739
commit e109d981b8
5 changed files with 48 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/prototypes.h
View file

@ -54,6 +54,8 @@ extern void finish_server(void);
* src/lib/commands/ *.c * src/lib/commands/ *.c
*/ */
extern int check_market(void); extern int check_market(void);
extern int edit_sect(struct sctstr *, char *, char *);
extern int edit_sect_i(struct sctstr *, char *, int);
extern int load_comm_ok(struct sctstr *, natid, i_type, int); extern int load_comm_ok(struct sctstr *, natid, i_type, int);
extern void gift(natid, natid, void *, char *); extern void gift(natid, natid, void *, char *);
extern int display_mark(i_type, int); extern int display_mark(i_type, int);
@ -63,7 +65,6 @@ extern int nav_map(int, int, int);
extern int do_unit_move(struct emp_qelem *, int *, double *, double *); extern int do_unit_move(struct emp_qelem *, int *, double *, double *);
extern int count_pop(int); extern int count_pop(int);
extern int scuttle_tradeship(struct shpstr *, int); extern int scuttle_tradeship(struct shpstr *, int);
extern void resnoise(struct sctstr *, char *, int, int);
extern int line_of_sight(char **rad, int ax, int ay, int bx, int by); extern int line_of_sight(char **rad, int ax, int ay, int bx, int by);
extern void plane_sona(struct emp_qelem *, int, int, struct shiplist **); extern void plane_sona(struct emp_qelem *, int, int, struct shiplist **);
extern char *prsub(struct shpstr *); extern char *prsub(struct shpstr *);

6
src/lib/commands/edit.c
View file

@ -54,8 +54,6 @@ static void print_plane(struct plnstr *);
static void print_land(struct lndstr *); static void print_land(struct lndstr *);
static void print_ship(struct shpstr *); static void print_ship(struct shpstr *);
static char *getin(char *, char **); static char *getin(char *, char **);
static int edit_sect(struct sctstr *, char *, char *);
static int edit_sect_i(struct sctstr *, char *, int);
static int edit_nat(struct natstr *, char *, char *); static int edit_nat(struct natstr *, char *, char *);
static int edit_ship(struct shpstr *, char *, char *); static int edit_ship(struct shpstr *, char *, char *);
static int edit_land(struct lndstr *, char *, char *); static int edit_land(struct lndstr *, char *, char *);
@ -415,7 +413,7 @@ warn_deprecated(char key)
} }
#endif #endif
static int int
edit_sect_i(struct sctstr *sect, char *key, int arg) edit_sect_i(struct sctstr *sect, char *key, int arg)
{ {
int new; int new;
@ -573,7 +571,7 @@ edit_sect_i(struct sctstr *sect, char *key, int arg)
return RET_OK; return RET_OK;
} }
static int int
edit_sect(struct sctstr *sect, char *key, char *p) edit_sect(struct sctstr *sect, char *key, char *p)
{ {
coord newx, newy; coord newx, newy;

23
src/lib/commands/setres.c
View file

@ -45,7 +45,7 @@ setres(void)
{ {
struct sctstr sect; struct sctstr sect;
char *what; char *what;
int amt; int ret;
char *p; char *p;
struct nstr_sect nstr; struct nstr_sect nstr;
char buf[1024]; char buf[1024];
@ -64,35 +64,30 @@ setres(void)
p = getstarg(player->argp[3], "What value : ", buf); p = getstarg(player->argp[3], "What value : ", buf);
if (!p || !*p) if (!p || !*p)
return RET_SYN; return RET_SYN;
amt = atoi(p);
amt = LIMIT_TO(amt, 0, 100);
if (!check_sect_ok(&sect)) if (!check_sect_ok(&sect))
return RET_FAIL; return RET_FAIL;
switch (char0) { switch (char0) {
case 'i': case 'i':
resnoise(&sect, "Iron ore content", sect.sct_min, amt); ret = edit_sect(&sect, "i", p);
sect.sct_min = (unsigned char)amt;
break; break;
case 'g': case 'g':
resnoise(&sect, "Gold content", sect.sct_gmin, amt); ret = edit_sect(&sect, "g", p);
sect.sct_gmin = (unsigned char)amt;
break; break;
case 'o': case 'o':
resnoise(&sect, "Oil content", sect.sct_oil, amt); ret = edit_sect(&sect, "c", p);
sect.sct_oil = (unsigned char)amt;
break; break;
case 'f': case 'f':
resnoise(&sect, "Fertility content", sect.sct_fertil, amt); ret = edit_sect(&sect, "f", p);
sect.sct_fertil = (unsigned char)amt;
break; break;
case 'u': case 'u':
resnoise(&sect, "Uranium content", sect.sct_uran, amt); ret = edit_sect(&sect, "u", p);
sect.sct_uran = (unsigned char)amt;
break; break;
default: default:
pr("huh?\n"); pr("huh?\n");
return RET_SYN; ret = RET_SYN;
} }
if (ret != RET_OK)
return ret;
putsect(&sect); putsect(&sect);
} }
return RET_OK; return RET_OK;

135
src/lib/commands/setsect.c
View file

@ -35,10 +35,6 @@
#include <config.h> #include <config.h>
#include "commands.h" #include "commands.h"
#include "news.h"
#include "optlist.h"
static void resbenefit(natid, int);
/* /*
* format: setres thing <sect> <#> * format: setres thing <sect> <#>
@ -48,7 +44,7 @@ setsector(void)
{ {
struct sctstr sect; struct sctstr sect;
char *what; char *what;
int amt, current; int amt, ret;
char *p; char *p;
struct nstr_sect nstr; struct nstr_sect nstr;
char buf[1024]; char buf[1024];
@ -73,68 +69,22 @@ setsector(void)
return RET_FAIL; return RET_FAIL;
switch (char0) { switch (char0) {
case 'i': case 'i':
current = sect.sct_min; ret = edit_sect_i(&sect, "i", sect.sct_min + amt);
current += amt;
current = LIMIT_TO(current, 0, 100);
resnoise(&sect, "Iron ore content", sect.sct_min, current);
sect.sct_min = (unsigned char)current;
break; break;
case 'g': case 'g':
current = sect.sct_gmin; ret = edit_sect_i(&sect, "g", sect.sct_gmin + amt);
current += amt;
current = LIMIT_TO(current, 0, 100);
resnoise(&sect, "Gold content", sect.sct_gmin, current);
sect.sct_gmin = (unsigned char)current;
break; break;
case 'o': case 'o':
switch (char1) { switch (char1) {
case 'i': case 'i':
current = sect.sct_oil; ret = edit_sect_i(&sect, "c", sect.sct_oil + amt);
current += amt; break;
current = LIMIT_TO(current, 0, 100);
resnoise(&sect, "Oil content", sect.sct_oil, current);
sect.sct_oil = (unsigned char)current;
break; break;
case 'w': case 'w':
if ((amt < 0) || (amt > MAXNOC - 1)) ret = edit_sect(&sect, "o", p);
return RET_SYN;
pr("Owner of %s changed from %s to %s.\n",
xyas(sect.sct_x, sect.sct_y, player->cnum),
prnatid(sect.sct_own), prnatid(amt));
if (amt == sect.sct_own)
break;
if (sect.sct_own && sect.sct_own != player->cnum) {
wu(0, sect.sct_own,
"Sector %s taken from you by an act of %s!\n",
xyas(sect.sct_x, sect.sct_y, sect.sct_own),
cname(player->cnum));
resbenefit(sect.sct_own, -1);
}
if (amt && amt != player->cnum) {
wu(0, amt,
"Sector %s given to you by an act of %s!\n",
xyas(sect.sct_x, sect.sct_y, amt),
cname(player->cnum));
resbenefit(amt, 1);
}
sect.sct_own = (natid)amt;
break; break;
case 'l': case 'l':
if ((amt < 0) || (amt > MAXNOC - 1)) ret = edit_sect(&sect, "O", p);
return RET_SYN;
pr("Old owner of %s changed from %s to %s.\n",
xyas(sect.sct_x, sect.sct_y, player->cnum),
prnatid(sect.sct_oldown), prnatid(amt));
if (amt == sect.sct_oldown)
break;
if (sect.sct_own && sect.sct_own != player->cnum)
wu(0, sect.sct_own,
"Old owner of %s changed from %s to %s"
" by an act of %s\n",
xyas(sect.sct_x, sect.sct_y, player->cnum),
prnatid(sect.sct_oldown), prnatid(amt),
cname(player->cnum));
sect.sct_oldown = (natid)amt;
break; break;
default: default:
pr("huh?\n"); pr("huh?\n");
@ -142,32 +92,15 @@ setsector(void)
} }
break; break;
case 'e': case 'e':
current = sect.sct_effic; ret = edit_sect_i(&sect, "e", sect.sct_effic + amt);
current += amt;
current = LIMIT_TO(current, 0, 100);
resnoise(&sect, "Efficiency", sect.sct_effic, current);
sect.sct_effic = current;
break; break;
case 'm': case 'm':
switch (char1) { switch (char1) {
case 'i': case 'i':
current = sect.sct_mines; ret = edit_sect_i(&sect, "M", sect.sct_mines + amt);
current += amt;
current = LIMIT_TO(current, 0, MINES_MAX);
if (sect.sct_own == sect.sct_oldown)
resnoise(&sect, "Mines", sect.sct_mines, current);
else
pr("Mines of %s changed from %d to %d\n",
xyas(sect.sct_x, sect.sct_y, player->cnum),
sect.sct_mines, current);
sect.sct_mines = current;
break; break;
case 'o': case 'o':
current = sect.sct_mobil; ret = edit_sect_i(&sect, "m", sect.sct_mobil + amt);
current += amt;
current = LIMIT_TO(current, -127, 127);
resnoise(&sect, "Mobility", sect.sct_mobil, current);
sect.sct_mobil = current;
break; break;
default: default:
pr("huh?\n"); pr("huh?\n");
@ -175,58 +108,24 @@ setsector(void)
} }
break; break;
case 'a': case 'a':
current = sect.sct_avail; ret = edit_sect_i(&sect, "a", sect.sct_avail + amt);
current += amt;
current = LIMIT_TO(current, 0, 9999);
resnoise(&sect, "Available workforce", sect.sct_avail, current);
sect.sct_avail = (short)current;
break; break;
case 'w': case 'w':
current = sect.sct_work; ret = edit_sect_i(&sect, "w", sect.sct_work + amt);
current += amt;
current = LIMIT_TO(current, 0, 100);
resnoise(&sect, "Workforce percentage", sect.sct_work, current);
sect.sct_work = (unsigned char)current;
break; break;
case 'f': case 'f':
current = sect.sct_fertil; ret = edit_sect_i(&sect, "f", sect.sct_fertil + amt);
current += amt;
current = LIMIT_TO(current, 0, 100);
resnoise(&sect, "Fertility content", sect.sct_fertil, current);
sect.sct_fertil = (unsigned char)current;
break; break;
case 'u': case 'u':
current = sect.sct_uran; ret = edit_sect_i(&sect, "u", sect.sct_uran + amt);
current += amt;
current = LIMIT_TO(current, 0, 100);
resnoise(&sect, "Uranium content", sect.sct_uran, current);
sect.sct_uran = (unsigned char)current;
break; break;
default: default:
pr("huh?\n"); pr("huh?\n");
return RET_SYN; ret = RET_SYN;
} }
if (ret != RET_OK)
return ret;
putsect(&sect); putsect(&sect);
} }
return RET_OK; return RET_OK;
} }
static void
resbenefit(natid who, int goodness)
{
if (opt_GODNEWS && getnatp(who)->nat_stat != STAT_GOD && goodness)
nreport(player->cnum, goodness > 0 ? N_AIDS : N_HURTS, who, 1);
}
void
resnoise(struct sctstr *sptr, char *name, int old, int new)
{
pr("%s of %s changed from %d to %d\n",
name, xyas(sptr->sct_x, sptr->sct_y, player->cnum), old, new);
if (sptr->sct_own && sptr->sct_own != player->cnum && new != old)
wu(0, sptr->sct_own,
"%s in %s was changed from %d to %d by an act of %s\n",
name, xyas(sptr->sct_x, sptr->sct_y, sptr->sct_own),
old, new, cname(player->cnum));
resbenefit(sptr->sct_own, new - old);
}

36
tests/actofgod/journal.log
View file

@ -320,37 +320,37 @@
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input setres f 2,2 0 Play#0 input setres f 2,2 0
Play#0 command setresource Play#0 command setresource
Play#0 output Play#0 1 Fertility content of 2,2 changed from 0 to 0 Play#0 output Play#0 1 Fertility of 2,2 changed from 0 to 0
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input setres f 4,2 -1 Play#0 input setres f 4,2 -1
Play#0 command setresource Play#0 command setresource
Play#0 output Play#0 1 Fertility content of 4,2 changed from 0 to 0 Play#0 output Play#0 1 Fertility of 4,2 changed from 0 to 0
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input setres f 6,2 100 Play#0 input setres f 6,2 100
Play#0 command setresource Play#0 command setresource
Play#0 output Play#0 1 Fertility content of 6,2 changed from 0 to 100 Play#0 output Play#0 1 Fertility of 6,2 changed from 0 to 100
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input setres f 8,2 101 Play#0 input setres f 8,2 101
Play#0 command setresource Play#0 command setresource
Play#0 output Play#0 1 Fertility content of 8,2 changed from 0 to 100 Play#0 output Play#0 1 Fertility of 8,2 changed from 0 to 100
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input setsect f 1,3 -2147483648 Play#0 input setsect f 1,3 -2147483648
Play#0 command setsector Play#0 command setsector
Play#0 output Play#0 1 Fertility content of 1,3 changed from 0 to 0 Play#0 output Play#0 1 Fertility of 1,3 changed from 0 to 0
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input setsect f 3:7,3 1 Play#0 input setsect f 3:7,3 1
Play#0 command setsector Play#0 command setsector
Play#0 output Play#0 1 Fertility content of 3,3 changed from 0 to 1 Play#0 output Play#0 1 Fertility of 3,3 changed from 0 to 1
Play#0 output Play#0 1 Fertility content of 5,3 changed from 0 to 1 Play#0 output Play#0 1 Fertility of 5,3 changed from 0 to 1
Play#0 output Play#0 1 Fertility content of 7,3 changed from 0 to 1 Play#0 output Play#0 1 Fertility of 7,3 changed from 0 to 1
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input setsect f 5,3 2147483647 Play#0 input setsect f 5,3 2147483647
Play#0 command setsector Play#0 command setsector
Play#0 output Play#0 1 Fertility content of 5,3 changed from 1 to 0 Play#0 output Play#0 1 Fertility of 5,3 changed from 1 to 0
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input setsect f 7,3 -1 Play#0 input setsect f 7,3 -1
Play#0 command setsector Play#0 command setsector
Play#0 output Play#0 1 Fertility content of 7,3 changed from 1 to 0 Play#0 output Play#0 1 Fertility of 7,3 changed from 1 to 0
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit l 1,1 c 0 Play#0 input edit l 1,1 c 0
Play#0 command edit Play#0 command edit
@ -692,7 +692,7 @@
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input setsect f -1,-1 50 Play#0 input setsect f -1,-1 50
Play#0 command setsector Play#0 command setsector
Play#0 output Play#0 1 Fertility content of -1,-1 changed from 0 to 50 Play#0 output Play#0 1 Fertility of -1,-1 changed from 0 to 50
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input setsect ol 1:3,-3 1 Play#0 input setsect ol 1:3,-3 1
Play#0 command setsector Play#0 command setsector
@ -1543,13 +1543,13 @@
Play#0 output Play#0 1 Gold content in 7,3 was changed from 1 to 0 by an act of POGO Play#0 output Play#0 1 Gold content in 7,3 was changed from 1 to 0 by an act of POGO
Play#0 output Play#0 1 Fertility in 5,1 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Fertility in 5,1 was changed from 0 to 100 by an act of POGO
Play#0 output Play#0 1 Fertility in 7,1 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Fertility in 7,1 was changed from 0 to 100 by an act of POGO
Play#0 output Play#0 1 Fertility content in 6,2 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Fertility in 6,2 was changed from 0 to 100 by an act of POGO
Play#0 output Play#0 1 Fertility content in 8,2 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Fertility in 8,2 was changed from 0 to 100 by an act of POGO
Play#0 output Play#0 1 Fertility content in 3,3 was changed from 0 to 1 by an act of POGO Play#0 output Play#0 1 Fertility in 3,3 was changed from 0 to 1 by an act of POGO
Play#0 output Play#0 1 Fertility content in 5,3 was changed from 0 to 1 by an act of POGO Play#0 output Play#0 1 Fertility in 5,3 was changed from 0 to 1 by an act of POGO
Play#0 output Play#0 1 Fertility content in 7,3 was changed from 0 to 1 by an act of POGO Play#0 output Play#0 1 Fertility in 7,3 was changed from 0 to 1 by an act of POGO
Play#0 output Play#0 1 Fertility content in 5,3 was changed from 1 to 0 by an act of POGO Play#0 output Play#0 1 Fertility in 5,3 was changed from 1 to 0 by an act of POGO
Play#0 output Play#0 1 Fertility content in 7,3 was changed from 1 to 0 by an act of POGO Play#0 output Play#0 1 Fertility in 7,3 was changed from 1 to 0 by an act of POGO
Play#0 output Play#0 1 Oil content in 5,1 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Oil content in 5,1 was changed from 0 to 100 by an act of POGO
Play#0 output Play#0 1 Oil content in 7,1 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Oil content in 7,1 was changed from 0 to 100 by an act of POGO
Play#0 output Play#0 1 Oil content in 6,2 was changed from 0 to 100 by an act of POGO Play#0 output Play#0 1 Oil content in 6,2 was changed from 0 to 100 by an act of POGO