commands: Rename the command functions

[empserver] / src / lib / commands / assa.c

diff --git a/src/lib/commands/assa.c b/src/lib/commands/assa.c
index d1e60d979aa8ce623388935f7a84c238d3a31439..2812e0e9ce685b731072206fb6890906417bb2dd 100644 (file)
--- a/src/lib/commands/assa.c
+++ b/src/lib/commands/assa.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -45,7 +45,7 @@ static void sneak_ashore(struct combat[], struct emp_qelem *,
                         struct combat *);
 
 int
-assa(void)
+c_assault(void)
 {
     struct combat off[1];      /* assaulting ship */
     struct combat def[1];      /* defending sector */
@@ -192,7 +192,7 @@ sneak_ashore(struct combat off[], struct emp_qelem *olist,
     struct emp_qelem *qp;
     struct ulist *llp;
     struct lndstr *lp;
-    int rel;
+    enum relations rel;
 
     pr("Trying to sneak on shore...\n");
 
@@ -202,7 +202,9 @@ sneak_ashore(struct combat off[], struct emp_qelem *olist,
        llp = (struct ulist *)qp;
        lp = &llp->unit.land;
        rel = relations_with(def->own, player->cnum);
-       if (chance(0.10) || rel == ALLIED || !def->own) {
+       if (rel == ALLIED || !def->own
+           || !chance(LND_SPY_DETECT_CHANCE(lp->lnd_effic / 2))) {
+                               /* eff/2 because this is hard */
            pr("%s made it on shore safely.\n", prland(lp));
        } else {
            pr("%s was spotted", prland(lp));
@@ -216,7 +218,7 @@ sneak_ashore(struct combat off[], struct emp_qelem *olist,
                wu(0, def->own, "%s spy spotted in %s.\n",
                   cname(player->cnum), xyas(def->x, def->y,
                                             def->own));
-               pr(" but made it ok.\n");
+               pr(" but made it OK.\n");
            }
        }
     }