diff --git a/SoccerFun.cabal b/SoccerFun.cabal --- a/SoccerFun.cabal +++ b/SoccerFun.cabal @@ -1,11 +1,12 @@ Name: SoccerFun -Version: 0.5.2 +Version: 0.5.3 Copyright: (c) 2010, Jan Rochel License: BSD3 License-File: LICENSE Author: Jan Rochel Maintainer: jan@rochel.info -Stability: beta +Homepage: http://rochel.info/ +Stability: unmaintained Build-Type: Simple Synopsis: Football simulation framework for teaching functional programming Homepage: http://www.cs.ru.nl/~peter88/SoccerFun/SoccerFun.html @@ -14,8 +15,8 @@ Category: Game, Education, AI Cabal-Version: >= 1.6 Data-Files: - template/Main.hs template/Makefile template/Children/Child.hs template/Children/Team.hs - tournament/mkIndex.sh tournament/makeLoop.sh tournament/Makefile SoccerFun/Tape/Record/Template.hs + template/Main.hs template/Makefile template/Children/Child.hs template/Children/Team.hs + tournament/mkIndex.sh tournament/makeLoop.sh tournament/Makefile SoccerFun/Tape/Record/Template.hs Library Extensions: @@ -26,14 +27,14 @@ FlexibleInstances TemplateHaskell Build-Depends: - base >= 4 && < 4.4, + base >= 4 && < 4.8, base-unicode-symbols >= 0.2 && < 0.3, random >= 1.0 && < 1.1, - mtl >= 1.1 && < 2.1, + mtl >= 1.1 && < 2.3, derive >= 2.4 && < 2.5, binary >= 0.5 && < 0.6, process >= 1.0 && < 1.1, - directory >= 1.0 && < 1.2, + directory >= 1.0 && < 1.1, zlib >= 0.5 && < 0.6 Exposed-Modules: SoccerFun.Ball diff --git a/SoccerFun/Referee/Ivanov.hs b/SoccerFun/Referee/Ivanov.hs --- a/SoccerFun/Referee/Ivanov.hs +++ b/SoccerFun/Referee/Ivanov.hs @@ -688,15 +688,15 @@ getBehindLinesActions ∷ Half → Ball → Field → IvanovLongTermMemory → ([RefereeAction],IvanovLongTermMemory) getBehindLinesActions half theBall field longMem@IvanovLongTermMemory {lastKickedTheBall} | (pxy (ballPos theBall)) == p = ([],longMem) -- ball is not behind (see definition of pointToRectangle) - | isNothing lastKickedTheBall = ([CenterKick Team1, DisplacePlayers $ kickoffDisplacements longMem],longMem) -- the ball got behind by unknown forces + | isNothing lastKickedTheBall = ([CenterKick Team1, DisplacePlayers $ kickoffDisplacements longMem],longMem {ballIsFor = Just Team1, typeOfKickoff = Just $ CenterKick Team1}) -- the ball got behind by unknown forces | (px (pxy (ballPos theBall))) < zero = runIdentity $ do -- behind line West? (team,homeTeamWest) ← return $ if half == FirstHalf then (Team1, nameOf team1) else (Team2,nameOf team2) -- first half? let ng | isbetween (py (pxy (ballPos theBall))) ((fwidth field)/2.0 - goalWidth/2.0) ((fwidth field)/2.0 + goalWidth/2.0) -- goal? && (pz (ballPos theBall)) < goalHeight = if (team==Team1) - then ([Goal Team2,CenterKick Team1, DisplacePlayers $ kickoffDisplacements longMem],longMem { ballIsFor=Just Team1}) - else ([Goal Team1,CenterKick Team2, DisplacePlayers $ kickoffDisplacements longMem],longMem { ballIsFor=Just Team2}) + then ([Goal Team2,CenterKick Team1, DisplacePlayers $ kickoffDisplacements longMem],longMem { ballIsFor=Just Team1, typeOfKickoff = Just $ CenterKick Team1}) + else ([Goal Team1,CenterKick Team2, DisplacePlayers $ kickoffDisplacements longMem],longMem { ballIsFor=Just Team2, typeOfKickoff = Just $ CenterKick Team2}) | clubName (fromJust lastKickedTheBall) == homeTeamWest = runIdentity $ do -- lastPlayerKicked Team1? corner ← return $ if (py (pxy (ballPos theBall))) > (fwidth field)/2.0 then South else North return ([Corner (other team) corner],longMem { ballIsFor = Just (other team), typeOfKickoff = Just $ Corner (other team) corner}) diff --git a/tournament/mkIndex.sh b/tournament/mkIndex.sh --- a/tournament/mkIndex.sh +++ b/tournament/mkIndex.sh @@ -1,6 +1,6 @@ #!/bin/sh -echo 'SoccerFun Tournament' +echo 'SoccerFun Tournament
' echo "" for i in teams/*; do @@ -12,10 +12,10 @@ for i in teams/*; do echo "" for j in teams/*; do - game=`basename $i`-`basename $j` + game=`basename $j`-`basename $i` echo "" done -echo '
" if [ -f "tapes/$game.log" ]; then - if [ `stat -c%s "tapes/$game.log"` -lt 10 ]; then + if [ 0`stat -c%s "tapes/$game.log"` -lt 10 ]; then [ -s "tapes/$game.sft" ] && echo "" cat "tapes/$game.log" [ -s "tapes/$game.sft" ] && echo "" @@ -29,4 +29,4 @@ echo "
' +echo '
'