More achievements: bridges and mills (#260)

* achievements can use multitile index
* add achievements for bridges and mills
* use bridge achievements for maps with rivers
* show number of achivements in main menu

data/json/achievements.json

@@ -77,6 +77,34 @@
             }
         ]
     },
+    {
+        "id": "poineer",
+        "name": "Pioneer",
+        "icon": "bridge",
+        "icon_index": 5,
+        "description": "Own 5 bridges.",
+        "conditions": [
+            {
+                "type": "terrain",
+                "ids": ["bridge"],
+                "number": 5
+            }
+        ]
+    },
+    {
+        "id": "civil-engineer",
+        "name": "Civil Engineer",
+        "icon": "bridge",
+        "icon_index": 5,
+        "description": "Own 10 bridges.",
+        "conditions": [
+            {
+                "type": "terrain",
+                "ids": ["bridge"],
+                "number": 10
+            }
+        ]
+    },
     {
         "id": "granary",
         "name": "Granary",
@@ -168,6 +196,19 @@
             }
         ]
     },
+    {
+        "id": "miller-guild",
+        "name": "Miller Guild",
+        "icon": "watermill",
+        "description": "Own 10 mills.",
+        "conditions": [
+            {
+                "type": "terrain",
+                "ids": ["watermill", "windmill"],
+                "number": 10
+            }
+        ]
+    },
     {
         "id": "knight",
         "name": "Knight",

data/maps/Coastline.json

@@ -43,7 +43,8 @@
   ],
   "achievements": [
     "landscape-architect",
-    "fisherman-guild"
+    "fisherman-guild",
+    "pioneer"
   ],
   "description": [
     "A medium-sized (40x40) map with a coastline and a river. Plenty of all resources.",

data/maps/River Delta.json

@@ -57,7 +57,7 @@
     "landscape-architect",
     "wood-gnome",
     "fisherman-guild",
-    "farmer-guild"
+    "civil-engineer"
   ],
   "description": [
     "A larger (53x46) map of a river delta. Plenty of resources, but a lot of waterways to bridge.",

game/menu/ui.go

@@ -722,14 +722,8 @@ func (ui *UI) createScenariosPanel(games []save.SaveGame, achievements *achievem
 
 func (ui *UI) createAchievementsPanel(achieves *achievements.Achievements, fonts *res.Fonts) *widget.Container {
 	menuContainer := ui.createTabPanel()
-
 	img := ui.emptyImage()
 
-	label := ui.createMainMenuLabel("Achievements", fonts)
-	menuContainer.AddChild(label)
-
-	scroll, content := ui.createScrollPanel(panelHeight - 76)
-
 	achUnlocked := []*achievements.Achievement{}
 	achLocked := []*achievements.Achievement{}
 	for i := range achieves.Achievements {
@@ -742,6 +736,11 @@ func (ui *UI) createAchievementsPanel(achieves *achievements.Achievements, fonts
 	}
 	achUnlocked = append(achUnlocked, achLocked...)
 
+	label := ui.createMainMenuLabel(fmt.Sprintf("Achievements (%d/%d)", len(achUnlocked)-len(achLocked), len(achUnlocked)), fonts)
+	menuContainer.AddChild(label)
+
+	scroll, content := ui.createScrollPanel(panelHeight - 76)
+
 	for _, ach := range achUnlocked {
 		name := util.Capitalize(ach.Name)
 
@@ -763,9 +762,10 @@ func (ui *UI) createAchievementsPanel(achieves *achievements.Achievements, fonts
 		var icon *ebiten.Image
 		if terr.IsTerrainName(ach.Icon) {
 			t := terr.ToTerrain(ach.Icon)
-			icon = ui.createTerrainImage(t, 1)
+			icon = ui.createTerrainImage(t, ach.IconIndex, 1)
 		} else {
-			icon = ui.sprites.Get(ui.sprites.GetIndex(ach.Icon))
+			idx := ui.sprites.GetIndex(ach.Icon)
+			icon = ui.sprites.GetSprite(ui.sprites.GetMultiTileIndex(idx, terr.Directions(ach.IconIndex), 0, 0))
 		}
 
 		graphic := widget.NewGraphic(
@@ -849,7 +849,7 @@ func (ui *UI) emptyImage() *widget.ButtonImage {
 }
 
 func (ui *UI) createTerrainGraphic(terrain terr.Terrain) *widget.Graphic {
-	img := ui.createTerrainImage(terrain, 3)
+	img := ui.createTerrainImage(terrain, 0, 3)
 
 	graphic := widget.NewGraphic(
 		widget.GraphicOpts.WidgetOpts(
@@ -865,14 +865,13 @@ func (ui *UI) createTerrainGraphic(terrain terr.Terrain) *widget.Graphic {
 	return graphic
 }
 
-func (ui *UI) createTerrainImage(t terr.Terrain, scale int) *ebiten.Image {
+func (ui *UI) createTerrainImage(t terr.Terrain, tileIdx int, scale int) *ebiten.Image {
 	props := &terr.Properties[t]
 
 	bx, by := ui.sprites.TileWidth, ui.sprites.TileWidth
 
 	img := ebiten.NewImage(bx*scale, by*scale)
 
-	idx := ui.sprites.GetTerrainIndex(t)
 	height := 0
 
 	for _, tr := range props.TerrainBelow {
@@ -888,7 +887,9 @@ func (ui *UI) createTerrainImage(t terr.Terrain, scale int) *ebiten.Image {
 		height = info2.Height
 	}
 
-	sp1 := ui.sprites.GetRand(idx, 0, 0)
+	idx := ui.sprites.GetTerrainIndex(t)
+	subIdx := ui.sprites.GetMultiTileIndex(idx, terr.Directions(tileIdx), 0, 0)
+	sp1 := ui.sprites.GetSprite(subIdx)
 	op := ebiten.DrawImageOptions{}
 	op.GeoM.Translate(0, float64(ui.sprites.TileWidth-sp1.Bounds().Dy()-height))
 	op.GeoM.Scale(float64(scale), float64(scale))

game/res/achievements/achievements.go

@@ -22,6 +22,7 @@ type Achievement struct {
 	Name        string
 	Description string
 	Icon        string
+	IconIndex   int
 	Conditions  []Condition
 	Completed   bool
 }
@@ -113,6 +114,7 @@ func New(world *ecs.World, f fs.FS, file string, playerFile string) *Achievement
 				ID:          achieve.ID,
 				Name:        achieve.Name,
 				Icon:        achieve.Icon,
+				IconIndex:   achieve.IconIndex,
 				Description: achieve.Description,
 				Conditions:  conditions,
 			},
@@ -255,6 +257,7 @@ type achievementJs struct {
 	ID          string        `json:"id"`
 	Name        string        `json:"name"`
 	Icon        string        `json:"icon"`
+	IconIndex   int           `json:"icon_index"`
 	Description string        `json:"description"`
 	Conditions  []conditionJs `json:"conditions"`
 }

game/res/sprites.go

@@ -207,5 +207,5 @@ func (s *Sprites) GetMultiTileIndex(idx int, dirs terr.Directions, frame int, ra
 		sIdx := (rand%vars)*inf.AnimFrames + (frame/inf.AnimSpeed)%inf.AnimFrames
 		return inf.Index[sIdx]
 	}
-	return idx
+	return inf.Index[0]
 }