diff options
Diffstat (limited to 'internal/player')
| -rw-r--r-- | internal/player/player.go | 94 | ||||
| -rw-r--r-- | internal/player/store.go | 4 |
2 files changed, 49 insertions, 49 deletions
diff --git a/internal/player/player.go b/internal/player/player.go index 2cc19bb..cb823aa 100644 --- a/internal/player/player.go +++ b/internal/player/player.go @@ -3,8 +3,8 @@ package player import ( "sort" - "thehouseoficarus/internal/action" - "thehouseoficarus/internal/object" + "thehouseoficarus/internal/behavior" + "thehouseoficarus/internal/item" ) type SkillName string @@ -42,7 +42,7 @@ var AllSkills = []SkillName{ } var SkillAbbr = map[SkillName]string{ - Accuracy: "acc", + Accuracy: "acc", Strength: "str", Defense: "def", Hitpoints: "hp", @@ -95,7 +95,7 @@ type InventorySlot struct { type OptionType int const ( - OptBool OptionType = iota + OptBool OptionType = iota OptString OptInt ) @@ -157,47 +157,47 @@ func GetOptionDef(name string) *OptionDef { } type Player struct { - Name string `yaml:"name"` - Skills map[SkillName]int `yaml:"skills"` - Inventory map[int]*InventorySlot `yaml:"inventory"` - Bank map[int]*InventorySlot `yaml:"bank"` - Equipment map[object.EquipSlot]string `yaml:"equipment"` - EquipQuality map[string]int `yaml:"equip_quality,omitempty"` - RoomID int `yaml:"room_id"` - HP int `yaml:"hp"` - Credits int `yaml:"credits"` - Description string `yaml:"description"` - AttackStyle AttackStyle `yaml:"attack_style"` - Prompt string `yaml:"prompt"` - Options map[string]any `yaml:"-"` - Flags map[string]any `yaml:"flags"` - CutsceneRoom int `yaml:"cutscene_room,omitempty"` - RegenerateTick int - AmmoQty int `yaml:"ammo_qty,omitempty"` - Action *action.Action `yaml:"-"` - BackgroundAction *action.Action `yaml:"-"` - WalkSequence []string `yaml:"-"` - ConsumeCooldown int `yaml:"-"` - MoveTicks int `yaml:"-"` - MoveDirection string `yaml:"-"` - MoveTarget int `yaml:"-"` - MovePendingFlags map[string]any `yaml:"-"` - MovePendingPlayerFlags map[string]any `yaml:"-"` - VisualTickCurrent int `yaml:"-"` - AutotriggerMod string `yaml:"-"` - QueuedTrigger string `yaml:"-"` - AttackTimer int `yaml:"-"` - HazardTimer int `yaml:"-"` - PendingDangerDir string `yaml:"-"` - Battery float64 `yaml:"battery"` - ActiveTechs map[string]bool `yaml:"-"` - QuickTech string `yaml:"quick_tech,omitempty"` - TechActivatedSinceTick map[string]bool `yaml:"-"` - Sneaking bool `yaml:"-"` - SneakNotified map[string]bool `yaml:"-"` - ActiveBuffs []PotionBuff `yaml:"-"` - MapSymbols map[int]MapSymbolData `yaml:"map_symbols,omitempty"` - Stats PlayerStats `yaml:"stats"` + Name string `yaml:"name"` + Skills map[SkillName]int `yaml:"skills"` + Inventory map[int]*InventorySlot `yaml:"inventory"` + Bank map[int]*InventorySlot `yaml:"bank"` + Equipment map[item.EquipSlot]string `yaml:"equipment"` + EquipQuality map[string]int `yaml:"equip_quality,omitempty"` + RoomID int `yaml:"room_id"` + HP int `yaml:"hp"` + Credits int `yaml:"credits"` + Description string `yaml:"description"` + AttackStyle AttackStyle `yaml:"attack_style"` + Prompt string `yaml:"prompt"` + Options map[string]any `yaml:"-"` + Flags map[string]any `yaml:"flags"` + CutsceneRoom int `yaml:"cutscene_room,omitempty"` + RegenerateTick int + AmmoQty int `yaml:"ammo_qty,omitempty"` + Action *behavior.Action `yaml:"-"` + BackgroundAction *behavior.Action `yaml:"-"` + WalkSequence []string `yaml:"-"` + ConsumeCooldown int `yaml:"-"` + MoveTicks int `yaml:"-"` + MoveDirection string `yaml:"-"` + MoveTarget int `yaml:"-"` + MovePendingFlags map[string]any `yaml:"-"` + MovePendingPlayerFlags map[string]any `yaml:"-"` + VisualTickCurrent int `yaml:"-"` + AutotriggerMod string `yaml:"-"` + QueuedTrigger string `yaml:"-"` + AttackTimer int `yaml:"-"` + HazardTimer int `yaml:"-"` + PendingDangerDir string `yaml:"-"` + Battery float64 `yaml:"battery"` + ActiveTechs map[string]bool `yaml:"-"` + QuickTech string `yaml:"quick_tech,omitempty"` + TechActivatedSinceTick map[string]bool `yaml:"-"` + Sneaking bool `yaml:"-"` + SneakNotified map[string]bool `yaml:"-"` + ActiveBuffs []PotionBuff `yaml:"-"` + MapSymbols map[int]MapSymbolData `yaml:"map_symbols,omitempty"` + Stats PlayerStats `yaml:"stats"` } type MapSymbolData struct { @@ -323,11 +323,11 @@ func New(name string) *Player { Name: name, Skills: make(map[SkillName]int), Bank: make(map[int]*InventorySlot), - Equipment: make(map[object.EquipSlot]string), + Equipment: make(map[item.EquipSlot]string), AttackStyle: Accurate, Prompt: "> ", RoomID: 0, - MapSymbols: make(map[int]MapSymbolData), + MapSymbols: make(map[int]MapSymbolData), Stats: PlayerStats{ RoomsVisited: make(map[int]bool), MobKills: make(map[string]int), diff --git a/internal/player/store.go b/internal/player/store.go index 97ff13f..bcadf3b 100644 --- a/internal/player/store.go +++ b/internal/player/store.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "thehouseoficarus/internal/object" "gopkg.in/yaml.v3" + "thehouseoficarus/internal/item" ) type AccountStore struct { @@ -90,7 +90,7 @@ func (s *AccountStore) LoadCharacter(name string) (*Player, error) { p.Skills = make(map[SkillName]int) } if p.Equipment == nil { - p.Equipment = make(map[object.EquipSlot]string) + p.Equipment = make(map[item.EquipSlot]string) } if p.Inventory == nil { p.Inventory = make(map[int]*InventorySlot) |