Skip to content

Commit

Permalink
New art style: Color Pencils. New transparency settings. Improvements…
Browse files Browse the repository at this point in the history
… to all shaders
  • Loading branch information
jhaakma committed Jun 16, 2024
1 parent f37ae3a commit 1095b0a
Show file tree
Hide file tree
Showing 44 changed files with 865 additions and 256 deletions.
Binary file added Data Files/Icons/jop/color_pencil.dds
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -249,24 +249,18 @@ Activator.registerActivator{
onActivate = function(e)
if e.target then
activate(e)
else
elseif tes3ui.menuMode() then
equip(e)
end
end,
isActivatorItem = function(e)
-- if e.target and tes3ui.menuMode() then
-- logger:debug("Menu mode, skip")
-- return false
-- end
-- --For now, only activate paper when its in the world
-- if not e.target then return false end
local painting = Painting:new{
reference = e.target,
item = e.item,
itemData = e.itemData,
}
local canvasConfig = painting:getCanvasConfig()
if canvasConfig and not canvasConfig.requiresEasel then
if canvasConfig and not canvasConfig.requiresEasel and not painting:hasPaintingData() then
return true
end
return false
Expand Down
5 changes: 3 additions & 2 deletions Data Files/MWSE/mods/mer/joyOfPainting/config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ config.merchantPaintingSupplies = {
jop_dye_red = 10,
jop_dye_yellow = 10,
jop_dye_blue = 10,
jop_color_pencils_01 = 10,
misc_inkwell = 10,
misc_quill = 4,
['sc_paper plain'] = 25,
Expand Down Expand Up @@ -94,7 +95,7 @@ config.subject = {
--Configs for how thick ink is based on skill
config.ink = {
THICKNESS_MIN = 0.0005,
THICKNESS_MAX = 0.0035,
THICKNESS_MAX = 0.0030,
}


Expand Down Expand Up @@ -144,7 +145,7 @@ config.paperMolds = {}
config.paperPulps = {}
---@type table<string, JOP.Tapestry.data>
config.tapestries = {}
---@type table<string, string>
---@type table<string, JOP.ArtStyle.shader>
config.shaders = {}
---@type table<string, JOP.Subject>
config.subjects = {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ local config = require("mer.joyOfPainting.config")
local ShaderService = require("mer.joyOfPainting.services.ShaderService")

event.register("loaded", function()
for _, shaderId in pairs(config.shaders) do
ShaderService.disable(shaderId)
for _, shader in pairs(config.shaders) do
ShaderService.disable(shader.shaderId)
end
end)
Loading

0 comments on commit 1095b0a

Please sign in to comment.