Updated K&A setup and Watland scenario.

Update Knud & Abel reference mat. Update rulebook. Update PAC.
author: Tor Andersson <tor@ccxvii.net> 2023-04-30 21:19:14 +0200
committer: Tor Andersson <tor@ccxvii.net> 2023-06-07 13:17:53 +0200
commit: bdf7d75d400f826668c8336934b78aacffba5993 (patch)
tree: d4ec2328d8bbfe36a410ccfb478f545585396b69
parent: 5497eaa56eed6bb079413669cdf09a0e8946a6a1 (diff)
download: nevsky-bdf7d75d400f826668c8336934b78aacffba5993.tar.gz
39 files changed, 37 insertions, 21 deletions
diff --git a/data.js b/data.js
index c35ec91..1838399 100644
--- a/data.js
+++ b/data.js
@@ -139,7 +139,7 @@ lords:[
 {"side":"Teutonic","name":"Andreas","full_name":"Andreas von Felben","title":"Landmeister in Livonia","seats":[9,13],"marshal":2,"fealty":2,"service":4,"lordship":3,"command":3,"forces":{"knights":1,"sergeants":2,"men_at_arms":1},"assets":{"transport":2,"prov":2},"ships":1,"vassals":[0,1,2],"image":0},
 {"side":"Teutonic","name":"Heinrich","full_name":"Heinrich","title":"Bishop of Ösel-Wiek","seats":[8],"marshal":0,"fealty":3,"service":4,"lordship":2,"command":1,"forces":{"knights":1,"sergeants":1,"men_at_arms":1},"assets":{"coin":1,"ship":2,"prov":1},"ships":1,"vassals":[3,4],"image":1},
 {"side":"Teutonic","name":"Hermann","full_name":"Hermann","title":"Bishop of Dorpat","seats":[7,12],"marshal":1,"fealty":4,"service":4,"lordship":3,"command":3,"forces":{"knights":1,"sergeants":1,"men_at_arms":1,"militia":1},"assets":{"transport":1,"coin":1,"prov":1},"ships":0,"vassals":[5,6,7],"image":2},
-{"side":"Teutonic","name":"Knud & Abel","full_name":"Knud & Abel","title":"Princes of Denmark","seats":[0,1],"marshal":0,"fealty":2,"service":3,"lordship":3,"command":2,"forces":{"knights":1,"sergeants":1,"men_at_arms":2,"militia":1},"assets":{"ship":2,"prov":2},"ships":1,"vassals":[8,9,10],"image":3},
+{"side":"Teutonic","name":"Knud & Abel","full_name":"Knud & Abel","title":"Princes of Denmark","seats":[0,1],"marshal":0,"fealty":2,"service":3,"lordship":3,"command":2,"forces":{"knights":1,"sergeants":1,"men_at_arms":2,"militia":1},"assets":{"coin":1,"ship":2,"prov":2},"ships":1,"vassals":[8,9,10],"image":3},
 {"side":"Teutonic","name":"Rudolf","full_name":"Rudolf von Kassel","title":"Castellan of Wenden","seats":[13],"marshal":0,"fealty":5,"service":2,"lordship":1,"command":3,"forces":{"knights":1,"sergeants":1,"men_at_arms":1},"assets":{"transport":1,"prov":1},"ships":0,"vassals":[11,12,13],"image":4},
 {"side":"Teutonic","name":"Yaroslav","full_name":"Yaroslav","title":"Exile of Pskov","seats":[12],"marshal":0,"fealty":4,"service":2,"lordship":1,"command":2,"forces":{"knights":1,"light_horse":1,"men_at_arms":1},"assets":{"transport":1,"prov":1},"ships":0,"vassals":[14],"image":5},
 {"side":"Russian","name":"Aleksandr","full_name":"Aleksandr","title":"Prince of Novgorod","seats":[24,27],"marshal":2,"fealty":0,"service":6,"lordship":4,"command":3,"forces":{"knights":3,"men_at_arms":2},"assets":{"transport":2},"ships":1,"vassals":[15,16,17,18,19],"image":0},
diff --git a/info/images/cover.png b/info/images/cover.png
index 1afb495..0b28050 100644
--- a/info/images/cover.png
+++ b/info/images/cover.png
diff --git a/info/images/setup_watland.png b/info/images/setup_watland.png
index 5aedc77..32ed23e 100644
--- a/info/images/setup_watland.png
+++ b/info/images/setup_watland.png
diff --git a/info/info_mat_teutonic_knud_and_abel.png b/info/info_mat_teutonic_knud_and_abel.png
index 28dfbb1..abee5f2 100644
--- a/info/info_mat_teutonic_knud_and_abel.png
+++ b/info/info_mat_teutonic_knud_and_abel.png
diff --git a/info/pac.html b/info/pac.html
index 667f714..336b92f 100644
--- a/info/pac.html
+++ b/info/pac.html
@@ -21,24 +21,24 @@ img {
 <body>
 
 <section>
-<img class="portrait" src="pac1_1-fs8.png">
-<img class="portrait" src="pac1_2-fs8.png">
-<img class="portrait" src="pac1_3-fs8.png">
-<img class="portrait" src="pac1_4-fs8.png">
+<img class="portrait" src="pac1_1.jpg">
+<img class="portrait" src="pac1_2.jpg">
+<img class="portrait" src="pac1_3.jpg">
+<img class="portrait" src="pac1_4.jpg">
 </section>
 
 <section>
-<img class="landscape" src="pac3_1-fs8.png">
-<img class="landscape" src="pac3_2-fs8.png">
+<img class="landscape" src="pac3_1.jpg">
+<img class="landscape" src="pac3_2.jpg">
 </section>
 
 <section>
-<img class="landscape" src="pac2_1-fs8.png">
-<img class="landscape" src="pac2_2-fs8.png">
+<img class="landscape" src="pac2_1.jpg">
+<img class="landscape" src="pac2_2.jpg">
 </section>
 
 <section>
-<img class="landscape" src="pac4_2-fs8.png">
-<img class="landscape" src="pac4_1-fs8.png">
+<img class="landscape" src="pac4_2.jpg">
+<img class="landscape" src="pac4_1.jpg">
 </section>
 
diff --git a/info/pac1_1-fs8.png b/info/pac1_1-fs8.png
deleted file mode 100644
index a173c95..0000000
--- a/info/pac1_1-fs8.png
+++ /dev/null
diff --git a/info/pac1_1.jpg b/info/pac1_1.jpg
new file mode 100644
index 0000000..b4cf294
--- /dev/null
+++ b/info/pac1_1.jpg
diff --git a/info/pac1_1.png b/info/pac1_1.png
new file mode 100644
index 0000000..5150e8e
--- /dev/null
+++ b/info/pac1_1.png
diff --git a/info/pac1_2-fs8.png b/info/pac1_2-fs8.png
deleted file mode 100644
index c641521..0000000
--- a/info/pac1_2-fs8.png
+++ /dev/null
diff --git a/info/pac1_2.jpg b/info/pac1_2.jpg
new file mode 100644
index 0000000..74c6992
--- /dev/null
+++ b/info/pac1_2.jpg
diff --git a/info/pac1_2.png b/info/pac1_2.png
new file mode 100644
index 0000000..fb1bfa2
--- /dev/null
+++ b/info/pac1_2.png
diff --git a/info/pac1_3-fs8.png b/info/pac1_3-fs8.png
deleted file mode 100644
index 2834fe2..0000000
--- a/info/pac1_3-fs8.png
+++ /dev/null
diff --git a/info/pac1_3.jpg b/info/pac1_3.jpg
new file mode 100644
index 0000000..777806e
--- /dev/null
+++ b/info/pac1_3.jpg
diff --git a/info/pac1_3.png b/info/pac1_3.png
new file mode 100644
index 0000000..5dfae8d
--- /dev/null
+++ b/info/pac1_3.png
diff --git a/info/pac1_4-fs8.png b/info/pac1_4-fs8.png
deleted file mode 100644
index 7d414f6..0000000
--- a/info/pac1_4-fs8.png
+++ /dev/null
diff --git a/info/pac1_4.jpg b/info/pac1_4.jpg
new file mode 100644
index 0000000..8675cc7
--- /dev/null
+++ b/info/pac1_4.jpg
diff --git a/info/pac1_4.png b/info/pac1_4.png
new file mode 100644
index 0000000..30e5fca
--- /dev/null
+++ b/info/pac1_4.png
diff --git a/info/pac2_1-fs8.png b/info/pac2_1-fs8.png
deleted file mode 100644
index 1302b5e..0000000
--- a/info/pac2_1-fs8.png
+++ /dev/null
diff --git a/info/pac2_1.jpg b/info/pac2_1.jpg
new file mode 100644
index 0000000..d4feb5a
--- /dev/null
+++ b/info/pac2_1.jpg
diff --git a/info/pac2_1.png b/info/pac2_1.png
new file mode 100644
index 0000000..bb8483f
--- /dev/null
+++ b/info/pac2_1.png
diff --git a/info/pac2_2-fs8.png b/info/pac2_2-fs8.png
deleted file mode 100644
index c787522..0000000
--- a/info/pac2_2-fs8.png
+++ /dev/null
diff --git a/info/pac2_2.jpg b/info/pac2_2.jpg
new file mode 100644
index 0000000..623c915
--- /dev/null
+++ b/info/pac2_2.jpg
diff --git a/info/pac2_2.png b/info/pac2_2.png
new file mode 100644
index 0000000..3a0ae8d
--- /dev/null
+++ b/info/pac2_2.png
diff --git a/info/pac3_1-fs8.png b/info/pac3_1-fs8.png
deleted file mode 100644
index 64c33c0..0000000
--- a/info/pac3_1-fs8.png
+++ /dev/null
diff --git a/info/pac3_1.jpg b/info/pac3_1.jpg
new file mode 100644
index 0000000..066b04c
--- /dev/null
+++ b/info/pac3_1.jpg
diff --git a/info/pac3_1.png b/info/pac3_1.png
new file mode 100644
index 0000000..1c003a4
--- /dev/null
+++ b/info/pac3_1.png
diff --git a/info/pac3_2-fs8.png b/info/pac3_2-fs8.png
deleted file mode 100644
index f9ed7b4..0000000
--- a/info/pac3_2-fs8.png
+++ /dev/null
diff --git a/info/pac3_2.jpg b/info/pac3_2.jpg
new file mode 100644
index 0000000..7e49c8c
--- /dev/null
+++ b/info/pac3_2.jpg
diff --git a/info/pac3_2.png b/info/pac3_2.png
new file mode 100644
index 0000000..2482223
--- /dev/null
+++ b/info/pac3_2.png
diff --git a/info/pac4_1-fs8.png b/info/pac4_1-fs8.png
deleted file mode 100644
index c9b59eb..0000000
--- a/info/pac4_1-fs8.png
+++ /dev/null
diff --git a/info/pac4_1.jpg b/info/pac4_1.jpg
new file mode 100644
index 0000000..9ccda0d
--- /dev/null
+++ b/info/pac4_1.jpg
diff --git a/info/pac4_1.png b/info/pac4_1.png
new file mode 100644
index 0000000..f36629a
--- /dev/null
+++ b/info/pac4_1.png
diff --git a/info/pac4_2-fs8.png b/info/pac4_2-fs8.png
deleted file mode 100644
index 9300a5f..0000000
--- a/info/pac4_2-fs8.png
+++ /dev/null
diff --git a/info/pac4_2.jpg b/info/pac4_2.jpg
new file mode 100644
index 0000000..dcfa7c3
--- /dev/null
+++ b/info/pac4_2.jpg
diff --git a/info/pac4_2.png b/info/pac4_2.png
new file mode 100644
index 0000000..c8a0b26
--- /dev/null
+++ b/info/pac4_2.png
diff --git a/info/rules.html b/info/rules.html
index 988f331..476c18e 100644
--- a/info/rules.html
+++ b/info/rules.html
@@ -54,12 +54,12 @@ RULES OF PLAY
 </h1>
 
 <p style="text-align:center">
-<mark>Second Edition 2023-01-21</mark>
+<mark>Second Edition 2023-06-07</mark>
 
 <blockquote>
 <mark>
 NEVSKY Second Edition Changes
-<br>1.6 Forces for Hermann and Knud & Abel are weaker.
+<br>1.5-1.6 Forces for Hermann and Knud &amp; Abel are weaker. Knud &amp; Abel start with Coin.
 <br>3.1.2-3.1.3 Arts of War "No" cards depart the game when drawn.
 <br>3.3.2 Disband on Campaign counts Servicefrom next Levy.
 <br>3.4.1 Levy Lords drops the exception for Andrey.
@@ -3583,6 +3583,8 @@ Teutons&mdash;
 Andreas at Fellin
 <li>
 Knud &amp; Abel at Wesenberg
+<li>
+Yaroslav at Pskov
 </ul>
 
 <p>
@@ -3605,13 +3607,13 @@ Calendar:
 <li>
 Box 1 has white Victory.
 <li>
-Box 4 has black Victory, Levy, and <mark>Rudolf and Karelians</mark> cylinders.
+Box 4 has black Victory, Levy, and <mark>Heinrich, Rudolf, and Karelians</mark> cylinders.
 <li>
-Box 5 has <mark>Yaroslav and</mark> Andrey cylinders.
+Box 5 has Andrey cylinder and Yaroslav Service..
 <li>
 Box 6 has Knud &amp; Abel <mark>and Vladislav</mark> Service.
 <li>
-Box 7 has <mark>Heinrich and</mark> Aleksandr cylinder and Andreas and Domash Service.
+Box 7 has Aleksandr cylinder and Andreas and Domash Service.
 <li>
 Box 8 has Hermann cylinder.
 </ul>
@@ -3622,7 +3624,7 @@ Remove from Play: Gavrilo cylinder, mat, and Service markers.
 
 <p>
 <mark>
-Victory: To win at scenario end (<a href="#5.3">5.3</a>), the Teutons must have at least 10 VP and must at least double Russian VP. (There is no tie.)
+Victory: To win at scenario end (<a href="#5.3">5.3</a>), the Teutons must have at least 7 VP and must at least double Russian VP. (There is no tie.)
 </mark>
 
 <p>
diff --git a/rules.js b/rules.js
index 5fbd499..98d6d15 100644
--- a/rules.js
+++ b/rules.js
@@ -1744,12 +1744,12 @@ function setup_watland() {
 	muster_lord(LORD_KNUD_ABEL, LOC_WESENBERG, 6)
 	muster_lord(LORD_DOMASH, LOC_NOVGOROD, 7)
 	muster_lord(LORD_VLADISLAV, LOC_LADOGA, 6)
+	muster_lord(LORD_YAROSLAV, LOC_PSKOV, 5)
 
+	set_lord_cylinder_on_calendar(LORD_HEINRICH, 4)
 	set_lord_cylinder_on_calendar(LORD_RUDOLF, 4)
 	set_lord_cylinder_on_calendar(LORD_KARELIANS, 4)
-	set_lord_cylinder_on_calendar(LORD_YAROSLAV, 5)
 	set_lord_cylinder_on_calendar(LORD_ANDREY, 5)
-	set_lord_cylinder_on_calendar(LORD_HEINRICH, 7)
 	set_lord_cylinder_on_calendar(LORD_ALEKSANDR, 7)
 	set_lord_cylinder_on_calendar(LORD_HERMANN, 8)
 }
@@ -10666,8 +10666,8 @@ function goto_game_end() {
 		let vp2 = count_vp2()
 
 		if (game.scenario === "Watland") {
-			if (vp1 < 20)
-				goto_game_over(P2, `Russians won \u2014 Teutons had less than 10 VP.`)
+			if (vp1 < 14)
+				goto_game_over(P2, `Russians won \u2014 Teutons had less than 7 VP.`)
 			else if (vp1 < vp2 * 2)
 				goto_game_over(P2, `Russians won \u2014 Teutons had less than double Russian VP.`)
 			else
diff --git a/tools/gendata.js b/tools/gendata.js
index 9505548..fcb04bc 100644
--- a/tools/gendata.js
+++ b/tools/gendata.js
@@ -433,6 +433,7 @@ let lords = [
 			militia: 1,
 		},
 		assets: {
+			coin: 1,
 			ship: 2,
 			prov: 2,
 		},
diff --git a/tools/scale.sh b/tools/scale.sh
index 65e7fe9..bc7b44b 100644
--- a/tools/scale.sh
+++ b/tools/scale.sh
@@ -10,3 +10,16 @@ do
 	O=${F/300/150}
 	convert $F -colorspace RGB -resize 50% -colorspace sRGB $O
 done
+
+mkdir -p service75
+mkdir -p service150
+for F in service300/*.png
+do
+	echo $F
+
+	O=${F/300/75}
+	convert $F -colorspace RGB -resize 25% -colorspace sRGB $O
+
+	O=${F/300/150}
+	convert $F -colorspace RGB -resize 50% -colorspace sRGB $O
+done
author	Tor Andersson <tor@ccxvii.net>	2023-04-30 21:19:14 +0200
committer	Tor Andersson <tor@ccxvii.net>	2023-06-07 13:17:53 +0200
commit	bdf7d75d400f826668c8336934b78aacffba5993 (patch)
tree	d4ec2328d8bbfe36a410ccfb478f545585396b69
parent	5497eaa56eed6bb079413669cdf09a0e8946a6a1 (diff)
download	nevsky-bdf7d75d400f826668c8336934b78aacffba5993.tar.gz