Shared character defaults, fixed paths and names, one global font
This commit is contained in:
1 parent
4962eac7a8
commit
7dbb4cc154
22 files changed
+434
-567
No files matched your search
+6
-3
@@ -1,5 +1,7 @@
|
||||
#include "play.h"
|
||||
|
||||
constexpr const char* FULL_SUFFIX = "Full";
|
||||
|
||||
constexpr float AUTO_ACCELERATION = 0.45f;
|
||||
constexpr float AUTO_ANGLE_STEP = 0.08f;
|
||||
constexpr float AUTO_BRAKING = 2;
|
||||
@@ -64,8 +66,9 @@ void Interactions::update(Play& play, Pointer pointer)
|
||||
bool isReady = cooldowns[i] <= 0;
|
||||
cooldowns[i] = std::max(0, entry.dialogueCooldown);
|
||||
Dialogue& dialogue = character.dialogue;
|
||||
bool isFull = body.is_over_capacity() && dialogue.pools.contains(entry.dialoguePoolFull);
|
||||
const std::string& pool = isFull ? entry.dialoguePoolFull : entry.dialoguePool;
|
||||
std::string pool = entry.dialoguePool;
|
||||
if (body.is_over_capacity() && dialogue.pools.contains(pool + FULL_SUFFIX))
|
||||
pool += FULL_SUFFIX;
|
||||
if (dialogue.pools.contains(pool))
|
||||
{
|
||||
if (text.is_interruptible() && isReady)
|
||||
@@ -92,7 +95,7 @@ void Interactions::update(Play& play, Pointer pointer)
|
||||
}
|
||||
|
||||
if ((wasInteracting && !isInteracting) || (wasHovering && !isHovering))
|
||||
active.play(character.cursor.idle);
|
||||
active.play(CURSOR_ANIMATION_IDLE);
|
||||
if (wasHolding && !isHolding && !body.actor.pending)
|
||||
body.idle_play();
|
||||
pointerPrevious = pointer.position;
|
||||
|
||||
Reference in new issue
Block a user