Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit fc0366f
Author: Steven <[email protected]>
Date:   Wed Sep 22 20:59:27 2021 +0100

    Fix voices causing engine errors. (voices should in future be tied to each gamemode..)

commit 23947f3
Author: Steven <[email protected]>
Date:   Wed Sep 22 20:58:34 2021 +0100

    Move to v5_2b for asset versioning

commit f28a812
Author: Steven <[email protected]>
Date:   Tue Sep 21 21:53:48 2021 +0100

    Fixes for testing

commit 5f1b67f
Author: Steven <[email protected]>
Date:   Mon Sep 20 21:02:15 2021 +0100

    Initial test of sound versioning code
  • Loading branch information
safalin1 committed Sep 24, 2021
1 parent b7f377a commit b83289e
Show file tree
Hide file tree
Showing 138 changed files with 326 additions and 259 deletions.
14 changes: 7 additions & 7 deletions src/data/microtf2/Bossgames.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"Name" "Acid Pit Escape"
"Enabled" "1"
"Duration" "58.0"
"BackgroundMusic" "gemidyne/warioware/bosses/bgm/rocketjump.mp3"
"BackgroundMusic" "gemidyne/warioware/{version}/bosses/bgm/rocketjump.mp3"
"EntryPoint" "Bossgame1_EntryPoint"
"UsesCaption" "1"
}
Expand All @@ -14,7 +14,7 @@
"Name" "Escape from the Factory"
"Enabled" "1"
"Duration" "80.0"
"BackgroundMusic" "gemidyne/warioware/bosses/bgm/escape.mp3"
"BackgroundMusic" "gemidyne/warioware/{version}/bosses/bgm/escape.mp3"
"EntryPoint" "Bossgame2_EntryPoint"
"BlockedSpecialRounds" "1,3,5,6,7,12,14"
"UsesCaption" "1"
Expand All @@ -24,7 +24,7 @@
"Name" "Disappearing Blocks"
"Enabled" "1"
"Duration" "80.0"
"BackgroundMusic" "gemidyne/warioware/bosses/bgm/disappearingblocks.mp3"
"BackgroundMusic" "gemidyne/warioware/{version}/bosses/bgm/disappearingblocks.mp3"
"EntryPoint" "Bossgame3_EntryPoint"
"BlockedSpecialRounds" "1,3,5,6,7,12"
"RequiresMultiplePlayers" "1"
Expand All @@ -35,7 +35,7 @@
"Name" "Smash Arena"
"Enabled" "1"
"Duration" "81.0"
"BackgroundMusic" "gemidyne/warioware/bosses/bgm/fallingfloor.mp3"
"BackgroundMusic" "gemidyne/warioware/{version}/bosses/bgm/fallingfloor.mp3"
"EntryPoint" "Bossgame4_EntryPoint"
"BlockedSpecialRounds" "12"
"RequiresMultiplePlayers" "1"
Expand All @@ -46,7 +46,7 @@
"Name" "BeatBlock Galaxy"
"Enabled" "1"
"Duration" "120.0"
"BackgroundMusic" "gemidyne/warioware/bosses/bgm/beatblock.mp3"
"BackgroundMusic" "gemidyne/warioware/{version}/bosses/bgm/beatblock.mp3"
"EntryPoint" "Bossgame5_EntryPoint"
"BlockedSpecialRounds" "1,5,6,7"
"UsesCaption" "1"
Expand All @@ -56,7 +56,7 @@
"Name" "Target Practice Arena"
"Enabled" "1"
"Duration" "60.0"
"BackgroundMusic" "gemidyne/warioware/bosses/bgm/targetpractice.mp3"
"BackgroundMusic" "gemidyne/warioware/{version}/bosses/bgm/targetpractice.mp3"
"EntryPoint" "Bossgame6_EntryPoint"
"RequiresMultiplePlayers" "1"
"BlockedSpecialRounds" "0,1,3,5,6,7,11,12,14"
Expand All @@ -78,7 +78,7 @@
"Name" "Inventory Day"
"Enabled" "1"
"Duration" "120.0"
"BackgroundMusic" "gemidyne/warioware/bosses/bgm/propcount.mp3"
"BackgroundMusic" "gemidyne/warioware/{version}/bosses/bgm/propcount.mp3"
"EntryPoint" "Bossgame8_EntryPoint"
"RequiresMultiplePlayers" "1"
"BlockedSpecialRounds" "0,1,3,5,6,7,11,12,14"
Expand Down
84 changes: 42 additions & 42 deletions src/data/microtf2/Gamemodes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,36 @@
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/wario/preminigame.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/wario/preminigame.mp3"
"Length" "2.073550"
}
}
"SysMusic_BossTime"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/wario/boss.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/wario/boss.mp3"
"Length" "4.048937"
}
}
"SysMusic_SpeedUp"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/wario/speed.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/wario/speed.mp3"
"Length" "3.735500"
}
}
"SysMusic_GameOver"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/wario/gameover.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/wario/gameover.mp3"
"Length" "8.422667"
}
}
"SysMusic_Failure" "gemidyne/warioware/system/bgm/themes/wario/failure.mp3"
"SysMusic_Winner" "gemidyne/warioware/system/bgm/themes/wario/winner.mp3"
"SysMusic_Failure" "gemidyne/warioware/{version}/system/bgm/themes/wario/failure.mp3"
"SysMusic_Winner" "gemidyne/warioware/{version}/system/bgm/themes/wario/winner.mp3"
"SysMusic_Failure_Length" "1.814388"
"SysMusic_Winner_Length" "2.021705"
}
Expand All @@ -51,36 +51,36 @@
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/mona/preminigame.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/mona/preminigame.mp3"
"Length" "3.997863"
}
}
"SysMusic_BossTime"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/special/boss.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/special/boss.mp3"
"Length" "3.813878"
}
}
"SysMusic_SpeedUp"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/special/speed.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/special/speed.mp3"
"Length" "3.787755"
}
}
"SysMusic_GameOver"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/special/gameover.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/special/gameover.mp3"
"Length" "8.359125"
}
}
"SysMusic_Failure" "gemidyne/warioware/system/bgm/themes/mona/failure.mp3"
"SysMusic_Winner" "gemidyne/warioware/system/bgm/themes/mona/winner.mp3"
"SysMusic_Failure" "gemidyne/warioware/{version}/system/bgm/themes/mona/failure.mp3"
"SysMusic_Winner" "gemidyne/warioware/{version}/system/bgm/themes/mona/winner.mp3"
"SysMusic_Failure_Length" "2.012395"
"SysMusic_Winner_Length" "2.012395"
}
Expand All @@ -93,36 +93,36 @@
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/orbulon/preminigame.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/orbulon/preminigame.mp3"
"Length" "2.073550"
}
}
"SysMusic_BossTime"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/orbulon/boss.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/orbulon/boss.mp3"
"Length" "4.048937"
}
}
"SysMusic_SpeedUp"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/orbulon/speed.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/orbulon/speed.mp3"
"Length" "3.761625"
}
}
"SysMusic_GameOver"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/orbulon/gameover.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/orbulon/gameover.mp3"
"Length" "8.432053"
}
}
"SysMusic_Failure" "gemidyne/warioware/system/bgm/themes/orbulon/failure.mp3"
"SysMusic_Winner" "gemidyne/warioware/system/bgm/themes/orbulon/winner.mp3"
"SysMusic_Failure" "gemidyne/warioware/{version}/system/bgm/themes/orbulon/failure.mp3"
"SysMusic_Winner" "gemidyne/warioware/{version}/system/bgm/themes/orbulon/winner.mp3"
"SysMusic_Failure_Length" "2.047628"
"SysMusic_Winner_Length" "2.021705"
}
Expand All @@ -135,36 +135,36 @@
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/jimmyt/preminigame.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/jimmyt/preminigame.mp3"
"Length" "2.021705"
}
}
"SysMusic_BossTime"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/t-boss.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/t-boss.mp3"
"Length" "4.048937"
}
}
"SysMusic_SpeedUp"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/t-speed.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/t-speed.mp3"
"Length" "3.735500"
}
}
"SysMusic_GameOver"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/t-gameover.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/t-gameover.mp3"
"Length" "8.412416"
}
}
"SysMusic_Failure" "gemidyne/warioware/system/bgm/themes/jimmyt/failure.mp3"
"SysMusic_Winner" "gemidyne/warioware/system/bgm/themes/jimmyt/winner.mp3"
"SysMusic_Failure" "gemidyne/warioware/{version}/system/bgm/themes/jimmyt/failure.mp3"
"SysMusic_Winner" "gemidyne/warioware/{version}/system/bgm/themes/jimmyt/winner.mp3"
"SysMusic_Failure_Length" "2.047628"
"SysMusic_Winner_Length" "2.021705"
}
Expand All @@ -177,36 +177,36 @@
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/twario/preminigame.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/twario/preminigame.mp3"
"Length" "2.021705"
}
}
"SysMusic_BossTime"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/t-boss.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/t-boss.mp3"
"Length" "4.048937"
}
}
"SysMusic_SpeedUp"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/t-speed.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/t-speed.mp3"
"Length" "3.735500"
}
}
"SysMusic_GameOver"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/t-gameover.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/t-gameover.mp3"
"Length" "8.412416"
}
}
"SysMusic_Failure" "gemidyne/warioware/system/bgm/themes/twario/failure.mp3"
"SysMusic_Winner" "gemidyne/warioware/system/bgm/themes/twario/winner.mp3"
"SysMusic_Failure" "gemidyne/warioware/{version}/system/bgm/themes/twario/failure.mp3"
"SysMusic_Winner" "gemidyne/warioware/{version}/system/bgm/themes/twario/winner.mp3"
"SysMusic_Failure_Length" "2.021705"
"SysMusic_Winner_Length" "2.073550"
}
Expand All @@ -219,36 +219,36 @@
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/twarioman/preminigame.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/twarioman/preminigame.mp3"
"Length" "2.021705"
}
}
"SysMusic_BossTime"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/t-boss.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/t-boss.mp3"
"Length" "4.048937"
}
}
"SysMusic_SpeedUp"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/t-speed.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/t-speed.mp3"
"Length" "3.735500"
}
}
"SysMusic_GameOver"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/t-gameover.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/t-gameover.mp3"
"Length" "8.412416"
}
}
"SysMusic_Failure" "gemidyne/warioware/system/bgm/themes/twarioman/failure.mp3"
"SysMusic_Winner" "gemidyne/warioware/system/bgm/themes/twarioman/winner.mp3"
"SysMusic_Failure" "gemidyne/warioware/{version}/system/bgm/themes/twarioman/failure.mp3"
"SysMusic_Winner" "gemidyne/warioware/{version}/system/bgm/themes/twarioman/winner.mp3"
"SysMusic_Failure_Length" "2.021705"
"SysMusic_Winner_Length" "2.021705"
}
Expand All @@ -260,36 +260,36 @@
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/special/preminigame.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/special/preminigame.mp3"
"Length" "4.205688"
}
}
"SysMusic_BossTime"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/special/boss.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/special/boss.mp3"
"Length" "3.813878"
}
}
"SysMusic_SpeedUp"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/special/speed.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/special/speed.mp3"
"Length" "3.787755"
}
}
"SysMusic_GameOver"
{
"0"
{
"file" "gemidyne/warioware/system/bgm/themes/special/gameover.mp3"
"file" "gemidyne/warioware/{version}/system/bgm/themes/special/gameover.mp3"
"Length" "8.359125"
}
}
"SysMusic_Failure" "gemidyne/warioware/system/bgm/themes/special/failure.mp3"
"SysMusic_Winner" "gemidyne/warioware/system/bgm/themes/special/winner.mp3"
"SysMusic_Failure" "gemidyne/warioware/{version}/system/bgm/themes/special/failure.mp3"
"SysMusic_Winner" "gemidyne/warioware/{version}/system/bgm/themes/special/winner.mp3"
"SysMusic_Failure_Length" "2.099473"
"SysMusic_Winner_Length" "2.099473"
}
Expand Down
Loading

0 comments on commit b83289e

Please sign in to comment.