/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 16:54:23 UTC
  • Revision ID: josh@9ix.org-20110917165423-wflahgpej1hbjowe
harder to see creatures

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(20.0f),
 
7
                     MAXSPEED(60.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);
15
14
 
16
15
    AddTag("player");
17
16
 
18
17
    footsteps = Audio::NewDeck(Assets::RequestAudio("footsteps.ogg"));
19
18
    footsteps->SetLoops(0); //loop indefinitely
20
19
    
21
 
    SetCollider(new RectangleCollider(16, 16));
 
20
    SetCollider(new RectangleCollider(32, 32));
22
21
  }
23
22
 
24
23
  void Player::Update()
79
78
 
80
79
  Creature::Creature() : Entity(),
81
80
                         FRICTION(800),
82
 
                         MAXSPEED(15.0f),
 
81
                         MAXSPEED(30.0f),
83
82
                         ACCELERATION(1200)                      
84
83
  {
85
84
    sprite = new SpriteAnimation("creature.png", FILTER_NONE, 64, 64);
87
86
    sprite->Add("move", 1, 2, 4.0f);
88
87
    sprite->Play("idle");
89
88
    SetGraphic(sprite);
90
 
    scale = Vector2(0.25, 0.25);
91
89
 
92
90
    AddTag("creature");
93
 
    SetCollider(new RectangleCollider(16, 16));
 
91
    SetCollider(new RectangleCollider(32, 32));
94
92
 
95
93
    skitter1 = Audio::NewDeck(Assets::RequestAudio("skitter1.ogg"));
96
94
    skitter1->SetLoops(0); //loop indefinitely
97
95
 
98
 
    velocity = Vector2::Random() * MAXSPEED;
 
96
    velocity = Vector2::Random() * ACCELERATION;
99
97
 
100
98
    //set aiTime to random so creatures tick at different times
101
99
    aiTime= (float(rand()) / float(RAND_MAX)) * 1.0f;
108
106
    aiTime += Monocle::deltaTime;
109
107
    if (aiTime > 1.0f)
110
108
      {
111
 
        switch (rand() % 3)
 
109
        switch (rand() % 2)
112
110
          {
113
111
          case 0: // idle
114
112
            //printf("idle\n");