VanessaE
/
dreambuilder_game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more random theming added here and there 

also, make all uses of "single slot" image point to the same file
master
Vanessa Dannenberg 2021-03-04 17:24:36 -05:00
parent 67da11e2aa
commit 31516acc88
13 changed files with 57 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mods/dreambuilder_extras/customize-dreambuilder-game.sh
View File

@ -100,7 +100,6 @@ Calinous_mods/bedrock \
Calinous_mods/maptools \
Calinous_mods/moreores \
Sokomines_mods/cottages \
Sokomines_mods/locks \
Sokomines_mods/travelnet \
Sokomines_mods/windmill \
RBAs_mods/datastorage \
@ -136,10 +135,10 @@ caverealms_lite \
deezls_mods/extra_stairsplus \
blox \
new_campfire \
item_drop \
Zeg9s_mods/ufos/ufos"
item_drop"
COPY_MODS_LIST="
Sokomines_mods/locks \
nekogloops_mods/glooptest \
Calinous_mods/moreblocks \
CWzs_mods/replacer \
@ -147,7 +146,8 @@ CWzs_mods/player_textures \
bobblocks \
unifiedbricks \
my_mods/pipeworks \
RBAs_mods/unified_inventory"
RBAs_mods/unified_inventory \
Zeg9s_mods/ufos/ufos"
LINK_MODPACKS_LIST="$(ls -d my_mods/home_workshop_modpack/*/) \
$(ls -d my_mods/plantlife_modpack/*/) \
@ -277,12 +277,11 @@ sed -i "0, /depends = /s//depends = dreambuilder_gui_theming, /" $workdir"/mods/
sed -i '/size\[8,7;\]/ {
r /tmp/LISTCOLORS_HIDE_SLOTS
a \\t\t"image[-0.1,2.75;10.03,4.95;default_standard_inventory_bg.png]"..
a \\t\t"image[-0.1,0.23;10.03,2.37;vessels_upper_slots_bg.png]"..
}' $workdir"/mods/vessels/init.lua"
# r /tmp/LISTCOLORS_HIDE_SLOTS
sed -i "0, /depends = /s//depends = dreambuilder_gui_theming, /" $workdir"/mods/vessels/mod.conf"
sed -i 's/"field\[.*\]"/ \
@ -329,7 +328,7 @@ sed -i '/formspec = formspec/ {
sed -i '/size\[8,9;\]/ {
r /tmp/LISTCOLORS_HIDE_SLOTS
a \\t\t"image[-0.1,4.93;10.03,4.65;technic_main_inventory.png]"..
a \\t\t"image[2.9,0.93;1.254,1.163;technic_single_slot.png]"..
a \\t\t"image[2.9,0.93;1.254,1.163;default_single_slot.png]"..
}' $workdir"/mods/technic/machines/register/generator.lua"
# this alloy furnace change will match in two places, on purpose.
@ -348,7 +347,7 @@ sed -i '/size\[8,9;\]/ {
sed -i '/size\[8,9;\]/ {
r /tmp/LISTCOLORS_HIDE_SLOTS
a \\t\t"image[-0.1,4.93;10.03,4.65;technic_main_inventory.png]"..
a \\t\t"image[2.9,0.93;1.254,1.163;technic_single_slot.png]"..
a \\t\t"image[2.9,0.93;1.254,1.163;default_single_slot.png]"..
a \\t\t"image[0.91,2.93;2.508,1.163;technic_base_machine_upgrade_slots_bg.png]"..
}' $workdir"/mods/technic/machines/MV/tool_workshop.lua"
@ -364,7 +363,7 @@ sed -i '/size\[8,9;\]/ {
}' $workdir"/mods/technic/machines/other/constructor.lua"
sed -i '/list\[current_name/ {
i \\t\t\t\t\t.."image[5.89,"..(i*0.998-1.07)..";1.254,1.163;technic_single_slot.png]"
i \\t\t\t\t\t.."image[5.89,"..(i*0.998-1.07)..";1.254,1.163;default_single_slot.png]"
}' $workdir"/mods/technic/machines/other/constructor.lua"
sed -i '/size\[9,11;\]/ {
@ -388,6 +387,9 @@ sed -i '/local n = 4/ {
d
}' $workdir"/mods/unified_inventory/internal.lua"
sed -i "s/ui_single_slot.png/default_single_slot.png/" $workdir"/mods/unified_inventory/internal.lua"
sed -i "s/ui_single_slot.png/default_single_slot.png/" $workdir"/mods/unified_inventory/register.lua"
sed -i '/1.175;ui_bags_header.png/ {
a \\t\t\t"style_type[button;bgcolor="..dreambuilder_theme.btn_color.."]",
}' $workdir"/mods/unified_inventory/bags.lua"
@ -407,6 +409,26 @@ sed -i '/image\[2.75,1.5;1,1;/ {
a \\t\t"image[4.64,0.83;2.52,2.44;default_furnace_upper_right_slots_bg_"..w.."x"..h..".png]"..
}' $workdir"/mods/homedecor_common/furnaces.lua"
sed -i '/size\[8,10\]/ {
r /tmp/LISTCOLORS_HIDE_SLOTS
a \\t\t"image[-0.12,5.73;10.03,4.95;default_standard_inventory_bg.png]"..
a \\t\t"image[-0.12,0.85;10.03,4.79;default_chest_upper_slots_bg.png]"..
}' $workdir"/mods/locks/shared_locked_chest.lua"
# This one will match in two places, deliberately.
sed -i '/size\[8,9\]/ {
r /tmp/LISTCOLORS_HIDE_SLOTS
a \\t\t"image[-0.1,4.90;10.03,4.65;default_standard_inventory_old_bg.png]"..
a \\t\t"image[1.88,0.37;1.254,3.59;default_furnace_upper_middle_slots_bg.png]"..
a \\t\t"image[4.9,0.87;2.5,2.46;default_furnace_upper_right_slots_bg_2x2.png]"..
}' $workdir"/mods/locks/shared_locked_furnace.lua"
sed -i '/size\[8,5.5\]/ {
r /tmp/LISTCOLORS_HIDE_SLOTS a \\t\t"image[-0.1,1.42;10.03,4.65;default_standard_inventory_old_bg.png]"..
a \\t\t"image[3.4,-0.1;1.254,1.163;default_single_slot.png]"..
}' $workdir"/mods/ufos/furnace.lua"
mv $workdir"/mods/dreambuilder_extras/dreambuilder_gui_theming" \
$workdir"/mods/"

0
mods/dreambuilder_gui_theming/textures/technic_single_slot.png → mods/dreambuilder_gui_theming/textures/default_single_slot.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 642 B

After

Width:  |  Height:  |  Size: 642 B

BIN
mods/dreambuilder_gui_theming/textures/default_standard_inventory_old_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
mods/dreambuilder_gui_theming/textures/ui_single_slot.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 642 B

5
mods/locks/shared_locked_chest.lua
View File

@ -50,6 +50,11 @@ minetest.register_node("locks:shared_locked_chest", {
-- prepare the lock of the chest
locks:lock_init( pos,
"size[8,10]"..
"listcolors[#00000000;"..dreambuilder_theme.listcolor_slot_bg_hover..";#00000000;"..
dreambuilder_theme.tooltip_bgcolor..";"..
dreambuilder_theme.tooltip_fontcolor.."]"..
"image[-0.12,5.73;10.03,4.95;default_standard_inventory_bg.png]"..
"image[-0.12,0.85;10.03,4.79;default_chest_upper_slots_bg.png]"..
---- "field[0.5,0.2;8,1.0;locks_sent_lock_command;Locked chest. Type password, command or /help for help:;]"..
---- "button_exit[3,0.8;2,1.0;locks_sent_input;Proceed]"..
-- "list[current_name;main;0,0;8,4;]"..

12
mods/locks/shared_locked_furnace.lua
View File

@ -87,6 +87,12 @@ end
function locks.get_furnace_active_formspec(pos, percent)
local formspec =
"size[8,9]"..
"listcolors[#00000000;"..dreambuilder_theme.listcolor_slot_bg_hover..";#00000000;"..
dreambuilder_theme.tooltip_bgcolor..";"..
dreambuilder_theme.tooltip_fontcolor.."]"..
"image[-0.1,4.90;10.03,4.65;default_standard_inventory_old_bg.png]"..
"image[1.88,0.37;1.254,3.59;default_furnace_upper_middle_slots_bg.png]"..
"image[4.9,0.87;2.5,2.46;default_furnace_upper_right_slots_bg_2x2.png]"..
"image[2,1.5;1,1;default_furnace_fire_bg.png^[lowpart:"..
(100-percent)..":default_furnace_fire_fg.png]"..
"list[current_name;fuel;2,2.5;1,1;]"..
@ -102,6 +108,12 @@ end
locks.furnace_inactive_formspec =
"size[8,9]"..
"listcolors[#00000000;"..dreambuilder_theme.listcolor_slot_bg_hover..";#00000000;"..
dreambuilder_theme.tooltip_bgcolor..";"..
dreambuilder_theme.tooltip_fontcolor.."]"..
"image[-0.1,4.90;10.03,4.65;default_standard_inventory_old_bg.png]"..
"image[1.88,0.37;1.254,3.59;default_furnace_upper_middle_slots_bg.png]"..
"image[4.9,0.87;2.5,2.46;default_furnace_upper_right_slots_bg_2x2.png]"..
"image[2,1.5;1,1;default_furnace_fire_bg.png]"..
"list[current_name;fuel;2,2.5;1,1;]"..
"list[current_name;src;2,0.5;1,1;]"..

2
mods/technic/machines/MV/tool_workshop.lua
View File

@ -24,7 +24,7 @@ local workshop_formspec =
dreambuilder_theme.tooltip_bgcolor..";"..
dreambuilder_theme.tooltip_fontcolor.."]"..
"image[-0.1,4.93;10.03,4.65;technic_main_inventory.png]"..
"image[2.9,0.93;1.254,1.163;technic_single_slot.png]"..
"image[2.9,0.93;1.254,1.163;default_single_slot.png]"..
"image[0.91,2.93;2.508,1.163;technic_base_machine_upgrade_slots_bg.png]"..
"list[current_name;src;3,1;1,1;]"..
"label[0,0;"..S("%s Tool Workshop"):format("MV").."]"..

2
mods/technic/machines/other/constructor.lua
View File

@ -155,7 +155,7 @@ local function make_constructor(mark, length)
for i = 1, length do
formspec = formspec
.."label[5,"..(i - 1)..";"..S("Slot %d"):format(i).."]"
.."image[5.89,"..(i*0.998-1.07)..";1.254,1.163;technic_single_slot.png]"
.."image[5.89,"..(i*0.998-1.07)..";1.254,1.163;default_single_slot.png]"
.."list[current_name;slot"..i
..";6,"..(i - 1)..";1,1;]"
end

2
mods/technic/machines/register/generator.lua
View File

@ -40,7 +40,7 @@ function technic.register_generator(data)
dreambuilder_theme.tooltip_bgcolor..";"..
dreambuilder_theme.tooltip_fontcolor.."]"..
"image[-0.1,4.93;10.03,4.65;technic_main_inventory.png]"..
"image[2.9,0.93;1.254,1.163;technic_single_slot.png]"..
"image[2.9,0.93;1.254,1.163;default_single_slot.png]"..
"label[0,0;"..S("Fuel-Fired %s Generator"):format(tier).."]"..
"list[current_name;src;3,1;1,1;]"..
"image[4,1;1,1;default_furnace_fire_bg.png]"..

1
mods/ufos/furnace.lua
View File

@ -4,6 +4,7 @@ ufos.fuel_time = 10
ufos.furnace_inactive_formspec =
"size[8,5.5]"..
"image[3.4,-0.1;1.254,1.163;default_single_slot.png]"..
"list[current_name;fuel;3.5,0;1,1;]"..
"list[current_player;main;0,1.5;8,4;]"..
"label[4.5,0;Fuel needed: "..ufos.fuel.."]"..

2
mods/unified_inventory/internal.lua
View File

@ -82,7 +82,7 @@ function unified_inventory.get_formspec(player, page)
if unified_inventory.is_creative(player_name)
and page == "craft" then
formspec[n] = "background[0,"..(ui_peruser.formspec_y + 2)..";1,1;ui_single_slot.png]"
formspec[n] = "background[0,"..(ui_peruser.formspec_y + 2)..";1,1;default_single_slot.png]"
n = n+1
end

2
mods/unified_inventory/register.lua
View File

@ -178,7 +178,7 @@ unified_inventory.register_page("craft", {
formspec = formspec.."list[current_player;craft;2,"..formspecy..";3,3;]"
if unified_inventory.trash_enabled or unified_inventory.is_creative(player_name) or minetest.get_player_privs(player_name).give then
formspec = formspec.."label[7,"..(formspecy + 1.5)..";" .. F(S("Trash:")) .. "]"
formspec = formspec.."background[7,"..(formspecy + 2)..";1,1;ui_single_slot.png]"
formspec = formspec.."background[7,"..(formspecy + 2)..";1,1;default_single_slot.png]"
formspec = formspec.."list[detached:trash;main;7,"..(formspecy + 2)..";1,1;]"
end
formspec = formspec.."listring[current_name;craft]"

3
mods/vessels/init.lua
View File

@ -9,6 +9,9 @@ local S = minetest.get_translator("vessels")
local vessels_shelf_formspec =
"size[8,7;]" ..
"listcolors[#00000000;"..dreambuilder_theme.listcolor_slot_bg_hover..";#00000000;"..
dreambuilder_theme.tooltip_bgcolor..";"..
dreambuilder_theme.tooltip_fontcolor.."]"..
"image[-0.1,2.75;10.03,4.95;default_standard_inventory_bg.png]"..
"image[-0.1,0.23;10.03,2.37;vessels_upper_slots_bg.png]"..
"list[context;vessels;0,0.3;8,2;]" ..