Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/Triturados/Juego
Browse files Browse the repository at this point in the history
  • Loading branch information
yojhansg committed May 6, 2022
2 parents 82b8fd3 + e63bb58 commit 165e455
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 4 deletions.
6 changes: 2 additions & 4 deletions CrunchThroughHell/resources/Scripts/scenes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -454,19 +454,17 @@ function scene3() -- Overworld de verdad
speedIncrement: 30;
]]);

local images = {"corazon", "fuerza", "velocidad"}
for i = 0, 2, 1 do

local buttonwidth = 200;
local margin = 100;
local xpos = round((width() - buttonwidth) * 0.5 - buttonwidth - margin + (buttonwidth + margin) * i);
tiendaComp:sendComponent(i, menu:createButton('mainmenuButton', xpos, 500, 11, buttonwidth, 50));
tiendaComp:sendComponent(i, menu:createButton(images[i+1], xpos, 500, 11, buttonwidth, 50));
end
local currency = menu:createTextElement('Souls: 22' , 10, round(height() - 30), 11, 0.05, 0);
tiendaComp:sendComponent(3, currency)





-- local tiendaMesh = scene:createObject("boss1")
-- tiendaMesh:addComponent("Transform"):sendMsg([[
Expand Down
39 changes: 39 additions & 0 deletions CrunchThroughHell/resources/materials/mainMenu.material
Original file line number Diff line number Diff line change
Expand Up @@ -396,4 +396,43 @@ material back{
}
}
}
}
material fuerza{
technique{
pass{
lighting off
depth_check off
scene_blend alpha_blend
texture_unit {
texture fuerza.png
colour_op modulate
}
}
}
}
material velocidad{
technique{
pass{
lighting off
depth_check off
scene_blend alpha_blend
texture_unit {
texture velocidad.png
colour_op modulate
}
}
}
}
material corazon{
technique{
pass{
lighting off
depth_check off
scene_blend alpha_blend
texture_unit {
texture corazon.png
colour_op modulate
}
}
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 165e455

Please sign in to comment.