/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-26 01:11:27 UTC
  • Revision ID: josh@9ix.org-20130626011127-7e7z5ed0r0xmtva3
show planet labels, get better names

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'
23
25
 
24
26
util = {
25
27
   signOf = function(value)
33
35
 
34
36
GameView = View:extend {
35
37
   onNew = function (self)
36
 
              the.storage = Storage:new{filename = 'scores.lua'}
 
38
              the.storage = Storage:new{filename = 'world.lua'}
37
39
              the.storage:load()
38
40
              --if not the.storage.data.highScore then
39
41
              --   print('initializing storage')
43
45
              the.bullets = Group:new()
44
46
              the.interface = Group:new()
45
47
              the.planets = Group:new()
 
48
              the.planetLabels = Group:new()
46
49
              the.indicators = Group:new()
47
50
              the.enemies = Group:new()
48
51
 
 
52
              -- init bg before build/load since planets need to know bg size
49
53
              the.bg = Tile:new{
50
54
                 image = 'data/stars3.png',
51
55
                 width = 27320,
53
57
              }
54
58
              self:add(the.bg)
55
59
 
 
60
              if self.newWorld or not the.storage.data.player then
 
61
                 the.storage.data = {planets = {}}
 
62
 
 
63
                 -- build planets from random
 
64
                 for _ = 1, math.random(3, 6) do
 
65
                    local planet = Planet:new{
 
66
                       x = math.random(the.app.width / 2,
 
67
                                       the.bg.width - the.app.width / 2),
 
68
                       y = math.random(the.app.height / 2,
 
69
                                       the.bg.height - the.app.height / 2),
 
70
                       rotation = math.random() * math.pi
 
71
                    }
 
72
                    the.planets:add(planet)
 
73
                    table.insert(the.storage.data.planets, {
 
74
                                    x = planet.x,
 
75
                                    y = planet.y,
 
76
                                    rotation = planet.rotation,
 
77
                                    goods = planet.goods,
 
78
                                    name = planet.name
 
79
                                 })
 
80
                 end
 
81
 
 
82
                 -- build fresh player
 
83
                 local player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
84
                 the.player = player
 
85
                 the.storage.data.player = {x = player.x,
 
86
                                            y = player.y,
 
87
                                            money = player.money,
 
88
                                            goods = player.goods,
 
89
                                            cargoSpace = player.cargoSpace
 
90
                                         }
 
91
 
 
92
                 the.storage:save()
 
93
              else
 
94
                 -- load planets with x, y, goods
 
95
                 for _, planetData in ipairs(the.storage.data.planets) do
 
96
                    the.planets:add(Planet:new(planetData))
 
97
                 end
 
98
 
 
99
                 -- load player with cargo, money, position
 
100
                 the.player = SpacePlayer:new(the.storage.data.player)
 
101
 
 
102
                 -- reload storage as we've turned it all into objects
 
103
                 the.storage:load()
 
104
              end
 
105
 
56
106
              self:add(the.planets)
 
107
              self:add(the.planetLabels)
57
108
 
58
 
              --the.player = CrystalPlayer:new{x=400,y=300}
59
 
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
60
109
              self:add(the.player)
61
110
              self:add(the.player.thrust)
62
111
              self:add(the.player.shield)
76
125
              self:add(the.indicators)
77
126
              self:add(the.interface)
78
127
 
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
 
 
90
128
              the.cursor = Cursor:new()
91
129
              self:add(the.cursor)
92
130
 
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
 
 
114
131
              love.mouse.setGrab(true)
115
132
              love.mouse.setVisible(false)
116
133
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
168
185
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
169
186
                 self.console:watch('num rocks', '#the.rocks.sprites')
170
187
                 self.console:watch('num planets', '#the.planets.sprites')
 
188
                 self.console:watch('num enemies', 'the.enemies:count()')
171
189
                 --self.console:watch('drawTook', 'the.drawTook')
172
190
 
173
191
                 -- back off that dark overlay a bit