Skip to content

gameplay: allow diving #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgerhardy merged 3 commits into from
Mar 9, 2025
Merged

gameplay: allow diving #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5b3f39
gameplay: allow diving, DENSITY_PLAYER 1000
cryham Mar 7, 2025
6b4118a
heavier package for diving, density 800
cryham Mar 7, 2025
c98ab88
fix wind for new density
cryham Mar 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/caveexpress/server/map/Map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "common/MapSettings.h"
#include "common/Shared.h"
#include "caveexpress/shared/constants/Commands.h"
#include "caveexpress/shared/constants/Density.h"
#include "common/Log.h"
#include "service/ServiceProvider.h"
#include "common/SpriteDefinition.h"
Expand Down Expand Up @@ -1493,7 +1494,8 @@ bool Map::visitEntity (IEntity *entity)
if (_time >= _warmupPhase) {
entity->update(Constant::DELTA_PHYSICS_MILLIS);
if (entity->shouldApplyWind())
entity->applyLinearImpulse(b2Vec2(_wind, 0.0f));
entity->applyLinearImpulse(b2Vec2(_wind * (DENSITY_PLAYER / 400.0f), 0.0f));
// entity->applyLinearImpulse(b2Vec2(_wind * entity->getMass() / 200.f, 0.0f)); // acceleration?
}
handleVisibility(entity, vismask);

Expand Down
4 changes: 2 additions & 2 deletions src/caveexpress/shared/constants/Density.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ namespace caveexpress {
#define DENSITY_NPC_FISH 550.0f
#define DENSITY_STONE 2400.0f
#define DENSITY_BOMB 1200.0f
#define DENSITY_PACKAGE 500.0f
#define DENSITY_PACKAGE 800.0f // 500.0f old, no diving
#define DENSITY_TREE 450.0f
#define DENSITY_FRUIT 350.0f
#define DENSITY_EGG 500.0f
#define DENSITY_PLAYER 400.0f
#define DENSITY_PLAYER 1000.0f // 400.0f old, no diving
#define DENSITY_AIR 1.2041f
#define DENSITY_PACKAGETARGET 450.0f
#define DENSITY_BRIDGE 1000.0f
Expand Down
Loading