diff options
| -rw-r--r-- | TODO.md | 2 | ||||
| -rw-r--r-- | tsalis/README.md | 17 | ||||
| -rw-r--r-- | tsalis/src/printer.c | 2 | ||||
| -rw-r--r-- | tsalis/src/tsalis.c | 13 |
4 files changed, 18 insertions, 16 deletions
@@ -3,7 +3,6 @@ - Reward organisms for "eating" information ## TSALIS UPDATES -- Better CLI arguments - Create process cursor selector (on WORLD and PROCESS view) - Better console: - Console resumes sim after closing @@ -15,6 +14,7 @@ - Make save files portable ## PYTHON PLUGINS/APPS +- PySalis simulation runner script - Create REPORT app that reads many savefiles and generates data files from: - Organism sizes - Instruction count diff --git a/tsalis/README.md b/tsalis/README.md index bb50c38..4b9709f 100644 --- a/tsalis/README.md +++ b/tsalis/README.md @@ -15,17 +15,19 @@ let me know! ## List of commands ### Command-line arguments -You may run *TSALIS* from the terminal in any of these three ways (arguments +You may run *TSALIS* from the terminal in any of the following ways (arguments are being represented by *XX*). Note that, upon exit, *SALIS* automatically generates a save (by default called *def.sim*). This save file may be freely renamed and reloaded as needed. -|Arguments |Action | -|:--------------|-------------------------------------------------------------------------------:| -|tsalis |If file *def.sim* exists in directory, loads simulation from that file. | -|tsalis |If file *def.sim* does not exist, creates new simulation (memory size 2^16). | -|tsalis n*XX* |Creates new simulation with memory size 2^*XX*. | -|tsalis l*XX* |Loads simulation from file named *XX*. | +|Arguments |Action | +|:------------------|-------------------------------------------------------------------------------:| +|tsalis |If file *def.sim* exists in directory, loads simulation from that file. | +|tsalis |If file *def.sim* does not exist, creates new simulation (memory size 2^16). | +|tsalis -n *XX* |Creates new simulation with memory size 2^*XX*. | +|tsalis --new *XX* |Creates new simulation with memory size 2^*XX*. | +|tsalis -l *XX* |Loads simulation from file named *XX*. | +|tsalis --load *XX* |Loads simulation from file named *XX*. | ### Keyboard commands |Key |Action | @@ -33,6 +35,7 @@ renamed and reloaded as needed. |Left arrow |Previous page | |Right arrow |Next page | |wasd |Scroll (PROCESS and WORLD page) | +|WA |Fast vertical scroll (PROCESS and WORLD page) | |Q |Scroll to top (PROCESS and WORLD page) | |A |Scroll to left (PROCESS page) | |zx |Zoom in/out (WORLD page) | diff --git a/tsalis/src/printer.c b/tsalis/src/printer.c index c835f24..ec01ada 100644 --- a/tsalis/src/printer.c +++ b/tsalis/src/printer.c @@ -102,12 +102,14 @@ tsp_check(void) return SFALSE; } + endwin(); return STRUE; } void tsp_init(void) { + initscr(); cbreak(); noecho(); curs_set(0); diff --git a/tsalis/src/tsalis.c b/tsalis/src/tsalis.c index 7722ca9..dc57fa4 100644 --- a/tsalis/src/tsalis.c +++ b/tsalis/src/tsalis.c @@ -59,14 +59,11 @@ init(int argc, char **argv) if (argc == 1) { onDefault(); - } else if (argc == 2) { - char cmd = argv[1][0]; - char *val = &argv[1][1]; - - if (cmd == 'n') { - s_init(atoi(val)); - } else if (cmd == 'l') { - onLoad(val); + } else if (argc == 3) { + if (!strcmp(argv[1], "-n") || !strcmp(argv[1], "--new")) { + s_init(atoi(argv[2])); + } else if (!strcmp(argv[1], "-l") || !strcmp(argv[1], "--load")) { + onLoad(argv[2]); } else { fputs("ERROR: Incorrect arguments\n", stderr); exit(1); |