diff --git a/def.go b/def.go index eb6e239..9122d4f 100644 --- a/def.go +++ b/def.go @@ -173,6 +173,8 @@ const ( objTypeJob = 6 objTypeItem = 7 objTypeCastle = 8 + objTypeFair = 9 + objTypeUnion = 10 castleDeer = 1 castleDragon = 2 @@ -250,6 +252,8 @@ const ( objSubTypeItemPart = 705 objSubTypeItemOther = 706 objSubTypeCastle = 801 + objSubTypeFair = 901 + objSubTypeUnion = 1001 objJobStatusNew = 0 objJobStatusPillageGo = 1 diff --git a/obj.go b/obj.go index ec2b5e2..c9856fa 100644 --- a/obj.go +++ b/obj.go @@ -1,5 +1,10 @@ package main +import ( + "strconv" + "time" +) + var ( cacheObjCastle map[string]ChatWarsCastle cacheObjGuild map[string]ChatWarsGuild @@ -170,7 +175,7 @@ func loadObjCastle() error { defer castles.Close() for castles.Next() { - err = rules.Scan(&id, &logo, &name) + err = castles.Scan(&id, &logo, &name) if err != nil { return err }