From 97487cff3f4ba95d628bfa7fe5fe1d6ff0884ba8 Mon Sep 17 00:00:00 2001 From: Stexinator Date: Fri, 18 Nov 2022 12:23:25 +0100 Subject: [PATCH] [TheWitcher] add non-carried gear --- TheWitcher/translation.json | 2 ++ TheWitcher/witchersheet.css | 32 ++++++++++++++++-- TheWitcher/witchersheet.html | 65 ++++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 3 deletions(-) diff --git a/TheWitcher/translation.json b/TheWitcher/translation.json index 4205333e1d..d9e79698e0 100644 --- a/TheWitcher/translation.json +++ b/TheWitcher/translation.json @@ -284,12 +284,14 @@ "loot-u": "LOOT", "tools-u": "TOOLS", "consumables-u": "CONSUMABLES", + "noncarried-u": "NON CARRIED ITEMS", "used-skill-u": "USED SKILL", "campaign-info-u": "CAMPAIGN INFORMATION", "settings-u": "SETTINGS", "inventory-u": "INVENTORY", "show-tools-u": "Show tools", "show-consumables-u": "Show consumables", + "show-NonCarried-u": "Show non carried items", "weapon-template-u": "WEAPON TEMPLATES", "show-singlestrike": "Show single strike", "show-fastattacks-u": "Show fast attacks", diff --git a/TheWitcher/witchersheet.css b/TheWitcher/witchersheet.css index 2182378f65..bfb3921318 100644 --- a/TheWitcher/witchersheet.css +++ b/TheWitcher/witchersheet.css @@ -3229,6 +3229,14 @@ input.consumables-toggle:checked ~ div.consumables { display: block; } +input.noncarried-toggle:not(:checked) ~ div.noncarried { + display: none; +} + +input.noncarried-toggle:checked ~ div.noncarried { + display: block; +} + input.repeating_gear_notes { width: 210px; height: 25px; @@ -3986,7 +3994,10 @@ input.focus4-toggle:checked ~ div.focus4-container { [data-groupname=repeating_crafting3] .repcontrol_add, [data-groupname=repeating_crafting4] .repcontrol_add, [data-groupname=repeating_tools] .repcontrol_add, -[data-groupname=repeating_consumables] .repcontrol_add { +[data-groupname=repeating_consumables] .repcontrol_add, +[data-groupname=repeating_noncarried-items1] .repcontrol_add, +[data-groupname=repeating_noncarried-items2] .repcontrol_add, +[data-groupname=repeating_noncarried-items3] .repcontrol_add { display: inline-block; box-shadow:none; padding: 2px 8px 2px 6px; @@ -4018,6 +4029,15 @@ input.focus4-toggle:checked ~ div.focus4-container { margin-left: 10px; } +[data-groupname=repeating_noncarried-items1] .repitem { + margin-left: 10px; +} +[data-groupname=repeating_noncarried-items2] .repitem { + margin-left: 10px; +} +[data-groupname=repeating_noncarried-items3] .repitem { + margin-left: 10px; +} [data-groupname=repeating_events] .repitem { margin: 0px 0px -10px 0px; @@ -4033,7 +4053,10 @@ input.focus4-toggle:checked ~ div.focus4-container { [data-groupname=repeating_crafting4] .repitem, [data-groupname=repeating_gear] .repitem, [data-groupname=repeating_tools] .repitem, -[data-groupname=repeating_consumables] .repitem { +[data-groupname=repeating_consumables] .repitem, +[data-groupname=repeating_noncarried-items1] .repitem, +[data-groupname=repeating_noncarried-items2] .repitem, +[data-groupname=repeating_noncarried-items3] .repitem { } [data-groupname=repeating_events] .repcontrol_edit, @@ -4046,7 +4069,10 @@ input.focus4-toggle:checked ~ div.focus4-container { [data-groupname=repeating_crafting4] .repcontrol_edit, [data-groupname=repeating_gear] .repcontrol_edit, [data-groupname=repeating_tools] .repcontrol_edit, -[data-groupname=repeating_consumables] .repcontrol_edit { +[data-groupname=repeating_consumables] .repcontrol_edit, +[data-groupname=repeating_noncarried-items1] .repcontrol_edit, +[data-groupname=repeating_noncarried-items2] .repcontrol_edit, +[data-groupname=repeating_noncarried-items3] .repcontrol_edit { display: inline-block; box-shadow:none; padding: 2px 6px 2px 8px; diff --git a/TheWitcher/witchersheet.html b/TheWitcher/witchersheet.html index 2cda8e6666..02802bfd89 100644 --- a/TheWitcher/witchersheet.html +++ b/TheWitcher/witchersheet.html @@ -2778,6 +2778,56 @@ + + +
+ +
+ + | + | + + +
+
+ | + | + | + +
+
+
+
+ + | + | + + +
+
+ | + | + | + +
+
+
+
+ + | + | + + +
+
+ | + | + | + +
+
+
+
@@ -3398,6 +3448,10 @@ Show Consumables +
@@ -4379,6 +4433,17 @@ on('change:repeating_consumables remove:repeating_consumables sheet:opened', fun repeatingSum("weight_consumables","consumables","gearweight","gearquantity"); }); +on('change:repeating_noncarried-items1 remove:repeating_noncarried-items1 sheet:opened', function() { + repeatingSum("containerweight1","noncarried-items1","gearweight","gearquantity"); +}); +on('change:repeating_noncarried-items2 remove:repeating_noncarried-items2 sheet:opened', function() { + repeatingSum("containerweight2","noncarried-items2","gearweight","gearquantity"); +}); +on('change:repeating_noncarried-items3 remove:repeating_noncarried-items3 sheet:opened', function() { + repeatingSum("containerweight3","noncarried-items3","gearweight","gearquantity"); +}); + + on('change:repeating_comp remove:repeating_comp sheet:opened', function() { repeatingSum("weight_comp","comp","compweight","compquantity"); });