From b76924ffd4090102ac13c1891cdb15e43a5b38bb Mon Sep 17 00:00:00 2001 From: noritaka97 <64798635+noritaka97@users.noreply.github.com> Date: Mon, 8 Jun 2020 15:09:17 -0400 Subject: [PATCH] [A Song of Ice and Fire] Minor Update (#6697) * [A Song of Ice and Fire] Minor Update - Minor translation fix - Add new field translation - Update French translation - Invert field value between Army penalty and Army Bulk - Modify Army Table Design - Update css design - Add Hero Bonus in the Army - Add Disorganization Malus * [A Song of Ice and Fire] Minor Update 2 - Minor translation fix - Add new field translation - Update French translation - Invert field value between Army penalty and Army Bulk - Modify Army Table Design - Update css design - Add Hero Bonus in the Army - Add Disorganization Malus - Remove button value from attribut Co-authored-by: Noritaka971 --- A Song of Ice and Fire/SIFRPNew.css | 11 +- A Song of Ice and Fire/SIFRPNew.html | 598 +++++++------------- A Song of Ice and Fire/translation.json | 7 +- A Song of Ice and Fire/translations/fr.json | 7 +- 4 files changed, 234 insertions(+), 389 deletions(-) diff --git a/A Song of Ice and Fire/SIFRPNew.css b/A Song of Ice and Fire/SIFRPNew.css index 4faf3f8c07..20b05f914b 100644 --- a/A Song of Ice and Fire/SIFRPNew.css +++ b/A Song of Ice and Fire/SIFRPNew.css @@ -306,6 +306,14 @@ height: 24px; line-height: 24px; vertical-align: middle; } +.charsheet .sheet-wrapper .sheet-4colrow .sheet-col { + width: calc(25% - 9px) !important; + margin-right: 5px !important; + } +.charsheet .sheet-wrapper .sheet-4colrow .sheet-col:last-child { +margin-right: 0 !important; +} + .charsheet .sheet-wrapper .sheet-3colrowspecial .sheet-col { width: calc(40% - 9px) !important; margin-right: 5px !important; @@ -490,7 +498,7 @@ font-weight: bold; font-family: inherit; vertical-align: middle; text-align:center; -width: 99px; /* 99% Original*/ +width: 2%; /* 99% Original*/ cursor: pointer; background: none; box-shadow: none; @@ -498,7 +506,6 @@ transition: none; border-radius: none; border:none; } - .charsheet .sheet-wrapper .sheet-characteristics button[type="roll"]:hover label, .charsheet .sheet-wrapper .sheet-characteristics button[type="roll"]:hover input { color: #fff; diff --git a/A Song of Ice and Fire/SIFRPNew.html b/A Song of Ice and Fire/SIFRPNew.html index c18eaa4fe4..f7c53d1289 100644 --- a/A Song of Ice and Fire/SIFRPNew.html +++ b/A Song of Ice and Fire/SIFRPNew.html @@ -2369,23 +2369,18 @@

Armies

-
-
-
+
+
- -
- +
- -
+
-
-
-
+
+
@@ -2424,9 +2418,8 @@
-
-
-
+
+
-
+
+
+
+
+
+ +
+
+
+
 

Abilities


-
- - - -
-
+
-
-
-
- -
-
-
- -
-
-
-
- -
 
- -
-
-
- -
-
-
- -
-
-
-
- -
 
- -
-
-
- -
-
-
- -
-
-
-
- -
 
- -
-
-
- -
-
-
- -
-
-
-
- -
 
- -
-
-
- -
-
-
- -
-
-
-
-
- - - -
-
- -
-
-
- -
-
-
- -
-
-
-
- -
 
- -
-
-
- -
-
-
- -
-
-
-
- -
 
- -
-
-
- -
-
-
- -
-
-
-
- -
 
- -
-
-
- -
-
-
- -
-
-
+
+
+
+
-
-
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+

COMBAT

-
-
- - - -
-
+ +
-
-
-
- -
-
-
- -
-
-
+
+
+
+
- -
 
+
+
+ +
+
+
+
+
+
+
-
-
-
- -
-
-
- -
-
-
-
- -
 
- -
-
-
- -
-
-
- -
-
-
-
- -
 
- -
-
-
- -
-
-
- -
-
-
-
-
 
- -
-
-
- -
-
-
- -
+
+
+
+
+
-
-
-
- -
-
-
- -
-
-
- -
-
-
-
- -
 
+
-
-
-
- -
-
-
- -
-
-
-
- -
 
- -
-
-
- -
-
-
- -
-
-
-
- -
 
- -
-
-
- -
-
-
- -
-
-
-
-
 
- -
-
-
- -
-
-
- -
-
-
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+

DEFENSE & HEALTH

-
-
-
-
- - - -
-
- -
-
-
- -
-
-
- -
-
-
-
- -
 
- -
-
-
- -
-
-
- -
-
-
-
-
-
-
-
- - -
-
-
- -
-
-
- -
-
-
-
- -
 
- -
-
-
- -
-
-
- -
-
-
-
-
-
-
-
+ +
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+

-
diff --git a/A Song of Ice and Fire/translation.json b/A Song of Ice and Fire/translation.json index d0f5062d5a..cff08b316a 100644 --- a/A Song of Ice and Fire/translation.json +++ b/A Song of Ice and Fire/translation.json @@ -237,5 +237,10 @@ "fight-dam-mod":"Fight Dam. Mod.", "marksmanship-dam-mod":"Marksman Dam. Mod.", "defense-mod":"Defense Mod.", - "available":"Available:" + "available":"Available:", + "defense-sante":"DEFENSE & HEALTH", + "malus-disorganize":"Malus Disorganized", + "armyhero":"Hero :", + "nohero":"Without Hero", + "hero":"With Hero" } \ No newline at end of file diff --git a/A Song of Ice and Fire/translations/fr.json b/A Song of Ice and Fire/translations/fr.json index 260e9154c2..26315d77d5 100644 --- a/A Song of Ice and Fire/translations/fr.json +++ b/A Song of Ice and Fire/translations/fr.json @@ -236,5 +236,10 @@ "fight-dam-mod": "Mod. Dégat CàC", "marksmanship-dam-mod": "Mod. Dégat Tir", "defense-mod": "Mod. Défense", - "available": "Disponible:" + "available": "Disponible:", + "defense-sante":"DEFENSE & SANTE", + "malus-disorganize":"Malus Désorganisé", + "armyhero":"Héro :", + "nohero":"Sans Héro", + "hero":"Avec Héro" } \ No newline at end of file