From 316436bcfad54259583a0cc1a0185b458835a783 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 23 Apr 2011 08:05:40 +0200 Subject: [PATCH] Create nukes at the tech level permitted by research The tech level is visible to players, but currently has no effect. --- src/lib/commands/buil.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/lib/commands/buil.c b/src/lib/commands/buil.c index ebf7de3e..456f28b5 100644 --- a/src/lib/commands/buil.c +++ b/src/lib/commands/buil.c @@ -183,19 +183,16 @@ buil(void) if (type >= 0) { np = &nchr[type]; rqtech = np->n_tech; - if (rqtech > tlev - || (drnuke_const > MIN_DRNUKE_CONST && - np->n_tech * drnuke_const > rlev)) + if (drnuke_const > MIN_DRNUKE_CONST) + tlev = (tlev < (rlev / drnuke_const) ? (int)tlev : + (int)(rlev / drnuke_const)); + if (rqtech > tlev) type = -1; } if (type < 0) { - int tt = tlev; - if (drnuke_const > MIN_DRNUKE_CONST) - tt = (tlev < (rlev / drnuke_const) ? (int)tlev : - (int)(rlev / drnuke_const)); pr("You can't build that!\n"); pr("Use `show nuke build %d' to show types you can build.\n", - tt); + tlev); return RET_FAIL; } break;