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