/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
23
 
25
24
util = {
26
25
   signOf = function(value)
34
33
 
35
34
GameView = View:extend {
36
35
   onNew = function (self)
37
 
              the.storage = Storage:new{filename = 'world.lua'}
 
36
              the.storage = Storage:new{filename = 'scores.lua'}
38
37
              the.storage:load()
39
38
              --if not the.storage.data.highScore then
40
39
              --   print('initializing storage')
47
46
              the.indicators = Group:new()
48
47
              the.enemies = Group:new()
49
48
 
50
 
              -- init bg before build/load since planets need to know bg size
51
49
              the.bg = Tile:new{
52
50
                 image = 'data/stars3.png',
53
51
                 width = 27320,
55
53
              }
56
54
              self:add(the.bg)
57
55
 
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
 
                                 })
77
 
                 end
78
 
 
79
 
                 -- build fresh player
80
 
                 local player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
81
 
                 the.player = player
82
 
                 the.storage.data.player = {x = player.x,
83
 
                                            y = player.y,
84
 
                                            money = player.money,
85
 
                                            goods = player.goods,
86
 
                                            cargoSpace = player.cargoSpace
87
 
                                         }
88
 
 
89
 
                 the.storage:save()
90
 
              else
91
 
                 -- load planets with x, y, goods
92
 
                 for _, planetData in ipairs(the.storage.data.planets) do
93
 
                    the.planets:add(Planet:new(planetData))
94
 
                 end
95
 
 
96
 
                 -- load player with cargo, money, position
97
 
                 the.player = SpacePlayer:new(the.storage.data.player)
98
 
 
99
 
                 -- reload storage as we've turned it all into objects
100
 
                 the.storage:load()
101
 
              end
102
 
 
103
56
              self:add(the.planets)
104
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}
105
60
              self:add(the.player)
106
61
              self:add(the.player.thrust)
107
62
              self:add(the.player.shield)
121
76
              self:add(the.indicators)
122
77
              self:add(the.interface)
123
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
 
124
90
              the.cursor = Cursor:new()
125
91
              self:add(the.cursor)
126
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
 
127
114
              love.mouse.setGrab(true)
128
115
              love.mouse.setVisible(false)
129
116
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
181
168
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
182
169
                 self.console:watch('num rocks', '#the.rocks.sprites')
183
170
                 self.console:watch('num planets', '#the.planets.sprites')
184
 
                 self.console:watch('num enemies', 'the.enemies:count()')
185
171
                 --self.console:watch('drawTook', 'the.drawTook')
186
172
 
187
173
                 -- back off that dark overlay a bit