DayNightCycle events

# Changes

* Added `DayNightCycle` as event type
  * Handling in discord integration
* Miscellaneous cleanup/typo fixes

# Examples

Discord integration:

<img width="673" alt="image" src="https://github.com/user-attachments/assets/b188c750-046d-4ac7-9abd-82699a0cb4f9" />

Author: Volte6

internal/events/eventtypes.go

@@ -211,3 +211,13 @@ type PlayerDeath struct {
 }
 
 func (l PlayerDeath) Type() string { return `PlayerDeath` }
+
+type DayNightCycle struct {
+	IsSunrise bool
+	Day       int
+	Month     int
+	Year      int
+	Time      string
+}
+
+func (l DayNightCycle) Type() string { return `DayNightCycle` }

internal/hooks/DayNightCycle_NotifySunriseSunset.go

@@ -0,0 +1,34 @@
+package hooks
+
+import (
+	"github.com/volte6/gomud/internal/events"
+	"github.com/volte6/gomud/internal/gametime"
+	"github.com/volte6/gomud/internal/templates"
+)
+
+//
+// Watches the rounds go by
+// Spawns the loot goblin every so often
+//
+
+func NotifySunriseSunset(e events.Event) bool {
+	evt, typeOk := e.(events.DayNightCycle)
+	if !typeOk {
+		return false
+	}
+
+	if evt.IsSunrise {
+		sunriseTxt, _ := templates.Process("generic/sunrise", gametime.GetDate())
+		events.AddToQueue(events.Broadcast{
+			Text: sunriseTxt,
+		})
+		return true
+	}
+
+	sunsetTxt, _ := templates.Process("generic/sunset", nil)
+	events.AddToQueue(events.Broadcast{
+		Text: sunsetTxt,
+	})
+
+	return true
+}

internal/hooks/NewRound_DoCombat.go

@@ -20,11 +20,6 @@ import (
 	"github.com/volte6/gomud/internal/util"
 )
 
-//
-// Watches the rounds go by
-// Applies autohealing where appropriate
-//
-
 func DoCombat(e events.Event) bool {
 
 	evt := e.(events.NewRound)

internal/hooks/NewRound_MobRoundTick.go

@@ -9,11 +9,6 @@ import (
 	"github.com/volte6/gomud/internal/users"
 )
 
-//
-// Watches the rounds go by
-// Applies autohealing where appropriate
-//
-
 func MobRoundTick(e events.Event) bool {
 
 	//

internal/hooks/NewRound_SpawnLootGoblin.go

@@ -6,11 +6,6 @@ import (
 	"github.com/volte6/gomud/internal/rooms"
 )
 
-//
-// Watches the rounds go by
-// Applies autohealing where appropriate
-//
-
 func SpawnLootGoblin(e events.Event) bool {
 
 	evt := e.(events.NewRound)

internal/hooks/NewRound_SunriseSunset.go

@@ -3,7 +3,6 @@ package hooks
 import (
 	"github.com/volte6/gomud/internal/events"
 	"github.com/volte6/gomud/internal/gametime"
-	"github.com/volte6/gomud/internal/templates"
 )
 
 //
@@ -20,20 +19,15 @@ func SunriseSunset(e events.Event) bool {
 	gdNow := gametime.GetDate()
 
 	if gdBefore.Night != gdNow.Night {
-		if gdNow.Night {
-			sunsetTxt, _ := templates.Process("generic/sunset", nil)
 
-			events.AddToQueue(events.Broadcast{
-				Text: sunsetTxt,
-			})
+		events.AddToQueue(events.DayNightCycle{
+			IsSunrise: !gdNow.Night,
+			Day:       gdNow.Day,
+			Month:     gdNow.Month,
+			Year:      gdNow.Year,
+			Time:      gdNow.String(),
+		})
 
-		} else {
-			sunriseTxt, _ := templates.Process("generic/sunrise", gdNow)
-			events.AddToQueue(events.Broadcast{
-				Text: sunriseTxt,
-			})
-
-		}
 	}
 
 	return true

internal/hooks/hooks.go

@@ -55,6 +55,9 @@ func RegisterListeners() {
 	events.RegisterListener(events.LevelUp{}, SendLevelNotifications)
 	events.RegisterListener(events.LevelUp{}, CheckGuide)
 
+	// Day/Night cycle
+	events.RegisterListener(events.DayNightCycle{}, NotifySunriseSunset)
+
 	// Listener for debugging some stuff (catches all events)
 	/*
 		events.RegisterListener(nil, func(e events.Event) bool {

internal/integrations/discord/client.go

@@ -53,6 +53,7 @@ func registerListeners() {
 	events.RegisterListener(events.Log{}, HandleLogs)
 	events.RegisterListener(events.LevelUp{}, HandleLevelup)
 	events.RegisterListener(events.PlayerDeath{}, HandleDeath)
+	events.RegisterListener(events.DayNightCycle{}, HandleNewDay)
 }
 
 // Sends an embed message to discord which includes a colored bar to the left

internal/integrations/discord/listeners.go

@@ -6,10 +6,15 @@ import (
 
 	"github.com/volte6/gomud/internal/connections"
 	"github.com/volte6/gomud/internal/events"
+	"github.com/volte6/gomud/internal/gametime"
 	"github.com/volte6/gomud/internal/users"
 	"github.com/volte6/gomud/internal/util"
 )
 
+var (
+	lastMonth = -1
+)
+
 // Player enters the world event
 func HandlePlayerSpawn(e events.Event) bool {
 	evt, typeOk := e.(events.PlayerSpawn)
@@ -100,3 +105,22 @@ func HandleDeath(e events.Event) bool {
 
 	return true
 }
+
+func HandleNewDay(e events.Event) bool {
+	evt, typeOk := e.(events.DayNightCycle)
+	if !typeOk {
+		return false
+	}
+
+	if evt.IsSunrise {
+		message := fmt.Sprintf(`:sunny: **Day %d begins.**`, evt.Day)
+		if lastMonth != evt.Month {
+			message += fmt.Sprintf(` *It is the month **%s** in the year of the **%s**.*`, gametime.MonthName(evt.Month), gametime.GetZodiac(evt.Year))
+			lastMonth = evt.Month
+		}
+
+		SendMessage(message)
+	}
+
+	return true
+}

internal/templates/templatesfunctions.go

@@ -208,8 +208,8 @@ var (
 		"permadeath": func() bool {
 			return bool(configs.GetConfig().PermaDeath)
 		},
-		"zodiac": func(month int) string {
-			return gametime.GetZodiac(month)
+		"zodiac": func(year int) string {
+			return gametime.GetZodiac(year)
 		},
 		"month": func(month int) string {
 			return gametime.MonthName(month)