/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 16:59:41 UTC
  • Revision ID: josh@9ix.org-20110918165941-waswg2xidvf0v04x
player and creature spawners in level editor

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