@umang-boss/claudemon 2.1.2 → 2.2.0

package/src/hooks/award-xp.ts

@@ -21,7 +21,6 @@ import {
   generateEncounter,
   shouldBonusEncounter,
   shouldDiversityBonus,
-  getTimeOfDayBias,
 } from "../engine/encounters.js";
 import type { EncounterContext } from "../engine/encounters.js";
 import { calculateMood } from "../engine/mood.js";
@@ -138,7 +137,6 @@ const evolutionReady = checkEvolution(pokemon, state) !== null;
 // Build encounter context for the enhanced trigger system
 const encounterSpeed = state.config.encounterSpeed ?? "normal";
 const currentHour = new Date().getHours();
-const timeOfDayTypes = getTimeOfDayBias(currentHour);
 
 const encounterCtx: EncounterContext = {
   xpSinceLastEncounter: (state.xpSinceLastEncounter ?? 0) + xpEvent.xp,
@@ -153,7 +151,7 @@ state.xpSinceLastEncounter = encounterCtx.xpSinceLastEncounter;
 let encounterTriggered = false;
 
 if (shouldTriggerEncounter(encounterCtx) && !state.pendingEncounter) {
-  const encounter = generateEncounter(eventType, state, timeOfDayTypes);
+  const encounter = generateEncounter(eventType, state);
   if (encounter) {
     state.pendingEncounter = encounter;
     state.xpSinceLastEncounter = 0;
@@ -163,7 +161,7 @@ if (shouldTriggerEncounter(encounterCtx) && !state.pendingEncounter) {
     // 10% chance for a bonus encounter after a regular one
     // (bonus replaces the pending encounter with a second roll)
     if (shouldBonusEncounter()) {
-      const bonusEncounter = generateEncounter(eventType, state, timeOfDayTypes);
+      const bonusEncounter = generateEncounter(eventType, state);
       if (bonusEncounter) {
         // The bonus encounter replaces the first; first is already set as pending
         // In practice the player still sees one encounter per trigger,
@@ -177,7 +175,7 @@ if (shouldTriggerEncounter(encounterCtx) && !state.pendingEncounter) {
 // Tool diversity bonus: if 3+ unique tool types used recently and no pending encounter,
 // grant an extra encounter opportunity
 if (!encounterTriggered && !state.pendingEncounter && shouldDiversityBonus(state.recentToolTypes)) {
-  const diversityEncounter = generateEncounter(eventType, state, timeOfDayTypes);
+  const diversityEncounter = generateEncounter(eventType, state);
   if (diversityEncounter) {
     state.pendingEncounter = diversityEncounter;
     state.xpSinceLastEncounter = 0;

package/statusline/buddy-status.sh

@@ -353,7 +353,7 @@ RIGHT_PAD=$(( COLS - ART_W - RIGHT_MARGIN ))
 SPRITE_PAD=$(( COLS - ART_W - RIGHT_MARGIN - JITTER_OFFSET ))
 [ "$SPRITE_PAD" -lt 0 ] && SPRITE_PAD=0
 
-# Build left array — line 1: model+context, line 2: update notice (if any)
+# Build left array — line 1: model+context, line 2: update notification
 LEFT_LINES=()
 LEFT_LINES+=("$LEFT_1")  # line 1: model · context
 LEFT_LINES+=("$LEFT_2")  # line 2: update notification (or empty)
@@ -368,19 +368,23 @@ LEFT_COUNT=${#LEFT_LINES[@]}
 FULL_SPACER=""
 for (( s=0; s<SPRITE_PAD; s++ )); do FULL_SPACER+="$B"; done
 
-# ── Output name line ABOVE sprite — with speech before name ──
-SPEECH_TEXT=""
-SPEECH_VISIBLE_W=0
+# ── Output name line — speech left-aligned, name right-aligned ──
+INFO_W=${#INFO_LINE}
+SPEECH_OUT=""
+SPEECH_OUT_W=0
+SPEECH_LEFT_PAD=50
 if [ -n "$SPEECH" ]; then
-  SPEECH_TEXT="${SPEECH_COLOR}${SPEECH}${NC}  "
-  SPEECH_VISIBLE_W=$(( ${#SPEECH} + 2 ))
+  SPEECH_PREFIX=""
+  for (( s=0; s<SPEECH_LEFT_PAD; s++ )); do SPEECH_PREFIX+="$B"; done
+  SPEECH_OUT="${SPEECH_PREFIX}${SPEECH_COLOR}${SPEECH}${NC}"
+  SPEECH_OUT_W=$(( ${#SPEECH} + SPEECH_LEFT_PAD ))
 fi
 
-NAME_PAD=$(( RIGHT_PAD - SPEECH_VISIBLE_W ))
-[ "$NAME_PAD" -lt 0 ] && NAME_PAD=0
-NAME_SPACER=""
-for (( s=0; s<NAME_PAD; s++ )); do NAME_SPACER+="$B"; done
-echo "${NAME_SPACER}${SPEECH_TEXT}${INFO_LINE}"
+NAME_GAP=$(( COLS - SPEECH_OUT_W - INFO_W - RIGHT_MARGIN ))
+[ "$NAME_GAP" -lt 1 ] && NAME_GAP=1
+NAME_GAP_STR=""
+for (( s=0; s<NAME_GAP; s++ )); do NAME_GAP_STR+="$B"; done
+echo "${SPEECH_OUT}${NAME_GAP_STR}${INFO_LINE}"
 
 # ── Output sprite lines (right-aligned with jitter, left content merged) ──
 for (( i=0; i<SPRITE_COUNT; i++ )); do