Add housing/pets/Thom Krooke, wordle overhaul, boost system, backup strategy

Part 3 (Housing, Thom Krooke & Pets): - Housing system with tiered upgrades, mortgage loans, FRED API rates - Thom Krooke realtor NPC with !thom commands and !thom pay extra principal - Pet system with arrival, naming, leveling, combat, morning defense - Pet ditch recovery scales with level, name validation Wordle overhaul: - Remove daily expiration — puzzles persist until solved/failed - Auto-start new puzzle after solve, fail, or skip - Sequential puzzle IDs instead of date-based - Auto-create puzzle on first guess if none active Adventure fixes: - Double XP/money boost toggle (!adv boost, admin only) - Fix ensureCharacter wiping existing data on query errors - Fix rival RPS format string bug - Fix daily summary empty data (load today+yesterday logs) - Fix holdem DM-to-room reply routing - Fix Robbie payout to 25% of item value - Add fishing to leaderboard and TwinBee calculations - Add Thom to morning menu - Persist mortgage rate across restarts via db.CacheGet/Set Infrastructure: - Daily database backup via VACUUM INTO with 7-day retention - Admin DM notification on backup failure (async) - Daily NPC house balance reset for holdem Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-07-15 16:42:41 +00:00 · 2026-04-10 16:50:49 -07:00
parent 90865d1c51
commit 76110f61ca
24 changed files with 3298 additions and 166 deletions
--- a/internal/plugin/adventure_character.go
+++ b/internal/plugin/adventure_character.go
@@ -71,6 +71,28 @@ type AdventureCharacter struct {
 	NPCMsgCountDate         string
 	MistyRollTarget         int
 	ArinaRollTarget         int
+	// Housing
+	HouseTier           int
+	HouseLoanBalance    int
+	HouseLoanFrozen     bool
+	HouseMissedPayments int
+	HouseAutopay        bool
+	HouseCurrentRate    float64
+	// Pets
+	PetType             string
+	PetName             string
+	PetXP               int
+	PetLevel            int
+	PetArmorTier        int
+	PetChasedAway       bool
+	PetReactivated      bool
+	PetArrived          bool
+	MistyEncounterCount int
+	MistyDonatedCount   int
+	ThomAnimalLineFired bool
+	PetSupplyShopUnlocked bool
+	PetLevel10Date      string
+	PetMorningDefense   bool
 }

 type AdvEquipment struct {
@@ -232,6 +254,31 @@ func (c *AdventureCharacter) Kill() {
 	c.LastDeathDate = time.Now().UTC().Format("2006-01-02")
 }

+// HasPet returns true if the player has an active pet (not chased away).
+func (c *AdventureCharacter) HasPet() bool {
+	return c.PetType != "" && c.PetArrived && !c.PetChasedAway
+}
+
+// HasHouse returns true if the player has purchased at least a base house.
+func (c *AdventureCharacter) HasHouse() bool {
+	return c.HouseTier > 0 || c.HouseLoanBalance > 0
+}
+
+// HouseHPBonus returns the HP bonus percentage from housing tier.
+// Tier 1 (Base) = +0%, Tier 2 (Livable) = +5%, Tier 3 (Comfortable) = +12%, Tier 4 (Established) = +20%
+func (c *AdventureCharacter) HouseHPBonus() float64 {
+	switch c.HouseTier {
+	case 2:
+		return 0.05
+	case 3:
+		return 0.12
+	case 4:
+		return 0.20
+	default:
+		return 0
+	}
+}
+
 // ── Action Economy ──────────────────────────────────────────────────────────

 const maxCombatActions = 1
@@ -368,6 +415,9 @@ func loadAdvCharacter(userID id.UserID) (*AdventureCharacter, error) {
 	var deadUntil, reprieveLast, babysitExp, pardonUsed sql.NullTime
 	var mistyLastSeen, arinaLastSeen, mistyBuffExp, mistyDebuffExp, arinaBuffExp sql.NullTime

+	var houseFrozen, houseAutopay int
+	var petChasedAway, petReactivated, petArrived, thomAnimalLine, petSupplyUnlocked, petMorningDef int
+
 	err := d.QueryRow(`
 		SELECT user_id, display_name,
 		       combat_level, mining_skill, foraging_skill, fishing_skill,
@@ -385,7 +435,14 @@ func loadAdvCharacter(userID id.UserID) (*AdventureCharacter, error) {
 		       misty_last_seen, arina_last_seen,
 		       misty_buff_expires, misty_debuff_expires, arina_buff_expires,
 		       npc_msg_count, npc_msg_count_date,
-		       misty_roll_target, arina_roll_target
+		       misty_roll_target, arina_roll_target,
+		       house_tier, house_loan_balance, house_loan_frozen, house_missed_payments,
+		       house_autopay, house_current_rate,
+		       pet_type, pet_name, pet_xp, pet_level, pet_armor_tier,
+		       pet_chased_away, pet_reactivated, pet_arrived,
+		       misty_encounter_count, misty_donated_count,
+		       thom_animal_line_fired, pet_supply_shop_unlocked, pet_level10_date,
+		       pet_morning_defense
 		FROM adventure_characters WHERE user_id = ?`, string(userID)).Scan(
 		&c.UserID, &c.DisplayName,
 		&c.CombatLevel, &c.MiningSkill, &c.ForagingSkill, &c.FishingSkill,
@@ -404,6 +461,13 @@ func loadAdvCharacter(userID id.UserID) (*AdventureCharacter, error) {
 		&mistyBuffExp, &mistyDebuffExp, &arinaBuffExp,
 		&c.NPCMsgCount, &c.NPCMsgCountDate,
 		&c.MistyRollTarget, &c.ArinaRollTarget,
+		&c.HouseTier, &c.HouseLoanBalance, &houseFrozen, &c.HouseMissedPayments,
+		&houseAutopay, &c.HouseCurrentRate,
+		&c.PetType, &c.PetName, &c.PetXP, &c.PetLevel, &c.PetArmorTier,
+		&petChasedAway, &petReactivated, &petArrived,
+		&c.MistyEncounterCount, &c.MistyDonatedCount,
+		&thomAnimalLine, &petSupplyUnlocked, &c.PetLevel10Date,
+		&petMorningDef,
 	)
 	if err != nil {
 		return nil, err
@@ -413,6 +477,7 @@ func loadAdvCharacter(userID id.UserID) (*AdventureCharacter, error) {
 	c.HolidayActionTaken = holidayTaken == 1
 	c.RivalUnlockedNotified = rivalUnlocked == 1
 	c.BabysitActive = babysitAct == 1
+	c.PetMorningDefense = petMorningDef == 1
 	if deadUntil.Valid {
 		c.DeadUntil = &deadUntil.Time
 	}
@@ -440,6 +505,13 @@ func loadAdvCharacter(userID id.UserID) (*AdventureCharacter, error) {
 	if arinaBuffExp.Valid {
 		c.ArinaBuffExpires = &arinaBuffExp.Time
 	}
+	c.HouseLoanFrozen = houseFrozen == 1
+	c.HouseAutopay = houseAutopay == 1
+	c.PetChasedAway = petChasedAway == 1
+	c.PetReactivated = petReactivated == 1
+	c.PetArrived = petArrived == 1
+	c.ThomAnimalLineFired = thomAnimalLine == 1
+	c.PetSupplyShopUnlocked = petSupplyUnlocked == 1
 	return c, nil
 }

@@ -494,6 +566,38 @@ func saveAdvCharacter(char *AdventureCharacter) error {
 	if char.BabysitActive {
 		babysitAct = 1
 	}
+	houseFrozen := 0
+	if char.HouseLoanFrozen {
+		houseFrozen = 1
+	}
+	houseAutopay := 0
+	if char.HouseAutopay {
+		houseAutopay = 1
+	}
+	petChasedAway := 0
+	if char.PetChasedAway {
+		petChasedAway = 1
+	}
+	petReactivated := 0
+	if char.PetReactivated {
+		petReactivated = 1
+	}
+	petArrived := 0
+	if char.PetArrived {
+		petArrived = 1
+	}
+	thomAnimalLine := 0
+	if char.ThomAnimalLineFired {
+		thomAnimalLine = 1
+	}
+	petSupplyUnlocked := 0
+	if char.PetSupplyShopUnlocked {
+		petSupplyUnlocked = 1
+	}
+	petMorningDef := 0
+	if char.PetMorningDefense {
+		petMorningDef = 1
+	}

 	_, err := d.Exec(`
 		UPDATE adventure_characters SET
@@ -512,7 +616,14 @@ func saveAdvCharacter(char *AdventureCharacter) error {
 			misty_last_seen = ?, arina_last_seen = ?,
 			misty_buff_expires = ?, misty_debuff_expires = ?, arina_buff_expires = ?,
 			npc_msg_count = ?, npc_msg_count_date = ?,
-			misty_roll_target = ?, arina_roll_target = ?
+			misty_roll_target = ?, arina_roll_target = ?,
+			house_tier = ?, house_loan_balance = ?, house_loan_frozen = ?, house_missed_payments = ?,
+			house_autopay = ?, house_current_rate = ?,
+			pet_type = ?, pet_name = ?, pet_xp = ?, pet_level = ?, pet_armor_tier = ?,
+			pet_chased_away = ?, pet_reactivated = ?, pet_arrived = ?,
+			misty_encounter_count = ?, misty_donated_count = ?,
+			thom_animal_line_fired = ?, pet_supply_shop_unlocked = ?, pet_level10_date = ?,
+			pet_morning_defense = ?
 		WHERE user_id = ?`,
 		char.DisplayName, char.CombatLevel, char.MiningSkill, char.ForagingSkill, char.FishingSkill,
 		char.CombatXP, char.MiningXP, char.ForagingXP, char.FishingXP,
@@ -529,6 +640,13 @@ func saveAdvCharacter(char *AdventureCharacter) error {
 		char.MistyBuffExpires, char.MistyDebuffExpires, char.ArinaBuffExpires,
 		char.NPCMsgCount, char.NPCMsgCountDate,
 		char.MistyRollTarget, char.ArinaRollTarget,
+		char.HouseTier, char.HouseLoanBalance, houseFrozen, char.HouseMissedPayments,
+		houseAutopay, char.HouseCurrentRate,
+		char.PetType, char.PetName, char.PetXP, char.PetLevel, char.PetArmorTier,
+		petChasedAway, petReactivated, petArrived,
+		char.MistyEncounterCount, char.MistyDonatedCount,
+		thomAnimalLine, petSupplyUnlocked, char.PetLevel10Date,
+		petMorningDef,
 		string(char.UserID),
 	)
 	return err
@@ -646,9 +764,20 @@ func loadAllAdvCharacters() ([]AdventureCharacter, error) {
 		       masterwork_drops_received,
 		       rival_pool, rival_unlocked_notified,
 		       babysit_active, babysit_expires_at, babysit_skill_focus,
+		       hospital_visits, robbie_visit_count, last_death_date,
 		       combat_actions_used, harvest_actions_used,
+		       last_pardon_used,
+		       misty_last_seen, arina_last_seen,
+		       misty_buff_expires, misty_debuff_expires, arina_buff_expires,
 		       npc_msg_count, npc_msg_count_date,
-		       misty_roll_target, arina_roll_target
+		       misty_roll_target, arina_roll_target,
+		       house_tier, house_loan_balance, house_loan_frozen, house_missed_payments,
+		       house_autopay, house_current_rate,
+		       pet_type, pet_name, pet_xp, pet_level, pet_armor_tier,
+		       pet_chased_away, pet_reactivated, pet_arrived,
+		       misty_encounter_count, misty_donated_count,
+		       thom_animal_line_fired, pet_supply_shop_unlocked, pet_level10_date,
+		       pet_morning_defense
 		FROM adventure_characters`)
 	if err != nil {
 		return nil, err
@@ -659,7 +788,10 @@ func loadAllAdvCharacters() ([]AdventureCharacter, error) {
 	for rows.Next() {
 		c := AdventureCharacter{}
 		var alive, actionTaken, holidayTaken, rivalUnlocked, babysitAct int
-		var deadUntil, reprieveLast, babysitExp sql.NullTime
+		var deadUntil, reprieveLast, babysitExp, pardonUsed sql.NullTime
+		var mistyLastSeen, arinaLastSeen, mistyBuffExp, mistyDebuffExp, arinaBuffExp sql.NullTime
+		var houseFrozen, houseAutopay int
+		var petChasedAway, petReactivated, petArrived, thomAnimalLine, petSupplyUnlocked, petMorningDef int
 		if err := rows.Scan(
 			&c.UserID, &c.DisplayName,
 			&c.CombatLevel, &c.MiningSkill, &c.ForagingSkill, &c.FishingSkill,
@@ -671,9 +803,20 @@ func loadAllAdvCharacters() ([]AdventureCharacter, error) {
 			&c.MasterworkDropsReceived,
 			&c.RivalPool, &rivalUnlocked,
 			&babysitAct, &babysitExp, &c.BabysitSkillFocus,
-		&c.CombatActionsUsed, &c.HarvestActionsUsed,
-		&c.NPCMsgCount, &c.NPCMsgCountDate,
-		&c.MistyRollTarget, &c.ArinaRollTarget,
+			&c.HospitalVisits, &c.RobbieVisitCount, &c.LastDeathDate,
+			&c.CombatActionsUsed, &c.HarvestActionsUsed,
+			&pardonUsed,
+			&mistyLastSeen, &arinaLastSeen,
+			&mistyBuffExp, &mistyDebuffExp, &arinaBuffExp,
+			&c.NPCMsgCount, &c.NPCMsgCountDate,
+			&c.MistyRollTarget, &c.ArinaRollTarget,
+			&c.HouseTier, &c.HouseLoanBalance, &houseFrozen, &c.HouseMissedPayments,
+			&houseAutopay, &c.HouseCurrentRate,
+			&c.PetType, &c.PetName, &c.PetXP, &c.PetLevel, &c.PetArmorTier,
+			&petChasedAway, &petReactivated, &petArrived,
+			&c.MistyEncounterCount, &c.MistyDonatedCount,
+			&thomAnimalLine, &petSupplyUnlocked, &c.PetLevel10Date,
+			&petMorningDef,
 		); err != nil {
 			return nil, err
 		}
@@ -682,6 +825,14 @@ func loadAllAdvCharacters() ([]AdventureCharacter, error) {
 		c.HolidayActionTaken = holidayTaken == 1
 		c.RivalUnlockedNotified = rivalUnlocked == 1
 		c.BabysitActive = babysitAct == 1
+		c.PetMorningDefense = petMorningDef == 1
+		c.HouseLoanFrozen = houseFrozen == 1
+		c.HouseAutopay = houseAutopay == 1
+		c.PetChasedAway = petChasedAway == 1
+		c.PetReactivated = petReactivated == 1
+		c.PetArrived = petArrived == 1
+		c.ThomAnimalLineFired = thomAnimalLine == 1
+		c.PetSupplyShopUnlocked = petSupplyUnlocked == 1
 		if deadUntil.Valid {
 			c.DeadUntil = &deadUntil.Time
 		}
@@ -691,6 +842,24 @@ func loadAllAdvCharacters() ([]AdventureCharacter, error) {
 		if babysitExp.Valid {
 			c.BabysitExpiresAt = &babysitExp.Time
 		}
+		if pardonUsed.Valid {
+			c.LastPardonUsed = &pardonUsed.Time
+		}
+		if mistyLastSeen.Valid {
+			c.MistyLastSeen = &mistyLastSeen.Time
+		}
+		if arinaLastSeen.Valid {
+			c.ArinaLastSeen = &arinaLastSeen.Time
+		}
+		if mistyBuffExp.Valid {
+			c.MistyBuffExpires = &mistyBuffExp.Time
+		}
+		if mistyDebuffExp.Valid {
+			c.MistyDebuffExpires = &mistyDebuffExp.Time
+		}
+		if arinaBuffExp.Valid {
+			c.ArinaBuffExpires = &arinaBuffExp.Time
+		}
 		chars = append(chars, c)
 	}
 	return chars, rows.Err()
@@ -701,7 +870,7 @@ func resetAllAdvDailyActions() error {
 	// Only reset actions taken before today — protects against race if a player
 	// resolves their action at exactly midnight.
 	today := time.Now().UTC().Format("2006-01-02")
-	_, err := d.Exec(`UPDATE adventure_characters SET action_taken_today = 0, holiday_action_taken = 0, combat_actions_used = 0, harvest_actions_used = 0 WHERE last_action_date < ? OR last_action_date IS NULL`, today)
+	_, err := d.Exec(`UPDATE adventure_characters SET action_taken_today = 0, holiday_action_taken = 0, combat_actions_used = 0, harvest_actions_used = 0, pet_morning_defense = 0 WHERE last_action_date < ? OR last_action_date IS NULL`, today)
 	return err
 }

@@ -762,14 +931,13 @@ type AdvDayLog struct {
 	XPGained     int
 }

-func loadAdvTodayLogs() ([]AdvDayLog, error) {
+func loadAdvLogsForDate(date string) ([]AdvDayLog, error) {
 	d := db.Get()
-	today := time.Now().UTC().Format("2006-01-02")
 	rows, err := d.Query(`
 		SELECT user_id, activity_type, COALESCE(location,''), outcome, loot_value, xp_gained
 		FROM adventure_activity_log
 		WHERE logged_at >= ? AND logged_at < DATE(?, '+1 day')
-		ORDER BY logged_at`, today, today)
+		ORDER BY logged_at`, date, date)
 	if err != nil {
 		return nil, err
 	}