2008-10-14 18:16:26 +02:00
|
|
|
----------------------------------------------------------------------------
|
|
|
|
-- @author Gregor "farhaven" Best
|
|
|
|
-- @copyright 2008 Gregor "farhaven" Best
|
|
|
|
-- @release @AWESOME_VERSION@
|
|
|
|
----------------------------------------------------------------------------
|
|
|
|
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
--{{{ Awesome Invaders by Gregor "farhaven" Best
|
2008-10-14 21:39:56 +02:00
|
|
|
-- The ultra-cool retro graphics are done by Andrei "Garoth" Thorp.
|
2008-10-14 18:16:26 +02:00
|
|
|
--
|
|
|
|
-- Use Left and Right to control motion, Space to fire, q quits the game,
|
|
|
|
-- s creates a screenshot in ~/.cache/awesome (needs ImageMagick).
|
|
|
|
--
|
|
|
|
-- Maybe there are some huge memory leaks here and there, if you notice one,
|
|
|
|
-- message me.
|
|
|
|
--
|
|
|
|
-- Anyway, have fun :)
|
|
|
|
--
|
|
|
|
-- Start this by adding
|
|
|
|
-- require("invaders")
|
|
|
|
-- to the top of your rc.lua and adding
|
|
|
|
-- invaders.run()
|
|
|
|
-- to the bottom of rc.lua or as a keybinding
|
|
|
|
--}}}
|
|
|
|
|
|
|
|
local wibox = wibox
|
|
|
|
local widget = widget
|
|
|
|
local awful = require("awful")
|
2008-10-15 18:59:31 +02:00
|
|
|
local beautiful = require("awful.beautiful")
|
2008-10-14 18:16:26 +02:00
|
|
|
local image = image
|
2008-10-19 19:28:11 +02:00
|
|
|
local capi = { screen = screen, mouse = mouse, keygrabber = keygrabber }
|
2008-10-14 18:16:26 +02:00
|
|
|
|
|
|
|
local tonumber = tonumber
|
|
|
|
local table = table
|
|
|
|
local math = math
|
|
|
|
local os = os
|
|
|
|
local io = io
|
|
|
|
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
--- Space Invaders look-alike
|
2008-10-14 18:16:26 +02:00
|
|
|
module("invaders")
|
|
|
|
|
|
|
|
local gamedata = { }
|
|
|
|
gamedata.field = { }
|
|
|
|
gamedata.field.x = 100
|
|
|
|
gamedata.field.y = 100
|
2008-10-19 19:28:11 +02:00
|
|
|
gamedata.field.h = 400
|
|
|
|
gamedata.field.w = 600
|
2008-10-14 18:16:26 +02:00
|
|
|
gamedata.running = false
|
2008-10-19 19:28:11 +02:00
|
|
|
gamedata.ammo_max = 1
|
2008-10-14 18:16:26 +02:00
|
|
|
gamedata.shots = { }
|
|
|
|
gamedata.highscore = { }
|
|
|
|
gamedata.enemies = { }
|
2008-10-19 19:28:11 +02:00
|
|
|
gamedata.enemies.h = 10
|
|
|
|
gamedata.enemies.w = 20
|
|
|
|
gamedata.enemies.rows = 5
|
|
|
|
gamedata.enemies.count = gamedata.enemies.rows * 6
|
2008-10-14 18:16:26 +02:00
|
|
|
|
|
|
|
local player = { }
|
|
|
|
local game = { }
|
|
|
|
local shots = { }
|
|
|
|
local enemies = { }
|
|
|
|
|
|
|
|
function player.new ()
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
p = wibox({ position = "floating", bg = gamedata.solidbg or "#12345600" })
|
|
|
|
p:geometry({ width = 24,
|
2008-10-14 18:16:26 +02:00
|
|
|
height = 16,
|
|
|
|
x = gamedata.field.x + (gamedata.field.w / 2),
|
|
|
|
y = gamedata.field.y + gamedata.field.h - (16 + 5) })
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
p.screen = 1
|
2008-10-14 18:16:26 +02:00
|
|
|
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
w = widget({ type = "imagebox", name = "player" })
|
2008-10-14 18:16:26 +02:00
|
|
|
w.image = image("@AWESOME_ICON_PATH@/invaders/player.png")
|
2008-10-19 19:14:55 +02:00
|
|
|
p.widgets = w
|
2008-10-14 18:16:26 +02:00
|
|
|
|
|
|
|
return p
|
|
|
|
end
|
|
|
|
|
|
|
|
function player.move(x)
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
local gb = gamedata.player:geometry()
|
2008-10-14 18:16:26 +02:00
|
|
|
|
|
|
|
if x < 0 and gb.x > gamedata.field.x then
|
|
|
|
gb.x = gb.x + x
|
|
|
|
elseif x > 0 and gb.x < gamedata.field.x + gamedata.field.w - 30 then
|
|
|
|
gb.x = gb.x + x
|
|
|
|
end
|
|
|
|
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
gamedata.player:geometry(gb)
|
2008-10-14 18:16:26 +02:00
|
|
|
end
|
|
|
|
|
|
|
|
function player.fire()
|
|
|
|
if gamedata.ammo > 0 then
|
|
|
|
gamedata.ammo = gamedata.ammo - 1
|
|
|
|
gamedata.field.status.text = gamedata.score.." | "..gamedata.ammo .. " "
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
local gb = gamedata.player:geometry()
|
2008-10-14 18:16:26 +02:00
|
|
|
shots.fire(gb.x + 9, gb.y - 10, "#00FF00")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
function shots.fire (x, y, color)
|
|
|
|
local s = wibox({ position = "floating", bg = color })
|
|
|
|
s:geometry({ width = 4, height = 10, x = x, y = y })
|
|
|
|
s.screen = 1
|
|
|
|
|
|
|
|
for i = 1, gamedata.ammo_max do
|
|
|
|
if not gamedata.shots[i] or gamedata.shots[i].screen == nil then
|
|
|
|
gamedata.shots[i] = s
|
|
|
|
break
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
function shots.fire_enemy (x, y, color)
|
|
|
|
if gamedata.enemies.shots.fired < gamedata.enemies.shots.max then
|
|
|
|
gamedata.enemies.shots.fired = gamedata.enemies.shots.fired + 1
|
|
|
|
local s = wibox({ position = "floating", bg = color })
|
|
|
|
s:geometry({ width = 4, height = 10, x = x, y = y })
|
|
|
|
s.screen = 1
|
|
|
|
for i = 1, gamedata.enemies.shots.max do
|
|
|
|
if not gamedata.enemies.shots[i] or gamedata.enemies.shots[i].screen == nil then
|
|
|
|
gamedata.enemies.shots[i] = s
|
|
|
|
break
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
function shots.handle()
|
|
|
|
if not gamedata.running then return false end
|
|
|
|
if gamedata.ammo == gamedata.ammo_max then return false end
|
|
|
|
|
|
|
|
gamedata.ammo = gamedata.ammo_max
|
|
|
|
|
|
|
|
for i = 1, gamedata.ammo_max do
|
|
|
|
local s = gamedata.shots[i]
|
|
|
|
if s and s.screen then
|
|
|
|
gamedata.ammo = gamedata.ammo - 1
|
|
|
|
local g = s:geometry()
|
|
|
|
if g.y < gamedata.field.y + 15 then
|
|
|
|
s.screen = nil
|
|
|
|
gamedata.ammo = gamedata.ammo + 1
|
|
|
|
else
|
2008-10-19 19:28:11 +02:00
|
|
|
g.y = g.y - 6
|
2008-10-14 18:16:26 +02:00
|
|
|
s:geometry(g)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
gamedata.field.status.text = gamedata.score.." | "..gamedata.ammo .. " "
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
function shots.handle_enemy ()
|
|
|
|
if not gamedata.running then return false end
|
|
|
|
if gamedata.enemies.shots.fired == 0 then return false end
|
|
|
|
|
|
|
|
for i = 1, gamedata.enemies.shots.max do
|
|
|
|
local s = gamedata.enemies.shots[i]
|
|
|
|
if s and s.screen then
|
|
|
|
local g = s:geometry()
|
|
|
|
if g.y > gamedata.field.y + gamedata.field.h - 15 then
|
|
|
|
s.screen = nil
|
|
|
|
gamedata.enemies.shots.fired = gamedata.enemies.shots.fired - 1
|
|
|
|
else
|
|
|
|
g.y = g.y + 3
|
|
|
|
s:geometry(g)
|
|
|
|
end
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
if game.collide(gamedata.player, s) then
|
2008-10-14 18:16:26 +02:00
|
|
|
game.over()
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
function enemies.new (t)
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
e = wibox({ position = "floating", bg = gamedata.solidbg or "#12345600" })
|
2008-10-14 18:16:26 +02:00
|
|
|
e:geometry({ height = gamedata.enemies.h, width = gamedata.enemies.w,
|
|
|
|
x = gamedata.field.x,
|
|
|
|
y = gamedata.field.y })
|
|
|
|
e.screen = 1
|
|
|
|
w = widget({ type = "imagebox", name = "enemy"..t })
|
|
|
|
w.image = image("@AWESOME_ICON_PATH@/invaders/enemy_"..t..".png")
|
2008-10-19 19:14:55 +02:00
|
|
|
e.widgets = w
|
2008-10-14 18:16:26 +02:00
|
|
|
return e
|
|
|
|
end
|
|
|
|
|
|
|
|
function enemies.setup()
|
|
|
|
gamedata.enemies.data = { }
|
|
|
|
gamedata.enemies.x = 10
|
|
|
|
gamedata.enemies.y = 5
|
|
|
|
gamedata.enemies.dir = 1
|
|
|
|
if not gamedata.enemies.shots then gamedata.enemies.shots = { } end
|
|
|
|
gamedata.enemies.shots.max = 10
|
|
|
|
gamedata.enemies.shots.fired = 0
|
|
|
|
|
|
|
|
gamedata.enemies.speed_count = 0
|
|
|
|
|
|
|
|
for y = 1, gamedata.enemies.rows do
|
|
|
|
gamedata.enemies.data[y] = { }
|
|
|
|
for x = 1, math.ceil((gamedata.enemies.count / gamedata.enemies.rows) + 1) do
|
|
|
|
gamedata.enemies.data[y][x] = enemies.new( math.random(1, 3) )
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
for i = 1, gamedata.ammo_max do
|
|
|
|
if gamedata.shots[i] then
|
|
|
|
gamedata.shots[i].screen = nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
for i = 1, gamedata.enemies.shots.max do
|
|
|
|
if gamedata.enemies.shots[i] then
|
|
|
|
gamedata.enemies.shots[i].screen = nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
function enemies.handle ()
|
|
|
|
if not gamedata.running then return false end
|
|
|
|
|
|
|
|
gamedata.enemies.number = 0
|
|
|
|
|
|
|
|
for y = 1, #gamedata.enemies.data do
|
|
|
|
for x = 1, #gamedata.enemies.data[y] do
|
|
|
|
local e = gamedata.enemies.data[y][x]
|
|
|
|
if e.screen then
|
|
|
|
local g = e:geometry()
|
|
|
|
gamedata.enemies.number = gamedata.enemies.number + 1
|
|
|
|
if gamedata.enemies.speed_count == (gamedata.enemies.speed - 1) then
|
|
|
|
g.y = math.floor(gamedata.field.y + gamedata.enemies.y + ((y - 1) * gamedata.enemies.h * 2))
|
|
|
|
g.x = math.floor(gamedata.field.x + gamedata.enemies.x + ((x - 1) * gamedata.enemies.w * 2))
|
|
|
|
e:geometry(g)
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
if game.collide(gamedata.player, e) or g.y > gamedata.field.y + gamedata.field.h - 20 then
|
2008-10-14 18:16:26 +02:00
|
|
|
game.over()
|
|
|
|
end
|
|
|
|
end
|
|
|
|
if gamedata.ammo < gamedata.ammo_max then
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
for i = 1, gamedata.ammo_max do
|
2008-10-14 18:16:26 +02:00
|
|
|
local s = gamedata.shots[i]
|
|
|
|
if s and s.screen and game.collide(e, s) then
|
|
|
|
gamedata.enemies.number = gamedata.enemies.number - 1
|
|
|
|
e.screen = nil
|
|
|
|
s.screen = nil
|
|
|
|
|
|
|
|
gamedata.score = gamedata.score + 10
|
|
|
|
gamedata.field.status.text = gamedata.score.." | "..gamedata.ammo.." "
|
|
|
|
break
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
local x = math.random(1, gamedata.enemies.count / gamedata.enemies.rows)
|
|
|
|
if gamedata.enemies.speed_count == (gamedata.enemies.speed - 1)
|
|
|
|
and math.random(0, 150) <= 1
|
|
|
|
and gamedata.enemies.data[y][x].screen then
|
|
|
|
shots.fire_enemy(math.floor(gamedata.field.x + gamedata.enemies.x + ((x - 1) * gamedata.enemies.w)),
|
|
|
|
gamedata.field.y + gamedata.enemies.y + gamedata.enemies.h,
|
|
|
|
"#FF0000")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
if gamedata.enemies.number == 0 then
|
|
|
|
enemies.setup()
|
2008-10-15 18:59:31 +02:00
|
|
|
if gamedata.enemies.speed > 1 then gamedata.enemies.speed = gamedata.enemies.speed - 1 end
|
2008-10-14 18:16:26 +02:00
|
|
|
return false
|
|
|
|
end
|
|
|
|
|
|
|
|
gamedata.enemies.speed_count = gamedata.enemies.speed_count + 1
|
|
|
|
if gamedata.enemies.speed_count < gamedata.enemies.speed then return false end
|
|
|
|
gamedata.enemies.speed_count = 0
|
|
|
|
gamedata.enemies.x = gamedata.enemies.x + math.floor((gamedata.enemies.w * gamedata.enemies.dir) / 4)
|
2008-10-19 19:28:11 +02:00
|
|
|
if gamedata.enemies.x > gamedata.field.w - (2 * gamedata.enemies.w * (gamedata.enemies.count / gamedata.enemies.rows + 1)) + 5
|
2008-10-14 18:16:26 +02:00
|
|
|
or gamedata.enemies.x <= 10 then
|
|
|
|
gamedata.enemies.y = gamedata.enemies.y + gamedata.enemies.h
|
|
|
|
gamedata.enemies.dir = gamedata.enemies.dir * (-1)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
function keyhandler(mod, key)
|
|
|
|
if gamedata.highscore.getkeys then
|
|
|
|
if key:len() == 1 and gamedata.name:len() < 20 then
|
|
|
|
gamedata.name = gamedata.name .. key
|
|
|
|
elseif key == "BackSpace" then
|
|
|
|
gamedata.name = gamedata.name:sub(1, gamedata.name:len() - 1)
|
|
|
|
elseif key == "Return" then
|
|
|
|
gamedata.highscore.window.screen = nil
|
|
|
|
game.highscore_add(gamedata.score, gamedata.name)
|
|
|
|
game.highscore_show()
|
|
|
|
gamedata.highscore.getkeys = false
|
|
|
|
end
|
|
|
|
gamedata.namebox.text = " Name: " .. gamedata.name .. "|"
|
|
|
|
else
|
|
|
|
if key == "Left" then
|
|
|
|
player.move(-10)
|
|
|
|
elseif key == "Right" then
|
|
|
|
player.move(10)
|
|
|
|
elseif key == "q" then
|
|
|
|
game.quit()
|
|
|
|
return false
|
|
|
|
elseif key == " " then
|
|
|
|
player.fire()
|
|
|
|
elseif key == "s" then
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
awful.util.spawn("import -window root "..gamedata.cachedir.."/awesome/invaders-"..os.time()..".png")
|
2008-10-14 18:16:26 +02:00
|
|
|
end
|
|
|
|
end
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
function game.collide(o1, o2)
|
|
|
|
g1 = o1:geometry()
|
|
|
|
g2 = o2:geometry()
|
|
|
|
|
|
|
|
--check if o2 is inside o1
|
|
|
|
if g2.x >= g1.x and g2.x <= g1.x + g1.width
|
|
|
|
and g2.y >= g1.y and g2.y <= g1.y + g1.height then
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
return false
|
|
|
|
end
|
|
|
|
|
|
|
|
function game.over ()
|
|
|
|
gamedata.running = false
|
|
|
|
game.highscore(gamedata.score)
|
|
|
|
end
|
|
|
|
|
|
|
|
function game.quit()
|
|
|
|
gamedata.running = false
|
|
|
|
|
|
|
|
if gamedata.highscore.window then
|
|
|
|
gamedata.highscore.window.screen = nil
|
2008-10-19 19:14:55 +02:00
|
|
|
gamedata.highscore.window.widgets = nil
|
2008-10-14 18:16:26 +02:00
|
|
|
end
|
|
|
|
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
if gamedata.field.background then
|
|
|
|
gamedata.field.background.screen = nil
|
|
|
|
end
|
|
|
|
|
|
|
|
gamedata.player.screen = nil
|
2008-10-19 19:14:55 +02:00
|
|
|
gamedata.player.widgets = nil
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
gamedata.player = nil
|
2008-10-14 18:16:26 +02:00
|
|
|
|
|
|
|
gamedata.field.north.screen = nil
|
|
|
|
gamedata.field.north = nil
|
|
|
|
|
|
|
|
gamedata.field.south.screen = nil
|
|
|
|
gamedata.field.south = nil
|
|
|
|
|
|
|
|
gamedata.field.west.screen = nil
|
|
|
|
gamedata.field.west = nil
|
|
|
|
|
|
|
|
gamedata.field.east.screen = nil
|
|
|
|
gamedata.field.east = nil
|
|
|
|
|
|
|
|
for y = 1, #gamedata.enemies.data do
|
|
|
|
for x = 1, #gamedata.enemies.data[y] do
|
|
|
|
gamedata.enemies.data[y][x].screen = nil
|
2008-10-19 19:14:55 +02:00
|
|
|
gamedata.enemies.data[y][x].widgets = nil
|
2008-10-14 18:16:26 +02:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
for i = 1, gamedata.ammo_max do
|
|
|
|
if gamedata.shots[i] then gamedata.shots[i].screen = nil end
|
|
|
|
end
|
|
|
|
|
|
|
|
for i = 1, gamedata.enemies.shots.max do
|
|
|
|
if gamedata.enemies.shots[i] then gamedata.enemies.shots[i].screen = nil end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
function game.highscore_show ()
|
|
|
|
gamedata.highscore.window:geometry({ height = 140, width = 200,
|
|
|
|
x = gamedata.field.x + math.floor(gamedata.field.w / 2) - 100,
|
|
|
|
y = gamedata.field.y + math.floor(gamedata.field.h / 2) - 55 })
|
|
|
|
gamedata.highscore.window.screen = 1
|
|
|
|
|
|
|
|
gamedata.highscore.table = widget({ type = "textbox", name = "highscore" })
|
2008-10-19 19:14:55 +02:00
|
|
|
gamedata.highscore.window.widgets = gamedata.highscore.table
|
2008-10-14 18:16:26 +02:00
|
|
|
|
|
|
|
gamedata.highscore.table.text = " Highscores:\n"
|
|
|
|
|
|
|
|
for i = 1, 5 do
|
|
|
|
gamedata.highscore.table.text = gamedata.highscore.table.text .. "\n\t" .. gamedata.highscore[i]
|
|
|
|
end
|
|
|
|
|
|
|
|
gamedata.highscore.table.text = gamedata.highscore.table.text .. "\n\n Press Q to quit"
|
|
|
|
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
local fh = io.open(gamedata.cachedir.."/highscore_invaders", "w")
|
|
|
|
|
2008-10-14 18:16:26 +02:00
|
|
|
if not fh then
|
|
|
|
return false
|
|
|
|
end
|
|
|
|
|
|
|
|
for i = 1, 5 do
|
|
|
|
fh:write(gamedata.highscore[i].."\n")
|
|
|
|
end
|
|
|
|
|
|
|
|
fh:close()
|
|
|
|
end
|
|
|
|
|
|
|
|
function game.highscore_add (score, name)
|
|
|
|
local t = gamedata.highscore
|
|
|
|
|
|
|
|
for i = 5, 1, -1 do
|
|
|
|
if tonumber(t[i]:match("(%d+) ")) <= score then
|
|
|
|
if t[i+1] then t[i+1] = t[i] end
|
|
|
|
t[i] = score .. " " .. name
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
gamedata.highscore = t
|
|
|
|
end
|
|
|
|
|
|
|
|
function game.highscore (score)
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
local fh = io.open(gamedata.cachedir.."/highscore_invaders", "r")
|
|
|
|
|
2008-10-14 18:16:26 +02:00
|
|
|
if fh then
|
|
|
|
for i = 1, 5 do
|
|
|
|
gamedata.highscore[i] = fh:read("*line")
|
|
|
|
end
|
|
|
|
fh:close()
|
|
|
|
else
|
|
|
|
for i = 1, 5 do
|
|
|
|
gamedata.highscore[i] = ((6-i)*20).." foo"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
local newentry = false
|
|
|
|
for i = 1, 5 do
|
|
|
|
local s = tonumber(gamedata.highscore[i]:match("(%d+) .*"))
|
|
|
|
if s <= score then newentry = true end
|
|
|
|
end
|
|
|
|
|
2008-10-14 21:39:56 +02:00
|
|
|
gamedata.highscore.window = wibox({ position = "floating",
|
2008-10-15 18:59:31 +02:00
|
|
|
bg = gamedata.btheme.bg_focus or "#333333",
|
|
|
|
fg = gamedata.btheme.fg_focus or "#FFFFFF" })
|
2008-10-14 18:16:26 +02:00
|
|
|
gamedata.highscore.window:geometry({ height = 20, width = 300,
|
|
|
|
x = gamedata.field.x + math.floor(gamedata.field.w / 2) - 150,
|
|
|
|
y = gamedata.field.y + math.floor(gamedata.field.h / 2) })
|
|
|
|
gamedata.highscore.window.screen = 1
|
|
|
|
|
|
|
|
gamedata.namebox = widget({ type = "textbox", name = "foobar" })
|
|
|
|
gamedata.namebox.text = " Name: |"
|
2008-10-19 19:14:55 +02:00
|
|
|
gamedata.highscore.window.widgets = gamedata.namebox
|
2008-10-14 18:16:26 +02:00
|
|
|
|
|
|
|
if newentry then
|
|
|
|
gamedata.name = ""
|
|
|
|
gamedata.highscore.getkeys = true
|
|
|
|
else
|
|
|
|
game.highscore_show()
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
function run(args)
|
|
|
|
gamedata.screen = capi.screen[capi.mouse.screen]
|
|
|
|
gamedata.field.x = gamedata.screen.coords.x + math.floor((gamedata.screen.coords.width - gamedata.field.w) / 2)
|
|
|
|
gamedata.field.y = gamedata.screen.coords.y + math.floor((gamedata.screen.coords.height - gamedata.field.h) / 2)
|
2008-10-19 19:28:11 +02:00
|
|
|
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
if args then
|
|
|
|
if args['x'] then gamedata.field.x = args['x'] end
|
|
|
|
if args['y'] then gamedata.field.y = args['y'] end
|
|
|
|
if args['solidbg'] then gamedata.solidbg = args['solidbg'] end
|
|
|
|
end
|
|
|
|
|
2008-10-14 18:16:26 +02:00
|
|
|
gamedata.score = 0
|
|
|
|
gamedata.name = ""
|
|
|
|
gamedata.ammo = gamedata.ammo_max
|
2008-10-15 18:59:31 +02:00
|
|
|
gamedata.btheme = beautiful.get()
|
2008-10-14 18:16:26 +02:00
|
|
|
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
gamedata.cachedir = awful.util.getdir("cache")
|
|
|
|
|
|
|
|
if gamedata.solidbg then
|
|
|
|
gamedata.field.background = wibox({ position = "floating",
|
|
|
|
bg = gamedata.solidbg })
|
|
|
|
gamedata.field.background:geometry({ x = gamedata.field.x,
|
|
|
|
y = gamedata.field.y,
|
|
|
|
height = gamedata.field.h,
|
|
|
|
width = gamedata.field.w })
|
|
|
|
gamedata.field.background.screen = 1
|
|
|
|
end
|
2008-10-14 18:16:26 +02:00
|
|
|
|
2008-10-19 19:28:11 +02:00
|
|
|
gamedata.field.north = wibox({ position = "floating",
|
2008-10-15 18:59:31 +02:00
|
|
|
bg = gamedata.btheme.bg_focus or "#333333",
|
|
|
|
fg = gamedata.btheme.fg_focus or "#FFFFFF" })
|
2008-10-14 18:16:26 +02:00
|
|
|
gamedata.field.north:geometry({ width = gamedata.field.w + 10,
|
2008-10-14 21:39:56 +02:00
|
|
|
height = 15,
|
|
|
|
x = gamedata.field.x - 5,
|
|
|
|
y = gamedata.field.y - 15 })
|
2008-10-19 19:28:11 +02:00
|
|
|
gamedata.field.north.screen = 1
|
2008-10-14 18:16:26 +02:00
|
|
|
|
|
|
|
gamedata.field.status = widget({ type = "textbox", name = "status", align = "right" })
|
|
|
|
gamedata.field.status.text = gamedata.score.." | "..gamedata.ammo .. " "
|
|
|
|
|
|
|
|
gamedata.field.caption = widget({ type = "textbox", name = "caption", align = "left" })
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
gamedata.field.caption.text = " Awesome Invaders"
|
2008-10-14 18:16:26 +02:00
|
|
|
|
2008-10-19 19:14:55 +02:00
|
|
|
gamedata.field.north.widgets = { gamedata.field.caption, gamedata.field.status }
|
2008-10-14 18:16:26 +02:00
|
|
|
|
2008-10-14 21:39:56 +02:00
|
|
|
gamedata.field.south = wibox({ position = "floating",
|
2008-10-15 18:59:31 +02:00
|
|
|
bg = gamedata.btheme.bg_focus or "#333333",
|
|
|
|
fg = gamedata.btheme.fg_focus or "#FFFFFF" })
|
2008-10-14 18:16:26 +02:00
|
|
|
gamedata.field.south:geometry({ width = gamedata.field.w, height = 5,
|
|
|
|
x = gamedata.field.x,
|
|
|
|
y = gamedata.field.y + gamedata.field.h - 5 })
|
2008-10-19 19:28:11 +02:00
|
|
|
gamedata.field.south.screen = 1
|
2008-10-14 18:16:26 +02:00
|
|
|
|
2008-10-19 19:28:11 +02:00
|
|
|
gamedata.field.west = wibox({ position = "floating",
|
2008-10-15 18:59:31 +02:00
|
|
|
bg = gamedata.btheme.bg_focus or "#333333",
|
|
|
|
fg = gamedata.btheme.fg_focus or "#FFFFFF" })
|
2008-10-14 21:39:56 +02:00
|
|
|
gamedata.field.west:geometry({ width = 5,
|
|
|
|
height = gamedata.field.h,
|
|
|
|
x = gamedata.field.x - 5,
|
|
|
|
y = gamedata.field.y })
|
2008-10-19 19:28:11 +02:00
|
|
|
gamedata.field.west.screen = 1
|
2008-10-14 18:16:26 +02:00
|
|
|
|
2008-10-19 19:28:11 +02:00
|
|
|
gamedata.field.east = wibox({ position = "floating",
|
2008-10-15 18:59:31 +02:00
|
|
|
bg = gamedata.btheme.bg_focus or "#333333",
|
|
|
|
fg = gamedata.btheme.fg_focus or "#FFFFFF" })
|
2008-10-14 18:16:26 +02:00
|
|
|
gamedata.field.east:geometry({ width = 5,
|
|
|
|
height = gamedata.field.h,
|
|
|
|
x = gamedata.field.x + gamedata.field.w,
|
|
|
|
y = gamedata.field.y })
|
2008-10-19 19:28:11 +02:00
|
|
|
gamedata.field.east.screen = 1
|
2008-10-14 18:16:26 +02:00
|
|
|
|
|
|
|
gamedata.enemies.speed = 5
|
|
|
|
enemies.setup()
|
|
|
|
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
gamedata.player = player.new()
|
2008-10-19 19:28:11 +02:00
|
|
|
capi.keygrabber.run(keyhandler)
|
Various changes to awful.util and invaders
This commit changes various aspects of awful.util and invaders:
awful.util:
- added awful.util.getdir(d)
This function takes one argument and returns a matching directory,
as of now, only "cache" is supported. The return value is either
$XDG_CACHE_HOME/awesome/ or $HOME/.cache/awesome/, XDG_CACHE_HOME
takes precedence
invaders:
- renamed invaders to awesome invaders
at two places in the sourcecode, invaders is referred to as
"Space Invaders for Awesome". As Taiko holds the trademark for
the term "Space Invaders", I changed both of its occurences to
"Awesome Invaders" to avoid conflicts with the law of Japan and
the United States of America (and possibly others)
- added support for XDG_CACHE_HOME
this change adds support for XDG_CACHE_HOME as the cache directory
for highscores and screenshots
- added some parameters to invaders.run()
this change adds three parameters to invaders.run, supplied as a
table. They are "x", "y" and "solidbg".
"x" sets the X coordinate of the playfield
"y" sets the Y coordinate of the playfield
"solidbg" sets the color of the playfield background for people who
have problems with transparency. This still looks rather hackish and
needs to be polished
- changed startup position
up until now, invaders always started at (100,100) on the first
screen, now it starts centered to the screen on which the mouse cursor
is.
2008-10-17 19:05:57 +02:00
|
|
|
gamedata.running = true
|
2008-10-14 18:16:26 +02:00
|
|
|
end
|
|
|
|
|
2008-10-19 19:28:11 +02:00
|
|
|
awful.hooks.timer.register(0.02, shots.handle)
|
2008-10-14 18:16:26 +02:00
|
|
|
awful.hooks.timer.register(0.03, shots.handle_enemy)
|
|
|
|
awful.hooks.timer.register(0.01, enemies.handle)
|