lustlion/Mothback
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

naming convention for most stuff but not all

Browse Source
This commit is contained in:
lustlion
2022-03-04 23:28:30 +01:00
parent c978855711
commit cef2096577
29 changed files with 354 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
code/level.lua
View File

@@ -229,7 +229,7 @@ function SetTile(i,j,id)
LevelTiles[i][j] = InstanceTile(id)
end
function GridDisplay()
function drawGridDisplay()
for i = 1, #LevelTiles do
for j = 1, #LevelTiles[i] do
love.graphics.rectangle(
@@ -316,7 +316,7 @@ function TileOptimizeObjects()
local base_x = tileProperties.scale * j * tileProperties.width + tileProperties.scale * (levelProperties.offset.x - tileProperties.height)
local base_y = tileProperties.scale * i * tileProperties.height + tileProperties.scale * (levelProperties.offset.y - tileProperties.height)
local col = Collision:New(
local col = Collision:new(
base_x,
base_y,
base_x + tileProperties.width * tileProperties.scale * n,
@@ -359,7 +359,7 @@ function TileCreateObjects()
-- wholes are handled in optimization now
--[[if type == "whole" then
local col = Collision:New(
local col = Collision:new(
base_x,
base_y,
base_x + tileProperties.width * tileProperties.scale,
@@ -368,7 +368,7 @@ function TileCreateObjects()
table.insert(LoadedObjects.Collisions,col)
else]]if type == "half_bottom" then
local col = Collision:New(
local col = Collision:new(
base_x,
base_y + tileProperties.height/2 * tileProperties.scale,
base_x + tileProperties.width * tileProperties.scale,
@@ -378,7 +378,7 @@ function TileCreateObjects()
elseif type == "half_top" then
local col = Collision:New(
local col = Collision:new(
base_x,
base_y ,
base_x + tileProperties.width * tileProperties.scale,
@@ -388,7 +388,7 @@ function TileCreateObjects()
elseif type == "half_right" then
local col = Collision:New(
local col = Collision:new(
base_x + tileProperties.height/2 * tileProperties.scale,
base_y,
base_x + tileProperties.width * tileProperties.scale,
@@ -398,7 +398,7 @@ function TileCreateObjects()
elseif type == "half_left" then
local col = Collision:New(
local col = Collision:new(
base_x,
base_y,
base_x + tileProperties.height/2 * tileProperties.scale,
@@ -407,7 +407,7 @@ function TileCreateObjects()
table.insert(LoadedObjects.Collisions,col)
elseif type == "platform" then
local plat = Collision:New(
local plat = Collision:new(
base_x,
base_y + tileProperties.scale * 2,
base_x + tileProperties.width * tileProperties.scale,
@@ -418,7 +418,7 @@ function TileCreateObjects()
elseif type == "ramp2_bot_left_whole" then
for k = 1, 8 do
-- do ramp owo
local slope = Collision:New(
local slope = Collision:new(
base_x,
base_y + k * tileProperties.scale - tileProperties.scale,
base_x + k * 2 * tileProperties.scale,
@@ -428,7 +428,7 @@ function TileCreateObjects()
end
-- fill lower half
local col = Collision:New(
local col = Collision:new(
base_x,
base_y + tileProperties.height/2 * tileProperties.scale,
base_x + tileProperties.width * tileProperties.scale,
@@ -439,7 +439,7 @@ function TileCreateObjects()
elseif type == "ramp2_bot_left_half" then
for k = 1, 8 do
-- do ramp owo
local slope = Collision:New(
local slope = Collision:new(
base_x,
base_y + tileProperties.height/2 * tileProperties.scale + k * tileProperties.scale - tileProperties.scale,
base_x + k * 2 * tileProperties.scale,
@@ -452,7 +452,7 @@ function TileCreateObjects()
elseif type == "ramp2_top_left_whole" then
for k = 1, 8 do
-- do ramp owo
local slope = Collision:New(
local slope = Collision:new(
base_x,
base_y + tileProperties.height/2 * tileProperties.scale - tileProperties.scale + k * tileProperties.scale,
base_x + tileProperties.width * tileProperties.scale - (k-1) * 2 * tileProperties.scale,
@@ -462,7 +462,7 @@ function TileCreateObjects()
end
-- fill higher half
local col = Collision:New(
local col = Collision:new(
base_x,
base_y,
base_x + tileProperties.width * tileProperties.scale,
@@ -473,7 +473,7 @@ function TileCreateObjects()
elseif type == "ramp2_top_left_half" then
for k = 1, 8 do
-- do ramp owo
local slope = Collision:New(
local slope = Collision:new(
base_x,
base_y - tileProperties.scale + k * tileProperties.scale,
base_x + tileProperties.width * tileProperties.scale - (k-1) * 2 * tileProperties.scale,
@@ -486,7 +486,7 @@ function TileCreateObjects()
elseif type == "ramp2_bot_right_whole" then
for k = 1, 8 do
-- do ramp owo
local slope = Collision:New(
local slope = Collision:new(
base_x + (k-8) * -2 * tileProperties.scale,
base_y - tileProperties.scale + k * tileProperties.scale,
base_x + tileProperties.width * tileProperties.scale,
@@ -496,7 +496,7 @@ function TileCreateObjects()
end
-- fill lower half
local col = Collision:New(
local col = Collision:new(
base_x,
base_y + tileProperties.height/2 * tileProperties.scale,
base_x + tileProperties.width * tileProperties.scale,
@@ -507,7 +507,7 @@ function TileCreateObjects()
elseif type == "ramp2_bot_right_half" then
for k = 1, 8 do
-- do ramp owo
local slope = Collision:New(
local slope = Collision:new(
base_x + (k-8) * -2 * tileProperties.scale,
base_y + tileProperties.height/2 * tileProperties.scale - tileProperties.scale + k * tileProperties.scale,
base_x + tileProperties.width * tileProperties.scale,
@@ -520,7 +520,7 @@ function TileCreateObjects()
elseif type == "ramp2_top_right_half" then
for k = 1, 8 do
-- do ramp owo
local slope = Collision:New(
local slope = Collision:new(
base_x + (k-8) * -2 * tileProperties.scale,
base_y + tileProperties.height/2 * tileProperties.scale - k * tileProperties.scale,
base_x + tileProperties.width * tileProperties.scale,
@@ -533,7 +533,7 @@ function TileCreateObjects()
elseif type == "ramp2_top_right_whole" then
for k = 1, 8 do
-- do ramp owo
local slope = Collision:New(
local slope = Collision:new(
base_x + (k-8) * -2 * tileProperties.scale,
base_y + tileProperties.height/2 * tileProperties.scale + tileProperties.height/2 * tileProperties.scale - k * tileProperties.scale,
base_x + tileProperties.width * tileProperties.scale,
@@ -543,7 +543,7 @@ function TileCreateObjects()
end
-- fill higher half
local col = Collision:New(
local col = Collision:new(
base_x,
base_y,
base_x + tileProperties.width * tileProperties.scale,
@@ -555,7 +555,7 @@ function TileCreateObjects()
for k = 1, 16 do
-- do ramp owo
local slope = Collision:New(
local slope = Collision:new(
base_x,
base_y + k * tileProperties.scale - tileProperties.scale,
base_x + k * tileProperties.scale,
@@ -567,7 +567,7 @@ function TileCreateObjects()
elseif type == "ladder_right" then
local ladder = Collision:New(
local ladder = Collision:new(
base_x + (tileProperties.width-4)* tileProperties.scale,
base_y,
base_x + tileProperties.width * tileProperties.scale,
@@ -577,7 +577,7 @@ function TileCreateObjects()
elseif type == "ladder_platform_right" then
local ladder = Collision:New(
local ladder = Collision:new(
base_x + (tileProperties.width-4)* tileProperties.scale,
base_y + tileProperties.scale * 2,
base_x + tileProperties.width * tileProperties.scale,
@@ -585,7 +585,7 @@ function TileCreateObjects()
)
table.insert(LoadedObjects.Ladders,ladder)
local plat = Collision:New(
local plat = Collision:new(
base_x,
base_y + tileProperties.scale * 2,
base_x + tileProperties.width * tileProperties.scale,
@@ -596,7 +596,7 @@ function TileCreateObjects()
elseif type == "ladder_left" then
local ladder = Collision:New(
local ladder = Collision:new(
base_x,
base_y,
base_x + tileProperties.scale * 4,
@@ -607,7 +607,7 @@ function TileCreateObjects()
elseif type == "ladder_platform_left" then
local ladder = Collision:New(
local ladder = Collision:new(
base_x,
base_y + tileProperties.scale * 2,
base_x + tileProperties.scale * 4,
@@ -615,7 +615,7 @@ function TileCreateObjects()
)
table.insert(LoadedObjects.Ladders,ladder)
local plat = Collision:New(
local plat = Collision:new(
base_x,
base_y + tileProperties.scale * 2,
base_x + tileProperties.width * tileProperties.scale,
@@ -626,7 +626,7 @@ function TileCreateObjects()
elseif type == "bottom_hazard" then
local hazard = Collision:New(
local hazard = Collision:new(
base_x,
base_y + tileProperties.height * 12/16 * tileProperties.scale,
base_x + tileProperties.width * tileProperties.scale,