fire: Change "Sector X,Y firing" to "Sector X,Y ready to fire"
It's not firing, yet. While there, trim an unwanted blank line before reporting the first sector ready. Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
parent
6b3827523e
commit
cb05f13c93
2 changed files with 36 additions and 67 deletions
|
|
@ -80,6 +80,7 @@ multifire(void)
|
|||
struct shpstr fship;
|
||||
struct lndstr fland;
|
||||
struct sctstr fsect;
|
||||
char *sep = "";
|
||||
struct shpstr vship;
|
||||
struct sctstr vsect;
|
||||
enum targ_type target;
|
||||
|
|
@ -210,11 +211,12 @@ multifire(void)
|
|||
xyas(item.sect.sct_x, item.sect.sct_y, player->cnum));
|
||||
continue;
|
||||
}
|
||||
pr("\nSector %s firing\n",
|
||||
pr("%sSector %s ready to fire\n", sep,
|
||||
xyas(item.sect.sct_x, item.sect.sct_y, player->cnum));
|
||||
fx = fsect.sct_x;
|
||||
fy = fsect.sct_y;
|
||||
}
|
||||
sep = "\n";
|
||||
|
||||
ptr = getstarg(player->argp[3], "Firing at? ", buf);
|
||||
if (!ptr)
|
||||
|
|
|
|||
|
|
@ -57,20 +57,17 @@
|
|||
Play#1 output Play#1 6 0 637
|
||||
Play#1 input fire se 0,0 0,0
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 0,0 firing
|
||||
Play#1 output Play#1 1 Sector 0,0 ready to fire
|
||||
Play#1 output Play#1 1 You can't fire upon yourself!
|
||||
Play#1 output Play#1 6 0 636
|
||||
Play#1 input fire se 0,0 1,0
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 0,0 firing
|
||||
Play#1 output Play#1 1 Sector 0,0 ready to fire
|
||||
Play#1 output Play#1 1 No such sector exists!
|
||||
Play#1 output Play#1 6 0 635
|
||||
Play#1 input fire se 0,0 666
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 0,0 firing
|
||||
Play#1 output Play#1 1 Sector 0,0 ready to fire
|
||||
Play#1 output Play#1 1 No such ship exists!
|
||||
Play#1 output Play#1 6 0 634
|
||||
Play#1 input move m 0,0 1 nh
|
||||
|
|
@ -117,80 +114,69 @@
|
|||
Play#1 output Play#1 6 0 625
|
||||
Play#1 input fire se 4,0 -12,0
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 5.00 (4.50)
|
||||
Play#1 output Play#1 1 Target out of range.
|
||||
Play#1 output Play#1 6 0 624
|
||||
Play#1 input fire se 4,0 0
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 5.00 (4.50)
|
||||
Play#1 output Play#1 1 Target out of range.
|
||||
Play#1 output Play#1 6 0 623
|
||||
Play#1 input fire se 4,0 13
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 4.00 (4.50)
|
||||
Play#1 output Play#1 1 Target out of range.
|
||||
Play#1 output Play#1 6 0 622
|
||||
Play#1 input fire se 4,0 12
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 4.00 (4.50)
|
||||
Play#1 output Play#1 1 Target out of range.
|
||||
Play#1 output Play#1 6 0 621
|
||||
Play#1 input fire se 4,0 14,0
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 4.00 (4.50)
|
||||
Play#1 output Play#1 1 Target out of range.
|
||||
Play#1 output Play#1 6 0 620
|
||||
Play#1 input fire se 4,0 14,0
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 4.00 (4.50)
|
||||
Play#1 output Play#1 1 Target out of range.
|
||||
Play#1 output Play#1 6 0 619
|
||||
Play#1 input fire se 4,0 14,0
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 5.00 (4.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit sector 14,0 for 22 damage.
|
||||
Play#1 output Play#1 6 0 618
|
||||
Play#1 input fire se 4,0 14,0
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 4.00 (4.50)
|
||||
Play#1 output Play#1 1 Target out of range.
|
||||
Play#1 output Play#1 6 0 617
|
||||
Play#1 input fire se 4,0 14,0
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 4.00 (4.50)
|
||||
Play#1 output Play#1 1 Target out of range.
|
||||
Play#1 output Play#1 6 0 616
|
||||
Play#1 input fire se 4,0 14,0
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 5.00 (4.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit sector 14,0 for 39 damage.
|
||||
Play#1 output Play#1 6 0 615
|
||||
Play#1 input fire se 4,0 2,-2
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 5.00 (4.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit sector 2,-2 for 21 damage.
|
||||
|
|
@ -202,88 +188,77 @@
|
|||
Play#1 output Play#1 6 0 613
|
||||
Play#1 input fire se 0,0 -2,-2
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 0,0 firing
|
||||
Play#1 output Play#1 1 Sector 0,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 3.00 (3.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit sector -2,-2 for 0 damage.
|
||||
Play#1 output Play#1 6 0 612
|
||||
Play#1 input fire se 2,0 -2,-2
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 2,0 firing
|
||||
Play#1 output Play#1 1 Sector 2,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 5.00 (4.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit sector -2,-2 for 5 damage.
|
||||
Play#1 output Play#1 6 0 611
|
||||
Play#1 input fire se 4,0 -2,-2
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 5.00 (4.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit sector -2,-2 for 43 damage.
|
||||
Play#1 output Play#1 6 0 610
|
||||
Play#1 input fire se 0,0 4,2
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 0,0 firing
|
||||
Play#1 output Play#1 1 Sector 0,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 3.00 (3.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit sector 4,2 for 0 damage.
|
||||
Play#1 output Play#1 6 0 609
|
||||
Play#1 input fire se 2,0 4,2
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 2,0 firing
|
||||
Play#1 output Play#1 1 Sector 2,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 5.00 (4.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit sector 4,2 for 3 damage.
|
||||
Play#1 output Play#1 6 0 608
|
||||
Play#1 input fire se 4,0 1,3
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 5.00 (4.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit sector 1,3 for 29 damage.
|
||||
Play#1 output Play#1 6 0 607
|
||||
Play#1 input fire se 0,0 2,2
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 0,0 firing
|
||||
Play#1 output Play#1 1 Sector 0,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 4.00 (3.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit sector 2,2 for 0 damage.
|
||||
Play#1 output Play#1 6 0 606
|
||||
Play#1 input fire se 2,0 2,2
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 2,0 firing
|
||||
Play#1 output Play#1 1 Sector 2,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 5.00 (4.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit sector 2,2 for 5 damage.
|
||||
Play#1 output Play#1 6 0 605
|
||||
Play#1 input fire se 4,0 2,2
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 4.00 (4.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit sector 2,2 for 21 damage.
|
||||
Play#1 output Play#1 6 0 604
|
||||
Play#1 input fire se 0,0 9
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 0,0 firing
|
||||
Play#1 output Play#1 1 Sector 0,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 4.00 (3.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit cs cargo ship (#9) in 3,1 for 0 damage.
|
||||
Play#1 output Play#1 6 0 603
|
||||
Play#1 input fire se 2,0 9
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 2,0 firing
|
||||
Play#1 output Play#1 1 Sector 2,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 4.00 (4.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit cs cargo ship (#9) in 3,1 for 3 damage.
|
||||
|
|
@ -294,32 +269,28 @@
|
|||
Play#1 output Play#1 6 0 603
|
||||
Play#1 input fire se 0,0 23
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 0,0 firing
|
||||
Play#1 output Play#1 1 Sector 0,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 3.00 (3.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit cs cargo ship (#23) in 6,0 for 0 damage.
|
||||
Play#1 output Play#1 6 0 602
|
||||
Play#1 input fire se 2,0 23
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 2,0 firing
|
||||
Play#1 output Play#1 1 Sector 2,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 4.00 (4.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit cs cargo ship (#23) in 6,0 for 2 damage.
|
||||
Play#1 output Play#1 6 0 601
|
||||
Play#1 input fire se 4,0 23
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 4.00 (4.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit cs cargo ship (#23) in 8,0 for 26 damage.
|
||||
Play#1 output Play#1 6 0 600
|
||||
Play#1 input fire se 4,0 21
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 5.00 (4.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit cs cargo ship (#21) in 6,0 for 24 damage.
|
||||
|
|
@ -327,32 +298,28 @@
|
|||
Play#1 output Play#1 6 0 599
|
||||
Play#1 input fire se 0,0 22
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 0,0 firing
|
||||
Play#1 output Play#1 1 Sector 0,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 4.00 (3.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit cs cargo ship (#22) in 2,2 for 0 damage.
|
||||
Play#1 output Play#1 6 0 598
|
||||
Play#1 input fire se 2,0 22
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 2,0 firing
|
||||
Play#1 output Play#1 1 Sector 2,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 5.00 (4.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit cs cargo ship (#22) in 2,2 for 4 damage.
|
||||
Play#1 output Play#1 6 0 597
|
||||
Play#1 input fire se 4,0 22
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 5.00 (4.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit cs cargo ship (#22) in 2,2 for 49 damage.
|
||||
Play#1 output Play#1 6 0 596
|
||||
Play#1 input fire se 4,0 20
|
||||
Play#1 command fire
|
||||
Play#1 output Play#1 1
|
||||
Play#1 output Play#1 1 Sector 4,0 firing
|
||||
Play#1 output Play#1 1 Sector 4,0 ready to fire
|
||||
Play#1 output Play#1 1 range is 4.00 (4.50)
|
||||
Play#1 output Play#1 1 \007Kaboom!!!
|
||||
Play#1 output Play#1 1 Shells hit cs cargo ship (#20) in 2,2 for 27 damage.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue