Compare commits

..

3 Commits

Author SHA1 Message Date
e9ac5c757e Add the street background.
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-01 10:48:02 +01:00
6a3ef5d81e Add the street background.
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
2026-03-01 10:36:44 +01:00
c334f644de Merge pull request 'feature/task21_programming_home' (#23) from feature/task21_programming_home into master
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #23
2026-03-01 08:18:15 +00:00
7 changed files with 26 additions and 6 deletions

View File

@@ -27,6 +27,8 @@ decision/decision.play_rhythm.lua
decision/decision.play_ddr.lua
map/map.manager.lua
map/map.bedroom.lua
map/map.street.lua
map/map.office.lua
screen/screen.manager.lua
screen/screen.home.lua
screen/screen.toilet.lua

9
inc/map/map.office.lua Normal file
View File

@@ -0,0 +1,9 @@
Map.register({
id = "office",
from_x = 60,
from_y = 0,
width = 30,
height = 17,
to_x = 0,
to_y = 0,
})

9
inc/map/map.street.lua Normal file
View File

@@ -0,0 +1,9 @@
Map.register({
id = "street",
from_x = 30,
from_y = 0,
width = 30,
height = 17,
to_x = 0,
to_y = 0,
})

View File

@@ -5,5 +5,5 @@ Screen.register({
"go_to_toilet",
"go_to_walking_to_office",
},
background = "bedroom",
background = "bedroom"
})

View File

@@ -1,7 +1,6 @@
Screen.register({
id = "office",
name = "Office",
background_color = Config.colors.dark_grey,
decisions = {
"play_button_mash",
"play_rhythm",
@@ -12,4 +11,5 @@ Screen.register({
situations = {
"drink_coffee",
},
background = "office"
})

View File

@@ -1,9 +1,9 @@
Screen.register({
id = "walking_to_home",
name = "Walking to home",
background_color = Config.colors.dark_grey,
decisions = {
"go_to_home",
"go_to_office",
}
},
background = "street"
})

View File

@@ -1,9 +1,9 @@
Screen.register({
id = "walking_to_office",
name = "Walking to office",
background_color = Config.colors.dark_grey,
decisions = {
"go_to_home",
"go_to_office",
}
},
background = "street"
})