/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:
main.lua
20
20
require 'trade_view'
21
21
require 'shield'
22
22
require 'pause_view'
23
 
require 'game_over'
24
 
require 'names'
25
 
require 'good'
26
23
 
27
24
util = {
28
25
   signOf = function(value)
36
33
 
37
34
GameView = View:extend {
38
35
   onNew = function (self)
39
 
              the.storage = Storage:new{filename = 'world.lua'}
 
36
              the.storage = Storage:new{filename = 'scores.lua'}
40
37
              the.storage:load()
41
38
              --if not the.storage.data.highScore then
42
39
              --   print('initializing storage')
46
43
              the.bullets = Group:new()
47
44
              the.interface = Group:new()
48
45
              the.planets = Group:new()
49
 
              the.planetLabels = Group:new()
50
46
              the.indicators = Group:new()
51
47
              the.enemies = Group:new()
52
48
 
53
 
              -- init bg before build/load since planets need to know bg size
54
49
              the.bg = Tile:new{
55
50
                 image = 'data/stars3.png',
56
51
                 width = 27320,
58
53
              }
59
54
              self:add(the.bg)
60
55
 
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(5, 7) 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
56
              self:add(the.planets)
110
 
              self:add(the.planetLabels)
111
57
 
 
58
              --the.player = CrystalPlayer:new{x=400,y=300}
 
59
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
112
60
              self:add(the.player)
113
61
              self:add(the.player.thrust)
114
62
              self:add(the.player.shield)
128
76
              self:add(the.indicators)
129
77
              self:add(the.interface)
130
78
 
 
79
              for _ = 1, math.random(3, 6) do
 
80
                 local planet = Planet:new{
 
81
                    x = math.random(the.app.width / 2,
 
82
                                    the.bg.width - the.app.width / 2),
 
83
                    y = math.random(the.app.height / 2,
 
84
                                    the.bg.height - the.app.height / 2),
 
85
                    rotation = math.random() * math.pi
 
86
                 }
 
87
                 the.planets:add(planet)
 
88
              end
 
89
 
131
90
              the.cursor = Cursor:new()
132
91
              self:add(the.cursor)
133
92
 
 
93
              the.over = Text:new{
 
94
                 y = the.app.height / 2,
 
95
                 width = the.app.width,
 
96
                 align = 'center',
 
97
                 font = 25,
 
98
                 text = "Game Over",
 
99
                 visible = false
 
100
              }
 
101
              the.interface:add(the.over)
 
102
 
 
103
 
 
104
              the.instructions = Text:new{
 
105
                 y = the.app.height / 2 + 32,
 
106
                 width = the.app.width,
 
107
                 align = 'center',
 
108
                 font = 12,
 
109
                 text = "Press Enter to start a new game\nPress Q to quit",
 
110
                 visible = false
 
111
              }
 
112
              the.interface:add(the.instructions)
 
113
 
134
114
              love.mouse.setGrab(true)
135
115
              love.mouse.setVisible(false)
136
116
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
171
151
}
172
152
 
173
153
the.app = App:new {
174
 
   name = 'Traderous',
175
154
   onRun = function (self)
176
155
              print('Version: ' .. VERSION)
177
156
 
189
168
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
190
169
                 self.console:watch('num rocks', '#the.rocks.sprites')
191
170
                 self.console:watch('num planets', '#the.planets.sprites')
192
 
                 self.console:watch('num enemies', 'the.enemies:count()')
193
 
                 self.console:watch('onPlanet', 'the.player.onPlanet')
194
 
                 self.console:watch('kills', 'the.player.kills')
195
171
                 --self.console:watch('drawTook', 'the.drawTook')
196
172
 
197
173
                 -- back off that dark overlay a bit