Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
homedecor_modpack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Illuna-Minetest
homedecor_modpack
Commits
fdb37bda
Commit
fdb37bda
authored
5 years ago
by
Vanessa Dannenberg
Browse files
Options
Downloads
Patches
Plain Diff
fix wrong colorization table usage in table, standing, and desk lamps
parent
ab8bf558
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
homedecor_lighting/init.lua
+9
-8
9 additions, 8 deletions
homedecor_lighting/init.lua
with
9 additions
and
8 deletions
homedecor_lighting/init.lua
+
9
−
8
View file @
fdb37bda
...
@@ -32,11 +32,12 @@ local brightn_light_source = {
...
@@ -32,11 +32,12 @@ local brightn_light_source = {
}
}
local
brightn_hex
=
{
local
brightn_hex
=
{
0xffd0d0d0
,
[
"off"
]
=
0xffd0d0d0
,
0xffd8d8d8
,
[
"low"
]
=
0xffd8d8d8
,
0xffe0e0e0
,
[
"med"
]
=
0xffe0e0e0
,
0xffe8e8e8
,
[
"hi"
]
=
0xffe8e8e8
,
0xffffffff
,
[
"on"
]
=
0xffffffff
,
[
"max"
]
=
0xffffffff
,
}
}
local
bright_to_word
=
{
local
bright_to_word
=
{
...
@@ -671,7 +672,7 @@ for light_brightn_name in pairs(brightn_light_source) do
...
@@ -671,7 +672,7 @@ for light_brightn_name in pairs(brightn_light_source) do
"homedecor_generic_metal.png"
,
"homedecor_generic_metal.png"
,
"homedecor_generic_metal.png"
,
"homedecor_generic_metal.png"
,
{
name
=
"homedecor_generic_metal.png"
,
color
=
homedecor
.
color_med_grey
},
{
name
=
"homedecor_generic_metal.png"
,
color
=
homedecor
.
color_med_grey
},
{
name
=
gen_ls_tex_white
,
color
=
brightn_hex
[
5
]
},
{
name
=
gen_ls_tex_white
,
color
=
brightn_hex
[
light_brightn_name
]
},
},
},
inventory_image
=
"homedecor_desk_lamp_inv.png"
,
inventory_image
=
"homedecor_desk_lamp_inv.png"
,
paramtype
=
"light"
,
paramtype
=
"light"
,
...
@@ -836,7 +837,7 @@ for light_brightn_name in pairs(brightn_light_source) do
...
@@ -836,7 +837,7 @@ for light_brightn_name in pairs(brightn_light_source) do
mesh
=
"homedecor_table_lamp.obj"
,
mesh
=
"homedecor_table_lamp.obj"
,
tiles
=
{
tiles
=
{
wool_brightened
,
wool_brightened
,
{
name
=
gen_ls_tex_white
,
color
=
brightn_hex
[
brightn
ess
]
},
{
name
=
gen_ls_tex_white
,
color
=
brightn_hex
[
light_
brightn
_name
]
},
{
name
=
"homedecor_generic_wood_red.png"
,
color
=
0xffffffff
},
{
name
=
"homedecor_generic_wood_red.png"
,
color
=
0xffffffff
},
{
name
=
"homedecor_generic_metal.png"
,
color
=
homedecor
.
color_black
},
{
name
=
"homedecor_generic_metal.png"
,
color
=
homedecor
.
color_black
},
},
},
...
@@ -865,7 +866,7 @@ for light_brightn_name in pairs(brightn_light_source) do
...
@@ -865,7 +866,7 @@ for light_brightn_name in pairs(brightn_light_source) do
mesh
=
"homedecor_standing_lamp.obj"
,
mesh
=
"homedecor_standing_lamp.obj"
,
tiles
=
{
tiles
=
{
wool_brightened
,
wool_brightened
,
{
name
=
gen_ls_tex_white
,
color
=
brightn_hex
[
brightn
ess
]
},
{
name
=
gen_ls_tex_white
,
color
=
brightn_hex
[
light_
brightn
_name
]
},
{
name
=
"homedecor_generic_wood_red.png"
,
color
=
0xffffffff
},
{
name
=
"homedecor_generic_wood_red.png"
,
color
=
0xffffffff
},
{
name
=
"homedecor_generic_metal.png"
,
color
=
homedecor
.
color_black
},
{
name
=
"homedecor_generic_metal.png"
,
color
=
homedecor
.
color_black
},
},
},
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment