/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-25 17:05:31 UTC
  • Revision ID: josh@9ix.org-20130625170531-4es1bgbdaf0q8sch
fix start new game

Show diffs side-by-side

added added

removed removed

Lines of Context:
19
19
require 'planet'
20
20
require 'trade_view'
21
21
require 'shield'
 
22
require 'pause_view'
22
23
 
23
24
util = {
24
25
   signOf = function(value)
28
29
                  return -1
29
30
               end
30
31
            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
32
}
75
33
 
76
34
GameView = View:extend {
90
48
 
91
49
              the.bg = Tile:new{
92
50
                 image = 'data/stars3.png',
93
 
                 width = 13660,
94
 
                 height = 7680
 
51
                 width = 27320,
 
52
                 height = 15360
95
53
              }
96
54
              self:add(the.bg)
97
55
 
105
63
 
106
64
              self:add(the.enemies)
107
65
 
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)
 
66
              for _ = 1, 20 do
 
67
                 local e = Enemy:new{x = math.random(the.bg.width),
 
68
                                     y = math.random(the.bg.height)}
 
69
                 --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
70
                 the.enemies:add(e)
 
71
                 self:add(e.thrust) -- why doesn't this work in Enemy.new?
 
72
                 self:add(e.shield)
 
73
              end
113
74
 
114
75
              self:add(the.bullets)
115
76
              self:add(the.indicators)
116
77
              self:add(the.interface)
117
78
 
118
 
              for _ = 1, math.random(6) do
 
79
              for _ = 1, math.random(3, 6) do
119
80
                 local planet = Planet:new{
120
81
                    x = math.random(the.app.width / 2,
121
82
                                    the.bg.width - the.app.width / 2),
157
118
              self.focus = the.player
158
119
           end,
159
120
   onUpdate = function(self, dt)
 
121
                 if the.keys:justPressed('escape') then
 
122
                    PauseView:new():activate()
 
123
                 end
 
124
 
160
125
                 the.bullets:collide(the.planets)
161
126
                 the.bullets:collide(the.player)
162
127
                 the.bullets:collide(the.enemies)
211
176
           end,
212
177
   onUpdate = function (self, dt)
213
178
                 if not (DEBUG and the.console.visible) then
214
 
                    if the.keys:justPressed('q') then
215
 
                       self.quit()
216
 
                    elseif the.keys:justPressed('return') then
217
 
                       if the.keys:pressed('alt') then
218
 
                          love.graphics.toggleFullscreen()
219
 
                       else
220
 
                          self.view = GameView:new()
221
 
                       end
 
179
                    if the.keys:justPressed('return') and the.keys:pressed('alt') then
 
180
                       love.graphics.toggleFullscreen()
222
181
                    elseif the.keys:justPressed('f1') then
223
182
                       local ss = love.graphics.newScreenshot()
224
183
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')