diff --git a/README.md b/README.md index f516e09..ab4931e 100644 --- a/README.md +++ b/README.md @@ -152,6 +152,8 @@ https://creativecommons.org/licenses/by/3.0/ * Magic Hand icon by Lorc under CC BY 3.0 * Magic Shield icon by Lorc under CC BY 3.0 * Sly icon by Lorc under CC BY 3.0 +* Swap Bag icon by Lorc under CC BY 3.0 +* Person icon by Delapouite under CC BY 3.0 Portugese Translation submitted by IgorAK25 \ No newline at end of file diff --git a/assets/icons/person-black-bg.svg b/assets/icons/person-black-bg.svg new file mode 100644 index 0000000..6715680 --- /dev/null +++ b/assets/icons/person-black-bg.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/swap-bag-black-bg.svg b/assets/icons/swap-bag-black-bg.svg new file mode 100644 index 0000000..1d0902e --- /dev/null +++ b/assets/icons/swap-bag-black-bg.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/css/deltagreen.css b/css/deltagreen.css index 31e1f08..7b5df96 100644 --- a/css/deltagreen.css +++ b/css/deltagreen.css @@ -52,7 +52,7 @@ form.cowboy-style{ /* Override the default Foundry CSS to add the padding we removed from the outer window back in */ .deltagreen section.window-content form.editable{ - padding: 6px !important; + padding: 6px 6px 6px 6px !important; } @@ -257,6 +257,7 @@ form.cowboy-style{ -webkit-box-pack: start; -ms-flex-pack: start; justify-content: flex-start; + margin-bottom: 8px; } .deltagreen .sheet-header .profile-img { @@ -289,6 +290,7 @@ form.cowboy-style{ margin: 0; } + .deltagreen .sheet-body, .deltagreen .sheet-body .tab, .deltagreen .sheet-body .tab .editor { @@ -306,6 +308,15 @@ form.cowboy-style{ border-top: transparent !important; } +.deltagreen section.sheet-body{ + border: #000 !important; + border-width: 2px !important; + border-style: solid !important; + border-radius: 3px 3px 3px 3px; + + padding: 5px; +} + .deltagreen .tabs { height: auto; text-align: center; @@ -335,6 +346,16 @@ form.cowboy-style{ border-style: solid; } +.deltagreen .program-style .tabs .item.active { + background-color: #000000; + color: #ffffff; +} + +.deltagreen .cowboy-style .tabs .item.active { + background-color: rgba(156, 115, 18, 0.3); + color: #000000; +} + .deltagreen .items-list { list-style: none; /*margin: 7px 0; */ @@ -617,10 +638,11 @@ textarea.wounds{ grid-template-columns: 100%; align-items: center; justify-content: center; - border: 1px solid #999; + border: 1.5px solid #000000; padding: 5px; grid-gap: 3px; text-align: center; + border-radius: 2px; } div.max-resource-value{ @@ -666,6 +688,22 @@ div.horizontal-bar-section-divider{ background: #000; color: #fff; height: 30px; + + border-radius: 3px 3px 3px 3px; +} + +div.horizontal-bar-section-header{ + display: grid; + grid-template-columns: 100%; + justify-content: center; + align-items: center; + text-align: center; + + margin-bottom: 3px; + + background: #000; + color: #fff; + height: 50px; } .physical-description-label{ diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js index f7a5b81..bc1272d 100644 --- a/module/actor/actor-sheet.js +++ b/module/actor/actor-sheet.js @@ -560,16 +560,17 @@ export class DeltaGreenActorSheet extends ActorSheet { }; if(type == "weapon"){ - itemData.system.skill = "firearms"; //default skill to firearms, since that will be most common - itemData.system.expense = "Standard"; + //itemData.system.skill = "firearms"; //default skill to firearms, since that will be most common + //itemData.system.expense = "Standard"; } else if(type == "armor"){ - itemData.system.armor = 3; - itemData.system.expense = "Standard"; + //itemData.system.armor = 3; + //itemData.system.expense = "Standard"; } else if(type == "bond"){ + // try to default bonds for an agent to their current CHA itemData.system.score = this.object.system.statistics.cha.value; // Can vary, but at character creation starting bond score is usually agent's charisma - itemData.img = "icons/svg/mystery-man.svg" + //itemData.img = "icons/svg/mystery-man.svg" } // create the item diff --git a/module/deltagreen.js b/module/deltagreen.js index df50a63..5afae84 100644 --- a/module/deltagreen.js +++ b/module/deltagreen.js @@ -310,12 +310,12 @@ Hooks.once("ready", async function() { Hooks.on("ready", ()=> { //let backgroundImageSetting = game.settings.get("deltagreen", "characterSheetBackgroundImageSetting"); - let characterSheetStyle = game.settings.get("deltagreen", "characterSheetStyle"); + //let characterSheetStyle = game.settings.get("deltagreen", "characterSheetStyle"); - let customCss = ""; + //let customCss = ""; - let customStyle = document.createElement("style"); - customStyle.id = "dg-custom-css"; + //let customStyle = document.createElement("style"); + //customStyle.id = "dg-custom-css"; /* if(backgroundImageSetting === "OldPaper1"){ @@ -330,6 +330,7 @@ Hooks.on("ready", ()=> { } */ + /* if(characterSheetStyle === "cowboy"){ customCss += `div.deltagreen.sheet.actor section.window-content{ background: url("systems/deltagreen/assets/img/old_paper.jpg") !important; @@ -346,9 +347,27 @@ Hooks.on("ready", ()=> { if(customCss != ""){ //document.querySelector("head").appendChild(customStyle); } + */ }); +Hooks.on("preCreateItem", (item) => { + console.log("preCreateItem"); + console.log(item.img); + console.log(item.type); + + if(item.img === 'icons/svg/item-bag.svg'){ + + if(item.type === 'bond'){ + item.updateSource({ img: 'systems/deltagreen/assets/icons/person-black-bg.svg'}); + } + else{ + item.updateSource({ img: 'systems/deltagreen/assets/icons/swap-bag-black-bg.svg'}); + } + } + +}); + Hooks.on("renderSidebarTab", async (app, html) => { if (app.options.id == "actors") { let button = $("") diff --git a/module/settings.js b/module/settings.js index 0447e79..f6aef57 100644 --- a/module/settings.js +++ b/module/settings.js @@ -1,14 +1,14 @@ export const registerSystemSettings = function () { game.settings.register("deltagreen", "characterSheetStyle", { name: "Character Sheet Style", - hint: "Choose how actor sheets should be styled. 'Program' is a more modern government style, where 'Cowboy' is an older, grittier looking typewriter style.", + hint: "Choose how actor sheets should be styled. 'Program' is a more modern government style, where 'Cowboy/Outlaw' is an older, grittier looking typewriter style.", scope: "world", // This specifies a world-stored setting config: true, // This specifies that the setting appears in the configuration view requiresReload: true, type: String, choices: { // If choices are defined, the resulting setting will be a select menu - cowboy: "The Cowboys", + cowboy: "The Cowboys/Outlaws", program: "The Program", }, default: "program", // The default value for the setting diff --git a/templates/actor/actor-sheet.html b/templates/actor/actor-sheet.html index 4a178ce..1647f84 100644 --- a/templates/actor/actor-sheet.html +++ b/templates/actor/actor-sheet.html @@ -4,7 +4,7 @@
- + {{!--

DELTA GREEN

--}} {{!-- Name, Profession, Portrait --}}
@@ -91,7 +91,7 @@
{{!-- Skills Tab --}} -
+
SKILLS AND TRAINING
@@ -299,7 +299,7 @@
-
+
{{localize 'DG.Gear.Weapons'}}