From bdf7d75d400f826668c8336934b78aacffba5993 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Sun, 30 Apr 2023 21:19:14 +0200 Subject: Updated K&A setup and Watland scenario. Update Knud & Abel reference mat. Update rulebook. Update PAC. --- data.js | 2 +- info/images/cover.png | Bin 933943 -> 803453 bytes info/images/setup_watland.png | Bin 100968 -> 102148 bytes info/info_mat_teutonic_knud_and_abel.png | Bin 51940 -> 62437 bytes info/pac.html | 20 ++++++++++---------- info/pac1_1-fs8.png | Bin 309872 -> 0 bytes info/pac1_1.jpg | Bin 0 -> 239417 bytes info/pac1_1.png | Bin 0 -> 906912 bytes info/pac1_2-fs8.png | Bin 272974 -> 0 bytes info/pac1_2.jpg | Bin 0 -> 216893 bytes info/pac1_2.png | Bin 0 -> 853224 bytes info/pac1_3-fs8.png | Bin 233859 -> 0 bytes info/pac1_3.jpg | Bin 0 -> 188581 bytes info/pac1_3.png | Bin 0 -> 696877 bytes info/pac1_4-fs8.png | Bin 265805 -> 0 bytes info/pac1_4.jpg | Bin 0 -> 233402 bytes info/pac1_4.png | Bin 0 -> 914829 bytes info/pac2_1-fs8.png | Bin 185729 -> 0 bytes info/pac2_1.jpg | Bin 0 -> 172695 bytes info/pac2_1.png | Bin 0 -> 633463 bytes info/pac2_2-fs8.png | Bin 141973 -> 0 bytes info/pac2_2.jpg | Bin 0 -> 112408 bytes info/pac2_2.png | Bin 0 -> 477363 bytes info/pac3_1-fs8.png | Bin 208629 -> 0 bytes info/pac3_1.jpg | Bin 0 -> 166977 bytes info/pac3_1.png | Bin 0 -> 667808 bytes info/pac3_2-fs8.png | Bin 189252 -> 0 bytes info/pac3_2.jpg | Bin 0 -> 125393 bytes info/pac3_2.png | Bin 0 -> 519317 bytes info/pac4_1-fs8.png | Bin 331419 -> 0 bytes info/pac4_1.jpg | Bin 0 -> 220324 bytes info/pac4_1.png | Bin 0 -> 947779 bytes info/pac4_2-fs8.png | Bin 334424 -> 0 bytes info/pac4_2.jpg | Bin 0 -> 212423 bytes info/pac4_2.png | Bin 0 -> 891253 bytes info/rules.html | 14 ++++++++------ rules.js | 8 ++++---- tools/gendata.js | 1 + tools/scale.sh | 13 +++++++++++++ 39 files changed, 37 insertions(+), 21 deletions(-) delete mode 100644 info/pac1_1-fs8.png create mode 100644 info/pac1_1.jpg create mode 100644 info/pac1_1.png delete mode 100644 info/pac1_2-fs8.png create mode 100644 info/pac1_2.jpg create mode 100644 info/pac1_2.png delete mode 100644 info/pac1_3-fs8.png create mode 100644 info/pac1_3.jpg create mode 100644 info/pac1_3.png delete mode 100644 info/pac1_4-fs8.png create mode 100644 info/pac1_4.jpg create mode 100644 info/pac1_4.png delete mode 100644 info/pac2_1-fs8.png create mode 100644 info/pac2_1.jpg create mode 100644 info/pac2_1.png delete mode 100644 info/pac2_2-fs8.png create mode 100644 info/pac2_2.jpg create mode 100644 info/pac2_2.png delete mode 100644 info/pac3_1-fs8.png create mode 100644 info/pac3_1.jpg create mode 100644 info/pac3_1.png delete mode 100644 info/pac3_2-fs8.png create mode 100644 info/pac3_2.jpg create mode 100644 info/pac3_2.png delete mode 100644 info/pac4_1-fs8.png create mode 100644 info/pac4_1.jpg create mode 100644 info/pac4_1.png delete mode 100644 info/pac4_2-fs8.png create mode 100644 info/pac4_2.jpg create mode 100644 info/pac4_2.png 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 Binary files a/info/images/cover.png and b/info/images/cover.png differ diff --git a/info/images/setup_watland.png b/info/images/setup_watland.png index 5aedc77..32ed23e 100644 Binary files a/info/images/setup_watland.png and b/info/images/setup_watland.png differ diff --git a/info/info_mat_teutonic_knud_and_abel.png b/info/info_mat_teutonic_knud_and_abel.png index 28dfbb1..abee5f2 100644 Binary files a/info/info_mat_teutonic_knud_and_abel.png and b/info/info_mat_teutonic_knud_and_abel.png differ 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 {
- - - - + + + +
- - + +
- - + +
- - + +
diff --git a/info/pac1_1-fs8.png b/info/pac1_1-fs8.png deleted file mode 100644 index a173c95..0000000 Binary files a/info/pac1_1-fs8.png and /dev/null differ diff --git a/info/pac1_1.jpg b/info/pac1_1.jpg new file mode 100644 index 0000000..b4cf294 Binary files /dev/null and b/info/pac1_1.jpg differ diff --git a/info/pac1_1.png b/info/pac1_1.png new file mode 100644 index 0000000..5150e8e Binary files /dev/null and b/info/pac1_1.png differ diff --git a/info/pac1_2-fs8.png b/info/pac1_2-fs8.png deleted file mode 100644 index c641521..0000000 Binary files a/info/pac1_2-fs8.png and /dev/null differ diff --git a/info/pac1_2.jpg b/info/pac1_2.jpg new file mode 100644 index 0000000..74c6992 Binary files /dev/null and b/info/pac1_2.jpg differ diff --git a/info/pac1_2.png b/info/pac1_2.png new file mode 100644 index 0000000..fb1bfa2 Binary files /dev/null and b/info/pac1_2.png differ diff --git a/info/pac1_3-fs8.png b/info/pac1_3-fs8.png deleted file mode 100644 index 2834fe2..0000000 Binary files a/info/pac1_3-fs8.png and /dev/null differ diff --git a/info/pac1_3.jpg b/info/pac1_3.jpg new file mode 100644 index 0000000..777806e Binary files /dev/null and b/info/pac1_3.jpg differ diff --git a/info/pac1_3.png b/info/pac1_3.png new file mode 100644 index 0000000..5dfae8d Binary files /dev/null and b/info/pac1_3.png differ diff --git a/info/pac1_4-fs8.png b/info/pac1_4-fs8.png deleted file mode 100644 index 7d414f6..0000000 Binary files a/info/pac1_4-fs8.png and /dev/null differ diff --git a/info/pac1_4.jpg b/info/pac1_4.jpg new file mode 100644 index 0000000..8675cc7 Binary files /dev/null and b/info/pac1_4.jpg differ diff --git a/info/pac1_4.png b/info/pac1_4.png new file mode 100644 index 0000000..30e5fca Binary files /dev/null and b/info/pac1_4.png differ diff --git a/info/pac2_1-fs8.png b/info/pac2_1-fs8.png deleted file mode 100644 index 1302b5e..0000000 Binary files a/info/pac2_1-fs8.png and /dev/null differ diff --git a/info/pac2_1.jpg b/info/pac2_1.jpg new file mode 100644 index 0000000..d4feb5a Binary files /dev/null and b/info/pac2_1.jpg differ diff --git a/info/pac2_1.png b/info/pac2_1.png new file mode 100644 index 0000000..bb8483f Binary files /dev/null and b/info/pac2_1.png differ diff --git a/info/pac2_2-fs8.png b/info/pac2_2-fs8.png deleted file mode 100644 index c787522..0000000 Binary files a/info/pac2_2-fs8.png and /dev/null differ diff --git a/info/pac2_2.jpg b/info/pac2_2.jpg new file mode 100644 index 0000000..623c915 Binary files /dev/null and b/info/pac2_2.jpg differ diff --git a/info/pac2_2.png b/info/pac2_2.png new file mode 100644 index 0000000..3a0ae8d Binary files /dev/null and b/info/pac2_2.png differ diff --git a/info/pac3_1-fs8.png b/info/pac3_1-fs8.png deleted file mode 100644 index 64c33c0..0000000 Binary files a/info/pac3_1-fs8.png and /dev/null differ diff --git a/info/pac3_1.jpg b/info/pac3_1.jpg new file mode 100644 index 0000000..066b04c Binary files /dev/null and b/info/pac3_1.jpg differ diff --git a/info/pac3_1.png b/info/pac3_1.png new file mode 100644 index 0000000..1c003a4 Binary files /dev/null and b/info/pac3_1.png differ diff --git a/info/pac3_2-fs8.png b/info/pac3_2-fs8.png deleted file mode 100644 index f9ed7b4..0000000 Binary files a/info/pac3_2-fs8.png and /dev/null differ diff --git a/info/pac3_2.jpg b/info/pac3_2.jpg new file mode 100644 index 0000000..7e49c8c Binary files /dev/null and b/info/pac3_2.jpg differ diff --git a/info/pac3_2.png b/info/pac3_2.png new file mode 100644 index 0000000..2482223 Binary files /dev/null and b/info/pac3_2.png differ diff --git a/info/pac4_1-fs8.png b/info/pac4_1-fs8.png deleted file mode 100644 index c9b59eb..0000000 Binary files a/info/pac4_1-fs8.png and /dev/null differ diff --git a/info/pac4_1.jpg b/info/pac4_1.jpg new file mode 100644 index 0000000..9ccda0d Binary files /dev/null and b/info/pac4_1.jpg differ diff --git a/info/pac4_1.png b/info/pac4_1.png new file mode 100644 index 0000000..f36629a Binary files /dev/null and b/info/pac4_1.png differ diff --git a/info/pac4_2-fs8.png b/info/pac4_2-fs8.png deleted file mode 100644 index 9300a5f..0000000 Binary files a/info/pac4_2-fs8.png and /dev/null differ diff --git a/info/pac4_2.jpg b/info/pac4_2.jpg new file mode 100644 index 0000000..dcfa7c3 Binary files /dev/null and b/info/pac4_2.jpg differ diff --git a/info/pac4_2.png b/info/pac4_2.png new file mode 100644 index 0000000..c8a0b26 Binary files /dev/null and b/info/pac4_2.png differ 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

-Second Edition 2023-01-21 +Second Edition 2023-06-07

NEVSKY Second Edition Changes -
1.6 Forces for Hermann and Knud & Abel are weaker. +
1.5-1.6 Forces for Hermann and Knud & Abel are weaker. Knud & Abel start with Coin.
3.1.2-3.1.3 Arts of War "No" cards depart the game when drawn.
3.3.2 Disband on Campaign counts Servicefrom next Levy.
3.4.1 Levy Lords drops the exception for Andrey. @@ -3583,6 +3583,8 @@ Teutons— Andreas at Fellin
  • Knud & Abel at Wesenberg +
  • +Yaroslav at Pskov

    @@ -3605,13 +3607,13 @@ Calendar:

  • Box 1 has white Victory.
  • -Box 4 has black Victory, Levy, and Rudolf and Karelians cylinders. +Box 4 has black Victory, Levy, and Heinrich, Rudolf, and Karelians cylinders.
  • -Box 5 has Yaroslav and Andrey cylinders. +Box 5 has Andrey cylinder and Yaroslav Service..
  • Box 6 has Knud & Abel and Vladislav Service.
  • -Box 7 has Heinrich and Aleksandr cylinder and Andreas and Domash Service. +Box 7 has Aleksandr cylinder and Andreas and Domash Service.
  • Box 8 has Hermann cylinder. @@ -3622,7 +3624,7 @@ Remove from Play: Gavrilo cylinder, mat, and Service markers.

    -Victory: To win at scenario end (5.3), 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 (5.3), the Teutons must have at least 7 VP and must at least double Russian VP. (There is no tie.)

    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 -- cgit v1.2.3