diff --git a/assets/cursors/attack.png b/assets/cursors/attack.png new file mode 100644 index 0000000..a492ad8 Binary files /dev/null and b/assets/cursors/attack.png differ diff --git a/assets/cursors/move.png b/assets/cursors/move.png new file mode 100644 index 0000000..11776be Binary files /dev/null and b/assets/cursors/move.png differ diff --git a/assets/cursors/pointer.png b/assets/cursors/pointer.png new file mode 100644 index 0000000..6b74e0c Binary files /dev/null and b/assets/cursors/pointer.png differ diff --git a/assets/cursors/repair.png b/assets/cursors/repair.png new file mode 100644 index 0000000..f3dab1f Binary files /dev/null and b/assets/cursors/repair.png differ diff --git a/assets/cursors/sell.png b/assets/cursors/sell.png new file mode 100644 index 0000000..fac7063 Binary files /dev/null and b/assets/cursors/sell.png differ diff --git a/assets/svg/cursors/attack.svg b/assets/svg/cursors/attack.svg new file mode 100644 index 0000000..3b70e95 --- /dev/null +++ b/assets/svg/cursors/attack.svg @@ -0,0 +1,102 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/assets/svg/cursors/move.svg b/assets/svg/cursors/move.svg new file mode 100644 index 0000000..46517be --- /dev/null +++ b/assets/svg/cursors/move.svg @@ -0,0 +1,102 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/assets/svg/cursors/pointer.svg b/assets/svg/cursors/pointer.svg new file mode 100644 index 0000000..fcea3b2 --- /dev/null +++ b/assets/svg/cursors/pointer.svg @@ -0,0 +1,90 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/assets/svg/cursors/repair.svg b/assets/svg/cursors/repair.svg new file mode 100644 index 0000000..1a6dec5 --- /dev/null +++ b/assets/svg/cursors/repair.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/assets/svg/cursors/sell.svg b/assets/svg/cursors/sell.svg new file mode 100644 index 0000000..e86da3e --- /dev/null +++ b/assets/svg/cursors/sell.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + $ + + diff --git a/lib/states/menus/solo_lobby_menu.rb b/lib/states/menus/solo_lobby_menu.rb index 2b18b07..7118526 100644 --- a/lib/states/menus/solo_lobby_menu.rb +++ b/lib/states/menus/solo_lobby_menu.rb @@ -33,12 +33,12 @@ class IMICRTS end end - flow do - button("Accept", width: 0.4) do + flow(width: 1.0) do + button("Accept", width: 0.5) do push_state(Game) end - button("Back", width: 0.4, margin_left: 20) do + button("Back", align: :right) do push_state(MainMenu) end end diff --git a/lib/window.rb b/lib/window.rb index 95b4dc7..663c10c 100644 --- a/lib/window.rb +++ b/lib/window.rb @@ -4,6 +4,7 @@ class IMICRTS def setup @last_update_time = Gosu.milliseconds @mouse = CyberarmEngine::Vector.new + @cursor = Gosu::Image.new("#{IMICRTS::ASSETS_PATH}/cursors/pointer.png") self.caption = "#{IMICRTS::NAME} (#{IMICRTS::VERSION} #{IMICRTS::VERSION_NAME})" if ARGV.join.include?("--debug-game") @@ -15,6 +16,12 @@ class IMICRTS end end + def draw + @cursor.draw(mouse_x, mouse_y, Float::INFINITY) + + super + end + def update @mouse.x, @mouse.y = self.mouse_x, self.mouse_y super @@ -22,6 +29,10 @@ class IMICRTS @last_update_time = Gosu.milliseconds end + def needs_cursor? + return false + end + def close push_state(Closing) unless current_state.is_a?(Closing) end