From c2f517d667259c4f545d8f208f8d307ed70a3e77 Mon Sep 17 00:00:00 2001 From: Nicholas Hayashi Date: Wed, 7 Jul 2021 18:57:52 -0400 Subject: [PATCH] idk! --- color.lua | 1 - main.lua | 1 - sound.lua | 1 - src/game.lua | 3 --- src/geometry.lua | 1 - src/grid.lua | 1 - src/gui.lua | 1 - src/hexyz.lua | 1 - src/mob.lua | 1 - src/projectile.lua | 1 - src/tower.lua | 1 - texture.lua | 1 - 12 files changed, 14 deletions(-) diff --git a/color.lua b/color.lua index 475f588..6f66c88 100644 --- a/color.lua +++ b/color.lua @@ -1,5 +1,4 @@ - COLORS = { TRANSPARENT = vec4(0.6), TRANSPARENT1 = vec4(0.4), diff --git a/main.lua b/main.lua index 668dc88..1c3acce 100644 --- a/main.lua +++ b/main.lua @@ -1,5 +1,4 @@ - -- @TODO @TODO @TODO @TODO @TODO -- settings menu -- -- music volume diff --git a/sound.lua b/sound.lua index 0689ab9..bede6d6 100644 --- a/sound.lua +++ b/sound.lua @@ -1,5 +1,4 @@ - SOUNDS = { -- sfxr_synth seeds EXPLOSION1 = 49179102, -- this slowed sounds metal as fuck diff --git a/src/game.lua b/src/game.lua index 06d3548..4d02ee5 100644 --- a/src/game.lua +++ b/src/game.lua @@ -1,9 +1,7 @@ - game = false -- flag to tell if there is a game running state = {} - -- top right display types local TRDTS = { NOTHING = 0, @@ -228,7 +226,6 @@ local function game_action(scene) -- calculate spawn chance for next wave state.spawn_chance = math.log(state.current_wave)/100 + 0.002 - log(state.spawn_chance) state.time_until_next_break = get_wave_time(state.current_wave) end diff --git a/src/geometry.lua b/src/geometry.lua index 1d6b7ba..ede2bea 100644 --- a/src/geometry.lua +++ b/src/geometry.lua @@ -1,5 +1,4 @@ - function circles_intersect(center1, center2, radius1, radius2) local c1, c2, r1, r2 = center1, center2, radius1, radius2 local d = math.distance(center1, center2) diff --git a/src/grid.lua b/src/grid.lua index 9e06995..3fc93f6 100644 --- a/src/grid.lua +++ b/src/grid.lua @@ -1,5 +1,4 @@ - do -- add padding, because we terraform the very outer edge and it looks ugly, so hide it local padding = 2 diff --git a/src/gui.lua b/src/gui.lua index 20d179f..f1a219c 100644 --- a/src/gui.lua +++ b/src/gui.lua @@ -1,5 +1,4 @@ - function gui_numberfield(dimensions, opts) end diff --git a/src/hexyz.lua b/src/hexyz.lua index d0fe0f9..76ca6cc 100644 --- a/src/hexyz.lua +++ b/src/hexyz.lua @@ -1,5 +1,4 @@ - -- this is a single file with no dependencies which is meant to perform a bunch of mathy stuff -- related to hexagons, grids of them, and pathfinding on them -- diff --git a/src/mob.lua b/src/mob.lua index 81dee55..6fa3527 100644 --- a/src/mob.lua +++ b/src/mob.lua @@ -1,5 +1,4 @@ - state.mobs = {} MOB_TYPE = { diff --git a/src/projectile.lua b/src/projectile.lua index d461fb9..5319ea2 100644 --- a/src/projectile.lua +++ b/src/projectile.lua @@ -1,5 +1,4 @@ - state.projectiles = {} PROJECTILE_TYPE = { diff --git a/src/tower.lua b/src/tower.lua index 6195d45..b9b9e3d 100644 --- a/src/tower.lua +++ b/src/tower.lua @@ -1,5 +1,4 @@ - state.towers = {} TOWER_TYPE = { diff --git a/texture.lua b/texture.lua index 3bf2f1e..7b9bb20 100644 --- a/texture.lua +++ b/texture.lua @@ -1,5 +1,4 @@ - local function load_texture(filepath) local status, texture = pcall(am.texture2d, filepath)