Skip to content

Commit

Permalink
map rebalance
Browse files Browse the repository at this point in the history
  • Loading branch information
TheJeme committed Jun 12, 2021
1 parent 0e3bf8a commit 62cccb9
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 157 deletions.
75 changes: 0 additions & 75 deletions assets/upo bg.svg

This file was deleted.

2 changes: 1 addition & 1 deletion globals.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ logoFont = love.graphics.newFont('assets/rondalo.ttf', 152)

resolutionList = {
{2560, 1440},
{1920, 1080},
{450, 1080},
{1600, 900},
{1366, 768},
{1280, 720},
Expand Down
14 changes: 7 additions & 7 deletions levels/level01.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ function level01:load()
end

function level01:update(dt, timer)
if (respawnTime >= 5/math.sqrt(timer)) then
respawnTime = 0
createCircle(45, 420+timer*3, math.random(2*math.pi*100)/100, 0)
createCircle(45, 420+timer*3, math.random(2*math.pi*100)/100, 0)
createCircle(45, 420+timer*3, math.random(2*math.pi*100)/100, 0)
if (respawnTime >= 10/math.sqrt(timer)) then
respawnTime = 0
createCircle(45, 420+math.sqrt(timer*2), math.random(2*math.pi*100)/100, 0)
createCircle(45, 420+math.sqrt(timer*2), math.random(2*math.pi*100)/100, 0)
createCircle(45, 420+math.sqrt(timer*2), math.random(2*math.pi*100)/100, 0)
createSquare(220, 320)
createKite(cursor:getPositionX(), cursor:getPositionY(), 220+timer*2)

createKite(cursor:getPositionX(), cursor:getPositionY(), 220+timer*1.1)
else
respawnTime = respawnTime + dt
end
Expand Down
2 changes: 1 addition & 1 deletion levels/level02.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function level02:load()
end

function level02:update(dt, timer)
if (respawnTime >= 3/math.sqrt(timer)) then
if (respawnTime >= 6/math.sqrt(timer)) then
respawnTime = 0
createLaser2(300)
else
Expand Down
42 changes: 19 additions & 23 deletions levels/level03.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,45 +12,41 @@ end

function level03:update(dt, timer)
if (round >= 0) then
if (respawnTime1 > 2/math.sqrt(timer)) then
if (respawnTime1 > 4/math.sqrt(timer)) then
respawnTime1 = 0
round = round + 1
createCircle(45, 430+timer*4, math.random(2*math.pi*100)/100, 1)
createCircle(45, 430+timer*4, math.random(2*math.pi*100)/100, 1)
createCircle(45, 430+timer*4, math.random(2*math.pi*100)/100, 1)
createCircle(45, 430+timer*4, math.random(2*math.pi*100)/100, 1)
if (round > 15) then
createCircle(45, 430+timer*4, math.random(2*math.pi*100)/100, 1)
end
if (round > 15) then
createCircle(45, 430+timer*4, math.random(2*math.pi*100)/100, 1)
round = round + 1
createCircle(45, 410+math.sqrt(timer*2), math.random(2*math.pi*100)/100, 1)
createCircle(45, 410+math.sqrt(timer*2), math.random(2*math.pi*100)/100, 1)
createCircle(45, 410+math.sqrt(timer*2), math.random(2*math.pi*100)/100, 1)
createCircle(45, 410+math.sqrt(timer*2), math.random(2*math.pi*100)/100, 1)
if (round > 8) then
createCircle(45, 410+math.sqrt(timer*2), math.random(2*math.pi*100)/100, 1)
end
if (round > 20) then
createCircle(45, 430+timer*4, math.random(2*math.pi*100)/100, 1)
end
if (round > 27) then
createCircle(45, 430+timer*4, math.random(2*math.pi*100)/100, 1)
createCircle(45, 410+math.sqrt(timer*2), math.random(2*math.pi*100)/100, 1)
end
else
respawnTime1 = respawnTime1 + dt
end
end
if (round > 13) then
if (round > 17) then
if (respawnTime2 > 0.6) then
respawnTime2 = 0
createCircle2(cursor:getPositionX(), cursor:getPositionY(), 45, 520)
createCircle2(cursor:getPositionX(), cursor:getPositionY(), 45, 480)
else
respawnTime2 = respawnTime2 + dt
end
end
if (round > 35) then
if (respawnTime3 > 0.18) then
if (round > 48) then
if (respawnTime3 > 0.20) then
respawnTime3 = 0
trnAngle = trnAngle + 52 * dt
createCircle(20, 530+timer*4, 0+trnAngle, 1)
createCircle(20, 530+timer*4, math.pi/2+trnAngle, 1)
createCircle(20, 530+timer*4, math.pi+trnAngle, 1)
createCircle(20, 530+timer*4, 3*math.pi/2+trnAngle, 1)
createCircle(20, 550, 0+trnAngle, 1)
createCircle(20, 550, math.pi+trnAngle, 1)
if (round > 137) then
createCircle(20, 550, math.pi/2+trnAngle, 1)
createCircle(20, 550, 3*math.pi/2+trnAngle, 1)
end
else
respawnTime3 = respawnTime3 + dt
end
Expand Down
4 changes: 2 additions & 2 deletions levels/level04.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ end
function level04:update(dt, timer)
if (respawnTime >= 6/math.sqrt(timer)+1) then
respawnTime = 0
createCircle(45, 220+timer*1.7, math.random(2*math.pi*100)/100, 0)
createCircle(45, 220+math.sqrt(timer*1.7), math.random(2*math.pi*100)/100, 0)
createSquare(220, 200)
createLaser(250)
createKite(cursor:getPositionX(), cursor:getPositionY(), 300+timer*0.7)
createKite(cursor:getPositionX(), cursor:getPositionY(), 300+math.sqrt(timer*0.7))
else
respawnTime = respawnTime + dt
end
Expand Down
46 changes: 6 additions & 40 deletions levels/level05.lua
Original file line number Diff line number Diff line change
@@ -1,53 +1,19 @@
level05 = {}

local respawnTime1, respawnTime2, respawnTime3, round
local respawnTime1

function level05:load()
respawnTime1 = 0
round = 100
end

function level05:update(dt, timer)
if (respawnTime1 >= 3*math.log10(timer) and timer > 2) then
respawnTime1 = 0
round = round + 1
createCircle(45, 280+timer, math.random(2*math.pi*100)/100, 0)
createSquare(220, 260)
createKite(cursor:getPositionX(), cursor:getPositionY(), 250+timer)

if (round > 10) then
createCircle(45, 280+timer, math.random(2*math.pi*100)/100, 0)
end
if (round > 20) then
createCircle(45, 280+timer, math.random(2*math.pi*100)/100, 0)
end
if (round > 30) then
createCircle(45, 280+timer, math.random(2*math.pi*100)/100, 0)
end
if (round > 40) then
createCircle(45, 280+timer, math.random(2*math.pi*100)/100, 0)
end
if (round > 45) then
createCircle(45, 280+timer, math.random(2*math.pi*100)/100, 0)
end
if (round > 50) then
createKite(cursor:getPositionX(), cursor:getPositionY(), 250+timer)
end
if (round > 55) then
if (respawnTime1 > 2/math.sqrt(timer)) then
if (timer > 130) then
createKite(cursor:getPositionX(), cursor:getPositionY(), 380)
else
createKite(cursor:getPositionX(), cursor:getPositionY(), 250+timer)
end
if (round > 60) then
createKite(cursor:getPositionX(), cursor:getPositionY(), 250+timer)
end
if (round > 65) then
createKite(cursor:getPositionX(), cursor:getPositionY(), 250+timer)
end
if (round > 70) then
createKite(cursor:getPositionX(), cursor:getPositionY(), 250+timer)
end
if (round > 75) then
createSquare(220, 260)
end
respawnTime1 = 0
else
respawnTime1 = respawnTime1 + dt
end
Expand Down
8 changes: 4 additions & 4 deletions levels/level06.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ function level06:load()
end

function level06:update(dt, timer)
if (respawnTime >= 5/math.sqrt(timer)) then
if (respawnTime >= 8/math.sqrt(timer)) then
respawnTime = 0
createCircle(45, 320+timer*7, math.random(2*math.pi*100)/100, 0)
createCircle(45, 300+math.sqrt(timer*3), math.random(2*math.pi*100)/100, 0)
createSquare(220, 320)
createLaser(500)
createKite(cursor:getPositionX(), cursor:getPositionY(), 420+timer*2)
createLaser(400)
createKite(cursor:getPositionX(), cursor:getPositionY(), 400+math.sqrt(timer*2))
else
respawnTime = respawnTime + dt
end
Expand Down
2 changes: 0 additions & 2 deletions main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ function love.load()

discordRPC.initialize(appId, true)
now = os.time(os.date("*t"))
detailsNow = "In Mainmenu"
stateNow = ""
nextPresenceUpdate = 0
end

Expand Down
1 change: 1 addition & 0 deletions managers/levelmanager.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ require 'levels/level06'
levelmanager = {}

function levelmanager:loadLevel(levelIndex)
math.randomseed(os.time())
if (levelIndex == 1) then
level01:load()
elseif (levelIndex == 2) then
Expand Down
3 changes: 1 addition & 2 deletions objects/circle2.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ end
function circle2:draw()
for i, v in ipairs(listOfCircles2) do
love.graphics.setColor(28 / 255, 31 / 255, 39 / 255, 1)
love.graphics.circle("fill", v.x,
v.y, v.radius)
love.graphics.circle("fill", v.x, v.y, v.radius)
end
end

Expand Down

0 comments on commit 62cccb9

Please sign in to comment.