Skip to content

Commit

Permalink
Merge branch 'freature/RB-159-enhance-waves' of github.com:X-R-G-B/R-…
Browse files Browse the repository at this point in the history 
…Bus into freature/RB-159-enhance-waves
  • Loading branch information
@TTENSHII
TTENSHII committed Nov 2, 2023
2 parents 9c034c5 + 4fae04c commit 335e8e4
Show file tree
Hide file tree
Showing 7 changed files with 354 additions and 1 deletion.
Binary file added assets/Boss/big-purple-boss.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
341 changes: 341 additions & 0 deletions assets/Json/enemies.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,347 @@
]
}
]
},
{
"id": "big-purple-boss",
"spritePath": "assets/Boss/big-purple-boss.png",
"musicPath": "assets/Audio/Musics/Napstablook.mp3",
"damage": 20,
"health": 80.0,
"width": 2150,
"height": 4000,
"rect": {
"x": 60,
"y": 0,
"width": 448.0,
"height": 800
},
"collisionRect": {
"width": 2150,
"height": 4000
},
"velocity": {
"speedX": -20,
"speedY": 0
},
"animRect": [
{
"direction": "left",
"type": "move",
"time": 40,
"restartIndex": 0,
"list": [
{
"x": 60,
"y": 0,
"width": 448.0,
"height": 800
},
{
"x": 60,
"y": 800,
"width": 448.0,
"height": 800
},
{
"x": 60,
"y": 1600,
"width": 448.0,
"height": 800
},
{
"x": 60,
"y": 2400,
"width": 448.0,
"height": 800
},
{
"x": 60,
"y": 3200,
"width": 448.0,
"height": 800
},
{
"x": 660,
"y": 0,
"width": 448.0,
"height": 800
},
{
"x": 660,
"y": 800,
"width": 448.0,
"height": 800
},
{
"x": 660,
"y": 1600,
"width": 448.0,
"height": 800
},
{
"x": 660,
"y": 2400,
"width": 448.0,
"height": 800
},
{
"x": 660,
"y": 3200,
"width": 448.0,
"height": 800
},
{
"x": 1260,
"y": 0,
"width": 448.0,
"height": 800
},
{
"x": 1260,
"y": 800,
"width": 448.0,
"height": 800
},
{
"x": 1260,
"y": 1600,
"width": 448.0,
"height": 800
},
{
"x": 1260,
"y": 2400,
"width": 448.0,
"height": 800
},
{
"x": 1260,
"y": 3200,
"width": 448.0,
"height": 800
},
{
"x": 1860,
"y": 0,
"width": 448.0,
"height": 800
},
{
"x": 1860,
"y": 800,
"width": 448.0,
"height": 800
},
{
"x": 1860,
"y": 1600,
"width": 448.0,
"height": 800
},
{
"x": 1860,
"y": 2400,
"width": 448.0,
"height": 800
},
{
"x": 1860,
"y": 3200,
"width": 448.0,
"height": 800
},
{
"x": 2460,
"y": 0,
"width": 448.0,
"height": 800
},
{
"x": 2460,
"y": 800,
"width": 448.0,
"height": 800
},
{
"x": 2460,
"y": 1600,
"width": 448.0,
"height": 800
},
{
"x": 2460,
"y": 2400,
"width": 448.0,
"height": 800
},
{
"x": 2460,
"y": 3200,
"width": 448.0,
"height": 800
},
{
"x": 3060,
"y": 0,
"width": 448.0,
"height": 800
},
{
"x": 3060,
"y": 800,
"width": 448.0,
"height": 800
},
{
"x": 3060,
"y": 1600,
"width": 448.0,
"height": 800
},
{
"x": 3060,
"y": 2400,
"width": 448.0,
"height": 800
},
{
"x": 3060,
"y": 3200,
"width": 448.0,
"height": 800
}
]
}
]
},
{
"id": "big-daemon",
"spritePath": "assets/R-TypeSheet/big-daemon.png",
"damage": 20,
"health": 80.0,
"width": 500,
"height": 500,
"rect": {
"x": 0,
"y": 0,
"width": 512.0,
"height": 512
},
"collisionRect": {
"width": 512,
"height": 512
},
"velocity": {
"speedX": -20,
"speedY": 0
},
"animRect": [
{
"direction": "left",
"type": "move",
"time": 100,
"restartIndex": 0,
"list": [
{
"x": 0,
"y": 0,
"width": 512.0,
"height": 512
},
{
"x": 512,
"y": 0,
"width": 512.0,
"height": 512
},
{
"x": 1024,
"y": 0,
"width": 512.0,
"height": 512
},
{
"x": 1536,
"y": 0,
"width": 512.0,
"height": 512
},
{
"x": 2048,
"y": 0,
"width": 512.0,
"height": 512
},
{
"x": 2560,
"y": 0,
"width": 512.0,
"height": 512
},
{
"x": 3072,
"y": 0,
"width": 512.0,
"height": 512
},
{
"x": 3584,
"y": 0,
"width": 512.0,
"height": 512
},
{
"x": 4096,
"y": 0,
"width": 512.0,
"height": 512
},
{
"x": 4608,
"y": 0,
"width": 512.0,
"height": 512
},
{
"x": 5120,
"y": 0,
"width": 512.0,
"height": 512
},
{
"x": 5632,
"y": 0,
"width": 512.0,
"height": 512
},
{
"x": 6144,
"y": 0,
"width": 512.0,
"height": 512
},
{
"x": 6656,
"y": 0,
"width": 512.0,
"height": 512
},
{
"x": 7168,
"y": 0,
"width": 512.0,
"height": 512
},
{
"x": 7680,
"y": 0,
"width": 512.0,
"height": 512
}
]
}
]
}
]
}
10 changes: 9 additions & 1 deletion assets/Json/waves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,15 @@
"msBeforeSpawn" : 2000
},
{
"id": "green-head",
"id": "big-daemon",
"position" : {
"x": 10500,
"y": 4500
},
"msBeforeSpawn" : 2000
},
{
"id": "big-purple-boss",
"position" : {
"x": 10500,
"y": 2500
Expand Down
Binary file removed assets/R-TypeSheet/big purple boss.png
View file
Binary file not shown.
Binary file added assets/R-TypeSheet/big-daemon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/ECS/MessageTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ enum enemy_type_e {
CLASSIC_ENEMY = 0,
CLASSIC_ENEMY_2,
DAEMON,
BIG_DAEMON,
PAPYRUS,
NAPSTABLOOK,
LEJUTTER,
GREEN_HEAD,
BIG_PURPLE,
MAX_ENEMY_TYPE
};

Expand Down
2 changes: 2 additions & 0 deletions src/ECS/Systems/WaveSystems.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ namespace Systems {
static const std::unordered_map<enemy_type_e, std::string> enemiesTypes = {
{enemy_type_e::CLASSIC_ENEMY, "default"},
{enemy_type_e::CLASSIC_ENEMY_2, "default2"},
{enemy_type_e::BIG_DAEMON, "big-daemon"},
{enemy_type_e::DAEMON, "daemon"},
{enemy_type_e::PAPYRUS, "papyrus"},
{enemy_type_e::NAPSTABLOOK, "napstablook"},
{enemy_type_e::LEJUTTER, "le-jutteur"},
{enemy_type_e::GREEN_HEAD, "green-head"},
{enemy_type_e::BIG_PURPLE, "big-purple-boss"},
};

static const std::string &getEnemyId(enemy_type_e enemyType)
Expand Down

0 comments on commit 335e8e4

Please sign in to comment.