/traderous

To get this branch, use:
bzr branch http://9ix.org/bzr/traderous

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-06-23 02:28:12 UTC
  • Revision ID: josh@9ix.org-20130623022812-zhz3azvff45bgsw1
bigger space, slower movement, maintain enemy density

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
28
28
                  return -1
29
29
               end
30
30
            end,
31
 
   shortestVector = function(from, to)
32
 
                       if STRICT then
33
 
                          if from.x < the.app.width / 2 or
34
 
                             from.x > the.bg.width - the.app.width / 2 or
35
 
                             from.y < the.app.height / 2 or
36
 
                             from.y > the.bg.height - the.app.height / 2 then
37
 
                             error('"from" coordinate out of bounds: X='..from.x..' Y='..from.y)
38
 
                          end
39
 
 
40
 
                          if to.x < the.app.width / 2 or
41
 
                             to.x > the.bg.width - the.app.width / 2 or
42
 
                             to.y < the.app.height / 2 or
43
 
                             to.y > the.bg.height - the.app.height / 2 then
44
 
                             error('"to" coordinate out of bounds: X='..to.x..' Y='..to.y)
45
 
                          end
46
 
                       end
47
 
 
48
 
                       -- normalize grid to account for mirror zones
49
 
                       local fx = from.x - the.app.width / 2
50
 
                       local fy = from.y - the.app.height / 2
51
 
                       local tx = to.x - the.app.width / 2
52
 
                       local ty = to.y - the.app.height / 2
53
 
 
54
 
                       local short = {}
55
 
 
56
 
                       -- pick shorter x
57
 
                       if math.abs(tx - fx) < math.abs(tx - fx - (the.bg.width - the.app.width)) then
58
 
                          -- straight path is shorter
59
 
                          short.x = tx - fx
60
 
                       else
61
 
                          short.x = tx - fx - (the.bg.width - the.app.width)
62
 
                       end
63
 
 
64
 
                       -- pick shorter y
65
 
                       if math.abs(ty - fy) < math.abs(ty - fy - (the.bg.height - the.app.height)) then
66
 
                          -- straight path is shorter
67
 
                          short.y = ty - fy
68
 
                       else
69
 
                          short.y = ty - fy - (the.bg.height - the.app.height)
70
 
                       end
71
 
 
72
 
                       return vector.new(short.x, short.y)
73
 
                    end
74
31
}
75
32
 
76
33
GameView = View:extend {
90
47
 
91
48
              the.bg = Tile:new{
92
49
                 image = 'data/stars3.png',
93
 
                 width = 13660,
94
 
                 height = 7680
 
50
                 width = 27320,
 
51
                 height = 15360
95
52
              }
96
53
              self:add(the.bg)
97
54
 
105
62
 
106
63
              self:add(the.enemies)
107
64
 
108
 
              local e = Enemy:new{x=400, y=300}
109
 
              --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
110
 
              the.enemies:add(e)
111
 
              self:add(e.thrust) -- why doesn't this work in Enemy.new?
112
 
              self:add(e.shield)
 
65
              for _ = 1, 20 do
 
66
                 local e = Enemy:new{x = math.random(the.bg.width),
 
67
                                     y = math.random(the.bg.height)}
 
68
                 --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
69
                 the.enemies:add(e)
 
70
                 self:add(e.thrust) -- why doesn't this work in Enemy.new?
 
71
                 self:add(e.shield)
 
72
              end
113
73
 
114
74
              self:add(the.bullets)
115
75
              self:add(the.indicators)
116
76
              self:add(the.interface)
117
77
 
118
 
              for _ = 1, math.random(6) do
 
78
              for _ = 1, math.random(3, 6) do
119
79
                 local planet = Planet:new{
120
80
                    x = math.random(the.app.width / 2,
121
81
                                    the.bg.width - the.app.width / 2),
129
89
              the.cursor = Cursor:new()
130
90
              self:add(the.cursor)
131
91
 
 
92
              the.over = Text:new{
 
93
                 y = the.app.height / 2,
 
94
                 width = the.app.width,
 
95
                 align = 'center',
 
96
                 font = 25,
 
97
                 text = "Game Over",
 
98
                 visible = false
 
99
              }
 
100
              the.interface:add(the.over)
 
101
 
 
102
 
 
103
              the.instructions = Text:new{
 
104
                 y = the.app.height / 2 + 32,
 
105
                 width = the.app.width,
 
106
                 align = 'center',
 
107
                 font = 12,
 
108
                 text = "Press Enter to start a new game\nPress Q to quit",
 
109
                 visible = false
 
110
              }
 
111
              the.interface:add(the.instructions)
 
112
 
132
113
              love.mouse.setGrab(true)
133
114
              love.mouse.setVisible(false)
134
115
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)