/minild29

To get this branch, use:
bzr branch http://9ix.org/bzr/minild29

« back to all changes in this revision

Viewing changes to Dark.cpp

  • Committer: Josh C
  • Date: 2011-09-17 17:12:23 UTC
  • Revision ID: josh@9ix.org-20110917171223-hsvrl6q7mxxbc1sv
creatures move less, make everything smaller

Show diffs side-by-side

added added

removed removed

Lines of Context:
Dark.cpp
4
4
{
5
5
  Player::Player() : Entity(),
6
6
                     FRICTION(400),
7
 
                     MAXSPEED(60.0f),
 
7
                     MAXSPEED(20.0f),
8
8
                     ACCELERATION(800)
9
9
  {
10
10
    sprite = new SpriteAnimation("player.png", FILTER_NONE, 64, 64);
11
11
    sprite->Add("idle", 0, 0, 0.35f);
12
12
    sprite->Play("idle");
13
13
    SetGraphic(sprite);
 
14
    scale = Vector2(0.25, 0.25);
14
15
 
15
16
    AddTag("player");
16
17
 
17
18
    footsteps = Audio::NewDeck(Assets::RequestAudio("footsteps.ogg"));
18
19
    footsteps->SetLoops(0); //loop indefinitely
19
20
    
20
 
    SetCollider(new RectangleCollider(32, 32));
 
21
    SetCollider(new RectangleCollider(16, 16));
21
22
  }
22
23
 
23
24
  void Player::Update()
78
79
 
79
80
  Creature::Creature() : Entity(),
80
81
                         FRICTION(800),
81
 
                         MAXSPEED(30.0f),
 
82
                         MAXSPEED(15.0f),
82
83
                         ACCELERATION(1200)                      
83
84
  {
84
85
    sprite = new SpriteAnimation("creature.png", FILTER_NONE, 64, 64);
85
86
    sprite->Add("idle", 0, 0, 0.35f);
 
87
    sprite->Add("move", 1, 2, 4.0f);
86
88
    sprite->Play("idle");
87
89
    SetGraphic(sprite);
 
90
    scale = Vector2(0.25, 0.25);
88
91
 
89
92
    AddTag("creature");
90
 
    SetCollider(new RectangleCollider(32, 32));
 
93
    SetCollider(new RectangleCollider(16, 16));
91
94
 
92
95
    skitter1 = Audio::NewDeck(Assets::RequestAudio("skitter1.ogg"));
93
96
    skitter1->SetLoops(0); //loop indefinitely
94
97
 
95
 
    velocity = Vector2::Random() * ACCELERATION;
 
98
    velocity = Vector2::Random() * MAXSPEED;
96
99
 
97
100
    //set aiTime to random so creatures tick at different times
98
101
    aiTime= (float(rand()) / float(RAND_MAX)) * 1.0f;
105
108
    aiTime += Monocle::deltaTime;
106
109
    if (aiTime > 1.0f)
107
110
      {
108
 
        switch (rand() % 2)
 
111
        switch (rand() % 3)
109
112
          {
110
113
          case 0: // idle
111
114
            //printf("idle\n");
153
156
    if (ycol) {velocity.y = 0;}
154
157
 
155
158
    if (velocity.GetSquaredMagnitude() > 20)
156
 
      skitter1->Play();
 
159
      {
 
160
        skitter1->Play();
 
161
        sprite->Play("move");
 
162
      }
157
163
    else
158
 
      skitter1->Pause(); //Stop()?
 
164
      {
 
165
        skitter1->Pause(); //Stop()?
 
166
        sprite->Play("idle");
 
167
      }
159
168
  }
160
169
 
161
170
  // Scene
212
221
    creature2->position = Graphics::GetScreenCenter();
213
222
    Add(creature2);
214
223
 
215
 
    Graphics::SetBackgroundColor(Color::green * 0.2f);
 
224
    Graphics::SetBackgroundColor(Color::black * 0.2f);
216
225
 
217
226
  }
218
227