Add more testing

diff --git a/spades.awk b/spades.awk
index c7cf9cbe87c4c250f815d53bdadfaf6419bf6077..c3a281b3bc10dca015d61eb4d2cb55b4060943c2 100644 (file)
--- a/spades.awk
+++ b/spades.awk
@@ -428,6 +428,14 @@ AUTH == OWNER &&
        next
 }
 
        next
 }
 

+AUTH == OWNER &&
+/^\.order (\w+) ([0-4])/ {
+       say(sp_channel, FROM " is cheating for " $2)
+       sp_order[$3] = $2
+       sp_players[$2] = $3
+       sp_player = sp_order[sp_turn]
+}
+

 AUTH == OWNER &&
 sp_state == "play" &&
 /^\.force (\w+) (\S+)$/ {
 AUTH == OWNER &&
 sp_state == "play" &&
 /^\.force (\w+) (\S+)$/ {

diff --git a/test.awk b/test.awk
index 808a8e74514fa2ad2078b98bec50d3541417b10a..7cdc96b5bc596f26bde40e077facf27e8cf578f8 100644 (file)
--- a/test.awk
+++ b/test.awk
@@ -19,7 +19,7 @@ function debug(msg)
        print msg > "/dev/stderr"
 }
 
        print msg > "/dev/stderr"
 }
 

-function command(who, cmd)
+function command(who, cmd, i)

 {
        arg=cmd
        gsub(/\<[nbpYNS]|[+-]/, "", arg)
 {
        arg=cmd
        gsub(/\<[nbpYNS]|[+-]/, "", arg)


@@ -30,6 +30,7 @@ function command(who, cmd)
        else if (cmd ~ /^Y/)      say(who, ".allow " arg)
        else if (cmd ~ /^N/)      say(who, ".deny " arg)
        else if (cmd ~ /^S/)      say(who, ".show ")
        else if (cmd ~ /^Y/)      say(who, ".allow " arg)
        else if (cmd ~ /^N/)      say(who, ".deny " arg)
        else if (cmd ~ /^S/)      say(who, ".show ")

+       else if (cmd ~ /^o/)      say("andy753421", ".order " who " " i)

        else if (cmd ~ /^d/)      say("andy753421", ".deal " who " " hand[who])
        else if (cmd ~ /^l/)      say(who, ".look")
        else if (cmd ~ /^b/)      say(who, ".bid "  arg)
        else if (cmd ~ /^d/)      say("andy753421", ".deal " who " " hand[who])
        else if (cmd ~ /^l/)      say(who, ".look")
        else if (cmd ~ /^b/)      say(who, ".bid "  arg)


@@ -68,9 +69,10 @@ BEGIN {
        who         = parts[1]
        players[pi] = parts[1]
        auths[pi]   = parts[2]
        who         = parts[1]
        players[pi] = parts[1]
        auths[pi]   = parts[2]

-       hand[who]    = $0
-       gsub(/^\w*(\/\w*)?|[nbpYN-]\w+|\<[nejadwlbsBtpdS]\>|[.+]/, "", hand[who])
-       gsub(/^ */, "", hand[who])
+       hand[who]   = $0
+       gsub(/^\w*(\/\w*)?|[nbpYN-]\w+|\<[nejadowlbsBtpdS]\>|[.+]/, "", hand[who])
+       gsub(/^ *| *$/, "", hand[who])
+       gsub(/  */, " ", hand[who])

        print who ": " hand[who] > "/dev/stderr"
        say(who, "unicode :(")
        say(who, "colors :(")
        print who ": " hand[who] > "/dev/stderr"
        say(who, "unicode :(")
        say(who, "colors :(")


@@ -82,6 +84,6 @@ BEGIN {
                        auth(auths[pi], players[pi])
        for (ti=0; ti<nturns; ti++)
                for (pi=0; pi<length(players); pi++)
                        auth(auths[pi], players[pi])
        for (ti=0; ti<nturns; ti++)
                for (pi=0; pi<length(players); pi++)

-                       command(players[pi], turns[pi][ti])
+                       command(players[pi], turns[pi][ti], pi)

        reset()
 }
        reset()
 }

diff --git a/test.txt b/test.txt
index 801460dbf0a97ad6a3cdb77be614a10cacf2f797..fcad0b0486828af23c33803ce8e0c12b203c18fb 100644 (file)
--- a/test.txt
+++ b/test.txt
@@ -50,10 +50,10 @@
 #d/dd:      .        j Yauth  Nauth d b1 .      Ac
 
 # Test sorting
 #d/dd:      .        j Yauth  Nauth d b1 .      Ac
 
 # Test sorting

-a: n j s
-b: . j .
-c: . j .
-d: . j .
+#a: n j s
+#b: . j .
+#c: . j .
+#d: . j .

 
 # Test scoring
 #x: s s s s s s s  s  s  s  s  s
 
 # Test scoring
 #x: s s s s s s s  s  s  s  s  s


@@ -65,16 +65,32 @@ d: . j .
 #c: . . . j . d .  .  b3 .  Ad .
 #d: . . . . j d .  .  .  b3 Ac .
 
 #c: . . . j . d .  .  b3 .  Ad .
 #d: . . . . j d .  .  .  b3 Ac .
 

-# Nil/blind
-#a: n j d l b0  .  .    As Ks Qs Js 10s 9s 8s 7s 6s 5s 4s 3s 2s t e
-#b: . j d . b0 +Ah pAh -Ac Kh Qh Jh 10h 9h 8h 7h 6h 5h 4h 3h 2h s
-#c: . j d . b7  .  .    Ad Kd Qd Jd 10d 9d 8d 7d 6d 5d 4d 3d 2d .
-#d: . j d . b7 +Ac pAc -Ah Kc Qc Jc 10c 9c 8c 7c 6c 5c 4c 3c 2c .
+# Nil/blind (original)
+#a: n j o d l b0  .  .    As Ks Qs Js 10s 9s 8s 7s 6s 5s 4s 3s 2s t e
+#b: . j o d . b0 +Ah pAh -Ac Kh Qh Jh 10h 9h 8h 7h 6h 5h 4h 3h 2h s .
+#c: . j o d . b7  .  .    Ad Kd Qd Jd 10d 9d 8d 7d 6d 5d 4d 3d 2d . .
+#d: . j o d . b7 +Ac pAc -Ah Kc Qc Jc 10c 9c 8c 7c 6c 5c 4c 3c 2c . .
+
+# Nil/blind (passing modified)
+a: n j o d . b0 +As pAs  Ad
+b: . j o d l b1 +Ah pAh -Ac
+c: . j o d l b7 +Ad pAd  As
+d: . j o d l b7 +Ac pAc -Ah
+
+#a: n j o d l b0 +As pAs  Ad
+#b: . j o d l b0 +Ah pAh -Ac
+#c: . j o d l b7 +Ad pAd  As
+#d: . j o d l b7 +Ac pAc -Ah
+
+#a: n j o d l b0  .  .    As
+#b: . j o d l b1 +Ah pAh -Ac
+#c: . j o d l b7  .  .    Ad
+#d: . j o d l b7 +Ac pAc -Ah

 
 # Test full game
 
 # Test full game

-#a: n j d l b1  -Ah As Ks Qs Js 10s 9s 8s 7s 6s 5s 4s 3s 2s t
-#b: . j d l b3   .  Ah Kh Qh Jh 10h 9h 8h 7h 6h 5h 4h 3h 2h s
-#c: . j d l b1   .  Ad Kd Qd Jd 10d 9d 8d 7d 6d 5d 4d 3d 2d .
-#d: . j d l b2   .  Ac Kc Qc Jc 10c 9c 8c 7c 6c 5c 4c 3c 2c .
+#a: n j o d l b1  -Ah As Ks Qs Js 10s 9s 8s 7s 6s 5s 4s 3s 2s t
+#b: . j o d l b3   .  Ah Kh Qh Jh 10h 9h 8h 7h 6h 5h 4h 3h 2h s
+#c: . j o d l b1   .  Ad Kd Qd Jd 10d 9d 8d 7d 6d 5d 4d 3d 2d .
+#d: . j o d l b2   .  Ac Kc Qc Jc 10c 9c 8c 7c 6c 5c 4c 3c 2c .

 
 # vim: ft=conf
 
 # vim: ft=conf