/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-18 18:28:31 UTC
  • Revision ID: josh@9ix.org-20110918182831-w01844h80jb8r2y0
stalker moves slow and sniffs (and doesn't scuttle)

Show diffs side-by-side

added added

removed removed

Lines of Context:
Dark.cpp
93
93
 
94
94
  Creature::Creature() : Entity(),
95
95
                         FRICTION(800),
96
 
                         MAXSPEED(80.0f),
97
96
                         ACCELERATION(1200),
98
 
                         STALKSPEED(5.0f),
99
 
                         HUNTSPEED(80.0f)
 
97
                         DEFAULT_MAXSPEED(80.0f),
 
98
                         STALKSPEED(20.0f)
100
99
  {
101
100
    sprite = new SpriteAnimation("creature.png", FILTER_NONE, 64, 64);
102
101
    sprite->Add("idle", 0, 0, 0.35f);
103
102
    sprite->Add("move", 1, 2, 4.0f);
 
103
    sprite->Add("slowmove", 1, 2, 2.0f);
104
104
    sprite->Play("idle");
105
105
    SetGraphic(sprite);
106
106
    scale = Vector2(0.25, 0.25);
111
111
    skitter1 = Audio::NewDeck(Assets::RequestAudio("skitter1.ogg"));
112
112
    skitter1->SetLoops(0); //loop indefinitely
113
113
    alert = Assets::RequestAudio("alert.ogg");
114
 
    stalk = Assets::RequestAudio("stalk.ogg");
 
114
    sniff = Audio::NewDeck(Assets::RequestAudio("sniff.ogg"));
 
115
    sniff->SetLoops(0);
115
116
 
116
 
    velocity = Vector2::Random() * MAXSPEED;
 
117
    maxspeed = DEFAULT_MAXSPEED;
117
118
 
118
119
    //set aiTime to random so creatures tick at different times
119
120
    aiTime= (float(rand()) / float(RAND_MAX)) * 1.0f;
174
175
             pow(player->noisiness * 2, 2) )
175
176
          {
176
177
            state = "stalk";
177
 
            stalk->Play();
178
178
            Ping::NewPing(position, 8.0f, 32.0f, 0.15f);
179
 
            direction = (player->position - position).GetNormalized() * STALKSPEED;
 
179
            direction = (player->position - position).GetNormalized();
 
180
            maxspeed = STALKSPEED;
180
181
            aiTime = 0.0f;
181
182
            noiseTime = 0.0f;
182
183
          }
203
204
            || Collide("player")
204
205
            )
205
206
          {
206
 
            state == "hunt";
207
 
            direction = (player->position - position).GetNormalized() * HUNTSPEED;
 
207
            //state = "hunt";
 
208
            direction = (player->position - position).GetNormalized();
 
209
            //maxspeed = DEFAULT_MAXSPEED;
208
210
            // Play hunt noise (REEET!)
209
211
 
210
212
          }
222
224
    velocity.x = APPROACH(velocity.x, 0, FRICTION * Monocle::deltaTime);
223
225
    velocity.y = APPROACH(velocity.y, 0, FRICTION * Monocle::deltaTime);
224
226
 
225
 
    if (velocity.GetSquaredMagnitude() > pow(MAXSPEED, 2))
226
 
      velocity = velocity.GetNormalized() * MAXSPEED;
 
227
    if (velocity.GetSquaredMagnitude() > pow(maxspeed, 2))
 
228
      velocity = velocity.GetNormalized() * maxspeed;
227
229
 
228
230
    bool xcol = false;
229
231
    bool ycol = false;
248
250
      }
249
251
    if (ycol) {velocity.y = 0;}
250
252
 
251
 
    if (velocity.GetSquaredMagnitude() > 20)
252
 
      {
253
 
        Vector2 distance = ((DarkScene *)scene)->player->position - position;
 
253
    Vector2 distance = ((DarkScene *)scene)->player->position - position;
 
254
    if (state == "stalk")
 
255
      {
 
256
        float vol = (distance.GetMagnitude() / 250.0f) + 1.0f;
 
257
        sniff->SetVolume(vol);
 
258
        sniff->Play();
 
259
        sprite->Play("slowmove");
 
260
      }
 
261
    else if (velocity.GetSquaredMagnitude() > 20)
 
262
      {
254
263
        // at distance 0, vol should be 1.0.  at 800, it should be 0.
255
 
        float vol = (distance.GetMagnitude() / -800.0f) + 1.0f;
 
264
        float vol = (distance.GetMagnitude() / -600.0f) + 1.0f;
256
265
        skitter1->SetVolume(vol);
257
266
        skitter1->Play();
258
267
        sprite->Play("move");