zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-07 11:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix random chance of bonuses

Browse Source
This commit is contained in:
Askou
2021-06-15 11:56:02 +02:00
parent 3219928f37
commit eefc560a81
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Items/Bonus.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ namespace BBM {
{ {
double rnd = static_cast<double>(std::rand()) / RAND_MAX; double rnd = static_cast<double>(std::rand()) / RAND_MAX;
if (rnd <= 1) if (rnd <= 0.8)
return (static_cast<BonusType>((std::rand() % NOCLIP) + 1)); return (static_cast<BonusType>((std::rand() % NOCLIP) + 1));
return (NOTHING); return (NOTHING);
} }
sources/Map/Map.cpp
+20 -4
View File
@@ -44,6 +44,22 @@ namespace BBM
return; return;
health->takeDmg(health->getHealthPoint()); health->takeDmg(health->getHealthPoint());
} }
void MapGenerator::wallYouShouldNotPass(WAL::Entity &entity,
const WAL::Entity &wall,
CollisionComponent::CollidedAxis collidedAxis)
{
auto *mov = entity.tryGetComponent<MovableComponent>();
if (!mov)
return;
if (collidedAxis & CollisionComponent::CollidedAxis::X)
mov->_velocity.x = 0;
if (collidedAxis & CollisionComponent::CollidedAxis::Y)
mov->_velocity.y = 0;
if (collidedAxis & CollisionComponent::CollidedAxis::Z)
mov->_velocity.z = 0;
}
void MapGenerator::wallCollided(WAL::Entity &entity, void MapGenerator::wallCollided(WAL::Entity &entity,
const WAL::Entity &wall, const WAL::Entity &wall,
@@ -161,7 +177,7 @@ namespace BBM
.addComponent<PositionComponent>(Vector3f((width + 1) / 2, 0, -1)) .addComponent<PositionComponent>(Vector3f((width + 1) / 2, 0, -1))
.addComponent<CollisionComponent>( .addComponent<CollisionComponent>(
WAL::Callback<WAL::Entity &, const WAL::Entity &, CollisionComponent::CollidedAxis>(), WAL::Callback<WAL::Entity &, const WAL::Entity &, CollisionComponent::CollidedAxis>(),
&MapGenerator::wallCollided, Vector3f(-(width + 1) / 2 , 0.25, 0.25), Vector3f(width + 1, 2, 0.75)) &MapGenerator::wallYouShouldNotPass, Vector3f(-(width + 1) / 2 , 0.25, 0.25), Vector3f(width + 1, 2, 0.75))
.addComponent<Drawable3DComponent, RAY3D::Model>(unbreakableObj, false, .addComponent<Drawable3DComponent, RAY3D::Model>(unbreakableObj, false,
std::make_pair(MAP_DIFFUSE, unbreakablePnj), std::make_pair(MAP_DIFFUSE, unbreakablePnj),
RAY::Vector3(width + 3, 1, 1)); RAY::Vector3(width + 3, 1, 1));
@@ -169,7 +185,7 @@ namespace BBM
.addComponent<PositionComponent>(Vector3f((width + 1) / 2, 0, height + 1)) .addComponent<PositionComponent>(Vector3f((width + 1) / 2, 0, height + 1))
.addComponent<CollisionComponent>( .addComponent<CollisionComponent>(
WAL::Callback<WAL::Entity &, const WAL::Entity &, CollisionComponent::CollidedAxis>(), WAL::Callback<WAL::Entity &, const WAL::Entity &, CollisionComponent::CollidedAxis>(),
&MapGenerator::wallCollided, Vector3f(-(width + 1) / 2 , 0.25, 0.25), Vector3f(width + 1, 2, 0.75)) &MapGenerator::wallYouShouldNotPass, Vector3f(-(width + 1) / 2 , 0.25, 0.25), Vector3f(width + 1, 2, 0.75))
.addComponent<Drawable3DComponent, RAY3D::Model>(unbreakableObj, false, .addComponent<Drawable3DComponent, RAY3D::Model>(unbreakableObj, false,
std::make_pair(MAP_DIFFUSE, unbreakablePnj), std::make_pair(MAP_DIFFUSE, unbreakablePnj),
RAY::Vector3(width + 3, 1, 1)); RAY::Vector3(width + 3, 1, 1));
@@ -177,7 +193,7 @@ namespace BBM
.addComponent<PositionComponent>(Vector3f(width + 1, 0, height / 2)) .addComponent<PositionComponent>(Vector3f(width + 1, 0, height / 2))
.addComponent<CollisionComponent>( .addComponent<CollisionComponent>(
WAL::Callback<WAL::Entity &, const WAL::Entity &, CollisionComponent::CollidedAxis>(), WAL::Callback<WAL::Entity &, const WAL::Entity &, CollisionComponent::CollidedAxis>(),
&MapGenerator::wallCollided, Vector3f(0.25, 0.25, -(height + 1) / 2 ), Vector3f(0.75, 2, height + 1)) &MapGenerator::wallYouShouldNotPass, Vector3f(0.25, 0.25, -(height + 1) / 2 ), Vector3f(0.75, 2, height + 1))
.addComponent<Drawable3DComponent, RAY3D::Model>(unbreakableObj, false, .addComponent<Drawable3DComponent, RAY3D::Model>(unbreakableObj, false,
std::make_pair(MAP_DIFFUSE, unbreakablePnj), std::make_pair(MAP_DIFFUSE, unbreakablePnj),
RAY::Vector3(1, 1, height + 1)); RAY::Vector3(1, 1, height + 1));
@@ -185,7 +201,7 @@ namespace BBM
.addComponent<PositionComponent>(Vector3f(-1, 0, height / 2)) .addComponent<PositionComponent>(Vector3f(-1, 0, height / 2))
.addComponent<CollisionComponent>( .addComponent<CollisionComponent>(
WAL::Callback<WAL::Entity &, const WAL::Entity &, CollisionComponent::CollidedAxis>(), WAL::Callback<WAL::Entity &, const WAL::Entity &, CollisionComponent::CollidedAxis>(),
&MapGenerator::wallCollided, Vector3f(0.25, 0.25, -(height + 1) / 2 ), Vector3f(0.75, 2, height + 1)) &MapGenerator::wallYouShouldNotPass, Vector3f(0.25, 0.25, -(height + 1) / 2 ), Vector3f(0.75, 2, height + 1))
.addComponent<Drawable3DComponent, RAY3D::Model>(unbreakableObj, false, .addComponent<Drawable3DComponent, RAY3D::Model>(unbreakableObj, false,
std::make_pair(MAP_DIFFUSE, unbreakablePnj), std::make_pair(MAP_DIFFUSE, unbreakablePnj),
RAY::Vector3(1, 1, height + 1)); RAY::Vector3(1, 1, height + 1));
sources/Map/Map.hpp
+4
View File
@@ -175,6 +175,10 @@ namespace BBM
static const std::string secondFloorHolePath; static const std::string secondFloorHolePath;
public: public:
static void wallYouShouldNotPass(WAL::Entity &entity,
const WAL::Entity &wall,
CollisionComponent::CollidedAxis collidedAxis);
static void wallCollided(WAL::Entity &entity, static void wallCollided(WAL::Entity &entity,
const WAL::Entity &wall, const WAL::Entity &wall,
CollisionComponent::CollidedAxis collidedAxis); CollisionComponent::CollidedAxis collidedAxis);