From 042ca8a9e3eca41f693df638c9bb8ced97bf480a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nh=C3=A2n?= Date: Sun, 17 Sep 2023 16:21:49 +0700 Subject: [PATCH] rename feeding to feed to be consistent --- main.go | 8 ++++---- sprites/{feeding => feed}/00.png | Bin sprites/{feeding => feed}/01.png | Bin sprites/{feeding => feed}/02.png | Bin sprites/{feeding => feed}/03.png | Bin sprites/{feeding => feed}/04.png | Bin sprites/{feeding => feed}/05.png | Bin sprites/{feeding => feed}/06.png | Bin sprites/{feeding => feed}/07.png | Bin sprites/{feeding => feed}/08.png | Bin sprites/{feeding => feed}/09.png | Bin sprites/{feeding => feed}/10.png | Bin sprites/{feeding => feed}/11.png | Bin sprites/{feeding => feed}/12.png | Bin sprites/{feeding => feed}/13.png | Bin sprites/{feeding => feed}/14.png | Bin sprites/{feeding => feed}/15.png | Bin sprites/{feeding => feed}/16.png | Bin sprites/{feeding => feed}/17.png | Bin sprites/{feeding => feed}/18.png | Bin sprites/{feeding => feed}/19.png | Bin sprites/{feeding => feed}/20.png | Bin sprites/{feeding => feed}/21.png | Bin sprites/{feeding => feed}/22.png | Bin sprites/{feeding => feed}/23.png | Bin sprites/{feeding => feed}/24.png | Bin sprites/{feeding => feed}/25.png | Bin sprites/{feeding => feed}/26.png | Bin sprites/{feeding => feed}/27.png | Bin states.go | 2 +- 30 files changed, 5 insertions(+), 5 deletions(-) rename sprites/{feeding => feed}/00.png (100%) rename sprites/{feeding => feed}/01.png (100%) rename sprites/{feeding => feed}/02.png (100%) rename sprites/{feeding => feed}/03.png (100%) rename sprites/{feeding => feed}/04.png (100%) rename sprites/{feeding => feed}/05.png (100%) rename sprites/{feeding => feed}/06.png (100%) rename sprites/{feeding => feed}/07.png (100%) rename sprites/{feeding => feed}/08.png (100%) rename sprites/{feeding => feed}/09.png (100%) rename sprites/{feeding => feed}/10.png (100%) rename sprites/{feeding => feed}/11.png (100%) rename sprites/{feeding => feed}/12.png (100%) rename sprites/{feeding => feed}/13.png (100%) rename sprites/{feeding => feed}/14.png (100%) rename sprites/{feeding => feed}/15.png (100%) rename sprites/{feeding => feed}/16.png (100%) rename sprites/{feeding => feed}/17.png (100%) rename sprites/{feeding => feed}/18.png (100%) rename sprites/{feeding => feed}/19.png (100%) rename sprites/{feeding => feed}/20.png (100%) rename sprites/{feeding => feed}/21.png (100%) rename sprites/{feeding => feed}/22.png (100%) rename sprites/{feeding => feed}/23.png (100%) rename sprites/{feeding => feed}/24.png (100%) rename sprites/{feeding => feed}/25.png (100%) rename sprites/{feeding => feed}/26.png (100%) rename sprites/{feeding => feed}/27.png (100%) diff --git a/main.go b/main.go index e90c8a0..6b57778 100644 --- a/main.go +++ b/main.go @@ -29,8 +29,8 @@ var DragSprites embed.FS //go:embed sprites/hungry/* var HungrySprites embed.FS -//go:embed sprites/feeding/* -var FeedingSprites embed.FS +//go:embed sprites/feed/* +var FeedSprites embed.FS //go:embed sprites/walk-left/* var WalkLeftSprites embed.FS @@ -85,14 +85,14 @@ func NewAnim(sprites embed.FS, subdir string) *Anim { return &Anim{frames} } -var Idle, RightClick, Drag, Hungry, Feeding, WalkLeft, WalkRight *Anim +var Idle, RightClick, Drag, Hungry, Feed, WalkLeft, WalkRight *Anim func init() { Idle = NewAnim(IdleSprites, "idle") Drag = NewAnim(DragSprites, "drag") RightClick = NewAnim(RightClickSprites, "right-click") Hungry = NewAnim(HungrySprites, "hungry") - Feeding = NewAnim(FeedingSprites, "feeding") + Feed = NewAnim(FeedSprites, "feed") WalkLeft = NewAnim(WalkLeftSprites, "walk-left") WalkRight = NewAnim(WalkRightSprites, "walk-right") } diff --git a/sprites/feeding/00.png b/sprites/feed/00.png similarity index 100% rename from sprites/feeding/00.png rename to sprites/feed/00.png diff --git a/sprites/feeding/01.png b/sprites/feed/01.png similarity index 100% rename from sprites/feeding/01.png rename to sprites/feed/01.png diff --git a/sprites/feeding/02.png b/sprites/feed/02.png similarity index 100% rename from sprites/feeding/02.png rename to sprites/feed/02.png diff --git a/sprites/feeding/03.png b/sprites/feed/03.png similarity index 100% rename from sprites/feeding/03.png rename to sprites/feed/03.png diff --git a/sprites/feeding/04.png b/sprites/feed/04.png similarity index 100% rename from sprites/feeding/04.png rename to sprites/feed/04.png diff --git a/sprites/feeding/05.png b/sprites/feed/05.png similarity index 100% rename from sprites/feeding/05.png rename to sprites/feed/05.png diff --git a/sprites/feeding/06.png b/sprites/feed/06.png similarity index 100% rename from sprites/feeding/06.png rename to sprites/feed/06.png diff --git a/sprites/feeding/07.png b/sprites/feed/07.png similarity index 100% rename from sprites/feeding/07.png rename to sprites/feed/07.png diff --git a/sprites/feeding/08.png b/sprites/feed/08.png similarity index 100% rename from sprites/feeding/08.png rename to sprites/feed/08.png diff --git a/sprites/feeding/09.png b/sprites/feed/09.png similarity index 100% rename from sprites/feeding/09.png rename to sprites/feed/09.png diff --git a/sprites/feeding/10.png b/sprites/feed/10.png similarity index 100% rename from sprites/feeding/10.png rename to sprites/feed/10.png diff --git a/sprites/feeding/11.png b/sprites/feed/11.png similarity index 100% rename from sprites/feeding/11.png rename to sprites/feed/11.png diff --git a/sprites/feeding/12.png b/sprites/feed/12.png similarity index 100% rename from sprites/feeding/12.png rename to sprites/feed/12.png diff --git a/sprites/feeding/13.png b/sprites/feed/13.png similarity index 100% rename from sprites/feeding/13.png rename to sprites/feed/13.png diff --git a/sprites/feeding/14.png b/sprites/feed/14.png similarity index 100% rename from sprites/feeding/14.png rename to sprites/feed/14.png diff --git a/sprites/feeding/15.png b/sprites/feed/15.png similarity index 100% rename from sprites/feeding/15.png rename to sprites/feed/15.png diff --git a/sprites/feeding/16.png b/sprites/feed/16.png similarity index 100% rename from sprites/feeding/16.png rename to sprites/feed/16.png diff --git a/sprites/feeding/17.png b/sprites/feed/17.png similarity index 100% rename from sprites/feeding/17.png rename to sprites/feed/17.png diff --git a/sprites/feeding/18.png b/sprites/feed/18.png similarity index 100% rename from sprites/feeding/18.png rename to sprites/feed/18.png diff --git a/sprites/feeding/19.png b/sprites/feed/19.png similarity index 100% rename from sprites/feeding/19.png rename to sprites/feed/19.png diff --git a/sprites/feeding/20.png b/sprites/feed/20.png similarity index 100% rename from sprites/feeding/20.png rename to sprites/feed/20.png diff --git a/sprites/feeding/21.png b/sprites/feed/21.png similarity index 100% rename from sprites/feeding/21.png rename to sprites/feed/21.png diff --git a/sprites/feeding/22.png b/sprites/feed/22.png similarity index 100% rename from sprites/feeding/22.png rename to sprites/feed/22.png diff --git a/sprites/feeding/23.png b/sprites/feed/23.png similarity index 100% rename from sprites/feeding/23.png rename to sprites/feed/23.png diff --git a/sprites/feeding/24.png b/sprites/feed/24.png similarity index 100% rename from sprites/feeding/24.png rename to sprites/feed/24.png diff --git a/sprites/feeding/25.png b/sprites/feed/25.png similarity index 100% rename from sprites/feeding/25.png rename to sprites/feed/25.png diff --git a/sprites/feeding/26.png b/sprites/feed/26.png similarity index 100% rename from sprites/feeding/26.png rename to sprites/feed/26.png diff --git a/sprites/feeding/27.png b/sprites/feed/27.png similarity index 100% rename from sprites/feeding/27.png rename to sprites/feed/27.png diff --git a/states.go b/states.go index cffc86f..74ce188 100644 --- a/states.go +++ b/states.go @@ -162,7 +162,7 @@ func (s *StateHungry) EndAnimHook(sm *StateMachine) {} type StateFeed struct{} -func (s *StateFeed) Enter(sm *StateMachine) { sm.SetAnim(Feeding) } +func (s *StateFeed) Enter(sm *StateMachine) { sm.SetAnim(Feed) } func (s *StateFeed) Update(sm *StateMachine) {} func (s *StateFeed) EndAnimHook(sm *StateMachine) { sm.SetState(&StateIdle{})