From 161e6ada263c291ff3a49b1d9f371ca5f6a1751f Mon Sep 17 00:00:00 2001 Message-Id: <161e6ada263c291ff3a49b1d9f371ca5f6a1751f.1714839670.git.mdw@distorted.org.uk> From: Mark Wooding Date: Fri, 7 Mar 2003 00:41:46 +0000 Subject: [PATCH] Track Elite package interface change. Organization: Straylight/Edgeware From: mdw --- elite-cmdr | 6 +++--- elite-describe | 4 ++-- elite-find | 4 ++-- elite-map | 18 +++++++----------- elite-pairs | 17 +++++++---------- elite-prices | 4 ++-- elite-reach | 15 +++++---------- 7 files changed, 28 insertions(+), 40 deletions(-) diff --git a/elite-cmdr b/elite-cmdr index d94b04b..e534158 100755 --- a/elite-cmdr +++ b/elite-cmdr @@ -1,6 +1,6 @@ #! /usr/bin/tclsh -package require "elite" "1.0.0" +package require "elite" "1.0.1" if {[llength $argv] < 1} { puts stderr "usage: $argv0 \[-OPTION | ATTR | ATTR=VALUE\] ..." @@ -76,7 +76,7 @@ proc set/seed {a v} { proc get/world {a} { global cmdr gov eco - set ww [worldinfo $cmdr(gal-seed)] + set ww [elite-galaxylist $cmdr(gal-seed)] set s [nearest-planet $ww \ [expr {$cmdr(world-x) * 4}] [expr {$cmdr(world-y) * 2}]] elite-worldinfo p $s @@ -90,7 +90,7 @@ proc dump/world {a} { } proc set/world {a v} { global cmdr - set ww [worldinfo $cmdr(gal-seed)] + set ww [elite-galaxylist $cmdr(gal-seed)] set s [parse-planet-spec $cmdr(gal-seed) $v] if {[string equal $s ""]} { error "bad planet spec `$v'" } if {![in-galaxy-p $cmdr(gal-seed) $s]} { diff --git a/elite-describe b/elite-describe index 7b05c16..1d16e50 100755 --- a/elite-describe +++ b/elite-describe @@ -1,8 +1,8 @@ #! /usr/bin/tclsh # -# $Id: elite-describe,v 1.2 2003/02/25 00:25:38 mdw Exp $ +# $Id: elite-describe,v 1.3 2003/03/07 00:41:46 mdw Exp $ -package require "elite" "1.0.0" +package require "elite" "1.0.1" proc describe n { global economy government diff --git a/elite-find b/elite-find index 1eb5f3f..13a0f21 100755 --- a/elite-find +++ b/elite-find @@ -1,8 +1,8 @@ #! /usr/bin/tclsh # -# $Id: elite-find,v 1.2 2003/02/25 00:25:38 mdw Exp $ +# $Id: elite-find,v 1.3 2003/03/07 00:41:46 mdw Exp $ -package require "elite" "1.0.0" +package require "elite" "1.0.1" proc ok {s vv expr} { global argv0 diff --git a/elite-map b/elite-map index 72f3a85..61eea9e 100755 --- a/elite-map +++ b/elite-map @@ -1,6 +1,6 @@ #! /usr/bin/tclsh # -# $Id: elite-map,v 1.3 2003/02/26 01:12:57 mdw Exp $ +# $Id: elite-map,v 1.4 2003/03/07 00:41:46 mdw Exp $ package require "elite" "1.0.0" @@ -109,7 +109,7 @@ proc show-key {l {n {}}} { set out [format "%2s %s" $sy [world-summary $s]] if {[llength $n]} { append out [format " (%.1f LY)" \ - [expr {[world-distance $p(x) $p(y) $pp(x) $pp(y)]/10.0}]] + [expr {[elite-distance $p(x) $p(y) $pp(x) $pp(y)]/10.0}]] } puts $out } @@ -138,7 +138,7 @@ for {set i 0} {$i < [llength $argv]} {incr i} { } "-d" { incr i - set d [expr {[lindex $argv $i] * 10}] + set d [expr {int([lindex $argv $i] * 10)}] } "-W" { incr i @@ -182,18 +182,14 @@ for {set i 0} {$i < [llength $argv]} {incr i} { } set p [lrange $argv $i end] -set ww [worldinfo $g] +set ww [elite-galaxylist $g] if {![llength $p]} { set n {} set rt {} set w $ww incr v -1 } else { - if {![string equal $weight ""]} { - puts -nonewline stderr "\[computing adjacency table..." - adjacency $ww adj - puts stderr " done\]" - } + if {![string equal $weight ""]} { elite-adjacency adj $ww $d } set n {} foreach a $p { set s [parse-planet-spec $g $a] @@ -209,8 +205,8 @@ if {![llength $p]} { foreach w [lrange $n 1 end] { destructure {p .} [shortest-path adj $home $w $weight] if {![llength $p]} { - puts -stderr \ - "$argv0: no route from [worldinfo $home] to [worldinfo $w]" + puts stderr \ + "$argv0: no route from [worldname $home] to [worldname $w]" exit 1 } eval lappend rt $p diff --git a/elite-pairs b/elite-pairs index d4ce23a..5a435cf 100755 --- a/elite-pairs +++ b/elite-pairs @@ -1,8 +1,8 @@ #! /usr/bin/tclsh # -# $Id: elite-pairs,v 1.3 2003/02/26 00:02:51 mdw Exp $ +# $Id: elite-pairs,v 1.4 2003/03/07 00:41:46 mdw Exp $ -package require "elite" "1.0.0" +package require "elite" "1.0.1" proc ok {s vv expr} { global argv0 @@ -47,7 +47,7 @@ for {set i 0} {$i < [llength $argv]} {incr i} { } "-d" { incr i - set d [expr {[lindex $argv $i] * 10}] + set d [expr {int([lindex $argv $i] * 10)}] } "-v" { incr v @@ -73,20 +73,17 @@ if {$i != [llength $argv] - 2} { exit 1 } destructure {aexpr bexpr} [lrange $argv $i end] -puts -nonewline stderr "\[computing adjacency table..." -flush stderr -set ww [worldinfo $g] -adjacency $ww adj $d -puts stderr " done\]" +set ww [elite-galaxylist $g] +elite-adjacency adj $ww $d unset a foreach {s x y} $ww { if {![ok $s {} $aexpr]} { continue } elite-worldinfo a $s set l {} foreach {ss xx yy} $adj($s) { - set d [world-distance $x $y $xx $yy] + set d [elite-distance $x $y $xx $yy] if {[ok $ss {a d} $bexpr]} { - set d [expr {[world-distance $x $y $xx $yy]/10.0}] + set d [expr {[elite-distance $x $y $xx $yy]/10.0}] if {$v} { puts [format "%s (%.1f LY)" [world-summary $s] $d] puts [world-summary $ss] diff --git a/elite-prices b/elite-prices index e5c6c50..07ad778 100755 --- a/elite-prices +++ b/elite-prices @@ -1,8 +1,8 @@ #! /usr/bin/tclsh # -# $Id: elite-prices,v 1.3 2003/02/26 00:03:08 mdw Exp $ +# $Id: elite-prices,v 1.4 2003/03/07 00:41:46 mdw Exp $ -package require "elite" "1.0.0" +package require "elite" "1.0.1" foreach-world $galaxy1 p { set econame $eco($p(economy)) diff --git a/elite-reach b/elite-reach index 918d09b..7e72204 100755 --- a/elite-reach +++ b/elite-reach @@ -1,16 +1,12 @@ #! /usr/bin/tclsh # -# $Id: elite-reach,v 1.2 2003/02/25 00:25:38 mdw Exp $ +# $Id: elite-reach,v 1.3 2003/03/07 00:41:46 mdw Exp $ -package require "elite" "1.0.0" +package require "elite" "1.0.1" proc reach {dist seed} { - set ww [worldinfo $seed] - puts -nonewline stderr "\[computing adjacency table..." - adjacency $ww a $dist - puts stderr " done\]" - puts -nonewline stderr "\[painting..." - flush stdout + set ww [elite-galaxylist $seed] + elite-adjacency a $ww $dist foreach {s x w} $ww { set p($s) 1 } set pp {} while 1 { @@ -34,7 +30,6 @@ proc reach {dist seed} { } lappend pp $cc } - puts stderr " done\]\n" foreach cc $pp { set de 1 set l {} @@ -63,7 +58,7 @@ for {set i 0} {$i < [llength $argv]} {incr i} { switch -glob -- $a { "-d" { incr i - set d [expr {[lindex $argv $i] * 10}] + set d [expr {int([lindex $argv $i] * 10)}] } "-*" { puts stderr "usage: $argv0 \[-d DIST\] \[GALAXY ...\]" -- [mdw]