From 65f52c5180006925c7bf8794c9ea53f67843c0a9 Mon Sep 17 00:00:00 2001 From: Taka Date: Mon, 12 Oct 2020 09:55:34 +0000 Subject: [PATCH] Fixed Plentiful Ammo in the KMC national capabilities. --- .../data/default-template-pack/national-capabilities.json | 2 +- .../webapp/tests/fixtures/nat-caps/kfw/kfw-rok/1950.txt | 1 + vasl_templates/webapp/tests/test_national_capabilities.py | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/vasl_templates/webapp/data/default-template-pack/national-capabilities.json b/vasl_templates/webapp/data/default-template-pack/national-capabilities.json index 01f6893..19c5e3d 100644 --- a/vasl_templates/webapp/data/default-template-pack/national-capabilities.json +++ b/vasl_templates/webapp/data/default-template-pack/national-capabilities.json @@ -193,7 +193,7 @@ "kfw-rok": { "th_color": "{! -08/1950 = Red | 09/1950-04/1951 = Red (ROK) ; Black (KMC) | 05/1951- = Black | ??? !}", "oba": [ "{! 06/1950- = 10B | ??? !}", "3R", - "{! 09/1950- = Plentiful Ammo included !}", + "{? 09/1950- | Plentiful Ammo included | Plentiful Ammo included (KMC) | Plentiful Ammo included (ROK: 9/50+) ?}", "{! 06/1950-08/1950 = ROK: 6B/3R !}" ], "oba_access": "≤ 1 (ROK) ; 2 (KMC)", diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/kfw/kfw-rok/1950.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/kfw/kfw-rok/1950.txt index 9509023..c5041e7 100644 --- a/vasl_templates/webapp/tests/fixtures/nat-caps/kfw/kfw-rok/1950.txt +++ b/vasl_templates/webapp/tests/fixtures/nat-caps/kfw/kfw-rok/1950.txt @@ -4,6 +4,7 @@ SMOKE grenades HoB: +3/+4 DRM Red TH# OBA: ??? 3R (access: ≤ 1 (ROK) ; 2 (KMC)) +- Plentiful Ammo included (KMC) * Republic of Korea (ROK): * Early KW ROK rules diff --git a/vasl_templates/webapp/tests/test_national_capabilities.py b/vasl_templates/webapp/tests/test_national_capabilities.py index 862e284..e3fd1c8 100644 --- a/vasl_templates/webapp/tests/test_national_capabilities.py +++ b/vasl_templates/webapp/tests/test_national_capabilities.py @@ -307,9 +307,11 @@ def test_time_based_national_capabilities( webapp, webdriver ): ] ) # test the South Korean national Capabilities - check_oba( "kfw-rok", "Korea", 5, 1950, "???", "3R" ) + check_oba( "kfw-rok", "Korea", 5, 1950, "???", "3R", + comments = [ "Plentiful Ammo included (KMC)" ] + ) check_oba( "kfw-rok", "Korea", 6, 1950, "10B", "3R", - comments = [ "ROK: 6B/3R" ] + comments = [ "Plentiful Ammo included (KMC)", "ROK: 6B/3R" ] ) check_oba( "kfw-rok", "Korea", 10, 1950, "10B", "3R", plentiful=True ) check_th_color( "kfw-rok", "Korea", 8, 1950, "Red TH#" )