1
0
mirror of synced 2024-11-13 18:40:47 +01:00

Add Mob to OWM, update some assets (#604)

* Update OWM skin

* Center all bars on Title scene
This commit is contained in:
DragonRatTiger / リュウコ 2024-04-22 04:29:13 -05:00 committed by GitHub
parent 84d5448468
commit 9cc7324566
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 146 additions and 3 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 118 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 196 KiB

View File

@ -0,0 +1,139 @@
--func:DrawText(x, y, text)
--func:DrawNum(x, y, num)
--func:AddGraph("filename")
--func:DrawGraph(x, y, filename)
--func:SetOpacity(opacity, "filename")
--func:SetScale(xscale, yscale, "filename")
--func:SetColor(r, g, b, "filename")
--local debug_counter = 0
local mob_x = 0
local mob_front_y = 0
local mob_back_y = 0
local mob_back2_y = 0
local mob_back3_y = 0
local mob_height = 0
local mob_counter = 0
local mob_action_counter = 0
local mob_in_counter = 0
local mob_out_counter = 0
local mob_state = 0
function mobIn()
mob_state = 1
mob_in_counter = 0
end
function mobOut()
mob_state = 2
mob_out_counter = 0
end
function init()
func:AddGraph("Mob_Front.png")
func:AddGraph("Mob_Back_0.png")
func:AddGraph("Mob_Back_1.png")
func:AddGraph("Mob_Back2_0.png")
func:AddGraph("Mob_Back2_1.png")
func:AddGraph("Mob_Back3_0.png")
func:AddGraph("Mob_Back3_1.png")
mob_height = func:GetTextureHeight("Mob_Front.png")
end
function update()
--debug_counter = debug_counter + (deltaTime)
--if debug_counter > 2 then
-- if mob_state == 0 then
-- mobIn()
-- else
-- mobOut()
-- end
-- debug_counter = 0
--end
if mob_state == 3 and gauge[0] < 100 then
mobOut()
end
if mob_state == 0 then
if gauge[0] == 100 then
mobIn()
end
elseif mob_state == 1 then
mob_in_counter = mob_in_counter + (bpm[0] * deltaTime / 30.0)
if mob_in_counter > 1 then
mob_state = 3
mob_counter = 0.5
mob_action_counter = 0
end
mobinValue = (1.0 - math.sin(mob_in_counter * math.pi / 2))
mob_front_y = 1080 + (540 * mobinValue)
mob_back_y = 1080 + (540 * mobinValue)
mob_back2_y = 1080 + (540 * mobinValue)
mob_back3_y = 1080 + (540 * mobinValue)
elseif mob_state == 2 then
mob_out_counter = mob_out_counter + (bpm[0] * deltaTime / 30.0)
if mob_out_counter > 1 then
mob_state = 0
end
mobOutValue = (1 - math.cos(mob_out_counter * math.pi))
mob_front_y = 1080 + (540 * mobOutValue)
mob_back_y = 1080 + (540 * mobOutValue)
mob_back2_y = 1080 + (540 * mobOutValue)
mob_back3_y = 1080 + (540 * mobOutValue)
elseif mob_state == 3 then
mob_counter = mob_counter + (bpm[0] * deltaTime / 60.0)
if mob_counter > 1 then
mob_counter = 0
end
mob_action_counter = mob_action_counter + (bpm[0] * deltaTime / 65.0)
if mob_action_counter > 1 then
mob_action_counter = 0
end
mob_loop_value = (1.0 - math.sin(mob_counter * math.pi))
mob_front_y = 1080 + (mob_loop_value * 45)
mob_back_y = 1080 + (mob_loop_value * 70)
mob_back2_y = 1080 + (mob_loop_value * 105)
mob_back3_y = 1080 + (mob_loop_value * 80)
end
end
function draw()
if mob_state == 0 then
else
if mob_action_counter > 0.25 and mob_action_counter < 0.5 then
func:DrawGraph(mob_x, mob_back2_y - mob_height, "Mob_Back2_1.png")
func:DrawGraph(mob_x, mob_back_y - mob_height, "Mob_Back_1.png")
else
func:DrawGraph(mob_x, mob_back2_y - mob_height, "Mob_Back2_0.png")
func:DrawGraph(mob_x, mob_back_y - mob_height, "Mob_Back_0.png")
end
if (mob_counter > 0.500 and mob_counter < 0.6) or (mob_counter > 0.7 and mob_counter < 0.8) then
func:DrawGraph(mob_x, mob_back3_y - mob_height, "Mob_Back3_1.png")
else
func:DrawGraph(mob_x, mob_back3_y - mob_height, "Mob_Back3_0.png")
end
func:DrawGraph(mob_x, mob_front_y - mob_height, "Mob_Front.png")
end
end

View File

@ -57,6 +57,9 @@ local dan_first_in_move = 0
local dan_second_in_move = 0
local dan_in_slam = 0
local seed = 0
local special_chance = 0
local speech_text = "Speech/en/0.png"
function playEndAnime(player)
@ -75,8 +78,9 @@ function init()
func:AddGraph("Message.png")
func:AddGraph("Foxes.png")
math.randomseed(os.time())
local special_chance = math.random(1, 100)
seed = os.time()
math.randomseed(seed)
special_chance = math.random(1, 100)
if special_chance == 1 then
speech_text = "Speech/special/0.png"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

View File

@ -29,7 +29,7 @@ Title_Entry_Player_Select_Rect_2_Center=298,276,336,138
;Title_Entry_NamePlate=530,385
Title_Entry_NamePlate=795,577
Title_ModeSelect_Bar_X=700,640,700
Title_ModeSelect_Bar_X=640,640,640
Title_ModeSelect_Bar_Y=107,306,513
Title_ModeSelect_Bar_Offset=0,112