aboutsummaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
Diffstat (limited to 'internal')
-rw-r--r--internal/game/action_burn.go13
-rw-r--r--internal/game/action_clean.go43
-rw-r--r--internal/game/action_farm.go18
-rw-r--r--internal/game/action_finishing_blow.go4
-rw-r--r--internal/game/action_fletch.go39
-rw-r--r--internal/game/action_gather.go5
-rw-r--r--internal/game/action_identify.go2
-rw-r--r--internal/game/action_use.go4
-rw-r--r--internal/game/cmd_bank.go3
-rw-r--r--internal/game/cmd_clean.go4
-rw-r--r--internal/game/cmd_shop.go11
-rw-r--r--internal/game/cmd_stats.go5
-rw-r--r--internal/game/cmd_trigger_enchant.go4
-rw-r--r--internal/game/cmd_trigger_utility.go6
-rw-r--r--internal/game/cmd_wear.go18
-rw-r--r--internal/game/core_production.go202
-rw-r--r--internal/game/game.go6
-rw-r--r--internal/object/item.go30
18 files changed, 267 insertions, 150 deletions
diff --git a/internal/game/action_burn.go b/internal/game/action_burn.go
index 71b5a35..03a5572 100644
--- a/internal/game/action_burn.go
+++ b/internal/game/action_burn.go
@@ -199,7 +199,7 @@ func (g *Game) advanceBurn(sess *net.Session, p *player.Player) {
g.AccountStore.SaveCharacter(p)
sess.WriteLine(g.colorize(sess, "fire", fmt.Sprintf("You drop the %s and begin to make a fire...", g.itemColorize(sess, logDef, logDef.Name))))
- g.broadcastDrop(p, logDef.Name)
+ g.broadcastDrop(p, itemID, logDef.Name)
data["phase"] = 1
p.Action.WaitLeft = engine.ToTicks(toolSpeed)
@@ -293,7 +293,7 @@ func (g *Game) advanceStoke(sess *net.Session, p *player.Player) {
g.AccountStore.SaveCharacter(p)
- msg := g.colorize(sess, "fire", fmt.Sprintf("You throw %s onto the fire.", name))
+ msg := g.colorize(sess, "fire", fmt.Sprintf("You throw %s onto the fire.", g.itemColorize(sess, logDef, name)))
if xp > 0 && p.OptionBool("xp_drops") {
msg += g.colorize(sess, "xp", fmt.Sprintf(" (+%dxp %s)", xp, player.SkillAbbr[player.Firemaking]))
}
@@ -407,11 +407,16 @@ func (g *Game) hasFireObject(roomID int) bool {
return g.findFireObjectKey(roomID) != ""
}
-func (g *Game) broadcastDrop(p *player.Player, itemName string) {
+func (g *Game) broadcastDrop(p *player.Player, itemID, itemName string) {
+ itemDef, _ := g.ItemStore.Load(itemID)
for _, other := range g.Hub.PlayersInRoom(p.RoomID) {
op := other.Player
if op != nil && op.Name != p.Name {
- other.WriteLine(fmt.Sprintf("\n%s drops a %s.", p.Name, itemName))
+ colored := itemName
+ if itemDef != nil {
+ colored = g.itemColorize(other, itemDef, itemName)
+ }
+ other.WriteLine(fmt.Sprintf("%s drops a %s.", p.Name, colored))
}
}
}
diff --git a/internal/game/action_clean.go b/internal/game/action_clean.go
index b85a3e0..77b6ea3 100644
--- a/internal/game/action_clean.go
+++ b/internal/game/action_clean.go
@@ -6,6 +6,7 @@ import (
"thehouseoficarus/internal/engine"
"thehouseoficarus/internal/net"
+ "thehouseoficarus/internal/object"
"thehouseoficarus/internal/player"
)
@@ -21,7 +22,7 @@ func (g *Game) advanceClean(sess *net.Session, p *player.Player) {
items := g.CraftIndex.ByType("clean")
- var match *cleanMatch
+ var matchItem *object.ItemDef
for _, item := range items {
c := item.FirstCraft()
if filter != "" {
@@ -39,41 +40,36 @@ func (g *Game) advanceClean(sess *net.Session, p *player.Player) {
if !craftHasAllItems(c, p.HasItem) {
continue
}
- match = &cleanMatch{c.Consume[0].Items[0], item.ID, c.XP, c.Message}
+ matchItem = item
break
}
- if match == nil {
- sess.WriteLine("\nYou've finished cleaning herbs.")
+ if matchItem == nil {
+ sess.WriteLine("You've finished cleaning herbs.")
g.cancelBgAction(p)
return
}
+ craft := matchItem.FirstCraft()
+ consumeID := craft.Consume[0].Items[0]
+
for i := 0; i < 28; i++ {
slot := p.InvSlot(i)
- if slot != nil && slot.ItemID == match.consumeID {
- slot.ItemID = match.outputID
+ if slot != nil && slot.ItemID == consumeID {
+ slot.ItemID = matchItem.ID
break
}
}
- if match.xp > 0 {
- g.awardSkillXP(sess, p, player.Pharmacy, match.xp)
+ if craft.XP > 0 {
+ g.awardSkillXP(sess, p, player.Pharmacy, craft.XP)
}
g.AccountStore.SaveCharacter(p)
- msg := match.message
- if msg == "" {
- outDef, _ := g.ItemStore.Load(match.outputID)
- outputName := match.outputID
- if outDef != nil {
- outputName = outDef.Name
- }
- msg = fmt.Sprintf("You clean a %s.", outputName)
- }
- if p.OptionBool("xp_drops") && match.xp > 0 {
+ msg := g.resolveCraftMessage(sess, craft.Message, "You clean the %i1.", craft, matchItem.ID, nil, p.HasItem)
+ if p.OptionBool("xp_drops") && craft.XP > 0 {
abbr := player.SkillAbbr[player.Pharmacy]
- msg += g.colorize(sess, "xp", fmt.Sprintf(" (+%dxp %s)", match.xp, abbr))
+ msg += g.colorize(sess, "xp", fmt.Sprintf(" (+%dxp %s)", craft.XP, abbr))
}
sess.WriteLine(msg)
@@ -96,17 +92,10 @@ func (g *Game) advanceClean(sess *net.Session, p *player.Player) {
}
if !hasMore {
- sess.WriteLine("\nYou've finished cleaning herbs.")
+ sess.WriteLine("You've finished cleaning herbs.")
g.cancelBgAction(p)
return
}
p.BackgroundAction.WaitLeft = engine.ToTicks(2)
}
-
-type cleanMatch struct {
- consumeID string
- outputID string
- xp int
- message string
-}
diff --git a/internal/game/action_farm.go b/internal/game/action_farm.go
index 679af83..6361901 100644
--- a/internal/game/action_farm.go
+++ b/internal/game/action_farm.go
@@ -114,7 +114,7 @@ func (g *Game) advanceFarmGrowth(sess *net.Session, p *player.Player) {
p.Flags[prefix+"_dead"] = true
p.Flags[prefix+"_diseased"] = false
sess.WriteLine(g.colorize(sess, "farm_disease",
- fmt.Sprintf("\nYour %s has died from disease!", seedDisplayName(g, seedID))))
+ fmt.Sprintf("\nYour %s has died from disease!", g.seedDisplayName(sess, seedID))))
g.AccountStore.SaveCharacter(p)
continue
}
@@ -140,7 +140,7 @@ func (g *Game) advanceFarmGrowth(sess *net.Session, p *player.Player) {
p.Flags[prefix+"_watered"] = false
sess.WriteLine(g.colorize(sess, "farm_grow",
fmt.Sprintf("\nYour %s is fully grown and ready to harvest!",
- seedDisplayName(g, seedID))))
+ g.seedDisplayName(sess, seedID))))
} else {
if !watered && rand.Float64() < 0.10 {
p.Flags[prefix+"_stage"] = stage
@@ -148,22 +148,22 @@ func (g *Game) advanceFarmGrowth(sess *net.Session, p *player.Player) {
p.Flags[prefix+"_watered"] = false
sess.WriteLine(g.colorize(sess, "farm_disease",
fmt.Sprintf("\nYour %s has become diseased!",
- seedDisplayName(g, seedID))))
+ g.seedDisplayName(sess, seedID))))
} else {
p.Flags[prefix+"_stage"] = stage
p.Flags[prefix+"_watered"] = false
sess.WriteLine(g.colorize(sess, "farm_grow",
fmt.Sprintf("\nYour %s has grown to stage %d/%d.",
- seedDisplayName(g, seedID), stage, maxStages)))
+ g.seedDisplayName(sess, seedID), stage, maxStages)))
}
}
g.AccountStore.SaveCharacter(p)
}
}
-func seedDisplayName(g *Game, seedID string) string {
+func (g *Game) seedDisplayName(sess *net.Session, seedID string) string {
if def, err := g.ItemStore.Load(seedID); err == nil {
- return def.Name
+ return g.itemColorize(sess, def, def.Name)
}
return seedID
}
@@ -194,7 +194,7 @@ func (g *Game) advancePlant(sess *net.Session, p *player.Player) {
seedName := seedID
if def, err := g.ItemStore.Load(seedID); err == nil {
- seedName = def.Name
+ seedName = g.itemColorize(sess, def, def.Name)
}
patchName := patchDisplayName(prefix)
msg := fmt.Sprintf("You plant a %s in the %s.", seedName, patchName)
@@ -287,7 +287,7 @@ func (g *Game) advanceHarvest(sess *net.Session, p *player.Player) {
productName := product
if productDef != nil {
- productName = productDef.Name
+ productName = g.itemColorize(sess, productDef, productDef.Name)
}
patchName := patchDisplayName(prefix)
msg := fmt.Sprintf("You harvest %d %s from the %s.", yield, productName, patchName)
@@ -562,7 +562,7 @@ func (g *Game) showFarmPatches(sess *net.Session, p *player.Player) {
seedName := seedID
if sd, err := g.ItemStore.Load(seedID); err == nil {
- seedName = sd.Name
+ seedName = g.itemColorize(sess, sd, sd.Name)
}
dead, _ := p.Flags[prefix+"_dead"].(bool)
diff --git a/internal/game/action_finishing_blow.go b/internal/game/action_finishing_blow.go
index 1a31d86..674c2ef 100644
--- a/internal/game/action_finishing_blow.go
+++ b/internal/game/action_finishing_blow.go
@@ -53,11 +53,11 @@ func (g *Game) doFinishingBlow(sess *net.Session, p *player.Player, mob *world.M
return
}
if !fbDef.MatchesName(itemInput) && !strings.EqualFold(itemInput, fbDef.ID) {
- sess.WriteLine(fmt.Sprintf("That won't work on %s. You need %s.", mobDisplayName(mob, true), fbDef.Name))
+ sess.WriteLine(fmt.Sprintf("That won't work on %s. You need %s.", mobDisplayName(mob, true), g.itemColorize(sess, fbDef, fbDef.Name)))
return
}
if !p.HasItem(mob.FinishingBlow) {
- sess.WriteLine(fmt.Sprintf("You don't have any %s.", fbDef.Name))
+ sess.WriteLine(fmt.Sprintf("You don't have any %s.", g.itemColorize(sess, fbDef, fbDef.Name)))
return
}
autoKey := "assassin_unlocked_auto_" + mob.FinishingBlow
diff --git a/internal/game/action_fletch.go b/internal/game/action_fletch.go
index 52de86b..a8571ea 100644
--- a/internal/game/action_fletch.go
+++ b/internal/game/action_fletch.go
@@ -82,7 +82,12 @@ func (g *Game) doInstantFletch(sess *net.Session, p *player.Player, item *object
g.AccountStore.SaveCharacter(p)
- msg := fmt.Sprintf("You fletch %d %s.", totalOutput, item.Name)
+ outDef, _ := g.ItemStore.Load(item.ID)
+ outputName := item.Name
+ if outDef != nil {
+ outputName = g.itemColorize(sess, outDef, outDef.Name)
+ }
+ msg := fmt.Sprintf("You fletch %d %s.", totalOutput, outputName)
if p.OptionBool("xp_drops") && c.XP > 0 {
totalXP := c.XP * batches
abbr := player.SkillAbbr[skill]
@@ -92,6 +97,19 @@ func (g *Game) doInstantFletch(sess *net.Session, p *player.Player, item *object
}
func (g *Game) startTimedFletch(sess *net.Session, p *player.Player, item *object.ItemDef, count int) {
+ craft := item.FirstCraft()
+
+ startMsg := g.resolveCraftMessage(sess, craft.StartMessage, "You begin fletching %i1.", craft, item.ID, nil, p.HasItem)
+
+ sess.WriteLine(startMsg)
+
+ broadcastName := item.Name
+ if def, _ := g.ItemStore.Load(item.ID); def != nil {
+ broadcastName = def.Name
+ }
+ g.broadcastAction(sess, "%s starts fletching.", p.Name)
+ _ = broadcastName
+
p.BackgroundAction = &action.Action{
Type: "fletch",
TargetID: item.ID,
@@ -99,16 +117,12 @@ func (g *Game) startTimedFletch(sess *net.Session, p *player.Player, item *objec
Data: map[string]any{
"item_id": item.ID,
"phase": 0,
- "wait": item.FirstCraft().Wait,
+ "wait": craft.Wait,
"remaining": count,
},
WaitLeft: engine.ToTicks(1),
}
p.BackgroundActionState = &ActionState{Type: ActionFletching, TargetName: item.Name}
-
- g.broadcastAction(sess, "\n%s starts fletching.", p.Name)
-
- sess.WriteLine(fmt.Sprintf("\nYou begin fletching %s.", item.Name))
}
func (g *Game) advanceFletch(sess *net.Session, p *player.Player) {
@@ -132,7 +146,7 @@ func (g *Game) advanceFletch(sess *net.Session, p *player.Player) {
tmpItem := &object.ItemDef{Craft: object.CraftList{*c}}
if !g.canDoFletchItem(p, tmpItem) {
- sess.WriteLine("\nYou've run out of fletching materials.")
+ sess.WriteLine("You've run out of fletching materials.")
g.cancelBgAction(p)
return
}
@@ -160,7 +174,7 @@ func (g *Game) advanceFletch(sess *net.Session, p *player.Player) {
craftConsumeAll(c, p.HasItem, p.RemoveItem)
freeSlot := p.FirstFreeSlot()
if freeSlot == -1 {
- sess.WriteLine("\nYour inventory is too full!")
+ sess.WriteLine("Your inventory is too full!")
g.cancelBgAction(p)
return
}
@@ -172,10 +186,7 @@ func (g *Game) advanceFletch(sess *net.Session, p *player.Player) {
}
g.AccountStore.SaveCharacter(p)
- msg := c.Message
- if msg == "" {
- msg = fmt.Sprintf("You fletch %s.", item.Name)
- }
+ msg := g.resolveCraftMessage(sess, c.Message, "You fletch a %n.", c, item.ID, nil, p.HasItem)
if p.OptionBool("xp_drops") && c.XP > 0 {
abbr := player.SkillAbbr[skill]
msg += g.colorize(sess, "xp", fmt.Sprintf(" (+%dxp %s)", c.XP, abbr))
@@ -186,14 +197,14 @@ func (g *Game) advanceFletch(sess *net.Session, p *player.Player) {
remaining--
p.BackgroundAction.Data["remaining"] = remaining
if remaining <= 0 {
- sess.WriteLine("\nYou've finished fletching.")
+ sess.WriteLine("You've finished fletching.")
g.cancelBgAction(p)
return
}
}
if !g.canContinueProduction(p, item) {
- sess.WriteLine("\nYou've run out of fletching materials.")
+ sess.WriteLine("You've run out of fletching materials.")
g.cancelBgAction(p)
return
}
diff --git a/internal/game/action_gather.go b/internal/game/action_gather.go
index 9b47de2..00c9070 100644
--- a/internal/game/action_gather.go
+++ b/internal/game/action_gather.go
@@ -378,8 +378,9 @@ func (g *Game) checkBirdNest(sess *net.Session, p *player.Player, cfg *action.Ga
}
nestName := "bird's nest"
- if def, err := g.ItemStore.Load(birdsNestItemID); err == nil {
- nestName = def.Name
+ nestDef, _ := g.ItemStore.Load(birdsNestItemID)
+ if nestDef != nil {
+ nestName = g.itemColorize(sess, nestDef, nestDef.Name)
}
freeSlot := -1
diff --git a/internal/game/action_identify.go b/internal/game/action_identify.go
index fd7df20..faca2f5 100644
--- a/internal/game/action_identify.go
+++ b/internal/game/action_identify.go
@@ -60,7 +60,7 @@ func (g *Game) advanceIdentify(sess *net.Session, p *player.Player) {
totalXP := scrapCount * xpPer
junkName := junkID
if def, err := g.ItemStore.Load(junkID); err == nil {
- junkName = def.Name
+ junkName = g.itemColorize(sess, def, def.Name)
}
msg := fmt.Sprintf("The altar hums. You identify %d scrap into %d %s.", scrapCount, totalJunk, junkName)
diff --git a/internal/game/action_use.go b/internal/game/action_use.go
index a3858a9..b4c4b25 100644
--- a/internal/game/action_use.go
+++ b/internal/game/action_use.go
@@ -22,7 +22,7 @@ func (g *Game) startUse(sess *net.Session, p *player.Player, obj *object.ObjectD
if !p.HasItem(itemID) {
defName := itemID
if def, err := g.ItemStore.Load(itemID); err == nil {
- defName = def.Name
+ defName = g.itemColorize(sess, def, def.Name)
}
sess.WriteLine(fmt.Sprintf("You need %s to use this.", defName))
return
@@ -60,7 +60,7 @@ func (g *Game) advanceUse(sess *net.Session, p *player.Player) {
if !p.HasItem(itemID) {
defName := itemID
if def, err := g.ItemStore.Load(itemID); err == nil {
- defName = def.Name
+ defName = g.itemColorize(sess, def, def.Name)
}
sess.WriteLine(fmt.Sprintf("You've run out of %s.", defName))
g.cancelAction(p)
diff --git a/internal/game/cmd_bank.go b/internal/game/cmd_bank.go
index 5f9067d..d95f7c0 100644
--- a/internal/game/cmd_bank.go
+++ b/internal/game/cmd_bank.go
@@ -101,9 +101,10 @@ func (g *Game) showBankBrowse(sess *net.Session) {
})
for _, e := range entries {
+ def, _ := g.ItemStore.Load(e.id)
t.Rows = append(t.Rows, []string{
fmt.Sprintf("%d", e.slot+1),
- g.colorize(sess, "item", e.name),
+ g.itemColorize(sess, def, e.name),
fmt.Sprintf("%d", e.qty),
})
}
diff --git a/internal/game/cmd_clean.go b/internal/game/cmd_clean.go
index 28758b8..a40f5fc 100644
--- a/internal/game/cmd_clean.go
+++ b/internal/game/cmd_clean.go
@@ -74,9 +74,9 @@ func (g *Game) doClean(sess *net.Session, input string) {
}
p.BackgroundActionState = &ActionState{Type: ActionCleaning}
- g.broadcastAction(sess, "\n%s starts cleaning herbs.", p.Name)
+ g.broadcastAction(sess, "%s starts cleaning herbs.", p.Name)
- sess.WriteLine("\nYou begin cleaning herbs.")
+ sess.WriteLine("You begin cleaning herbs.")
}
func matchesCleanFilter(item *object.ItemDef, filter string) bool {
diff --git a/internal/game/cmd_shop.go b/internal/game/cmd_shop.go
index c6b7831..f0e18fe 100644
--- a/internal/game/cmd_shop.go
+++ b/internal/game/cmd_shop.go
@@ -138,7 +138,7 @@ func (g *Game) showShopBrowse(sess *net.Session) {
sellStr = fmt.Sprintf("%d cr", si.SellPrice)
}
t.Rows = append(t.Rows, []string{
- g.colorize(sess, "item", itemName),
+ g.itemColorize(sess, def, itemName),
g.colorize(sess, "credits_pickup", buyStr),
g.colorize(sess, "credits_pickup", sellStr),
})
@@ -182,7 +182,7 @@ func (g *Game) doShopBuy(sess *net.Session, input string, qty int, all bool) {
if len(matches) > 1 {
sess.WriteLine("That's ambiguous, which one?")
for _, m := range matches {
- sess.WriteLine(fmt.Sprintf(" - %s", g.colorize(sess, "item", m.name)))
+ sess.WriteLine(fmt.Sprintf(" - %s", g.itemColorize(sess, m.def, m.name)))
}
return
}
@@ -325,8 +325,9 @@ func (g *Game) doShopSell(sess *net.Session, input string, qty int, all bool) {
if len(matches) > 1 {
sess.WriteLine("That's ambiguous, which one?")
- for _, m := range uniqueItemNames(matches) {
- sess.WriteLine(fmt.Sprintf(" - %s", g.colorize(sess, "item", m)))
+ for _, m := range matches {
+ def, _ := g.ItemStore.Load(m.ID)
+ sess.WriteLine(fmt.Sprintf(" - %s", g.itemColorize(sess, def, m.Name)))
}
return
}
@@ -348,7 +349,7 @@ func (g *Game) doShopSell(sess *net.Session, input string, qty int, all bool) {
if def != nil {
displayName = def.Name
}
- sess.WriteLine(fmt.Sprintf("The shop doesn't want to buy %s.", g.colorize(sess, "item", displayName)))
+ sess.WriteLine(fmt.Sprintf("The shop doesn't want to buy %s.", g.itemColorize(sess, def, displayName)))
return
}
diff --git a/internal/game/cmd_stats.go b/internal/game/cmd_stats.go
index 906abf2..333d535 100644
--- a/internal/game/cmd_stats.go
+++ b/internal/game/cmd_stats.go
@@ -20,8 +20,10 @@ func (g *Game) doStats(sess *net.Session) {
attackType := "crush"
weaponName := "unarmed"
var weaponType object.WeaponType
+ var weaponDef *object.ItemDef
if itemID, ok := p.Equipment[object.SlotMainHand]; ok {
if def, err := g.ItemStore.Load(itemID); err == nil {
+ weaponDef = def
weaponName = def.Name
weaponType = def.WeaponType
if def.AttackType != "" {
@@ -34,6 +36,9 @@ func (g *Game) doStats(sess *net.Session) {
}
}
+ if weaponDef != nil {
+ weaponName = g.itemColorize(sess, weaponDef, weaponName)
+ }
sess.WriteLines(
"",
fmt.Sprintf("Weapon: %s (attack type: %s)", weaponName, attackType),
diff --git a/internal/game/cmd_trigger_enchant.go b/internal/game/cmd_trigger_enchant.go
index a1a6950..0279b4e 100644
--- a/internal/game/cmd_trigger_enchant.go
+++ b/internal/game/cmd_trigger_enchant.go
@@ -56,7 +56,7 @@ func (g *Game) triggerEnchant(sess *net.Session, p *player.Player, mod *ModDef,
inputName = inputDef.Name
}
- sess.WriteLine(fmt.Sprintf("You enchant the %s and it becomes a %s!", inputName, outputName))
+ sess.WriteLine(fmt.Sprintf("You enchant the %s and it becomes a %s!", g.itemColorize(sess, inputDef, inputName), g.itemColorize(sess, outputDef, outputName)))
}
func (g *Game) triggerChipBolts(sess *net.Session, p *player.Player, mod *ModDef, chip chipEntry) {
@@ -98,5 +98,5 @@ func (g *Game) triggerChipBolts(sess *net.Session, p *player.Player, mod *ModDef
name = inputDef.Name
}
- sess.WriteLine(fmt.Sprintf("You chip %d %s with arcane circuitry.", chip.Qty, name))
+ sess.WriteLine(fmt.Sprintf("You chip %d %s with arcane circuitry.", chip.Qty, g.itemColorize(sess, inputDef, name)))
}
diff --git a/internal/game/cmd_trigger_utility.go b/internal/game/cmd_trigger_utility.go
index 69abc34..5733722 100644
--- a/internal/game/cmd_trigger_utility.go
+++ b/internal/game/cmd_trigger_utility.go
@@ -71,7 +71,7 @@ func (g *Game) triggerProcessing(sess *net.Session, p *player.Player, mod *ModDe
g.triggerModReward(sess, p, mod, 1.0)
sess.WriteLine(fmt.Sprintf("You process the %s. You receive %s credits.",
- itemDef.Name, g.colorize(sess, "credits_pickup", fmt.Sprint(creditValue))))
+ g.itemColorize(sess, itemDef, itemDef.Name), g.colorize(sess, "credits_pickup", fmt.Sprint(creditValue))))
}
func (g *Game) triggerBonesToNuts(sess *net.Session, p *player.Player, mod *ModDef) {
@@ -150,7 +150,7 @@ func (g *Game) triggerEmGrab(sess *net.Session, p *player.Player, mod *ModDef, t
g.triggerModReward(sess, p, mod, 1.0)
- sess.WriteLine(fmt.Sprintf("You magnetically pull the %s toward you.", name))
+ sess.WriteLine(fmt.Sprintf("You magnetically pull the %s toward you.", g.itemColorize(sess, def, name)))
}
func (g *Game) triggerSuperheat(sess *net.Session, p *player.Player, mod *ModDef, targetArg string) {
@@ -243,7 +243,7 @@ func (g *Game) triggerSuperheat(sess *net.Session, p *player.Player, mod *ModDef
inputName = inputDef.Name
}
- sess.WriteLine(fmt.Sprintf("You superheat the %s and produce a %s.", inputName, outputName))
+ sess.WriteLine(fmt.Sprintf("You superheat the %s and produce a %s.", g.itemColorize(sess, inputDef, inputName), g.itemColorize(sess, match, outputName)))
}
func (g *Game) triggerPlankMake(sess *net.Session, p *player.Player, mod *ModDef, targetArg string) {
diff --git a/internal/game/cmd_wear.go b/internal/game/cmd_wear.go
index f2fd84c..8f8117f 100644
--- a/internal/game/cmd_wear.go
+++ b/internal/game/cmd_wear.go
@@ -13,7 +13,7 @@ func (g *Game) executeWear(sess *net.Session, args []string, rawInput string) {
g.doWear(sess, strings.Join(args, " "))
}
-func (g *Game) checkRequirements(p *player.Player, def *object.ItemDef) string {
+func (g *Game) checkRequirements(sess *net.Session, p *player.Player, def *object.ItemDef) string {
if len(def.Requirements) == 0 {
return ""
}
@@ -26,7 +26,7 @@ func (g *Game) checkRequirements(p *player.Player, def *object.ItemDef) string {
if len(unmet) == 0 {
return ""
}
- return fmt.Sprintf("You need %s to wear %s.", strings.Join(unmet, ", "), def.Name)
+ return fmt.Sprintf("You need %s to wear %s.", strings.Join(unmet, ", "), g.itemColorize(sess, def, def.Name))
}
func (g *Game) doWear(sess *net.Session, input string) {
@@ -56,8 +56,14 @@ func (g *Game) doWear(sess *net.Session, input string) {
unique := uniqueItemNames(matches)
if len(unique) > 1 {
sess.WriteLine("Equip what?")
- for _, name := range unique {
- sess.WriteLine(fmt.Sprintf(" - %s", name))
+ seen := make(map[string]bool)
+ for _, m := range matches {
+ if seen[m.Name] {
+ continue
+ }
+ seen[m.Name] = true
+ def, _ := g.ItemStore.Load(m.ID)
+ sess.WriteLine(fmt.Sprintf(" - %s", g.itemColorize(sess, def, m.Name)))
}
return
}
@@ -74,7 +80,7 @@ func (g *Game) doWear(sess *net.Session, input string) {
return
}
- if msg := g.checkRequirements(p, def); msg != "" {
+ if msg := g.checkRequirements(sess, p, def); msg != "" {
sess.WriteLine(msg)
return
}
@@ -190,7 +196,7 @@ func (g *Game) doWearAll(sess *net.Session) {
if err != nil || def.EquipSlot == "" {
continue
}
- if g.checkRequirements(p, def) != "" {
+ if g.checkRequirements(sess, p, def) != "" {
continue
}
current, exists := bestPerSlot[def.EquipSlot]
diff --git a/internal/game/core_production.go b/internal/game/core_production.go
index 4aecc54..47a164c 100644
--- a/internal/game/core_production.go
+++ b/internal/game/core_production.go
@@ -15,19 +15,64 @@ import (
"thehouseoficarus/internal/player"
)
-func craftFirstItemName(c *object.CraftDef, load func(string) (string, bool)) string {
- if c == nil {
- return ""
+func (g *Game) resolveCraftVar(sess *net.Session, varSpec string, craft *object.CraftDef, outputID string, byproducts []string, hasItem func(string) bool) string {
+ if !strings.Contains(varSpec, "%") {
+ return varSpec
}
- for _, e := range c.Consume {
+
+ outDef, _ := g.ItemStore.Load(outputID)
+ outputName := outputID
+ if outDef != nil {
+ outputName = g.itemColorize(sess, outDef, outDef.Name)
+ }
+ varSpec = strings.ReplaceAll(varSpec, "%n", outputName)
+
+ for i, e := range craft.Consume {
+ key := fmt.Sprintf("%%i%d", i+1)
+ if !strings.Contains(varSpec, key) {
+ continue
+ }
+ var matchedID string
for _, id := range e.Items {
- if name, ok := load(id); ok {
- return name
+ if hasItem(id) {
+ matchedID = id
+ break
}
- return id
+ }
+ if matchedID == "" && len(e.Items) > 0 {
+ matchedID = e.Items[0]
+ }
+ if def, err := g.ItemStore.Load(matchedID); err == nil {
+ varSpec = strings.ReplaceAll(varSpec, key, g.itemColorize(sess, def, def.Name))
+ } else {
+ varSpec = strings.ReplaceAll(varSpec, key, matchedID)
}
}
- return ""
+
+ for i, bpID := range byproducts {
+ key := fmt.Sprintf("%%b%d", i+1)
+ if !strings.Contains(varSpec, key) {
+ continue
+ }
+ if def, err := g.ItemStore.Load(bpID); err == nil {
+ varSpec = strings.ReplaceAll(varSpec, key, g.itemColorize(sess, def, def.Name))
+ } else {
+ varSpec = strings.ReplaceAll(varSpec, key, bpID)
+ }
+ }
+
+ return color.ExpandTags(g.colorMode(sess), varSpec)
+}
+
+func (g *Game) resolveCraftMessage(sess *net.Session, itemMsg, defaultMsg string, craft *object.CraftDef, outputID string, byproducts []string, hasItem func(string) bool) string {
+ msg := itemMsg
+ if msg == "" {
+ msg = defaultMsg
+ }
+ if msg == "" {
+ return ""
+ }
+ return g.resolveCraftVar(sess, msg, craft, outputID, byproducts, hasItem)
}
func (g *Game) startProduction(sess *net.Session, p *player.Player, item *object.ItemDef, craft *object.CraftDef, actionType, displayVerb, startMsg, endMsg string, count int) {
@@ -79,7 +124,7 @@ func (g *Game) startProduction(sess *net.Session, p *player.Player, item *object
p.ActionState = &ActionState{Type: ActionProducing, TargetName: outputName, Verb: displayVerb}
- g.broadcastAction(sess, "\n%s starts %s.", p.Name, displayVerb)
+ g.broadcastAction(sess, "%s starts %s.", p.Name, displayVerb)
}
func (g *Game) startProductionFromItem(sess *net.Session, p *player.Player, item *object.ItemDef, count int) {
@@ -93,30 +138,25 @@ func (g *Game) startProductionFromItem(sess *net.Session, p *player.Player, item
stationName = "inventory"
}
- firstItem := craftFirstItemName(craft, func(id string) (string, bool) {
- def, err := g.ItemStore.Load(id)
- if err != nil {
- return id, false
- }
- return def.Name, true
- })
-
info, ok := productionTypes[craft.Type]
if !ok {
- info = productionTypeInfo{craft.Type, craft.Type}
+ info = productionTypeInfo{
+ ActionType: craft.Type,
+ DisplayVerb: craft.Type,
+ StartMessage: "You start " + craft.Type + " %i1.",
+ SuccessMessage: "You produce %n.",
+ EndMessage: "You've finished " + craft.Type + ".",
+ }
}
- actionType := info.ActionType
- displayVerb := info.DisplayVerb
- var startMsg, endMsg string
+ startMsg := g.resolveCraftMessage(sess, craft.StartMessage, info.StartMessage, craft, item.ID, nil, p.HasItem)
if stationName != "inventory" {
- startMsg = fmt.Sprintf("You start %s %s on the %s.", displayVerb, firstItem, stationName)
- } else {
- startMsg = fmt.Sprintf("You start %s %s.", displayVerb, firstItem)
+ startMsg += " on the " + stationName + "."
}
- endMsg = fmt.Sprintf("You've finished %s.", displayVerb)
- g.startProduction(sess, p, item, craft, actionType, displayVerb, startMsg, endMsg, count)
+ endMsg := g.resolveCraftMessage(sess, craft.EndMessage, info.EndMessage, craft, item.ID, nil, p.HasItem)
+
+ g.startProduction(sess, p, item, craft, info.ActionType, info.DisplayVerb, startMsg, endMsg, count)
}
func (g *Game) loadCraftItem(itemID string) *object.ItemDef {
@@ -144,7 +184,7 @@ func (g *Game) advanceProduction(sess *net.Session, p *player.Player) bool {
if phase == 0 {
if startMsg != "" {
- sess.WriteLine(fmt.Sprintf("\n%s", startMsg))
+ sess.WriteLine(startMsg)
}
if len(craft.Steps) > 0 {
p.Action.Data["next_step_index"] = 0
@@ -161,7 +201,7 @@ func (g *Game) advanceProduction(sess *net.Session, p *player.Player) bool {
p.Action.Data["steps_accumulated_ticks"] = accTicks
for i := stepsIdx; i < len(craft.Steps); i++ {
if accTicks >= craft.Steps[i].Tick {
- sess.WriteLine(craft.Steps[i].Message)
+ sess.WriteLine(g.resolveCraftVar(sess, craft.Steps[i].Message, craft, item.ID, nil, p.HasItem))
p.Action.Data["next_step_index"] = i + 1
}
}
@@ -174,6 +214,8 @@ func (g *Game) advanceProduction(sess *net.Session, p *player.Player) bool {
chance = action.SuccessChance(action.SuccessFormula(*craft.Success), skillLevel, craft.Level)
}
+ info, _ := productionTypes[craft.Type]
+
if rand.Float64() < chance {
outputQty := craft.OutputQty
if outputQty <= 0 {
@@ -219,14 +261,13 @@ func (g *Game) advanceProduction(sess *net.Session, p *player.Player) bool {
}
g.AccountStore.SaveCharacter(p)
- msg := craft.Message
- if msg == "" {
- outputName := item.ID
- if outDef != nil {
- outputName = outDef.Name
- }
- msg = fmt.Sprintf("You produce %s.", outputName)
+ var defaultSuccess string
+ if info.SuccessMessage != "" {
+ defaultSuccess = info.SuccessMessage
+ } else {
+ defaultSuccess = "You produce %n."
}
+ msg := g.resolveCraftMessage(sess, craft.Message, defaultSuccess, craft, item.ID, byproducts, p.HasItem)
if p.OptionBool("xp_drops") && craft.XP > 0 {
abbr := player.SkillAbbr[player.SkillName(skill)]
msg += g.colorize(sess, "xp", fmt.Sprintf(" (+%dxp %s)", craft.XP, abbr))
@@ -243,11 +284,10 @@ func (g *Game) advanceProduction(sess *net.Session, p *player.Player) bool {
}
g.AccountStore.SaveCharacter(p)
- msg := craft.FailMessage
- if msg == "" {
- msg = "You fail and the materials are lost."
+ msg := g.resolveCraftMessage(sess, craft.FailMessage, info.FailMessage, craft, item.ID, nil, p.HasItem)
+ if msg != "" {
+ sess.WriteLine(g.colorize(sess, "damage", msg))
}
- sess.WriteLine(g.colorize(sess, "damage", msg))
}
if remaining > 0 {
@@ -255,7 +295,7 @@ func (g *Game) advanceProduction(sess *net.Session, p *player.Player) bool {
p.Action.Data["remaining"] = remaining
if remaining <= 0 {
if endMsg != "" {
- sess.WriteLine(fmt.Sprintf("\n%s", endMsg))
+ sess.WriteLine(endMsg)
}
g.cancelAction(p)
return false
@@ -268,7 +308,7 @@ func (g *Game) advanceProduction(sess *net.Session, p *player.Player) bool {
}
if endMsg != "" {
- sess.WriteLine(fmt.Sprintf("\n%s", endMsg))
+ sess.WriteLine(endMsg)
}
g.cancelAction(p)
return false
@@ -404,7 +444,7 @@ func (g *Game) dispatchMenuEntry(sess *net.Session, entry map[string]string) {
g.reprompt(sess)
}
-func (g *Game) formatMaterials(item *object.ItemDef) string {
+func (g *Game) formatMaterials(sess *net.Session, item *object.ItemDef) string {
craft := item.FirstCraft()
if craft == nil {
return ""
@@ -413,7 +453,7 @@ func (g *Game) formatMaterials(item *object.ItemDef) string {
for _, e := range craft.Consume {
itemName := e.Items[0]
if def, err := g.ItemStore.Load(e.Items[0]); err == nil {
- itemName = def.Name
+ itemName = g.itemColorize(sess, def, def.Name)
}
if e.Quantity > 1 {
parts = append(parts, fmt.Sprintf("%s x%d", itemName, e.Quantity))
@@ -454,7 +494,7 @@ func (g *Game) showProductionTable(sess *net.Session, p *player.Player, items []
productName = fmt.Sprintf("%s x%d", productName, outputQty)
}
- matStr := g.formatMaterials(item)
+ matStr := g.formatMaterials(sess, item)
levelStr := fmt.Sprint(craft.Level)
numStr := fmt.Sprintf("%d", i+1)
@@ -607,19 +647,73 @@ func (g *Game) hasToolType(p *player.Player, toolType string) bool {
}
type productionTypeInfo struct {
- ActionType string
- DisplayVerb string
+ ActionType string
+ DisplayVerb string
+ StartMessage string
+ SuccessMessage string
+ EndMessage string
+ FailMessage string
}
var productionTypes = map[string]productionTypeInfo{
- "cooking": {"cook", "cooking"},
- "smelting": {"smelt", "smelting"},
- "smithing": {"smith", "smithing"},
- "crafting": {"craft", "crafting"},
- "combine": {"combine", "combining"},
- "fletching": {"fletch", "fletching"},
- "pharmacy": {"mix", "mixing"},
- "construction": {"construct", "constructing"},
+ "cooking": {
+ ActionType: "cook",
+ DisplayVerb: "cooking",
+ StartMessage: "You start cooking %i1.",
+ SuccessMessage: "Cooked to perfection. %n looks great!",
+ EndMessage: "You've finished cooking.",
+ FailMessage: "You accidentally burn the %i1.",
+ },
+ "smelting": {
+ ActionType: "smelt",
+ DisplayVerb: "smelting",
+ StartMessage: "You place the %i1 into the furnace.",
+ SuccessMessage: "You remove a white hot %n!",
+ EndMessage: "You've finished smelting.",
+ FailMessage: "The %i1 is consumed by the flames.",
+ },
+ "smithing": {
+ ActionType: "smith",
+ DisplayVerb: "smithing",
+ StartMessage: "You begin smithing %i1.",
+ SuccessMessage: "You smith a %n.",
+ EndMessage: "You've finished smithing.",
+ },
+ "crafting": {
+ ActionType: "craft",
+ DisplayVerb: "crafting",
+ StartMessage: "You begin crafting %i1.",
+ SuccessMessage: "You craft a %n.",
+ EndMessage: "You've finished crafting.",
+ },
+ "combine": {
+ ActionType: "combine",
+ DisplayVerb: "combining",
+ StartMessage: "You start combining %i1.",
+ SuccessMessage: "You produce %n.",
+ EndMessage: "You've finished combining.",
+ },
+ "fletching": {
+ ActionType: "fletch",
+ DisplayVerb: "fletching",
+ StartMessage: "You begin fletching %i1.",
+ SuccessMessage: "You fletch a %n.",
+ EndMessage: "You've finished fletching.",
+ },
+ "pharmacy": {
+ ActionType: "mix",
+ DisplayVerb: "mixing",
+ StartMessage: "You start mixing %i1.",
+ SuccessMessage: "You mix a %n.",
+ EndMessage: "You've finished mixing.",
+ },
+ "construction": {
+ ActionType: "construct",
+ DisplayVerb: "constructing",
+ StartMessage: "You begin constructing %i1.",
+ SuccessMessage: "You construct a %n.",
+ EndMessage: "You've finished constructing.",
+ },
}
var productionActionTypes map[string]bool
diff --git a/internal/game/game.go b/internal/game/game.go
index 0dd5bdc..8bf289b 100644
--- a/internal/game/game.go
+++ b/internal/game/game.go
@@ -284,7 +284,9 @@ func (g *Game) ProcessQueuedCommands() {
if len(parts) > 0 {
g.executeCommand(qc.Session, parts[0], parts[1:], raw)
}
- g.writePrompt(qc.Session)
+ if p.BackgroundAction == nil {
+ g.writePrompt(qc.Session)
+ }
}
delete(g.freeQueue, p.Name)
@@ -322,7 +324,7 @@ func (g *Game) ProcessQueuedCommands() {
}
isBusy := p.Action != nil || len(p.WalkSequence) > 0 || combat.GetCombat(p.Name) != nil || p.MoveTicks > 0
_, isResting := g.restTimers[p.Name]
- if !isResting && !isBusy {
+ if !isResting && !isBusy && qc.Session.State == net.StateGame {
g.writePrompt(qc.Session)
}
}
diff --git a/internal/object/item.go b/internal/object/item.go
index 241cc0b..b0865d6 100644
--- a/internal/object/item.go
+++ b/internal/object/item.go
@@ -154,20 +154,22 @@ type SuccessFormula struct {
}
type CraftDef struct {
- Type string `yaml:"type"`
- Skill string `yaml:"skill"`
- Level int `yaml:"level"`
- XP int `yaml:"xp"`
- Wait float64 `yaml:"wait"`
- Station []string `yaml:"station"`
- Tool string `yaml:"tool"`
- Consume []ConsumeEntry `yaml:"consume"`
- OutputQty int `yaml:"output_qty"`
- Fail string `yaml:"fail"`
- Message string `yaml:"message"`
- FailMessage string `yaml:"fail_message"`
- Steps []CraftStep `yaml:"steps"`
- Success *SuccessFormula `yaml:"success"`
+ Type string `yaml:"type"`
+ Skill string `yaml:"skill"`
+ Level int `yaml:"level"`
+ XP int `yaml:"xp"`
+ Wait float64 `yaml:"wait"`
+ Station []string `yaml:"station"`
+ Tool string `yaml:"tool"`
+ Consume []ConsumeEntry `yaml:"consume"`
+ OutputQty int `yaml:"output_qty"`
+ Fail string `yaml:"fail"`
+ Message string `yaml:"message"`
+ FailMessage string `yaml:"fail_message"`
+ StartMessage string `yaml:"start_message"`
+ EndMessage string `yaml:"end_message"`
+ Steps []CraftStep `yaml:"steps"`
+ Success *SuccessFormula `yaml:"success"`
}
func (c *CraftDef) EffectiveSkill() string {
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-08 10:46:00 +0000