From ae6eb96d9632af89e606a4b7147972ee4c24cf85 Mon Sep 17 00:00:00 2001 From: Zsolt Tasnadi Date: Wed, 5 Jul 2023 23:06:36 +0200 Subject: [PATCH] add GetDefaultFontLayout and ArcadeClassic.ttf --- domain/dialog.go | 9 +-------- domain/font.go | 16 ++++++++++++++++ domain/menu.go | 17 ++--------------- fonts/ArcadeClassic.ttf | Bin 0 -> 17296 bytes 4 files changed, 19 insertions(+), 23 deletions(-) create mode 100644 domain/font.go create mode 100644 fonts/ArcadeClassic.ttf diff --git a/domain/dialog.go b/domain/dialog.go index adccba5..fd6796c 100644 --- a/domain/dialog.go +++ b/domain/dialog.go @@ -2,20 +2,13 @@ package domain import ( "game/konstructor/entity" - "image/color" ) func (d *Domain) InitDialog() { d.DialogMap = entity.DialogMap{ "TestDialog": { Layout: entity.DialogLayout{ - ChoiceFont: entity.FontLayout{ - Path: "fonts/Arial.ttf", - DPI: 72, - Size: 24, - Color: color.White, - SelectedColor: color.RGBA{R: 0, G: 255, B: 0, A: 100}, - }, + ChoiceFont: GetDefaultFontLayout(), }, Choices: []entity.DialogChoice{ { diff --git a/domain/font.go b/domain/font.go new file mode 100644 index 0000000..5423507 --- /dev/null +++ b/domain/font.go @@ -0,0 +1,16 @@ +package domain + +import ( + "game/konstructor/entity" + "image/color" +) + +func GetDefaultFontLayout() entity.FontLayout { + return entity.FontLayout{ + Path: "fonts/ArcadeClassic.ttf", + DPI: 72, + Size: 24, + Color: color.White, + SelectedColor: color.RGBA{R: 255, G: 0, B: 0, A: 100}, + } +} diff --git a/domain/menu.go b/domain/menu.go index 5d2e25e..47261e6 100644 --- a/domain/menu.go +++ b/domain/menu.go @@ -3,7 +3,6 @@ package domain import ( "fmt" "game/konstructor/entity" - "image/color" "os" ) @@ -12,13 +11,7 @@ func (d *Domain) InitMenu() { "MainMenu": { CurrentSelected: 0, Layout: entity.MenuLayout{ - MenuItemFont: entity.FontLayout{ - Path: "fonts/Arial.ttf", - DPI: 72, - Size: 24, - Color: color.White, - SelectedColor: color.RGBA{R: 0, G: 255, B: 0, A: 100}, - }, + MenuItemFont: GetDefaultFontLayout(), }, MenuItems: []entity.MenuItem{ { @@ -41,13 +34,7 @@ func (d *Domain) InitMenu() { "GameMenu": { CurrentSelected: 0, Layout: entity.MenuLayout{ - MenuItemFont: entity.FontLayout{ - Path: "fonts/Arial.ttf", - DPI: 72, - Size: 24, - Color: color.White, - SelectedColor: color.RGBA{R: 0, G: 255, B: 0, A: 100}, - }, + MenuItemFont: GetDefaultFontLayout(), }, MenuItems: []entity.MenuItem{ { diff --git a/fonts/ArcadeClassic.ttf b/fonts/ArcadeClassic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..394a9f781cedaa283a11b3b8b43c9006f4e5bac7 GIT binary patch literal 17296 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