Update

Author: Lama06

.gitignore

@@ -1,3 +1,4 @@
-Oinkyparty-Client.exe
-Oinkyparty-Server.exe
+Oinkyparty-Client-Windows.exe
+Oinkyparty-Server-Windows.exe
+Oinkyparty-Server-Raspberry-Pi
 .idea

build_raspberry_pi.cmd

@@ -1,5 +1,4 @@
-set GOOS=linux
-set GOARCH=arm
+@set GOOS=linux
+@set GOARCH=arm
 
-go build -o="Oinkyparty-Client.exe" ./cmd/client
-go build -o="Oinkyparty-Server.exe" ./cmd/server
+go build -o="Oinkyparty-Server-Raspberry-Pi" ./cmd/server

build_windows.cmd

@@ -1,5 +1,5 @@
-set GOOS=windows
-set GOARCH=amd64
+@set GOOS=windows
+@set GOARCH=amd64
 
-go build -o="Oinkyparty-Client.exe" ./cmd/client
-go build -o="Oinkyparty-Server.exe" ./cmd/server
+go build -o="Oinkyparty-Client-Windows.exe" ./cmd/client
+go build -o="Oinkyparty-Server-Windows.exe" ./cmd/server

client/client.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/Lama06/Oinky-Party/client/flappybird"
+	"github.com/Lama06/Oinky-Party/client/flappyoinky"
 	"github.com/Lama06/Oinky-Party/client/game"
 	"github.com/Lama06/Oinky-Party/protocol"
 	"github.com/hajimehoshi/ebiten/v2"
@@ -21,9 +21,9 @@ type gameType struct {
 
 var gameTypes = []gameType{
 	{
-		name:        "flappybird",
-		displayName: "Flappy Bird",
-		creator:     flappybird.Create,
+		name:        "flappyoinky",
+		displayName: "Flappy Oinky",
+		creator:     flappyoinky.Create,
 	},
 }
 
@@ -67,9 +67,8 @@ func newClient() *client {
 }
 
 func (c *client) start() {
-	fmt.Println("client starting...")
-
 	log.SetFlags(log.Lshortfile | log.Ltime)
+	log.Println("client starting...")
 
 	err := c.connect()
 	if err != nil {
@@ -309,8 +308,8 @@ func (c *client) handlePacket(packet []byte) error {
 		c.currentGame = nil
 		c.currentScreen = newPartyScreen(c)
 	default:
-		if packetHandlerComponent, ok := c.currentScreen.(packetHandlerScreen); ok {
-			err := packetHandlerComponent.HandlePacket(packet)
+		if packetHandlerScreen, ok := c.currentScreen.(packetHandlerScreen); ok {
+			err := packetHandlerScreen.HandlePacket(packet)
 			if err != nil {
 				return fmt.Errorf("screen failed to handle error: %w", err)
 			}

client/flappybird/flappybird.go client/flappyoinky/flappyoinky.go

@@ -1,4 +1,4 @@
-package flappybird
+package flappyoinky
 
 import (
 	"bytes"
@@ -8,7 +8,7 @@ import (
 	"github.com/Lama06/Oinky-Party/client/game"
 	"github.com/Lama06/Oinky-Party/client/rescources"
 	"github.com/Lama06/Oinky-Party/client/ui"
-	shared "github.com/Lama06/Oinky-Party/flappybird"
+	shared "github.com/Lama06/Oinky-Party/flappyoinky"
 	"github.com/Lama06/Oinky-Party/protocol"
 	"github.com/hajimehoshi/ebiten/v2"
 	"github.com/hajimehoshi/ebiten/v2/ebitenutil"
@@ -23,9 +23,9 @@ import (
 )
 
 var (
-	//go:embed bird.png
-	birdImageData []byte
-	birdImage     = loadImage(birdImageData)
+	//go:embed oinky.png
+	oinkyImageData []byte
+	oinkyImage     = loadImage(oinkyImageData)
 )
 
 func loadImage(data []byte) image.Image {
@@ -37,12 +37,12 @@ func loadImage(data []byte) image.Image {
 }
 
 // Die Größe des Vogels wird anhand der Größe des Fensters zu einem Quadrat ergänzt.
-func getVisualBirdSize() int {
+func getVisualOinkySize() int {
 	windowWidth, windowHeight := ebiten.WindowSize()
 	if windowWidth >= windowHeight {
-		return int(shared.BirdSize * float64(windowWidth))
+		return int(shared.OinkySize * float64(windowWidth))
 	} else {
-		return int(shared.BirdSize * float64(windowHeight))
+		return int(shared.OinkySize * float64(windowHeight))
 	}
 }
 
@@ -62,7 +62,7 @@ func (p *player) clientTick(delta float64) {
 
 	skippedTicks := int(math.Trunc(delta))
 	for i := 1; i <= skippedTicks; i++ {
-		speedY += shared.BirdSpeedYIncreasePerTick
+		speedY += shared.OinkySpeedYIncreasePerTick
 		posY += speedY
 	}
 	remainingDelta := delta - float64(skippedTicks)
@@ -91,16 +91,16 @@ func (p *player) clientTick(delta float64) {
 
 func (p *player) draw(client game.Client, screen *ebiten.Image) {
 	windowWidth, windowHeight := ebiten.WindowSize()
-	img := ebiten.NewImageFromImage(birdImage)
+	img := ebiten.NewImageFromImage(oinkyImage)
 	imgWidth, imgHeight := img.Size()
-	birdSize := getVisualBirdSize()
-	birdXScale, birdYScale := float64(birdSize)/float64(imgWidth), float64(birdSize)/float64(imgHeight)
-	birdX, birdY := shared.BirdPosX*float64(windowWidth), p.clientPosY*float64(windowHeight)
+	oinkySize := getVisualOinkySize()
+	oinkyXScale, oinkyYScale := float64(oinkySize)/float64(imgWidth), float64(oinkySize)/float64(imgHeight)
+	oinkyX, oinkyY := shared.OinkyPosX*float64(windowWidth), p.clientPosY*float64(windowHeight)
 
 	var drawOptions ebiten.DrawImageOptions
 	drawOptions.GeoM.Rotate(p.rotation)
-	drawOptions.GeoM.Scale(birdXScale, birdYScale)
-	drawOptions.GeoM.Translate(birdX, birdY)
+	drawOptions.GeoM.Scale(oinkyXScale, oinkyYScale)
+	drawOptions.GeoM.Translate(oinkyX, oinkyY)
 	screen.DrawImage(img, &drawOptions)
 
 	if p.id != client.Id() {
@@ -112,7 +112,7 @@ func (p *player) draw(client game.Client, screen *ebiten.Image) {
 			}
 		}
 
-		textX, textY := birdX+float64(birdSize)+50, birdY+float64(birdSize)/2
+		textX, textY := oinkyX+float64(oinkySize)+50, oinkyY+float64(oinkySize)/2
 		text.Draw(screen, partyPlayer.Name, rescources.RobotoNormalFont, int(textX), int(textY), colornames.Black)
 	}
 }
@@ -174,8 +174,8 @@ func (i *impl) HandleGameStarted() {
 	for index, partyPlayer := range partyPlayers {
 		i.players[index] = &player{
 			id:           partyPlayer.Id,
-			serverPosY:   shared.BirdStartPosY,
-			clientPosY:   shared.BirdStartPosY,
+			serverPosY:   shared.OinkyStartPosY,
+			clientPosY:   shared.OinkyStartPosY,
 			serverSpeedY: 0,
 			clientSpeedY: 0,
 			rotation:     0,
@@ -239,7 +239,9 @@ func (i *impl) HandlePacket(packet []byte) error {
 func (i *impl) obstacleCounter() *ui.Text {
 	windowWidth, _ := ebiten.WindowSize()
 
-	return ui.NewText(ui.NewCenteredPosition(windowWidth/2, 50), strconv.Itoa(int(i.obstacleCount)), rescources.RobotoTitleFont)
+	return ui.NewText(ui.NewCenteredPosition(windowWidth/2, 50), strconv.Itoa(int(i.obstacleCount)), ui.TextColorPalette{
+		Color: colornames.Black,
+	}, rescources.RobotoTitleFont)
 }
 
 func (i *impl) Draw(screen *ebiten.Image) {

client/flappybird/bird.pixil client/flappyoinky/oinky.pixil

@@ -8,7 +8,7 @@ import (
 )
 
 var (
-	//go:embed roboto_thin.ttf
+	//go:embed roboto_bold.ttf
 	robotoFontData   []byte
 	RobotoNormalFont font.Face
 	RobotoTitleFont  font.Face
@@ -23,7 +23,7 @@ func init() {
 	}
 
 	RobotoNormalFont, err = opentype.NewFace(robotoFont, &opentype.FaceOptions{
-		Size:    24,
+		Size:    28,
 		DPI:     72,
 		Hinting: font.HintingFull,
 	})
@@ -32,7 +32,7 @@ func init() {
 	}
 
 	RobotoTitleFont, err = opentype.NewFace(robotoFont, &opentype.FaceOptions{
-		Size:    55,
+		Size:    70,
 		DPI:     72,
 		Hinting: font.HintingFull,
 	})

client/flappybird/bird.png client/flappyoinky/oinky.png

@@ -8,6 +8,25 @@ import (
 	"github.com/Lama06/Oinky-Party/protocol"
 	"github.com/hajimehoshi/ebiten/v2"
 	"github.com/hajimehoshi/ebiten/v2/inpututil"
+	"image/color"
+)
+
+var (
+	defaultBackgroundColor = color.RGBA{R: 255, G: 255, B: 255, A: 255}
+	defaultButtonColors    = ui.ButtonColorPalette{
+		BackgroundColor:      color.RGBA{R: 18, G: 53, B: 91, A: 255},
+		BackgroundHoverColor: color.RGBA{R: 134, G: 22, B: 87, A: 255},
+		TextColor:            color.RGBA{R: 212, G: 245, B: 245, A: 255},
+		TextHoverColor:       color.RGBA{R: 212, G: 245, B: 245, A: 255},
+	}
+	defaultTextColors = ui.TextColorPalette{
+		Color:      color.RGBA{R: 87, G: 70, B: 123, A: 255},
+		HoverColor: color.RGBA{R: 82, G: 73, B: 72, A: 255},
+	}
+	defaultTitleColors = ui.TextColorPalette{
+		Color:      color.RGBA{R: 87, G: 70, B: 123, A: 255},
+		HoverColor: color.RGBA{R: 112, G: 248, B: 186, A: 255},
+	}
 )
 
 type screen interface {
@@ -35,21 +54,21 @@ func newTitleScreen(c *client) *titleScreen {
 func (t *titleScreen) title() *ui.Text {
 	width, height := ebiten.WindowSize()
 
-	return ui.NewText(ui.NewCenteredPosition(width/2, (height/3)), "Oinky Party", rescources.RobotoTitleFont)
+	return ui.NewText(ui.NewCenteredPosition(width/2, height/3), "Oinky Party", defaultTitleColors, rescources.RobotoTitleFont)
 }
 
 func (t *titleScreen) createPartyButton() *ui.Button {
 	width, height := ebiten.WindowSize()
 
-	return ui.NewButton(ui.NewCenteredPosition(width/2, (height/3)*2), "Party erstellen", func() {
+	return ui.NewButton(ui.NewCenteredPosition(width/2, (height/3)*2), "Party erstellen", defaultButtonColors, func() {
 		t.c.currentScreen = newCreatePartyScreen(t.c)
 	})
 }
 
 func (t *titleScreen) joinPartyBtn() *ui.Button {
 	width, height := ebiten.WindowSize()
 
-	return ui.NewButton(ui.NewCenteredPosition(width/2, (height/3)*2+100), "Party beitreten", func() {
+	return ui.NewButton(ui.NewCenteredPosition(width/2, (height/3)*2+100), "Party beitreten", defaultButtonColors, func() {
 		t.c.currentScreen = newJoinPartyScreen(t.c)
 	})
 }
@@ -71,6 +90,7 @@ func (t *titleScreen) Update() {
 }
 
 func (t *titleScreen) Draw(screen *ebiten.Image) {
+	screen.Fill(defaultBackgroundColor)
 	for _, component := range t.content() {
 		component.Draw(screen)
 	}
@@ -105,6 +125,7 @@ func (s *gameScreen) Update() {
 }
 
 func (s *gameScreen) Draw(screen *ebiten.Image) {
+	screen.Fill(defaultBackgroundColor)
 	if s.c.currentGame != nil {
 		s.c.currentGame.Draw(screen)
 	}
@@ -151,13 +172,13 @@ func (j *joinPartyScreen) statusText() *ui.Text {
 		text = "Fehler beim Laden der Parties"
 	}
 
-	return ui.NewText(ui.NewCenteredPosition(windowWidth/2, windowHeight/2), text, rescources.RobotoNormalFont)
+	return ui.NewText(ui.NewCenteredPosition(windowWidth/2, windowHeight/2), text, defaultTextColors, rescources.RobotoNormalFont)
 }
 
 func (j *joinPartyScreen) title() *ui.Text {
 	windowWidth, windowHeight := ebiten.WindowSize()
 
-	return ui.NewText(ui.NewCenteredPosition(windowWidth/2, windowHeight/3), "Party beitreten", rescources.RobotoTitleFont)
+	return ui.NewText(ui.NewCenteredPosition(windowWidth/2, windowHeight/3), "Party beitreten", defaultTitleColors, rescources.RobotoTitleFont)
 }
 
 func (j *joinPartyScreen) partiesList() []*ui.Button {
@@ -170,7 +191,7 @@ func (j *joinPartyScreen) partiesList() []*ui.Button {
 		partyButton := ui.NewButton(ui.NewCenteredPosition(
 			windowWidth/2,
 			(windowHeight/3)*2+100*i,
-		), fmt.Sprintf("%s (%d Spieler)", party.Name, len(party.Players)), func() {
+		), fmt.Sprintf("%s (%d Spieler)", party.Name, len(party.Players)), defaultButtonColors, func() {
 			joinParty, err := json.Marshal(protocol.JoinPartyPacket{
 				PacketName: protocol.JoinPartyPacketName,
 				Id:         partyCopy.Id,
@@ -210,6 +231,7 @@ func (j *joinPartyScreen) Update() {
 }
 
 func (j *joinPartyScreen) Draw(screen *ebiten.Image) {
+	screen.Fill(defaultBackgroundColor)
 	for _, component := range j.content() {
 		component.Draw(screen)
 	}
@@ -256,7 +278,7 @@ func (c *createPartyScreen) partyNameText() *ui.Text {
 
 	pos := ui.NewCenteredPosition(width/2, height/3)
 
-	return ui.NewText(pos, "Name der Party: "+string(c.partyName), rescources.RobotoNormalFont)
+	return ui.NewText(pos, "Name der Party: "+string(c.partyName), defaultTitleColors, rescources.RobotoTitleFont)
 }
 
 func (c *createPartyScreen) createButton() *ui.Button {
@@ -275,7 +297,7 @@ func (c *createPartyScreen) createButton() *ui.Button {
 		c.c.SendPacket(createParty)
 	}
 
-	return ui.NewButton(pos, "Party erstellen", callback)
+	return ui.NewButton(pos, "Party erstellen", defaultButtonColors, callback)
 }
 
 func (c *createPartyScreen) Update() {
@@ -292,6 +314,7 @@ func (c *createPartyScreen) Update() {
 }
 
 func (c *createPartyScreen) Draw(screen *ebiten.Image) {
+	screen.Fill(defaultBackgroundColor)
 	c.partyNameText().Draw(screen)
 	c.createButton().Draw(screen)
 }
@@ -313,7 +336,7 @@ func (p *partyScreen) title() *ui.Text {
 
 	pos := ui.NewCenteredPosition(width/2, height/3)
 
-	return ui.NewText(pos, "Party: "+p.c.partyName, rescources.RobotoTitleFont)
+	return ui.NewText(pos, "Party: "+p.c.partyName, defaultTitleColors, rescources.RobotoTitleFont)
 }
 
 func (p *partyScreen) playerList() []*ui.Text {
@@ -324,7 +347,7 @@ func (p *partyScreen) playerList() []*ui.Text {
 		playerList = append(playerList, ui.NewText(ui.NewCenteredPosition(
 			windowWidth/2,
 			100+windowHeight/3+100*i,
-		), player.Name, rescources.RobotoNormalFont))
+		), player.Name, defaultTextColors, rescources.RobotoNormalFont))
 	}
 
 	return playerList
@@ -335,7 +358,7 @@ func (p *partyScreen) startGameButton() *ui.Button {
 
 	pos := ui.NewCenteredPosition(windowWidth/2, windowHeight-100)
 
-	return ui.NewButton(pos, "Spiel starten", func() {
+	return ui.NewButton(pos, "Spiel starten", defaultButtonColors, func() {
 		p.c.currentScreen = newStartGameScreen(p.c)
 	})
 }
@@ -368,6 +391,7 @@ func (p *partyScreen) Update() {
 }
 
 func (p *partyScreen) Draw(screen *ebiten.Image) {
+	screen.Fill(defaultBackgroundColor)
 	for _, component := range p.contents() {
 		component.Draw(screen)
 	}
@@ -390,7 +414,7 @@ func (s *startGameScreen) title() *ui.Text {
 
 	pos := ui.NewCenteredPosition(width/2, height/3)
 
-	return ui.NewText(pos, "Spiel starten", rescources.RobotoTitleFont)
+	return ui.NewText(pos, "Spiel starten", defaultTextColors, rescources.RobotoTitleFont)
 }
 
 func (s *startGameScreen) gameButtons() []*ui.Button {
@@ -411,7 +435,7 @@ func (s *startGameScreen) gameButtons() []*ui.Button {
 			s.c.SendPacket(startGame)
 		}
 
-		buttons = append(buttons, ui.NewButton(pos, gameType.displayName, callback))
+		buttons = append(buttons, ui.NewButton(pos, gameType.displayName, defaultButtonColors, callback))
 	}
 
 	return buttons
@@ -439,6 +463,7 @@ func (s *startGameScreen) Update() {
 }
 
 func (s *startGameScreen) Draw(screen *ebiten.Image) {
+	screen.Fill(defaultBackgroundColor)
 	for _, component := range s.content() {
 		component.Draw(screen)
 	}