Changeset 1211Tweet

Timestamp:

Apr 10, 2012, 3:15:37 AM (11 years ago)

Author:

sam

Message:

mrpigeon: split enemy into red and blue enemies.

Location:

trunk/mrpigeon

Files:

• Makefile.am (modified) (1 diff)
• blueenemy.cpp (copied) (copied from trunk/mrpigeon/enemy.cpp) (1 diff)
• blueenemy.h (added)
• enemy.cpp (modified) (3 diffs)
• enemy.h (modified) (2 diffs)
• mrpigeon.cpp (modified) (4 diffs)
• mrpigeon.h (modified) (3 diffs)
• player.cpp (modified) (5 diffs)
• player.h (modified) (1 diff)
• redenemy.cpp (added)
• redenemy.h (added)

trunk/mrpigeon/Makefile.am

@@ -5 +5 @@
     mrpigeon.cpp mrpigeon.h \
     player.cpp player.h \
-    enemy.cpp enemy.h
+    enemy.cpp enemy.h \
+    blueenemy.cpp blueenemy.h \
+    redenemy.cpp redenemy.h
 mrpigeon_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
 mrpigeon_LDADD =

trunk/mrpigeon/blueenemy.cpp

@@ -20 +20 @@
 
 #include "mrpigeon.h"
-#include "enemy.h"
+#include "blueenemy.h"
 
-Enemy::Enemy(MrPigeon *in_game) :
-    game(in_game),
+BlueEnemy::BlueEnemy(MrPigeon *in_game) :
+    Enemy(in_game),
     enemytime(0.0f)
 {
     enemy_casualblue = Tiler::Register("mrpigeon/gfx/enemy_CasualBLUE_walk.png", ivec2(16,24), ivec2(0)); /* 6 frames */
     enemy_casualblueattack = Tiler::Register("mrpigeon/gfx/enemy_CasualBLUE_walkAttack.png", ivec2(16,24), ivec2(0)); /* 6 frames */
+
+    position = vec3(512, 81, 0);
+    velocity = vec3(-0.15f, 0, 0);
 }
 
-void Enemy::TickGame(float deltams)
+void BlueEnemy::TickGame(float deltams)
 {
-    WorldEntity::TickGame(deltams);
+    Enemy::TickGame(deltams);
 
     deltams *= game->GetSpeed();
 
     enemytime = fmod(deltams + enemytime, 700.0f);;
+
+    position += velocity * deltams;
 }
 
-void Enemy::TickDraw(float deltams)
+void BlueEnemy::TickDraw(float deltams)
 {
     WorldEntity::TickDraw(deltams);
 
-    Scene::GetDefault()->AddTile(enemy_casualblue, (int)(enemytime * 6 / 700.0f), ivec3(420, 81, 0), 0, vec2(-3.0f, 3.0f));
-    Scene::GetDefault()->AddTile(enemy_casualblueattack, (int)(enemytime * 6 / 700.0f), ivec3(320, 81, 0), 0, vec2(-3.0f, 3.0f));
+    /* + 48 because of vertical flip */
+    Scene::GetDefault()->AddTile(position.x > 255 ? enemy_casualblue : enemy_casualblueattack, (int)(enemytime * 6 / 700.0f), position + vec3(48.0f, 0, 0), 0, vec2(-3.0f, 3.0f));
 }
 
-Enemy::~Enemy()
+BlueEnemy::~BlueEnemy()
 {
     Tiler::Deregister(enemy_casualblue);

trunk/mrpigeon/enemy.cpp

@@ -23 +23 @@
 
 Enemy::Enemy(MrPigeon *in_game) :
-    game(in_game),
-    enemytime(0.0f)
+    game(in_game)
 {
-    enemy_casualblue = Tiler::Register("mrpigeon/gfx/enemy_CasualBLUE_walk.png", ivec2(16,24), ivec2(0)); /* 6 frames */
-    enemy_casualblueattack = Tiler::Register("mrpigeon/gfx/enemy_CasualBLUE_walkAttack.png", ivec2(16,24), ivec2(0)); /* 6 frames */
 }
 
@@ -35 +32 @@
 
     deltams *= game->GetSpeed();
-
-    enemytime = fmod(deltams + enemytime, 700.0f);;
 }
 
@@ -42 +37 @@
 {
     WorldEntity::TickDraw(deltams);
-
-    Scene::GetDefault()->AddTile(enemy_casualblue, (int)(enemytime * 6 / 700.0f), ivec3(420, 81, 0), 0, vec2(-3.0f, 3.0f));
-    Scene::GetDefault()->AddTile(enemy_casualblueattack, (int)(enemytime * 6 / 700.0f), ivec3(320, 81, 0), 0, vec2(-3.0f, 3.0f));
 }
 
 Enemy::~Enemy()
 {
-    Tiler::Deregister(enemy_casualblue);
-    Tiler::Deregister(enemy_casualblueattack);
 }
 

trunk/mrpigeon/enemy.h

@@ -7 +7 @@
 {
 public:
+    char const *GetName() { return "<enemy>"; }
+
+protected:
     Enemy(MrPigeon *game);
     virtual ~Enemy();
 
-    char const *GetName() { return "<enemy>"; }
-
-    MrPigeon *game;
-
-protected:
     virtual void TickGame(float deltams);
     virtual void TickDraw(float deltams);
@@ -21 +19 @@
             *enemy_casualblueattack;
 
-    float enemytime;
+    MrPigeon *game;
 };
 

trunk/mrpigeon/mrpigeon.cpp

@@ -26 +26 @@
 #include "player.h"
 #include "enemy.h"
+#include "blueenemy.h"
+#include "redenemy.h"
 
 MrPigeon::MrPigeon() :
@@ -35 +37 @@
     player = new Player(this);
     Ticker::Ref(player);
-    enemy = new Enemy(this);
-    Ticker::Ref(enemy);
+
+    for (int i = 0; i < 10; i++)
+        enemies[i] = NULL;
 
     hud_progress = Tiler::Register("mrpigeon/gfx/HUD_timeline.png", ivec2(160,16), ivec2(0));
@@ -86 +89 @@
     deltams *= GetSpeed();
 
-    railtime = fmod(deltams + railtime, 1000.0f);;
-    backtime = fmod(deltams + backtime, 10000.0f / 288 * active_deco_width);;
+    /* Delete enemies that went past us */
+    for (int i = 0; i < 10; i++)
+    {
+        if (enemies[i] && enemies[i]->position.x < -100.0f)
+        {
+            Ticker::Unref(enemies[i]);
+            enemies[i] = NULL;
+        }
+    }
+
+    /* Spawn enemies if necessary */
+    spawntime += deltams;
+    if (spawntime > 600.0f)
+    {
+        if (RandF(1.0f) < 0.2f)
+            spawntime -= 300.0f;
+        spawntime -= 600.0f;
+        for (int i = 0; i < 10; i++)
+        {
+            if (enemies[i] == NULL)
+            {
+                if (RandF(1.0f) < 0.4f)
+                    enemies[i] = new BlueEnemy(this);
+                else if (totaltime > 9000.0f && RandF(1.0f) < 0.3f)
+                    enemies[i] = new RedEnemy(this);
+
+                if (enemies[i])
+                    Ticker::Ref(enemies[i]);
+                break;
+            }
+        }
+    }
+
+    /* Scroll background etc. */
+    railtime = fmod(railtime + deltams, 1000.0f);;
+    backtime = fmod(backtime + deltams, 10000.0f / 288 * active_deco_width);;
 
     ivec3 buttons = Input::GetMouseButtons();
@@ -135 +172 @@
 
     Ticker::Unref(player);
-    Ticker::Unref(enemy);
+    for (int i = 0; i < 10; i++)
+        if (enemies[i])
+            Ticker::Unref(enemies[i]);
 
     Input::UntrackMouse(this);

trunk/mrpigeon/mrpigeon.h

@@ -11 +11 @@
 
     float GetSpeed() { return speed; }
+    class Enemy *const *GetEnemies() { return enemies; }
 
 protected:
@@ -17 +18 @@
 
     class Player *player;
-    class Enemy *enemy;
+    class Enemy *enemies[10];
 
     TileSet *hud_progress,
@@ -33 +34 @@
 
     double totaltime;
-    float railtime, backtime;
+    float railtime, backtime, spawntime;
     float speed;
 };

trunk/mrpigeon/player.cpp

@@ -21 +21 @@
 #include "mrpigeon.h"
 #include "player.h"
+#include "enemy.h"
 
 #define GRAVITY 0.0007f
@@ -26 +27 @@
 
 #define LEN_KICKAIR 500.0f
+#define LEN_KICKFLOOR 300.0f
 
 Player::Player(MrPigeon *in_game) :
@@ -57 +59 @@
     case WALKING:
     case FUNKING:
-        velocity.y = JUMPVEL;
-        state = JUMPING;
+        {
+            Enemy *const *enemies = game->GetEnemies();
+            bool must_kick = false;
+            for (int i = 0; i < 10; i++)
+                if (enemies[i]
+                     && enemies[i]->position.x > position.x + 60.0f - 30.0f
+                     && enemies[i]->position.x < position.x + 60.0f + 30.0f)
+                {
+                    must_kick = true;
+                    break;
+                }
+            if (must_kick)
+            {
+                walktime = 0.0f;
+                state = KICKFLOOR;
+            }
+            else
+            {
+                velocity.y = JUMPVEL;
+                state = JUMPING;
+            }
+        }
         break;
     case JUMPING:
@@ -88 +110 @@
         walktime = fmod(deltams + walktime, 700.0f);;
         break;
+    case KICKFLOOR:
+        walktime += deltams;
+        if (walktime > LEN_KICKFLOOR)
+            state = WALKING;
+        break;
     case FALLING:
         velocity.y -= deltams * GRAVITY;
@@ -131 +158 @@
         active_set = player_walkraisefist;
         active_frame = (int)(walktime * 8 / 700.0f);
+        break;
+    case KICKFLOOR:
+        active_set = player_kickfloor;
+        active_frame = (int)(walktime * 3 / LEN_KICKFLOOR);
         break;
     case FALLING:

trunk/mrpigeon/player.h

@@ -37 +37 @@
        WALKING,
        FUNKING,
+       KICKFLOOR,
        FALLING,
        JUMPING,