diff --git a/Faceball2030/Editor.h b/Faceball2030/Editor.h index 5a62a1c..4cd6007 100644 --- a/Faceball2030/Editor.h +++ b/Faceball2030/Editor.h @@ -11,6 +11,7 @@ enum EnemyID { EXIT, START, SHOOTME, + SONAR, COIN = 56, POWERUP_ARMOR = 57, POWERUP_SPEED = 58, diff --git a/Faceball2030/assets/enemies/Cylinder1_auv.png b/Faceball2030/assets/enemies/Cylinder1_auv.png new file mode 100644 index 0000000..a6d8517 Binary files /dev/null and b/Faceball2030/assets/enemies/Cylinder1_auv.png differ diff --git a/Faceball2030/assets/enemies/Sonar.mtl b/Faceball2030/assets/enemies/Sonar.mtl new file mode 100644 index 0000000..df63c2a --- /dev/null +++ b/Faceball2030/assets/enemies/Sonar.mtl @@ -0,0 +1,11 @@ +# Exported from Wings 3D 2.2.9 +newmtl Cylinder1_auv +Ns 19.999999999999996 +d 1.0 +illum 2 +Kd 1.0 1.0 1.0 +Ka 0.0 0.0 0.0 +Ks 0.19 0.19 0.19 +Ke 0.0 0.0 0.0 +map_Kd Cylinder1_auv.png + diff --git a/Faceball2030/assets/enemies/Sonar.png b/Faceball2030/assets/enemies/Sonar.png new file mode 100644 index 0000000..cfeca25 Binary files /dev/null and b/Faceball2030/assets/enemies/Sonar.png differ diff --git a/Faceball2030/assets/enemies/Sonar.wings b/Faceball2030/assets/enemies/Sonar.wings new file mode 100644 index 0000000..bb88cef Binary files /dev/null and b/Faceball2030/assets/enemies/Sonar.wings differ diff --git a/Faceball2030/assets/map/map1.map b/Faceball2030/assets/map/map1.map index 749765c..afc4518 100644 --- a/Faceball2030/assets/map/map1.map +++ b/Faceball2030/assets/map/map1.map @@ -30,5 +30,5 @@ 8195 8194 8202 -8202 -8206 +25114 +24590 diff --git a/Faceball2030/main.cpp b/Faceball2030/main.cpp index bcc21e8..3595bd4 100644 --- a/Faceball2030/main.cpp +++ b/Faceball2030/main.cpp @@ -36,6 +36,7 @@ void FaceBall::InitializeEnemyData() { enemyData[EXIT] = { "EXIT",undefined,GREEN }; enemyData[START] = { "SPAWN POSITION",undefined,{128,64,0} }; enemyData[SHOOTME] = { "SHOOTME",enemy_ShootMe,YELLOW,1,1,PI / 8,2,1,3 }; + enemyData[SONAR] = { "Sonar",enemy_Sonar,RED,5,1,PI / 8,2,1,3 }; enemyData[COIN] = { "Coin",undefined,BLUE }; enemyData[POWERUP_ARMOR] = { "Armor",undefined,{96,0,96} }; enemyData[POWERUP_SPEED] = { "Speed",undefined,{96,0,96} }; @@ -844,8 +845,10 @@ bool FaceBall::OnUserCreate() wall_tex = new Decal(new Sprite("assets/wall.png")); bullet_tex = new Decal(new Sprite("assets/enemies/bullet.png")); floor_tex = new Decal(new Sprite("assets/floor.png")); + enemy_Sonar_tex = new Decal(new Sprite("assets/enemies/Sonar.png")); enemy_ShootMe = { "assets/enemies/ShootMe.obj", enemy_ShootMe_tex }; + enemy_Sonar = { "assets/enemies/Sonar.obj", enemy_Sonar_tex }; bullet = { "assets/enemies/bullet.obj",bullet_tex }; mapWalls.texture = wall_tex; mapFloor.texture = floor_tex; diff --git a/Faceball2030/main.h b/Faceball2030/main.h index 08e1d7a..3e919e1 100644 --- a/Faceball2030/main.h +++ b/Faceball2030/main.h @@ -196,9 +196,11 @@ class FaceBall : public PixelGameEngine std::mapenemyData; std::vectorenemies; private: - Mesh mapWalls,mapFloor,enemy_ShootMe,bullet,green_bullet,undefined; + Mesh mapWalls,mapFloor,enemy_ShootMe,bullet,green_bullet,undefined, + enemy_Sonar; - Decal* dot, * enemy_ShootMe_tex,*bullet_tex,*wall_tex,*floor_tex; + Decal* dot, * enemy_ShootMe_tex,*bullet_tex,*wall_tex,*floor_tex, + *enemy_Sonar_tex; vi2d MAP_SIZE; std::vector>map; std::vectorobjects;