cyberarm/i-mic-rts
1
0
Fork 0
mirror of https://github.com/cyberarm/i-mic-rts.git synced 2025-12-15 15:52:34 +00:00
Code Issues Projects Releases Wiki Activity

Fixed lobby menu color picker not showing color

Browse Source
This commit is contained in:
Cyberarm
2021-10-12 12:27:20 -05:00
parent 04dea98751
commit 15713ec139
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/game_save.rb
View File

@@ -9,6 +9,7 @@ class IMICRTS
@player_id = player_id @player_id = player_id
@version = IMICRTS::VERSION @version = IMICRTS::VERSION
@map_file_digest = Digest::SHA256.digest(File.read("#{IMICRTS::GAME_ROOT_PATH}/assets/#{@map_file}")) if @map_file
end end
def parse def parse
@@ -32,7 +33,7 @@ class IMICRTS
end end
s = %{#{@version} s = %{#{@version}
#{@map_file}?#{Digest::SHA256.digest(File.read("#{IMICRTS::GAME_ROOT_PATH}/assets/#{@map_file}"))} #{@map_file}?#{@map_file_digest}
#{@gamesave ? "GAMESAVE?#{@player_id}" : "REPLAY"} #{@gamesave ? "GAMESAVE?#{@player_id}" : "REPLAY"}
#{JSON.dump(player_data)}} #{JSON.dump(player_data)}}

7
lib/states/menus/solo_lobby_menu.rb
View File

@@ -22,7 +22,10 @@ class IMICRTS
label "Color" label "Color"
@player_color = list_box items: TeamColors.keys, choose: Setting.get(:player_color).to_sym, width: 1.0 @player_color = list_box items: TeamColors.keys, choose: Setting.get(:player_color).to_sym, width: 1.0
@player_color.style.background = (TeamColors[@player_color.value.to_sym]) @player_color.style.background = (TeamColors[@player_color.value.to_sym])
@player_color.style.default[:background] = (TeamColors[@player_color.value.to_sym])
@player_color.style.color = Gosu::Color.new(@player_color.style.background&.gl).value > 0.9 ? Gosu::Color::BLACK : Gosu::Color::WHITE @player_color.style.color = Gosu::Color.new(@player_color.style.background&.gl).value > 0.9 ? Gosu::Color::BLACK : Gosu::Color::WHITE
@player_color.style.default[:color] = Gosu::Color.new(@player_color.style.background&.gl).value > 0.9 ? Gosu::Color::BLACK : Gosu::Color::WHITE
@player_color.subscribe(:changed) do |sender, value| @player_color.subscribe(:changed) do |sender, value|
@player_color.style.background = TeamColors[value.to_sym] @player_color.style.background = TeamColors[value.to_sym]
@player_color.style.color = Gosu::Color.new(@player_color.style.background&.gl).value > 0.9 ? Gosu::Color::BLACK : Gosu::Color::WHITE @player_color.style.color = Gosu::Color.new(@player_color.style.background&.gl).value > 0.9 ? Gosu::Color::BLACK : Gosu::Color::WHITE
@@ -32,10 +35,14 @@ class IMICRTS
7.times do |i| 7.times do |i|
box = list_box items: TeamColors.keys, choose: TeamColors.keys[i + 1], width: 1.0 box = list_box items: TeamColors.keys, choose: TeamColors.keys[i + 1], width: 1.0
box.style.background = (TeamColors[box.value.to_sym]) box.style.background = (TeamColors[box.value.to_sym])
box.style.default[:background] = (TeamColors[box.value.to_sym])
box.style.color = Gosu::Color.new(box.style.background&.gl).value > 0.9 ? Gosu::Color::BLACK : Gosu::Color::WHITE box.style.color = Gosu::Color.new(box.style.background&.gl).value > 0.9 ? Gosu::Color::BLACK : Gosu::Color::WHITE
box.style.default[:color] = Gosu::Color.new(box.style.background&.gl).value > 0.9 ? Gosu::Color::BLACK : Gosu::Color::WHITE
box.subscribe(:changed) do |sender, value| box.subscribe(:changed) do |sender, value|
box.style.background = TeamColors[value.to_sym] box.style.background = TeamColors[value.to_sym]
box.style.default[:background] = TeamColors[value.to_sym]
box.style.color = Gosu::Color.new(box.style.background&.gl).value > 0.9 ? Gosu::Color::BLACK : Gosu::Color::WHITE box.style.color = Gosu::Color.new(box.style.background&.gl).value > 0.9 ? Gosu::Color::BLACK : Gosu::Color::WHITE
box.style.default[:color] = Gosu::Color.new(box.style.background&.gl).value > 0.9 ? Gosu::Color::BLACK : Gosu::Color::WHITE
:handled :handled
end end
end end