/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:05:10 UTC
  • Revision ID: josh@9ix.org-20130623020510-i4t86yocvbjab19o
higher planet floor, recharge shields when you land, stop moving when you land

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'
23
22
 
24
23
util = {
25
24
   signOf = function(value)
29
28
                  return -1
30
29
               end
31
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
32
74
}
33
75
 
34
76
GameView = View:extend {
35
77
   onNew = function (self)
36
 
              the.storage = Storage:new{filename = 'world.lua'}
 
78
              the.storage = Storage:new{filename = 'scores.lua'}
37
79
              the.storage:load()
38
80
              --if not the.storage.data.highScore then
39
81
              --   print('initializing storage')
46
88
              the.indicators = Group:new()
47
89
              the.enemies = Group:new()
48
90
 
49
 
              -- init bg before build/load since planets need to know bg size
50
91
              the.bg = Tile:new{
51
92
                 image = 'data/stars3.png',
52
 
                 width = 27320,
53
 
                 height = 15360
 
93
                 width = 13660,
 
94
                 height = 7680
54
95
              }
55
96
              self:add(the.bg)
56
97
 
57
 
              if self.newWorld or not the.storage.data.player then
58
 
                 the.storage.data = {planets = {}}
59
 
 
60
 
                 -- build planets from random
61
 
                 for _ = 1, math.random(3, 6) do
62
 
                    local planet = Planet:new{
63
 
                       x = math.random(the.app.width / 2,
64
 
                                       the.bg.width - the.app.width / 2),
65
 
                       y = math.random(the.app.height / 2,
66
 
                                       the.bg.height - the.app.height / 2),
67
 
                       rotation = math.random() * math.pi
68
 
                    }
69
 
                    the.planets:add(planet)
70
 
                    table.insert(the.storage.data.planets, {
71
 
                                    x = planet.x,
72
 
                                    y = planet.y,
73
 
                                    rotation = planet.rotation,
74
 
                                    goods = planet.goods
75
 
                                 })
76
 
                 end
77
 
 
78
 
                 -- build fresh player
79
 
                 local player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
80
 
                 the.player = player
81
 
                 the.storage.data.player = {x = player.x,
82
 
                                            y = player.y,
83
 
                                            money = player.money,
84
 
                                            goods = player.goods,
85
 
                                            cargoSpace = player.cargoSpace
86
 
                                         }
87
 
 
88
 
                 the.storage:save()
89
 
              else
90
 
                 -- load planets with x, y, goods
91
 
                 for _, planetData in ipairs(the.storage.data.planets) do
92
 
                    the.planets:add(Planet:new(planetData))
93
 
                 end
94
 
 
95
 
                 -- load player with cargo, money, position
96
 
                 the.player = SpacePlayer:new(the.storage.data.player)
97
 
              end
98
 
 
99
98
              self:add(the.planets)
100
99
 
 
100
              --the.player = CrystalPlayer:new{x=400,y=300}
 
101
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
101
102
              self:add(the.player)
102
103
              self:add(the.player.thrust)
103
104
              self:add(the.player.shield)
104
105
 
105
106
              self:add(the.enemies)
106
107
 
107
 
              for _ = 1, 20 do
 
108
              for _ = 1, 5 do
108
109
                 local e = Enemy:new{x = math.random(the.bg.width),
109
110
                                     y = math.random(the.bg.height)}
110
111
                 --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
117
118
              self:add(the.indicators)
118
119
              self:add(the.interface)
119
120
 
 
121
              for _ = 1, math.random(3, 6) do
 
122
                 local planet = Planet:new{
 
123
                    x = math.random(the.app.width / 2,
 
124
                                    the.bg.width - the.app.width / 2),
 
125
                    y = math.random(the.app.height / 2,
 
126
                                    the.bg.height - the.app.height / 2),
 
127
                    rotation = math.random() * math.pi
 
128
                 }
 
129
                 the.planets:add(planet)
 
130
              end
 
131
 
120
132
              the.cursor = Cursor:new()
121
133
              self:add(the.cursor)
122
134
 
148
160
              self.focus = the.player
149
161
           end,
150
162
   onUpdate = function(self, dt)
151
 
                 if the.keys:justPressed('escape') then
152
 
                    PauseView:new():activate()
153
 
                 end
154
 
 
155
163
                 the.bullets:collide(the.planets)
156
164
                 the.bullets:collide(the.player)
157
165
                 the.bullets:collide(the.enemies)
198
206
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
199
207
                 self.console:watch('num rocks', '#the.rocks.sprites')
200
208
                 self.console:watch('num planets', '#the.planets.sprites')
201
 
                 self.console:watch('num enemies', 'the.enemies:count()')
202
209
                 --self.console:watch('drawTook', 'the.drawTook')
203
210
 
204
211
                 -- back off that dark overlay a bit
207
214
           end,
208
215
   onUpdate = function (self, dt)
209
216
                 if not (DEBUG and the.console.visible) then
210
 
                    if the.keys:justPressed('return') and the.keys:pressed('alt') then
211
 
                       love.graphics.toggleFullscreen()
 
217
                    if the.keys:justPressed('q') then
 
218
                       self.quit()
 
219
                    elseif the.keys:justPressed('return') then
 
220
                       if the.keys:pressed('alt') then
 
221
                          love.graphics.toggleFullscreen()
 
222
                       else
 
223
                          self.view = GameView:new()
 
224
                       end
212
225
                    elseif the.keys:justPressed('f1') then
213
226
                       local ss = love.graphics.newScreenshot()
214
227
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')