update

aerth · Jul 9, 2022 · 3a6b072 · 3a6b072
1 parent b5591ec
commit 3a6b072
Show file tree

Hide file tree

Showing 6 changed files with 182 additions and 100 deletions.
diff --git a/assets/assets.go b/assets/assets.go
diff --git a/librpg/common/loadpic.go b/librpg/common/loadpic.go
@@ -8,7 +8,7 @@ import (
 	"github.com/faiface/pixel"
 )
 
-// loadPicture from assets
+// loadPicture from embedded assets
 func LoadPicture(path string) (pixel.Picture, error) {
 	b, err := assets.Asset(path)
 	if err != nil {

diff --git a/librpg/common/object.go b/librpg/common/object.go
@@ -118,14 +118,3 @@ func (o Object) Draw(win pixel.Target, spritesheet pixel.Picture, sheetFrames []
 	//	}
 
 }
-
-const _ObjectType_name = "O_NONEO_TILEO_BLOCKO_INVISIBLEO_SPECIALO_WINO_DYNAMIC"
-
-var _ObjectType_index = [...]uint8{0, 6, 12, 19, 30, 39, 44, 53}
-
-func (i ObjectType) String() string {
-	if i < 0 || i >= ObjectType(len(_ObjectType_index)-1) {
-		return fmt.Sprintf("ObjectType(%d)", i)
-	}
-	return _ObjectType_name[_ObjectType_index[i]:_ObjectType_index[i+1]]
-}
diff --git a/librpg/common/strings.go b/librpg/common/strings.go
diff --git a/librpg/strings.go b/librpg/strings.go
diff --git a/makefile b/makefile
@@ -11,7 +11,10 @@ help:
 dev: clean generate embed-assets build
 
 generate:
-	stringer -output librpg/common/strings.go -type EntityType,EntityState,ItemType,ObjectType,animState,ActionType,StatusEffect,DObjectType librpg/common
+	# stringer -output librpg/common/strings.go -type EntityType,EntityState,ItemType,ObjectType,animState,ActionType,StatusEffect,DObjectType librpg/common
+	stringer -output librpg/strings.go -type ActionType,EntityState,EntityType,ItemType,animState,StatusEffect ./librpg/
+	stringer -output librpg/common/strings.go -type ObjectType ./librpg/common
+
 
 
 embed-assets: