/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
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)
33
32
 
34
33
GameView = View:extend {
35
34
   onNew = function (self)
36
 
              the.storage = Storage:new{filename = 'world.lua'}
 
35
              the.storage = Storage:new{filename = 'scores.lua'}
37
36
              the.storage:load()
38
37
              --if not the.storage.data.highScore then
39
38
              --   print('initializing storage')
46
45
              the.indicators = Group:new()
47
46
              the.enemies = Group:new()
48
47
 
49
 
              -- init bg before build/load since planets need to know bg size
50
48
              the.bg = Tile:new{
51
49
                 image = 'data/stars3.png',
52
50
                 width = 27320,
54
52
              }
55
53
              self:add(the.bg)
56
54
 
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
 
 
98
 
                 -- reload storage as we've turned it all into objects
99
 
                 the.storage:load()
100
 
              end
101
 
 
102
55
              self:add(the.planets)
103
56
 
 
57
              --the.player = CrystalPlayer:new{x=400,y=300}
 
58
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
104
59
              self:add(the.player)
105
60
              self:add(the.player.thrust)
106
61
              self:add(the.player.shield)
120
75
              self:add(the.indicators)
121
76
              self:add(the.interface)
122
77
 
 
78
              for _ = 1, math.random(3, 6) do
 
79
                 local planet = Planet:new{
 
80
                    x = math.random(the.app.width / 2,
 
81
                                    the.bg.width - the.app.width / 2),
 
82
                    y = math.random(the.app.height / 2,
 
83
                                    the.bg.height - the.app.height / 2),
 
84
                    rotation = math.random() * math.pi
 
85
                 }
 
86
                 the.planets:add(planet)
 
87
              end
 
88
 
123
89
              the.cursor = Cursor:new()
124
90
              self:add(the.cursor)
125
91
 
151
117
              self.focus = the.player
152
118
           end,
153
119
   onUpdate = function(self, dt)
154
 
                 if the.keys:justPressed('escape') then
155
 
                    PauseView:new():activate()
156
 
                 end
157
 
 
158
120
                 the.bullets:collide(the.planets)
159
121
                 the.bullets:collide(the.player)
160
122
                 the.bullets:collide(the.enemies)
201
163
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
202
164
                 self.console:watch('num rocks', '#the.rocks.sprites')
203
165
                 self.console:watch('num planets', '#the.planets.sprites')
204
 
                 self.console:watch('num enemies', 'the.enemies:count()')
205
166
                 --self.console:watch('drawTook', 'the.drawTook')
206
167
 
207
168
                 -- back off that dark overlay a bit
210
171
           end,
211
172
   onUpdate = function (self, dt)
212
173
                 if not (DEBUG and the.console.visible) then
213
 
                    if the.keys:justPressed('return') and the.keys:pressed('alt') then
214
 
                       love.graphics.toggleFullscreen()
 
174
                    if the.keys:justPressed('q') then
 
175
                       self.quit()
 
176
                    elseif the.keys:justPressed('return') then
 
177
                       if the.keys:pressed('alt') then
 
178
                          love.graphics.toggleFullscreen()
 
179
                       else
 
180
                          self.view = GameView:new()
 
181
                       end
215
182
                    elseif the.keys:justPressed('f1') then
216
183
                       local ss = love.graphics.newScreenshot()
217
184
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')