/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
 
require 'game_over'
24
22
 
25
23
util = {
26
24
   signOf = function(value)
34
32
 
35
33
GameView = View:extend {
36
34
   onNew = function (self)
37
 
              the.storage = Storage:new{filename = 'world.lua'}
 
35
              the.storage = Storage:new{filename = 'scores.lua'}
38
36
              the.storage:load()
39
37
              --if not the.storage.data.highScore then
40
38
              --   print('initializing storage')
47
45
              the.indicators = Group:new()
48
46
              the.enemies = Group:new()
49
47
 
50
 
              -- init bg before build/load since planets need to know bg size
51
48
              the.bg = Tile:new{
52
49
                 image = 'data/stars3.png',
53
50
                 width = 27320,
55
52
              }
56
53
              self:add(the.bg)
57
54
 
58
 
              if self.newWorld or not the.storage.data.player then
59
 
                 the.storage.data = {planets = {}}
60
 
 
61
 
                 -- build planets from random
62
 
                 for _ = 1, math.random(3, 6) do
63
 
                    local planet = Planet:new{
64
 
                       x = math.random(the.app.width / 2,
65
 
                                       the.bg.width - the.app.width / 2),
66
 
                       y = math.random(the.app.height / 2,
67
 
                                       the.bg.height - the.app.height / 2),
68
 
                       rotation = math.random() * math.pi
69
 
                    }
70
 
                    the.planets:add(planet)
71
 
                    table.insert(the.storage.data.planets, {
72
 
                                    x = planet.x,
73
 
                                    y = planet.y,
74
 
                                    rotation = planet.rotation,
75
 
                                    goods = planet.goods,
76
 
                                    name = planet.name
77
 
                                 })
78
 
                 end
79
 
 
80
 
                 -- build fresh player
81
 
                 local player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
82
 
                 the.player = player
83
 
                 the.storage.data.player = {x = player.x,
84
 
                                            y = player.y,
85
 
                                            money = player.money,
86
 
                                            goods = player.goods,
87
 
                                            cargoSpace = player.cargoSpace
88
 
                                         }
89
 
 
90
 
                 the.storage:save()
91
 
              else
92
 
                 -- load planets with x, y, goods
93
 
                 for _, planetData in ipairs(the.storage.data.planets) do
94
 
                    the.planets:add(Planet:new(planetData))
95
 
                 end
96
 
 
97
 
                 -- load player with cargo, money, position
98
 
                 the.player = SpacePlayer:new(the.storage.data.player)
99
 
 
100
 
                 -- reload storage as we've turned it all into objects
101
 
                 the.storage:load()
102
 
              end
103
 
 
104
55
              self:add(the.planets)
105
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}
106
59
              self:add(the.player)
107
60
              self:add(the.player.thrust)
108
61
              self:add(the.player.shield)
122
75
              self:add(the.indicators)
123
76
              self:add(the.interface)
124
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
 
125
89
              the.cursor = Cursor:new()
126
90
              self:add(the.cursor)
127
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
 
128
113
              love.mouse.setGrab(true)
129
114
              love.mouse.setVisible(false)
130
115
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
132
117
              self.focus = the.player
133
118
           end,
134
119
   onUpdate = function(self, dt)
135
 
                 if the.keys:justPressed('escape') then
136
 
                    PauseView:new():activate()
137
 
                 end
138
 
 
139
120
                 the.bullets:collide(the.planets)
140
121
                 the.bullets:collide(the.player)
141
122
                 the.bullets:collide(the.enemies)
182
163
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
183
164
                 self.console:watch('num rocks', '#the.rocks.sprites')
184
165
                 self.console:watch('num planets', '#the.planets.sprites')
185
 
                 self.console:watch('num enemies', 'the.enemies:count()')
186
166
                 --self.console:watch('drawTook', 'the.drawTook')
187
167
 
188
168
                 -- back off that dark overlay a bit
191
171
           end,
192
172
   onUpdate = function (self, dt)
193
173
                 if not (DEBUG and the.console.visible) then
194
 
                    if the.keys:justPressed('return') and the.keys:pressed('alt') then
195
 
                       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
196
182
                    elseif the.keys:justPressed('f1') then
197
183
                       local ss = love.graphics.newScreenshot()
198
184
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')