X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=views%2Frules%2FUltima.pug;h=8255a5e9d3403be371385ff5630c20fda5bb852a;hb=643479f8d7c3622b57fc49c4f10d9950793ebf4f;hp=c79acc35ddc584b67891de8148f618ca66d5e313;hpb=15c1295af871a5f416b0e5b43127512c8095497a;p=vchess.git

diff --git a/views/rules/Ultima.pug b/views/rules/Ultima.pug
index c79acc35..8255a5e9 100644
--- a/views/rules/Ultima.pug
+++ b/views/rules/Ultima.pug
@@ -39,19 +39,17 @@ p
 	| one square in any direction.
 	| All other pieces move like an orthodox queen.
 
-p When a piece is adjacent to an enemy immobilizer, it cannot move unless
-ul
-	li it is an immobilizer or a chameleon; or
-	li.
-		the enemy immobilizer is adjacent to a friendly immobilizer or chameleon
-		(cancelling the powers of the opponent's immobilizer)
+p.
+	When a piece is adjacent to an enemy immobilizer, it cannot move unless
+	the enemy immobilizer is adjacent to a friendly immobilizer or chameleon
+	(cancelling the powers of the opponent's immobilizer).
 p
 	| Note : this corresponds to the "pure rules" described on 
 	a(href="http://www.inference.org.uk/mackay/ultima/ultima.html") this page
 	| , which slightly differ from the initial rules.
-	| The aim is to get rid of the weird suicide rule, weakening the immobilizers lock
-	| (in particular, in the original rules two adjacent immobilizer are stuck forever
-	| until one is captured).
+	| The aim is to get rid of the weird suicide rule by weakening the immobilizers lock.
+	| In particular, in the original rules two adjacent immobilizer are stuck forever
+	| until one is captured. Note that it's still the case if all chameleons disappeared.
 
 h3 Capturing moves
 
@@ -62,7 +60,11 @@ p
 	| All other pieces capture passively: they land on a free square and captured
 	| units are determined by some characteristics of the movement.
 
-p Note: the immobilizer does not capture.
+p Note 1: the immobilizer does not capture.
+
+p.
+	Note 2: for passive captures, a 'X' is added at the end of the move notation,
+	to indicate that something was taken (replaying the game is necessary to know where).
 
 h4 Pawns/Pincers
 
@@ -92,15 +94,17 @@ figure.diagram-container
 h4 Long leapers (knights)
 
 p.
-	A knight captures exactly as a queen in draughts game: by jumping over its enemies,
-	as many times as it can/want but always in the same direction.
+	A knight captures exactly as a queen in international draughts game: by jumping
+	over its enemies, as many times as it can/want but always in the same direction.
 	In this respect it is less powerful than a draughts' queen:
 	on the following diagram c8 or f6 cannot be captured.
+	However, the knight does not have to maximize the number of captured units
+	(as is the case in draughts).
 
 figure.diagram-container
 	.diagram
-		| fen:2n2b1k/3r4/8/3p4/8/3b4/3N4/K7 w d4,d6,d8:
-	figcaption All marked squares are playable from d2.
+		| fen:2n4k/3r4/5b2/3p4/1m6/3b4/3N4/K7 d4,d6,d8,a5:
+	figcaption All marked squares captures are playable from d2.
 
 h4 Withdrawer (queen)
 
@@ -110,7 +114,7 @@ p.
 
 figure.diagram-container
 	.diagram
-		| fen:7k/8/8/3Qr3/8/8/8/K7 w a5,b5,c5:
+		| fen:7k/8/8/3Qr3/8/8/8/K7 a5,b5,c5:
 	figcaption 1.Qa5, 1.Qb5 or 1.Qc5 captures the black rook.
 
 h4 Chameleon (bishop)
@@ -125,7 +129,7 @@ p ...and these captures can be combined.
 
 figure.diagram-container
 	.diagram
-		| fen:7k/8/8/m3pP2/2n5/8/B7/K7 w a5,c4,e5:
+		| fen:7k/8/8/r3pP2/2n5/8/B7/K7 a5,c4,e5:
 	figcaption 1.Bd5 captures all marked pieces.
 
 p.
@@ -146,7 +150,7 @@ p.
 
 figure.diagram-container
 	.diagram
-		| fen:7k/8/8/p4r/4K3/8/8/8 w e5:
+		| fen:7k/8/8/p4r/4K3/8/8/8 e5:
 	figcaption 1.Ke5 is impossible
 
 h3 Credits