BRING BACK OLD MUSIC (#149)
This commit is contained in:
@@ -120,7 +120,7 @@
|
|||||||
|
|
||||||
<!-- Changelog -->
|
<!-- Changelog -->
|
||||||
<PanelContainer Name="Changelog" StyleClasses="LobbyGayBackground" HorizontalAlignment="Right"
|
<PanelContainer Name="Changelog" StyleClasses="LobbyGayBackground" HorizontalAlignment="Right"
|
||||||
VerticalAlignment="Top">
|
VerticalAlignment="Top" Visible="False">
|
||||||
|
|
||||||
<BoxContainer Orientation="Vertical">
|
<BoxContainer Orientation="Vertical">
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public sealed class AnimatedBackgroundControl : TextureRect
|
|||||||
[Dependency] private readonly IClyde _clyde = default!;
|
[Dependency] private readonly IClyde _clyde = default!;
|
||||||
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
||||||
|
|
||||||
private string RsiPath = "/Textures/Ohio/Lobby/backgrounds/native.rsi";
|
private string _rsiPath = "/Textures/Ohio/Lobby/backgrounds/native.rsi";
|
||||||
private const int States = 1;
|
private const int States = 1;
|
||||||
|
|
||||||
private IRenderTexture? _buffer;
|
private IRenderTexture? _buffer;
|
||||||
@@ -34,7 +34,7 @@ public sealed class AnimatedBackgroundControl : TextureRect
|
|||||||
|
|
||||||
private void InitializeStates()
|
private void InitializeStates()
|
||||||
{
|
{
|
||||||
var rsi = _resourceCache.GetResource<RSIResource>(RsiPath).RSI;
|
var rsi = _resourceCache.GetResource<RSIResource>(_rsiPath).RSI;
|
||||||
|
|
||||||
for (var i = 0; i < States; i++)
|
for (var i = 0; i < States; i++)
|
||||||
{
|
{
|
||||||
@@ -97,8 +97,8 @@ public sealed class AnimatedBackgroundControl : TextureRect
|
|||||||
{
|
{
|
||||||
var backgroundsProto = _prototypeManager.EnumeratePrototypes<AnimatedLobbyScreenPrototype>().ToList();
|
var backgroundsProto = _prototypeManager.EnumeratePrototypes<AnimatedLobbyScreenPrototype>().ToList();
|
||||||
var random = new Random();
|
var random = new Random();
|
||||||
int index = random.Next(backgroundsProto.Count);
|
var index = random.Next(backgroundsProto.Count);
|
||||||
RsiPath = $"/Textures/{backgroundsProto[index].Path}";
|
_rsiPath = $"/Textures/{backgroundsProto[index].Path}";
|
||||||
InitializeStates();
|
InitializeStates();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,22 +1,22 @@
|
|||||||
- type: soundCollection
|
|
||||||
id: LobbyMusicOld
|
|
||||||
files:
|
|
||||||
- /Audio/Lobby/thunderdome.ogg
|
|
||||||
- /Audio/Lobby/absconditus.ogg
|
|
||||||
- /Audio/Lobby/space_asshole.ogg
|
|
||||||
- /Audio/Lobby/endless_space.ogg
|
|
||||||
- /Audio/Lobby/singuloose.ogg
|
|
||||||
- /Audio/Lobby/comet_haley.ogg
|
|
||||||
- /Audio/Lobby/title2.ogg
|
|
||||||
- /Audio/Lobby/title3.ogg
|
|
||||||
- /Audio/Lobby/mod.flip-flap.ogg
|
|
||||||
- /Audio/Lobby/Spac_Stac.ogg
|
|
||||||
- /Audio/Lobby/pwmur.ogg
|
|
||||||
- /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg
|
|
||||||
- /Audio/Lobby/every_light_is_blinking_at_once.ogg
|
|
||||||
- /Audio/Lobby/atomicamnesiammx.ogg
|
|
||||||
|
|
||||||
- type: soundCollection
|
- type: soundCollection
|
||||||
id: LobbyMusic
|
id: LobbyMusic
|
||||||
|
files:
|
||||||
|
- /Audio/Lobby/thunderdome.ogg
|
||||||
|
- /Audio/Lobby/singuloose.ogg
|
||||||
|
- /Audio/Lobby/title2.ogg
|
||||||
|
- /Audio/Lobby/title3.ogg
|
||||||
|
- /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg
|
||||||
|
- /Audio/Lobby/every_light_is_blinking_at_once.ogg
|
||||||
|
- /Audio/Lobby/atomicamnesiammx.ogg
|
||||||
|
# - /Audio/Lobby/absconditus.ogg
|
||||||
|
# - /Audio/Lobby/space_asshole.ogg
|
||||||
|
# - /Audio/Lobby/endless_space.ogg
|
||||||
|
# - /Audio/Lobby/comet_haley.ogg
|
||||||
|
# - /Audio/Lobby/mod.flip-flap.ogg
|
||||||
|
# - /Audio/Lobby/Spac_Stac.ogg
|
||||||
|
# - /Audio/Lobby/pwmur.ogg
|
||||||
|
|
||||||
|
- type: soundCollection
|
||||||
|
id: LobbyMusicOld
|
||||||
files:
|
files:
|
||||||
- /Audio/Lobby/bobby.ogg
|
- /Audio/Lobby/bobby.ogg
|
||||||
|
|||||||
@@ -1,23 +1,23 @@
|
|||||||
- type: animatedLobbyScreen
|
|
||||||
id: NativeLobbyScreen
|
|
||||||
path: Ohio/Lobby/backgrounds/native.rsi
|
|
||||||
|
|
||||||
- type: animatedLobbyScreen
|
|
||||||
id: MilkywayLobbyScreen
|
|
||||||
path: Ohio/Lobby/backgrounds/milkyway.rsi
|
|
||||||
|
|
||||||
- type: animatedLobbyScreen
|
|
||||||
id: SusLobbyScreen
|
|
||||||
path: Ohio/Lobby/backgrounds/sus.rsi
|
|
||||||
|
|
||||||
- type: animatedLobbyScreen
|
|
||||||
id: ThirdLobbyScreen
|
|
||||||
path: Ohio/Lobby/backgrounds/3.rsi
|
|
||||||
|
|
||||||
- type: animatedLobbyScreen
|
- type: animatedLobbyScreen
|
||||||
id: FourthLobbyScreen
|
id: FourthLobbyScreen
|
||||||
path: Ohio/Lobby/backgrounds/4.rsi
|
path: Ohio/Lobby/backgrounds/4.rsi
|
||||||
|
|
||||||
- type: animatedLobbyScreen
|
#- type: animatedLobbyScreen
|
||||||
id: FifthLobbyScreen
|
# id: NativeLobbyScreen
|
||||||
path: Ohio/Lobby/backgrounds/5.rsi
|
# path: Ohio/Lobby/backgrounds/native.rsi
|
||||||
|
|
||||||
|
#- type: animatedLobbyScreen
|
||||||
|
# id: MilkywayLobbyScreen
|
||||||
|
# path: Ohio/Lobby/backgrounds/milkyway.rsi
|
||||||
|
|
||||||
|
#- type: animatedLobbyScreen
|
||||||
|
# id: SusLobbyScreen
|
||||||
|
# path: Ohio/Lobby/backgrounds/sus.rsi
|
||||||
|
|
||||||
|
#- type: animatedLobbyScreen
|
||||||
|
# id: ThirdLobbyScreen
|
||||||
|
# path: Ohio/Lobby/backgrounds/3.rsi
|
||||||
|
|
||||||
|
#- type: animatedLobbyScreen
|
||||||
|
# id: FifthLobbyScreen
|
||||||
|
# path: Ohio/Lobby/backgrounds/5.rsi
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
{
|
|
||||||
"version": 1,
|
|
||||||
"license": null,
|
|
||||||
"copyright": null,
|
|
||||||
"size": {
|
|
||||||
"x": 480,
|
|
||||||
"y": 480
|
|
||||||
},
|
|
||||||
"states": [
|
|
||||||
{
|
|
||||||
"name": "1",
|
|
||||||
"delays": [
|
|
||||||
[
|
|
||||||
0.1,
|
|
||||||
0.1,
|
|
||||||
0.1
|
|
||||||
]
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user