Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
UCC
progcomp2013
Commits
32068c19
Commit
32068c19
authored
Mar 28, 2013
by
Sam Moore
Browse files
Merge branch 'master' of
git://git.ucc.asn.au/progcomp2013
I have no idea why this merge is necessary, Presumably I did something.
parents
22cb182c
3f610d38
Changes
3
Hide whitespace changes
Inline
Side-by-side
qchess/qchess.py
View file @
32068c19
...
@@ -1240,7 +1240,7 @@ class NetworkSender(Player,Network):
...
@@ -1240,7 +1240,7 @@ class NetworkSender(Player,Network):
if
selected
!=
None
and
selected
.
colour
==
self
.
colour
and
len
(
s
)
>
2
and
not
"->"
in
s
:
if
selected
!=
None
and
selected
.
colour
==
self
.
colour
and
len
(
s
)
>
2
and
not
"->"
in
s
:
s
=
" "
.
join
(
s
[
0
:
3
])
s
=
" "
.
join
(
s
[
0
:
3
])
for
i
in
range
(
2
):
for
i
in
range
(
2
):
if
selected
.
types
_revealed
[
i
]
==
True
:
if
selected
.
types
[
i
][
0
]
==
'?'
:
s
+=
" "
+
str
(
selected
.
types
[
i
])
s
+=
" "
+
str
(
selected
.
types
[
i
])
else
:
else
:
s
+=
" unknown"
s
+=
" unknown"
...
@@ -1256,7 +1256,7 @@ class NetworkSender(Player,Network):
...
@@ -1256,7 +1256,7 @@ class NetworkSender(Player,Network):
class
NetworkReceiver
(
Player
,
Network
):
class
NetworkReceiver
(
Player
,
Network
):
def
__init__
(
self
,
colour
,
address
=
None
):
def
__init__
(
self
,
colour
,
address
=
None
):
Player
.
__init__
(
self
,
address
,
colour
)
Player
.
__init__
(
self
,
"NetworkReceiver"
,
colour
)
self
.
address
=
address
self
.
address
=
address
...
@@ -1301,9 +1301,9 @@ class NetworkReceiver(Player,Network):
...
@@ -1301,9 +1301,9 @@ class NetworkReceiver(Player,Network):
for
i
in
range
(
2
):
for
i
in
range
(
2
):
selected
.
types
[
i
]
=
str
(
s
[
3
+
i
])
selected
.
types
[
i
]
=
str
(
s
[
3
+
i
])
if
s
[
3
+
i
]
==
"unknown"
:
if
s
[
3
+
i
]
==
"unknown"
:
selected
.
types
_revealed
[
i
]
=
False
selected
.
types
[
i
]
=
'?'
+
selected
.
types
[
i
]
else
:
else
:
selected
.
types
_revealed
[
i
]
=
True
selected
.
types
[
i
]
=
selected
.
types
[
i
][
1
:]
selected
.
current_type
=
selected
.
types
[
selected
.
choice
]
selected
.
current_type
=
selected
.
types
[
selected
.
choice
]
else
:
else
:
pass
pass
...
@@ -1349,7 +1349,7 @@ class LogFile():
...
@@ -1349,7 +1349,7 @@ class LogFile():
def
setup
(
self
,
board
,
players
):
def
setup
(
self
,
board
,
players
):
for
p
in
players
:
for
p
in
players
:
self
.
log
.
write
(
"# "
+
p
.
colour
+
" : "
+
p
.
name
+
"
\n
"
)
self
.
log
.
write
(
"# "
+
str
(
p
.
colour
)
+
" : "
+
str
(
p
.
name
)
+
"
\n
"
)
self
.
log
.
write
(
"# Initial board
\n
"
)
self
.
log
.
write
(
"# Initial board
\n
"
)
for
x
in
range
(
0
,
w
):
for
x
in
range
(
0
,
w
):
...
@@ -2633,4 +2633,4 @@ if __name__ == "__main__":
...
@@ -2633,4 +2633,4 @@ if __name__ == "__main__":
sys
.
exit
(
102
)
sys
.
exit
(
102
)
# --- main.py --- #
# --- main.py --- #
# EOF - created from make on
Sat
Mar 2
3
1
2:5
5:44 WST 2013
# EOF - created from make on
Wed
Mar 2
7
1
3:0
5:44 WST 2013
qchess/src/log.py
View file @
32068c19
...
@@ -17,7 +17,7 @@ class LogFile():
...
@@ -17,7 +17,7 @@ class LogFile():
def
setup
(
self
,
board
,
players
):
def
setup
(
self
,
board
,
players
):
for
p
in
players
:
for
p
in
players
:
self
.
log
.
write
(
"# "
+
p
.
colour
+
" : "
+
p
.
name
+
"
\n
"
)
self
.
log
.
write
(
"# "
+
str
(
p
.
colour
)
+
" : "
+
str
(
p
.
name
)
+
"
\n
"
)
self
.
log
.
write
(
"# Initial board
\n
"
)
self
.
log
.
write
(
"# Initial board
\n
"
)
for
x
in
range
(
0
,
w
):
for
x
in
range
(
0
,
w
):
...
...
qchess/src/network.py
View file @
32068c19
...
@@ -116,7 +116,7 @@ class NetworkSender(Player,Network):
...
@@ -116,7 +116,7 @@ class NetworkSender(Player,Network):
if
selected
!=
None
and
selected
.
colour
==
self
.
colour
and
len
(
s
)
>
2
and
not
"->"
in
s
:
if
selected
!=
None
and
selected
.
colour
==
self
.
colour
and
len
(
s
)
>
2
and
not
"->"
in
s
:
s
=
" "
.
join
(
s
[
0
:
3
])
s
=
" "
.
join
(
s
[
0
:
3
])
for
i
in
range
(
2
):
for
i
in
range
(
2
):
if
selected
.
types
_revealed
[
i
]
==
True
:
if
selected
.
types
[
i
][
0
]
==
'?'
:
s
+=
" "
+
str
(
selected
.
types
[
i
])
s
+=
" "
+
str
(
selected
.
types
[
i
])
else
:
else
:
s
+=
" unknown"
s
+=
" unknown"
...
@@ -132,7 +132,7 @@ class NetworkSender(Player,Network):
...
@@ -132,7 +132,7 @@ class NetworkSender(Player,Network):
class
NetworkReceiver
(
Player
,
Network
):
class
NetworkReceiver
(
Player
,
Network
):
def
__init__
(
self
,
colour
,
address
=
None
):
def
__init__
(
self
,
colour
,
address
=
None
):
Player
.
__init__
(
self
,
address
,
colour
)
Player
.
__init__
(
self
,
"NetworkReceiver"
,
colour
)
self
.
address
=
address
self
.
address
=
address
...
@@ -177,9 +177,9 @@ class NetworkReceiver(Player,Network):
...
@@ -177,9 +177,9 @@ class NetworkReceiver(Player,Network):
for
i
in
range
(
2
):
for
i
in
range
(
2
):
selected
.
types
[
i
]
=
str
(
s
[
3
+
i
])
selected
.
types
[
i
]
=
str
(
s
[
3
+
i
])
if
s
[
3
+
i
]
==
"unknown"
:
if
s
[
3
+
i
]
==
"unknown"
:
selected
.
types
_revealed
[
i
]
=
False
selected
.
types
[
i
]
=
'?'
+
selected
.
types
[
i
]
else
:
else
:
selected
.
types
_revealed
[
i
]
=
True
selected
.
types
[
i
]
=
selected
.
types
[
i
][
1
:]
selected
.
current_type
=
selected
.
types
[
selected
.
choice
]
selected
.
current_type
=
selected
.
types
[
selected
.
choice
]
else
:
else
:
pass
pass
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment