diff --git a/music_quiz/data/mq/dialog/page1.json b/music_quiz/data/mq/dialog/page1.json index 163cb80..a7dc321 100644 --- a/music_quiz/data/mq/dialog/page1.json +++ b/music_quiz/data/mq/dialog/page1.json @@ -15,7 +15,7 @@ { "type": "minecraft:plain_message", "contents": { - "text": "\n1. 정답입력시에 채팅으로 입력해주시면 됩니다.\n[ 띄어쓰기, 영어 대소문자, 특수문자 ]\n상관없이 입력하셔도 인식 됩니다.\n\n2. 모든 소리는 날씨 소리로 조절할수 있습니다.\n\n3. 게임시작후 버튼들은 과반수(절반이상)가 눌러야 작동합니다.\n\n4. 힌트는 특수문자 제외 정답의 절반이 가려져서 나옵니다.\n힌트는 여러번 받을수 있고,\n받을때마다 가려지는 부분이 달라집니다." + "text": "\n1. 정답입력시에 채팅으로 입력해주시면 됩니다.\n[ 띄어쓰기, 영어 대소문자 ]\n상관없이 입력하셔도 인식 됩니다.\n\n2. 모든 소리는 주크박스/소리 블록 채널로 조절할수 있습니다.\n\n3. 게임시작후 버튼들은 과반수(절반이상)가 눌러야 작동합니다.\n\n4. 힌트는 특수문자 제외 정답의 절반이 가려져서 나옵니다.\n힌트는 여러번 받을수 있고,\n받을때마다 가려지는 부분이 달라집니다." }, "width": 300 } diff --git a/music_quiz/data/mq/function/commands/replay.mcfunction b/music_quiz/data/mq/function/commands/replay.mcfunction index e17c115..1384ad0 100644 --- a/music_quiz/data/mq/function/commands/replay.mcfunction +++ b/music_quiz/data/mq/function/commands/replay.mcfunction @@ -8,3 +8,4 @@ execute if score init main matches 10 run return run function mq:tellraw {"text" # warn-off execute-group execute if score init main matches 5 run function mq:quiz/stop_sound execute if score init main matches 5 run function mq:quiz/play_sound + diff --git a/music_quiz/data/mq/function/commands/stop.mcfunction b/music_quiz/data/mq/function/commands/stop.mcfunction index c7c2864..0c5734e 100644 --- a/music_quiz/data/mq/function/commands/stop.mcfunction +++ b/music_quiz/data/mq/function/commands/stop.mcfunction @@ -74,3 +74,5 @@ kill @e[distance=0..,tag=mq,type=minecraft:text_display] function mq:quiz/stop_sound function mq:images/clear +function mq:videos/clear +function mq:videos/cache/clear diff --git a/music_quiz/data/mq/function/init/config.mcfunction b/music_quiz/data/mq/function/init/config.mcfunction index 548143b..4a5a6bd 100644 --- a/music_quiz/data/mq/function/init/config.mcfunction +++ b/music_quiz/data/mq/function/init/config.mcfunction @@ -6,16 +6,29 @@ data modify storage mq:main spawn set value {x: 2769, y: 85, z: 5963, r: 0, f: 0 # 음원 재생 — minecraft_launcher 리소스팩의 musicquiz:track_NN 사운드 이벤트 # namespace — 리소스팩 네임스페이스 (기본 "musicquiz") -# source — /playsound 채널. stopsound 와 동일해야 함. 노래는 "player" 채널로 -# 재생 (음성/플레이어 채널 슬라이더로 음량 제어). +# source — /playsound 채널. stopsound 와 동일해야 함. 노래는 "record" 채널로 +# 재생 (주크박스/소리 블록 채널 슬라이더로 음량 제어). # volume — 기본 음량. 곡별 override 는 init/songs.mcfunction 의 volume 필드 사용 # pitch — 1.0 = 원본 속도 -data modify storage mq:main audio set value {namespace: "musicquiz", source: "player", volume: 1.0, pitch: 1.0} +data modify storage mq:main audio set value {namespace: "musicquiz", source: "record", volume: 1.0, pitch: 1.0} # 정답 페인팅 — 데이터팩의 mq:cover_NN painting_variant (텍스처는 리소스팩 musicquiz:cover_NN) # namespace — painting_variant 네임스페이스 (기본 "mq") # x,y,z — 페인팅 entity 좌표 (벽면 앞쪽 블록 위치) # facing — 페인팅이 바라보는 방향: south=0 / west=1 / north=2 / east=3 -data modify storage mq:main image set value {namespace: "mq", x: 2775, y: 85, z: 5982, facing: 2b} +data modify storage mq:main image set value {namespace: "mq", x: 2782, y: 88, z: 5979, facing: 2b} + +# 정답 영상 — 모드의 영상 재생 관련 +# namespace — 영상 아이디를 제외한 주소 (마지막에 /는 없어야함) +# x,y,z — 영상 블럭 좌표 (벽면 앞쪽 블록 위치) +# w,h — 영상 가로세로 크키 (왼쪽아래 기준) +# facing — 영상이 바라보는 방향: south / west / north / east +# sound — 영상 소리 설정 (0~100, 음소거: -1) +data modify storage mq:main video set value { \ + namespace: "https://video.tkrmagid.kr/api/video/폴더1/폴더2", \ + cmd_x: 2769, cmd_y: 73, cmd_z: 5965, \ + x: 2731, y: 96, z: 6034, facing: "north", w: 25,h: 14, \ + sound: -1 \ +} # 곡 개수 max_index 는 init/songs.mcfunction 의 길이로 자동 계산됨 diff --git a/music_quiz/data/mq/function/init/songs.mcfunction b/music_quiz/data/mq/function/init/songs.mcfunction index 8cc9c0a..c48f818 100644 --- a/music_quiz/data/mq/function/init/songs.mcfunction +++ b/music_quiz/data/mq/function/init/songs.mcfunction @@ -2,25 +2,25 @@ # 필수 — title, author, alias, volume # volume: /playsound 음량. 1.0 = 기본. 곡마다 음량 조절 가능. # 곡 순서가 리소스팩의 track_NN / cover_NN 인덱스와 1:1 매칭된다. -# 예) {title:"Quiet Song", author:"...", alias:[...], volume:2.0} +# 예) {title:"Quiet Song", author:"...", alias:[...], description:"...", volume:0.5} data modify storage mq:main songs set value [] -data modify storage mq:main songs append value {title:"푸르던", author:"아이유", alias:[]} -data modify storage mq:main songs append value {title:"금요일에 만나요", author:"아이유", alias:[]} -data modify storage mq:main songs append value {title:"나의 옛날이야기", author:"아이유", alias:[]} -data modify storage mq:main songs append value {title:"비밀의 화원", author:"아이유", alias:[]} -data modify storage mq:main songs append value {title:"겨울잠", author:"아이유", alias:[]} -data modify storage mq:main songs append value {title:"이런엔딩", author:"아이유", alias:[]} -data modify storage mq:main songs append value {title:"이름에게", author:"아이유", alias:[]} -data modify storage mq:main songs append value {title:"드라마", author:"아이유", alias:[]} -data modify storage mq:main songs append value {title:"가을아침", author:"아이유", alias:[]} -data modify storage mq:main songs append value {title:"Rain Drop", author:"아이유", alias:[]} -data modify storage mq:main songs append value {title:"에필로그", author:"아이유", alias:[]} -data modify storage mq:main songs append value {title:"무릎", author:"아이유", alias:[]} -data modify storage mq:main songs append value {title:"마음", author:"아이유", alias:[]} -data modify storage mq:main songs append value {title:"잠 못 드는 밤 비는 내리고", author:"아이유", alias:[]} -data modify storage mq:main songs append value {title:"정거장", author:"아이유", alias:[]} -data modify storage mq:main songs append value {title:"자장가", author:"아이유", alias:[]} -data modify storage mq:main songs append value {title:"사랑이 지나가면", author:"아이유", alias:[]} +data modify storage mq:main songs append value {title:"푸르던", author:"아이유", alias:[], description:"", volume:1.0} +data modify storage mq:main songs append value {title:"금요일에 만나요", author:"아이유", alias:[], description:"", volume:1.0} +data modify storage mq:main songs append value {title:"나의 옛날이야기", author:"아이유", alias:[], description:"", volume:1.0} +data modify storage mq:main songs append value {title:"비밀의 화원", author:"아이유", alias:[], description:"", volume:1.0} +data modify storage mq:main songs append value {title:"겨울잠", author:"아이유", alias:[], description:"", volume:1.0} +data modify storage mq:main songs append value {title:"이런엔딩", author:"아이유", alias:[], description:"", volume:1.0} +data modify storage mq:main songs append value {title:"이름에게", author:"아이유", alias:[], description:"", volume:1.0} +data modify storage mq:main songs append value {title:"드라마", author:"아이유", alias:[], description:"", volume:1.0} +data modify storage mq:main songs append value {title:"가을아침", author:"아이유", alias:[], description:"", volume:1.0} +data modify storage mq:main songs append value {title:"Rain Drop", author:"아이유", alias:[], description:"", volume:1.0} +data modify storage mq:main songs append value {title:"에필로그", author:"아이유", alias:[], description:"", volume:1.0} +data modify storage mq:main songs append value {title:"무릎", author:"아이유", alias:[], description:"", volume:1.0} +data modify storage mq:main songs append value {title:"마음", author:"아이유", alias:[], description:"", volume:1.0} +data modify storage mq:main songs append value {title:"잠 못 드는 밤 비는 내리고", author:"아이유", alias:[], description:"", volume:1.0} +data modify storage mq:main songs append value {title:"정거장", author:"아이유", alias:[], description:"", volume:1.0} +data modify storage mq:main songs append value {title:"자장가", author:"아이유", alias:[], description:"", volume:1.0} +data modify storage mq:main songs append value {title:"사랑이 지나가면", author:"아이유", alias:[], description:"", volume:1.0} # 곡 개수는 songs 배열 길이에서 자동 계산됨 execute store result storage mq:main max_index int 1 run data get storage mq:main songs diff --git a/music_quiz/data/mq/function/load.mcfunction b/music_quiz/data/mq/function/load.mcfunction index 3daef27..ad233a9 100644 --- a/music_quiz/data/mq/function/load.mcfunction +++ b/music_quiz/data/mq/function/load.mcfunction @@ -1,4 +1,4 @@ -data modify storage mq:main answer set value {title:"", author:"", alias:[]} +data modify storage mq:main answer set value {title:"", author:"", alias:[], description:""} data merge storage func:temp {} data merge storage mq:tmp {} @@ -45,3 +45,5 @@ bossbar add mq:process [{"text":"진행도: ","color": "yellow","bold": true},{" function mq:commands/stop with storage mq:main function mq:players/login with storage mq:main spawn + +function mq:videos/cache/clear diff --git a/music_quiz/data/mq/function/quiz/correct.mcfunction b/music_quiz/data/mq/function/quiz/correct.mcfunction index a667333..e1857bd 100644 --- a/music_quiz/data/mq/function/quiz/correct.mcfunction +++ b/music_quiz/data/mq/function/quiz/correct.mcfunction @@ -5,6 +5,7 @@ scoreboard players set @s answer 2 function mq:tellraw {"text":"","color":"black","msg":""} function mq:tellraw {"text":"","color":"black",msg:[{"text":"정답: ","color": "aqua"},{"storage":"mq:main","nbt":"answer.title","color": "yellow","bold": true}]} function mq:tellraw {"text":"","color":"black",msg:[{"text":"가수: ","color":"aqua"},{"storage":"mq:main","nbt":"answer.author","color": "yellow","bold": true}]} +function mq:tellraw {"text":"","color":"black",msg:[{"text":"설명: ","color":"aqua"},{"storage":"mq:main","nbt":"answer.description","color": "yellow","bold": false}]} execute if score skip buttons matches -2 run function mq:tellraw {"text":"","color":"black",msg:[{"text":"정답자: ","color": "aqua"},{"text":"스킵","color": "yellow","bold": true}]} execute unless score skip buttons matches -2 run function mq:tellraw {"text":"","color":"black",msg:[{"text":"정답자: ","color": "aqua"},{"selector":"@s","color": "yellow","bold": true}]} function mq:tellraw {"text":"","color":"black",msg:[{"text": "( 15초뒤 다음문제로 넘어갑니다. )","color": "gray"}]} @@ -30,3 +31,4 @@ scoreboard players set replay buttons -3 scoreboard players set timer main 1 function mq:images/show +function mq:videos/show diff --git a/music_quiz/data/mq/function/quiz/play_sound.mcfunction b/music_quiz/data/mq/function/quiz/play_sound.mcfunction index be1f1a7..cb626dd 100644 --- a/music_quiz/data/mq/function/quiz/play_sound.mcfunction +++ b/music_quiz/data/mq/function/quiz/play_sound.mcfunction @@ -3,3 +3,8 @@ data modify storage mq:tmp playsound.track set from storage mq:main answer.track # 곡 단위 volume override — songs[i].volume 가 없으면 audio.volume 그대로 유지 (no-op) data modify storage mq:tmp playsound.volume set from storage mq:main answer.volume function mq:quiz/macro/play_sound with storage mq:tmp playsound + +# volume 테스트 (replay 이용) +# function mq:quiz/stop_sound +# data modify storage mq:main answer.volume set value 0.5 +# function mq:quiz/play_sound \ No newline at end of file diff --git a/music_quiz/data/mq/function/quiz/select.mcfunction b/music_quiz/data/mq/function/quiz/select.mcfunction index 8941965..9765134 100644 --- a/music_quiz/data/mq/function/quiz/select.mcfunction +++ b/music_quiz/data/mq/function/quiz/select.mcfunction @@ -20,3 +20,4 @@ execute if score index main matches 1..9 run data modify storage mq:tmp pad set execute unless score index main matches 1..9 run data modify storage mq:tmp pad set value "" function mq:quiz/setanswer +function mq:videos/cache/add diff --git a/music_quiz/data/mq/function/repeat/timers/init6.mcfunction b/music_quiz/data/mq/function/repeat/timers/init6.mcfunction index eba4b9f..41a1da0 100644 --- a/music_quiz/data/mq/function/repeat/timers/init6.mcfunction +++ b/music_quiz/data/mq/function/repeat/timers/init6.mcfunction @@ -1,3 +1,5 @@ execute if score timer main matches 300 run title @a title {"text":""} +# warn-off execute-group execute if score timer main matches 290 run function mq:images/clear +execute if score timer main matches 290 run function mq:videos/clear execute if score timer main matches 300.. run function mq:quiz/select with storage mq:main diff --git a/music_quiz/data/mq/function/videos/cache/add.mcfunction b/music_quiz/data/mq/function/videos/cache/add.mcfunction new file mode 100644 index 0000000..8d6e0c7 --- /dev/null +++ b/music_quiz/data/mq/function/videos/cache/add.mcfunction @@ -0,0 +1,9 @@ +data modify storage mq:tmp video set from storage mq:main video + +scoreboard players operation cache_idx func.temp = index main +scoreboard players add cache_idx func.temp 1 +execute store result storage mq:tmp video.cache_num int 1 run scoreboard players get cache_idx func.temp + +execute store result storage mq:tmp video.num int 1 run scoreboard players get index main +data modify storage mq:tmp video.cmd set value "cache" +function mq:videos/macro/cmd with storage mq:tmp video diff --git a/music_quiz/data/mq/function/videos/cache/clear.mcfunction b/music_quiz/data/mq/function/videos/cache/clear.mcfunction new file mode 100644 index 0000000..4fda891 --- /dev/null +++ b/music_quiz/data/mq/function/videos/cache/clear.mcfunction @@ -0,0 +1 @@ +function mq:videos/macro/custom {cmd: "videoCache clear"} diff --git a/music_quiz/data/mq/function/videos/clear.mcfunction b/music_quiz/data/mq/function/videos/clear.mcfunction new file mode 100644 index 0000000..dd2b16d --- /dev/null +++ b/music_quiz/data/mq/function/videos/clear.mcfunction @@ -0,0 +1,4 @@ +data modify storage mq:tmp video set from storage mq:main video +execute store result storage mq:tmp video.num int 1 run scoreboard players get index main +data modify storage mq:tmp video.cmd set value "delete" +function mq:videos/macro/cmd with storage mq:tmp video diff --git a/music_quiz/data/mq/function/videos/macro/cmd.mcfunction b/music_quiz/data/mq/function/videos/macro/cmd.mcfunction new file mode 100644 index 0000000..743e18e --- /dev/null +++ b/music_quiz/data/mq/function/videos/macro/cmd.mcfunction @@ -0,0 +1,18 @@ +$execute if data storage mq:tmp {video:{cmd:"delete"}} run setblock $(cmd_x) $(cmd_y) $(cmd_z) minecraft:command_block[conditional=false,facing=up]{ \ + Command:"videoDelete $(x) $(y) $(z)", \ + auto:0b \ +} +$execute if data storage mq:tmp {video:{cmd:"num"}} run setblock $(cmd_x) $(cmd_y) $(cmd_z) minecraft:command_block[conditional=false,facing=up]{ \ + Command:"videoPlace $(x) $(y) $(z) $(facing) $(w) $(h) $(sound) video_$(num)", \ + auto:0b \ +} +$execute if data storage mq:tmp {video:{cmd:"cache"}} run setblock $(cmd_x) $(cmd_y) $(cmd_z) minecraft:command_block[conditional=false,facing=up]{ \ + Command:"videoCache add video_$(num) $(namespace)/$(cache_num)", \ + auto:0b \ +} +$execute if data storage mq:tmp {video:{cmd:"cmd"}} run setblock $(cmd_x) $(cmd_y) $(cmd_z) minecraft:command_block[conditional=false,facing=up]{ \ + Command:"$(cmd_value)", \ + auto:0b \ +} + +$data modify block $(cmd_x) $(cmd_y) $(cmd_z) auto set value 1b diff --git a/music_quiz/data/mq/function/videos/macro/custom.mcfunction b/music_quiz/data/mq/function/videos/macro/custom.mcfunction new file mode 100644 index 0000000..c17805c --- /dev/null +++ b/music_quiz/data/mq/function/videos/macro/custom.mcfunction @@ -0,0 +1,6 @@ +function mq:videos/clear +data modify storage mq:tmp video set from storage mq:main video +execute store result storage mq:tmp video.num int 1 run scoreboard players get index main +data modify storage mq:tmp video.cmd set value "custom" +$data modify storage mq:tmp video.cmd_value set value "$(cmd)" +function mq:videos/macro/cmd with storage mq:tmp video diff --git a/music_quiz/data/mq/function/videos/show.mcfunction b/music_quiz/data/mq/function/videos/show.mcfunction new file mode 100644 index 0000000..e52e228 --- /dev/null +++ b/music_quiz/data/mq/function/videos/show.mcfunction @@ -0,0 +1,5 @@ +function mq:videos/clear +data modify storage mq:tmp video set from storage mq:main video +execute store result storage mq:tmp video.num int 1 run scoreboard players get index main +data modify storage mq:tmp video.cmd set value "num" +function mq:videos/macro/cmd with storage mq:tmp video diff --git a/music_quiz/data/mq/painting_variant/cover_01.json b/music_quiz/data/mq/painting_variant/cover_01.json index 046db53..d02a25b 100644 --- a/music_quiz/data/mq/painting_variant/cover_01.json +++ b/music_quiz/data/mq/painting_variant/cover_01.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_01", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_01" } diff --git a/music_quiz/data/mq/painting_variant/cover_02.json b/music_quiz/data/mq/painting_variant/cover_02.json index 83ac462..2ff9bdd 100644 --- a/music_quiz/data/mq/painting_variant/cover_02.json +++ b/music_quiz/data/mq/painting_variant/cover_02.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_02", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_02" } diff --git a/music_quiz/data/mq/painting_variant/cover_03.json b/music_quiz/data/mq/painting_variant/cover_03.json index 5f8fafb..ba35db0 100644 --- a/music_quiz/data/mq/painting_variant/cover_03.json +++ b/music_quiz/data/mq/painting_variant/cover_03.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_03", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_03" } diff --git a/music_quiz/data/mq/painting_variant/cover_04.json b/music_quiz/data/mq/painting_variant/cover_04.json index 78670d7..c487914 100644 --- a/music_quiz/data/mq/painting_variant/cover_04.json +++ b/music_quiz/data/mq/painting_variant/cover_04.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_04", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_04" } diff --git a/music_quiz/data/mq/painting_variant/cover_05.json b/music_quiz/data/mq/painting_variant/cover_05.json index e2854e9..adc937b 100644 --- a/music_quiz/data/mq/painting_variant/cover_05.json +++ b/music_quiz/data/mq/painting_variant/cover_05.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_05", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_05" } diff --git a/music_quiz/data/mq/painting_variant/cover_06.json b/music_quiz/data/mq/painting_variant/cover_06.json index c3a911d..a643b4b 100644 --- a/music_quiz/data/mq/painting_variant/cover_06.json +++ b/music_quiz/data/mq/painting_variant/cover_06.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_06", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_06" } diff --git a/music_quiz/data/mq/painting_variant/cover_07.json b/music_quiz/data/mq/painting_variant/cover_07.json index a0a7f16..73f3746 100644 --- a/music_quiz/data/mq/painting_variant/cover_07.json +++ b/music_quiz/data/mq/painting_variant/cover_07.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_07", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_07" } diff --git a/music_quiz/data/mq/painting_variant/cover_08.json b/music_quiz/data/mq/painting_variant/cover_08.json index bef5200..2037049 100644 --- a/music_quiz/data/mq/painting_variant/cover_08.json +++ b/music_quiz/data/mq/painting_variant/cover_08.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_08", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_08" } diff --git a/music_quiz/data/mq/painting_variant/cover_09.json b/music_quiz/data/mq/painting_variant/cover_09.json index b3c44ed..82926f1 100644 --- a/music_quiz/data/mq/painting_variant/cover_09.json +++ b/music_quiz/data/mq/painting_variant/cover_09.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_09", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_09" } diff --git a/music_quiz/data/mq/painting_variant/cover_10.json b/music_quiz/data/mq/painting_variant/cover_10.json index eecccd9..ea821b2 100644 --- a/music_quiz/data/mq/painting_variant/cover_10.json +++ b/music_quiz/data/mq/painting_variant/cover_10.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_10", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_10" } diff --git a/music_quiz/data/mq/painting_variant/cover_11.json b/music_quiz/data/mq/painting_variant/cover_11.json index 8bb173f..c00b960 100644 --- a/music_quiz/data/mq/painting_variant/cover_11.json +++ b/music_quiz/data/mq/painting_variant/cover_11.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_11", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_11" } diff --git a/music_quiz/data/mq/painting_variant/cover_12.json b/music_quiz/data/mq/painting_variant/cover_12.json index e05d1fe..709e64b 100644 --- a/music_quiz/data/mq/painting_variant/cover_12.json +++ b/music_quiz/data/mq/painting_variant/cover_12.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_12", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_12" } diff --git a/music_quiz/data/mq/painting_variant/cover_13.json b/music_quiz/data/mq/painting_variant/cover_13.json index 3bc50f4..e23f2d9 100644 --- a/music_quiz/data/mq/painting_variant/cover_13.json +++ b/music_quiz/data/mq/painting_variant/cover_13.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_13", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_13" } diff --git a/music_quiz/data/mq/painting_variant/cover_14.json b/music_quiz/data/mq/painting_variant/cover_14.json index dc00743..1b3fd90 100644 --- a/music_quiz/data/mq/painting_variant/cover_14.json +++ b/music_quiz/data/mq/painting_variant/cover_14.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_14", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_14" } diff --git a/music_quiz/data/mq/painting_variant/cover_15.json b/music_quiz/data/mq/painting_variant/cover_15.json index 82779b8..1104e6d 100644 --- a/music_quiz/data/mq/painting_variant/cover_15.json +++ b/music_quiz/data/mq/painting_variant/cover_15.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_15", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_15" } diff --git a/music_quiz/data/mq/painting_variant/cover_16.json b/music_quiz/data/mq/painting_variant/cover_16.json index c0097b4..6aea89d 100644 --- a/music_quiz/data/mq/painting_variant/cover_16.json +++ b/music_quiz/data/mq/painting_variant/cover_16.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_16", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_16" } diff --git a/music_quiz/data/mq/painting_variant/cover_17.json b/music_quiz/data/mq/painting_variant/cover_17.json index 6cad7e2..3f8fd8f 100644 --- a/music_quiz/data/mq/painting_variant/cover_17.json +++ b/music_quiz/data/mq/painting_variant/cover_17.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_17", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_17" } diff --git a/music_quiz/data/mq/painting_variant/cover_18.json b/music_quiz/data/mq/painting_variant/cover_18.json index 81c16ce..7474787 100644 --- a/music_quiz/data/mq/painting_variant/cover_18.json +++ b/music_quiz/data/mq/painting_variant/cover_18.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_18", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_18" } diff --git a/music_quiz/data/mq/painting_variant/cover_19.json b/music_quiz/data/mq/painting_variant/cover_19.json index de0bb93..e33aba4 100644 --- a/music_quiz/data/mq/painting_variant/cover_19.json +++ b/music_quiz/data/mq/painting_variant/cover_19.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_19", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_19" } diff --git a/music_quiz/data/mq/painting_variant/cover_20.json b/music_quiz/data/mq/painting_variant/cover_20.json index fc33242..b2adb3d 100644 --- a/music_quiz/data/mq/painting_variant/cover_20.json +++ b/music_quiz/data/mq/painting_variant/cover_20.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_20", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_20" } diff --git a/music_quiz/data/mq/painting_variant/cover_21.json b/music_quiz/data/mq/painting_variant/cover_21.json index 2836a22..f160f70 100644 --- a/music_quiz/data/mq/painting_variant/cover_21.json +++ b/music_quiz/data/mq/painting_variant/cover_21.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_21", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_21" } diff --git a/music_quiz/data/mq/painting_variant/cover_22.json b/music_quiz/data/mq/painting_variant/cover_22.json index 2485aa7..7f62d9e 100644 --- a/music_quiz/data/mq/painting_variant/cover_22.json +++ b/music_quiz/data/mq/painting_variant/cover_22.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_22", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_22" } diff --git a/music_quiz/data/mq/painting_variant/cover_23.json b/music_quiz/data/mq/painting_variant/cover_23.json index a88f8a6..1041392 100644 --- a/music_quiz/data/mq/painting_variant/cover_23.json +++ b/music_quiz/data/mq/painting_variant/cover_23.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_23", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_23" } diff --git a/music_quiz/data/mq/painting_variant/cover_24.json b/music_quiz/data/mq/painting_variant/cover_24.json index fa9b490..ff5f793 100644 --- a/music_quiz/data/mq/painting_variant/cover_24.json +++ b/music_quiz/data/mq/painting_variant/cover_24.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_24", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_24" } diff --git a/music_quiz/data/mq/painting_variant/cover_25.json b/music_quiz/data/mq/painting_variant/cover_25.json index 6b96d8e..961ae28 100644 --- a/music_quiz/data/mq/painting_variant/cover_25.json +++ b/music_quiz/data/mq/painting_variant/cover_25.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_25", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_25" } diff --git a/music_quiz/data/mq/painting_variant/cover_26.json b/music_quiz/data/mq/painting_variant/cover_26.json index 1f5c5dd..2304cde 100644 --- a/music_quiz/data/mq/painting_variant/cover_26.json +++ b/music_quiz/data/mq/painting_variant/cover_26.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_26", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_26" } diff --git a/music_quiz/data/mq/painting_variant/cover_27.json b/music_quiz/data/mq/painting_variant/cover_27.json index fdb4781..9ccad4f 100644 --- a/music_quiz/data/mq/painting_variant/cover_27.json +++ b/music_quiz/data/mq/painting_variant/cover_27.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_27", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_27" } diff --git a/music_quiz/data/mq/painting_variant/cover_28.json b/music_quiz/data/mq/painting_variant/cover_28.json index 5179090..93c1e77 100644 --- a/music_quiz/data/mq/painting_variant/cover_28.json +++ b/music_quiz/data/mq/painting_variant/cover_28.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_28", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_28" } diff --git a/music_quiz/data/mq/painting_variant/cover_29.json b/music_quiz/data/mq/painting_variant/cover_29.json index 52ead53..489e41c 100644 --- a/music_quiz/data/mq/painting_variant/cover_29.json +++ b/music_quiz/data/mq/painting_variant/cover_29.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_29", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_29" } diff --git a/music_quiz/data/mq/painting_variant/cover_30.json b/music_quiz/data/mq/painting_variant/cover_30.json index edec2cc..69bb887 100644 --- a/music_quiz/data/mq/painting_variant/cover_30.json +++ b/music_quiz/data/mq/painting_variant/cover_30.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_30", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_30" } diff --git a/music_quiz/data/mq/painting_variant/cover_31.json b/music_quiz/data/mq/painting_variant/cover_31.json index f743eea..53a49b6 100644 --- a/music_quiz/data/mq/painting_variant/cover_31.json +++ b/music_quiz/data/mq/painting_variant/cover_31.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_31", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_31" } diff --git a/music_quiz/data/mq/painting_variant/cover_32.json b/music_quiz/data/mq/painting_variant/cover_32.json index 07857f4..0e03370 100644 --- a/music_quiz/data/mq/painting_variant/cover_32.json +++ b/music_quiz/data/mq/painting_variant/cover_32.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_32", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_32" } diff --git a/music_quiz/data/mq/painting_variant/cover_33.json b/music_quiz/data/mq/painting_variant/cover_33.json index 1ae4165..65bf666 100644 --- a/music_quiz/data/mq/painting_variant/cover_33.json +++ b/music_quiz/data/mq/painting_variant/cover_33.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_33", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_33" } diff --git a/music_quiz/data/mq/painting_variant/cover_34.json b/music_quiz/data/mq/painting_variant/cover_34.json index 7ad2476..0aec099 100644 --- a/music_quiz/data/mq/painting_variant/cover_34.json +++ b/music_quiz/data/mq/painting_variant/cover_34.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_34", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_34" } diff --git a/music_quiz/data/mq/painting_variant/cover_35.json b/music_quiz/data/mq/painting_variant/cover_35.json index cd75677..72f5008 100644 --- a/music_quiz/data/mq/painting_variant/cover_35.json +++ b/music_quiz/data/mq/painting_variant/cover_35.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_35", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_35" } diff --git a/music_quiz/data/mq/painting_variant/cover_36.json b/music_quiz/data/mq/painting_variant/cover_36.json index b404331..fafaa24 100644 --- a/music_quiz/data/mq/painting_variant/cover_36.json +++ b/music_quiz/data/mq/painting_variant/cover_36.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_36", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_36" } diff --git a/music_quiz/data/mq/painting_variant/cover_37.json b/music_quiz/data/mq/painting_variant/cover_37.json index 5473447..f5e7d96 100644 --- a/music_quiz/data/mq/painting_variant/cover_37.json +++ b/music_quiz/data/mq/painting_variant/cover_37.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_37", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_37" } diff --git a/music_quiz/data/mq/painting_variant/cover_38.json b/music_quiz/data/mq/painting_variant/cover_38.json index 8efee00..631fb82 100644 --- a/music_quiz/data/mq/painting_variant/cover_38.json +++ b/music_quiz/data/mq/painting_variant/cover_38.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_38", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_38" } diff --git a/music_quiz/data/mq/painting_variant/cover_39.json b/music_quiz/data/mq/painting_variant/cover_39.json index c1180eb..d77b5d0 100644 --- a/music_quiz/data/mq/painting_variant/cover_39.json +++ b/music_quiz/data/mq/painting_variant/cover_39.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_39", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_39" } diff --git a/music_quiz/data/mq/painting_variant/cover_40.json b/music_quiz/data/mq/painting_variant/cover_40.json index 2f615dd..9e65c2a 100644 --- a/music_quiz/data/mq/painting_variant/cover_40.json +++ b/music_quiz/data/mq/painting_variant/cover_40.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_40", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_40" } diff --git a/music_quiz/data/mq/painting_variant/cover_41.json b/music_quiz/data/mq/painting_variant/cover_41.json index 1d4c17c..2c41dca 100644 --- a/music_quiz/data/mq/painting_variant/cover_41.json +++ b/music_quiz/data/mq/painting_variant/cover_41.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_41", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_41" } diff --git a/music_quiz/data/mq/painting_variant/cover_42.json b/music_quiz/data/mq/painting_variant/cover_42.json index 9cfc55d..396d501 100644 --- a/music_quiz/data/mq/painting_variant/cover_42.json +++ b/music_quiz/data/mq/painting_variant/cover_42.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_42", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_42" } diff --git a/music_quiz/data/mq/painting_variant/cover_43.json b/music_quiz/data/mq/painting_variant/cover_43.json index 3dd1fac..9527c4f 100644 --- a/music_quiz/data/mq/painting_variant/cover_43.json +++ b/music_quiz/data/mq/painting_variant/cover_43.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_43", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_43" } diff --git a/music_quiz/data/mq/painting_variant/cover_44.json b/music_quiz/data/mq/painting_variant/cover_44.json index e2f7928..f6fcaf4 100644 --- a/music_quiz/data/mq/painting_variant/cover_44.json +++ b/music_quiz/data/mq/painting_variant/cover_44.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_44", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_44" } diff --git a/music_quiz/data/mq/painting_variant/cover_45.json b/music_quiz/data/mq/painting_variant/cover_45.json index d3be956..47707b1 100644 --- a/music_quiz/data/mq/painting_variant/cover_45.json +++ b/music_quiz/data/mq/painting_variant/cover_45.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_45", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_45" } diff --git a/music_quiz/data/mq/painting_variant/cover_46.json b/music_quiz/data/mq/painting_variant/cover_46.json index 32adb1a..820c476 100644 --- a/music_quiz/data/mq/painting_variant/cover_46.json +++ b/music_quiz/data/mq/painting_variant/cover_46.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_46", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_46" } diff --git a/music_quiz/data/mq/painting_variant/cover_47.json b/music_quiz/data/mq/painting_variant/cover_47.json index a3fc253..3f666eb 100644 --- a/music_quiz/data/mq/painting_variant/cover_47.json +++ b/music_quiz/data/mq/painting_variant/cover_47.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_47", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_47" } diff --git a/music_quiz/data/mq/painting_variant/cover_48.json b/music_quiz/data/mq/painting_variant/cover_48.json index bad13de..38275ed 100644 --- a/music_quiz/data/mq/painting_variant/cover_48.json +++ b/music_quiz/data/mq/painting_variant/cover_48.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_48", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_48" } diff --git a/music_quiz/data/mq/painting_variant/cover_49.json b/music_quiz/data/mq/painting_variant/cover_49.json index 7c6a7b2..c427b24 100644 --- a/music_quiz/data/mq/painting_variant/cover_49.json +++ b/music_quiz/data/mq/painting_variant/cover_49.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_49", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_49" } diff --git a/music_quiz/data/mq/painting_variant/cover_50.json b/music_quiz/data/mq/painting_variant/cover_50.json index ee03522..0a76577 100644 --- a/music_quiz/data/mq/painting_variant/cover_50.json +++ b/music_quiz/data/mq/painting_variant/cover_50.json @@ -1,5 +1,7 @@ { "asset_id": "musicquiz:cover_50", - "width": 1, - "height": 1 + "width": 5, + "height": 5, + "author": "musicquiz", + "title": "cover_50" }