diff --git a/Code/Analisis.py b/Code/Analisis.py index f08e736..3295b27 100644 --- a/Code/Analisis.py +++ b/Code/Analisis.py @@ -560,12 +560,14 @@ def hazListaRM(self): hasta = pv1[2:4] coronacion = pv1[4] if len(pv1) == 5 else None + txt = rm.abrTextoBase() + if txt: + txt = "(%s)"%txt if self.siFigurines: - nombre = pb.pgn(desde, hasta, coronacion) + \ - " (%s)" % rm.abrTextoBase() + nombre = pb.pgn(desde, hasta, coronacion) + txt + else: - nombre = pb.pgnSP(desde, hasta, coronacion) + \ - " (%s)" % rm.abrTextoBase() + nombre = pb.pgnSP(desde, hasta, coronacion) + txt li.append((rm, nombre, rm.puntosABS())) return li diff --git a/Code/EnginesWindows.py b/Code/EnginesWindows.py index 9c3d5e2..ffeca6a 100644 --- a/Code/EnginesWindows.py +++ b/Code/EnginesWindows.py @@ -26,8 +26,8 @@ def mas(cm): cm.elo = 1854 mas(cm) - cm = ConfigMotor("cinnamon", "Giuseppe Cannella", "1.2b", "http://cinnamonchess.altervista.org/") - cm.path = "cinnamon_1.2b-generic.exe" + cm = ConfigMotor("cinnamon", "Giuseppe Cannella", "1.2c", "http://cinnamonchess.altervista.org/") + cm.path = "cinnamon_1.2c-generic.exe" cm.ordenUCI("Hash", "32") cm.elo = 1930 mas(cm) diff --git a/Code/Gestor.py b/Code/Gestor.py index 17aafe3..82e3bff 100644 --- a/Code/Gestor.py +++ b/Code/Gestor.py @@ -276,7 +276,7 @@ def atajosRaton(self, a1h8): if not siPredictivo: if self.atajosRatonOrigen and self.atajosRatonDestino: - self.tablero.muevePiezaTemporal(self.atajosRatonOrigen, self.atajosRatonDestino) + # self.tablero.muevePiezaTemporal(self.atajosRatonOrigen, self.atajosRatonDestino) self.tablero.mensajero(self.atajosRatonOrigen, self.atajosRatonDestino) elif not self.atajosRatonOrigen: self.atajosRatonReset() diff --git a/Code/GestorEntPos.py b/Code/GestorEntPos.py index 06227f6..20e7359 100644 --- a/Code/GestorEntPos.py +++ b/Code/GestorEntPos.py @@ -321,6 +321,7 @@ def piensaHumano(self, siBlancas): self.siJuegaHumano = True self.activaColor(siBlancas) + self.siAnalizadoTutor = False def piensaRival(self): self.rivalPensando = True diff --git a/Code/GestorFideFics.py b/Code/GestorFideFics.py index 4a93acd..783a9d5 100644 --- a/Code/GestorFideFics.py +++ b/Code/GestorFideFics.py @@ -350,8 +350,7 @@ def mueveHumano(self, desde, hasta, coronacion=""): bmove = _("book move") comentario = "%s: %s %s\n%s: %s %s" % (self.nombreObj, jgObj.pgnSP(), bmove, self.configuracion.jugador, jgUsu.pgnSP(), bmove) - w = PantallaJuicio.MensajeF(self.pantalla, comentario) - w.mostrar() + QTUtil2.mensajeTemporal(self.pantalla, comentario, 2) siAnalizaJuez = False else: siAnalizaJuez = True diff --git a/Code/QT/PantallaAnalisis.py b/Code/QT/PantallaAnalisis.py index 2532e9c..e8e7671 100644 --- a/Code/QT/PantallaAnalisis.py +++ b/Code/QT/PantallaAnalisis.py @@ -150,7 +150,10 @@ def gridDato(self, grid, fila, oColumna): desde = pv1[:2] hasta = pv1[2:4] coronacion = pv1[4] if len(pv1) == 5 else None - return jg.posicionBase.pgn(desde, hasta, coronacion) + " (%s)" % rm.abrTextoBase() + txt = rm.abrTextoBase() + if txt: + txt = " (%s)" % txt + return jg.posicionBase.pgn(desde, hasta, coronacion) + txt elif columna == "DIF": mrm, pos = jg.analisis rm = mrm.liMultiPV[0] diff --git a/Code/QT/Tablero.py b/Code/QT/Tablero.py index 9b4f3e7..258aa48 100644 --- a/Code/QT/Tablero.py +++ b/Code/QT/Tablero.py @@ -736,7 +736,6 @@ def mousePressEvent(self, event): f = chr(48 + yc) c = chr(96 + xc) a1h8 = c + f - self.liMouse.append(a1h8) if self.atajosRaton: diff --git a/Code/QT/WBase.py b/Code/QT/WBase.py index 4c6936e..fda044c 100644 --- a/Code/QT/WBase.py +++ b/Code/QT/WBase.py @@ -370,11 +370,12 @@ def gridDato(self, grid, fila, oColumna): mate = analisis.mate siW = jg.posicionBase.siBlancas if mate: - if mate > 0: - mate -= 1 - if not siW: - mate = -mate - info = ("(M%+d)" % mate) if mate else "" + if mate == 1: + info = "" + else: + if not siW: + mate = -mate + info = "(M%+d)" % mate else: pts = analisis.puntos if not siW: diff --git a/Code/XMotorRespuesta.py b/Code/XMotorRespuesta.py index 2c6a5d1..f3690b5 100644 --- a/Code/XMotorRespuesta.py +++ b/Code/XMotorRespuesta.py @@ -170,11 +170,11 @@ def abrTextoPDT(self): def abrTextoBase(self): if self.mate != 0: mt = self.mate - if mt > 0: - mt -= 1 + if mt == 1: + return "" if not self.siBlancas: mt = -mt - return ("M%+d" % mt) if mt else "M" + return ("M%+d" % mt) else: pts = self.puntos if not self.siBlancas: diff --git a/EnginesWindows/cinnamon/cinnamon_1.2b-generic.exe b/EnginesWindows/cinnamon/cinnamon_1.2c-generic.exe similarity index 52% rename from EnginesWindows/cinnamon/cinnamon_1.2b-generic.exe rename to EnginesWindows/cinnamon/cinnamon_1.2c-generic.exe index d498b33..a7e0c96 100644 Binary files a/EnginesWindows/cinnamon/cinnamon_1.2b-generic.exe and b/EnginesWindows/cinnamon/cinnamon_1.2c-generic.exe differ diff --git a/Locale/br/LC_MESSAGES/lucaschess.mo b/Locale/br/LC_MESSAGES/lucaschess.mo index 165296a..6c14c5a 100644 Binary files a/Locale/br/LC_MESSAGES/lucaschess.mo and b/Locale/br/LC_MESSAGES/lucaschess.mo differ diff --git a/Locale/fr/LC_MESSAGES/lucaschess.mo b/Locale/fr/LC_MESSAGES/lucaschess.mo index 3d7e1e0..70a75d5 100644 Binary files a/Locale/fr/LC_MESSAGES/lucaschess.mo and b/Locale/fr/LC_MESSAGES/lucaschess.mo differ diff --git a/Lucas.py b/Lucas.py index 1e53dcd..6e4c521 100644 --- a/Lucas.py +++ b/Lucas.py @@ -11,13 +11,14 @@ """ -1. Mate label in analysis. (dima d) +1. Wrong analysis label when mate. (dima d) 2. When program path includes cyrillic characters. (tserv) 3. Merging polyglot books. 4. Renaming a Personal opening guide. (Mario L) 5. Changed stockfish with a compilation valid to old pcs. (Jörg R) 6. Play like a GM, when saving to PGN. (Uli) -7. Cinnamon problems working with low fixed depths, detected but not fixed. (Xema) +7. Cinnamon engine, problems working with low depths, fixed by author Giussepe Cannella. (Xema) +8. Moving pieces pressing cell, can put pieces in wrong positions. (Bolivar Gonzalez) """ import os