Compare commits
1 Commits
f8d69be2ad
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 46d45783f3 |
Binary file not shown.
+23
-2
@@ -1,9 +1,17 @@
|
|||||||
## Nathan Hinton
|
## Nathan Hinton
|
||||||
## A number consumer that will create numbers when an extractor is placed on it.
|
## A number consumer that will create numbers when an extractor is placed on it.
|
||||||
|
|
||||||
|
require './dialouge_box.rb'
|
||||||
|
|
||||||
CONSUMER_DEBUG = false
|
CONSUMER_DEBUG = false
|
||||||
BORDER = 2
|
BORDER = 2
|
||||||
SIZE = 3
|
SIZE = 3
|
||||||
|
HOVER_TIME = 500 # ms
|
||||||
|
|
||||||
|
# This actually should be stored somewhere else. This is the goals/quests for the game
|
||||||
|
TASKS = [
|
||||||
|
"Collect 10 1's"
|
||||||
|
]
|
||||||
|
|
||||||
class Consumer
|
class Consumer
|
||||||
attr_reader :draw_x, :draw_y
|
attr_reader :draw_x, :draw_y
|
||||||
@@ -19,6 +27,9 @@ class Consumer
|
|||||||
@image = Gosu.render((SIZE * @box_size) - (2 * BORDER), (SIZE * @box_size) - (2 * BORDER)) {
|
@image = Gosu.render((SIZE * @box_size) - (2 * BORDER), (SIZE * @box_size) - (2 * BORDER)) {
|
||||||
Gosu.draw_rect(0, 0, (SIZE * @box_size) - (2 * BORDER), (SIZE * @box_size) - (2 * BORDER), Gosu::Color::GREEN, 0)
|
Gosu.draw_rect(0, 0, (SIZE * @box_size) - (2 * BORDER), (SIZE * @box_size) - (2 * BORDER), Gosu::Color::GREEN, 0)
|
||||||
}
|
}
|
||||||
|
@task_index = 0
|
||||||
|
@tooltip_timer = 0
|
||||||
|
@tooltip = DialougeBox.new(@x, @y, WIDTH, HEIGHT, TASKS[@task_index])
|
||||||
end
|
end
|
||||||
|
|
||||||
# Consumes numbers created
|
# Consumes numbers created
|
||||||
@@ -26,11 +37,20 @@ class Consumer
|
|||||||
# @param camera_x [Integer] The camera X position
|
# @param camera_x [Integer] The camera X position
|
||||||
# @param camera_y [Integer] The camera Y position
|
# @param camera_y [Integer] The camera Y position
|
||||||
# @param camera_zoom [Float] The camera zoom
|
# @param camera_zoom [Float] The camera zoom
|
||||||
def update(delta_mult, camera_x, camera_y, camera_zoom)
|
def update(delta_mult, camera_x, camera_y, camera_zoom, mouse_x, mouse_y)
|
||||||
@draw_x = (((((@screen_width / @box_size.to_f) / 2.0) + (@x - camera_x) * camera_zoom) * @box_size) + BORDER * camera_zoom)
|
@draw_x = (((((@screen_width / @box_size.to_f) / 2.0) + (@x - camera_x) * camera_zoom) * @box_size) + BORDER * camera_zoom)
|
||||||
@draw_y = (((((@screen_height / @box_size.to_f) / 2.0) + (@y - camera_y) * camera_zoom) * @box_size) + BORDER * camera_zoom)
|
@draw_y = (((((@screen_height / @box_size.to_f) / 2.0) + (@y - camera_y) * camera_zoom) * @box_size) + BORDER * camera_zoom)
|
||||||
@camera_zoom = camera_zoom
|
@camera_zoom = camera_zoom
|
||||||
|
if 0 < mouse_x - @draw_x && mouse_x - @draw_x < (SIZE * @box_size * @camera_zoom) && 0 < mouse_y - @draw_y && mouse_y - @draw_y < (SIZE * @box_size * @camera_zoom)
|
||||||
|
@tooltip_timer += 60.0 * delta_mult
|
||||||
|
if @tooltip_timer > HOVER_TIME
|
||||||
|
@tooltip.show = true
|
||||||
|
@tooltip.update(@draw_x, @draw_y, @camera_zoom)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
@tooltip_timer = 0
|
||||||
|
@tooltip.show = false
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Draw the consumer. Uses the camera x and y to shift where it should draw
|
# Draw the consumer. Uses the camera x and y to shift where it should draw
|
||||||
@@ -39,5 +59,6 @@ class Consumer
|
|||||||
puts "Drawing at #{@x - camera_x}, #{@y - camera_y}"
|
puts "Drawing at #{@x - camera_x}, #{@y - camera_y}"
|
||||||
end
|
end
|
||||||
@image.draw(@draw_x, @draw_y, 0, @camera_zoom, @camera_zoom)
|
@image.draw(@draw_x, @draw_y, 0, @camera_zoom, @camera_zoom)
|
||||||
|
@tooltip.draw()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
+3
-4
@@ -7,7 +7,7 @@ class DialougeBox
|
|||||||
attr_accessor :show
|
attr_accessor :show
|
||||||
def initialize(parent_x, parent_y, screen_width, screen_height, text)
|
def initialize(parent_x, parent_y, screen_width, screen_height, text)
|
||||||
@text = text
|
@text = text
|
||||||
@longest_line = ((@text.split("\n").map { |ss| ss.length}.max) / 3).to_i
|
@longest_line = ((@text.split("\n").map { |ss| ss.length}.max) / 2.25).to_i
|
||||||
@line_count = @text.split("\n").length
|
@line_count = @text.split("\n").length
|
||||||
|
|
||||||
@x = parent_x
|
@x = parent_x
|
||||||
@@ -24,7 +24,7 @@ class DialougeBox
|
|||||||
Gosu::Color.new(0xC0, 0xFF, 0xFF, 0xFF),
|
Gosu::Color.new(0xC0, 0xFF, 0xFF, 0xFF),
|
||||||
0,
|
0,
|
||||||
)
|
)
|
||||||
Gosu::Image.from_text(text, TEXT_SIZE).draw(TEXT_MARGIN, TEXT_MARGIN)
|
Gosu::Image.from_text(text, TEXT_SIZE, font: FONT_PATH).draw(TEXT_MARGIN, TEXT_MARGIN)
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -43,7 +43,7 @@ class DialougeBox
|
|||||||
Gosu::Color.new(0xC0, 0xFF, 0xFF, 0xFF),
|
Gosu::Color.new(0xC0, 0xFF, 0xFF, 0xFF),
|
||||||
0,
|
0,
|
||||||
)
|
)
|
||||||
Gosu::Image.from_text(newtext, TEXT_SIZE).draw(TEXT_MARGIN, TEXT_MARGIN)
|
Gosu::Image.from_text(newtext, TEXT_SIZE, font: FONT_PATH).draw(TEXT_MARGIN, TEXT_MARGIN)
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
@camera_zoom = camera_zoom
|
@camera_zoom = camera_zoom
|
||||||
@@ -53,7 +53,6 @@ class DialougeBox
|
|||||||
|
|
||||||
def draw()
|
def draw()
|
||||||
if @show
|
if @show
|
||||||
puts "Drawing tooltip at #{@x}, #{@y}"
|
|
||||||
@image.draw(@x, @y, 0, @camera_zoom, @camera_zoom)
|
@image.draw(@x, @y, 0, @camera_zoom, @camera_zoom)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ require './producer.rb'
|
|||||||
require './consumer.rb'
|
require './consumer.rb'
|
||||||
require './dialouge_box.rb'
|
require './dialouge_box.rb'
|
||||||
|
|
||||||
|
FONT_PATH = 'assets/font/Cousine-Regular.ttf'
|
||||||
|
|
||||||
# Viewport resolution
|
# Viewport resolution
|
||||||
WIDTH = Gosu::screen_width
|
WIDTH = Gosu::screen_width
|
||||||
HEIGHT = Gosu::screen_height
|
HEIGHT = Gosu::screen_height
|
||||||
@@ -195,7 +197,7 @@ class NumFactory < Gosu::Window
|
|||||||
end
|
end
|
||||||
|
|
||||||
@consumers.each do |consumer|
|
@consumers.each do |consumer|
|
||||||
consumer.update(delta_mult, @camera_x, @camera_y, @camera_zoom)
|
consumer.update(delta_mult, @camera_x, @camera_y, @camera_zoom, self.mouse_x, self.mouse_y)
|
||||||
end
|
end
|
||||||
@dialouges.each do |dialouge|
|
@dialouges.each do |dialouge|
|
||||||
dialouge.update(0, 0, newtext: "My new text is: #{delta_mult}")
|
dialouge.update(0, 0, newtext: "My new text is: #{delta_mult}")
|
||||||
@@ -238,15 +240,15 @@ class NumFactory < Gosu::Window
|
|||||||
dialouge.draw()
|
dialouge.draw()
|
||||||
end
|
end
|
||||||
|
|
||||||
Gosu::Image.from_text("#{width}, #{height}", 20).draw(1600, 0, 1)
|
Gosu::Image.from_text("#{width}, #{height}", 20, font: FONT_PATH).draw(1600, 0, 1)
|
||||||
Gosu::Image.from_text("#{mouse_x}, #{mouse_y}", 20).draw(1600, 100, 1)
|
Gosu::Image.from_text("#{mouse_x}, #{mouse_y}", 20, font: FONT_PATH).draw(1600, 100, 1)
|
||||||
Gosu::Image.from_text("Tick time: #{((Time.now() - @tick_time).to_f * 1000).to_i}", 20).draw(1600, 25, 1)
|
Gosu::Image.from_text("Tick time: #{((Time.now() - @tick_time).to_f * 1000).to_i}", 20, font: FONT_PATH).draw(1600, 25, 1)
|
||||||
Gosu::Image.from_text("FPS: #{Gosu.fps}", 20).draw(1600, 50, 1)
|
Gosu::Image.from_text("FPS: #{Gosu.fps}", 20, font: FONT_PATH).draw(1600, 50, 1)
|
||||||
Gosu::Image.from_text("items on screen: #{onscreen_items}", 20).draw(1600, 75, 1)
|
Gosu::Image.from_text("items on screen: #{onscreen_items}", 20, font: FONT_PATH).draw(1600, 75, 1)
|
||||||
Gosu::Image.from_text("Camera boxes: #{@camera_boxes}", 20).draw(1600, 175, 1)
|
Gosu::Image.from_text("Camera boxes: #{@camera_boxes}", 20, font: FONT_PATH).draw(1600, 175, 1)
|
||||||
Gosu::Image.from_text("Camera location: #{@camera_x}, #{@camera_y}", 20).draw(1600, 200, 1)
|
Gosu::Image.from_text("Camera location: #{@camera_x}, #{@camera_y}", 20, font: FONT_PATH).draw(1600, 200, 1)
|
||||||
Gosu::Image.from_text("Camera zoom: #{@camera_zoom}, #{@camera_x_zoom_offset}", 20).draw(1600, 225, 1)
|
Gosu::Image.from_text("Camera zoom: #{@camera_zoom}, #{@camera_x_zoom_offset}", 20, font: FONT_PATH).draw(1600, 225, 1)
|
||||||
Gosu::Image.from_text("Camera viewport: (#{@camera_min_x}, #{@camera_min_y}) to (#{@camera_max_x}, #{@camera_max_y})", 20).draw(1600, 250, 1)
|
Gosu::Image.from_text("Camera viewport: (#{@camera_min_x}, #{@camera_min_y}) to (#{@camera_max_x}, #{@camera_max_y})", 20, font: FONT_PATH).draw(1600, 250, 1)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
+3
-6
@@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
require './dialouge_box.rb'
|
require './dialouge_box.rb'
|
||||||
|
|
||||||
|
|
||||||
PRODUCER_DEBUG = false
|
PRODUCER_DEBUG = false
|
||||||
BORDER = 2
|
BORDER = 2
|
||||||
HOVER_TIME = 500 # ms
|
HOVER_TIME = 500 # ms
|
||||||
@@ -20,18 +19,17 @@ class Producer
|
|||||||
@x = x
|
@x = x
|
||||||
@y = y
|
@y = y
|
||||||
@number = [number, 1].max
|
@number = [number, 1].max
|
||||||
@rate = (30/rate).to_i
|
@rate = rate
|
||||||
@box_size = box_size
|
@box_size = box_size
|
||||||
@screen_width = screen_width
|
@screen_width = screen_width
|
||||||
@screen_height = screen_height
|
@screen_height = screen_height
|
||||||
@image = Gosu.render(@box_size - (2 * BORDER), @box_size - (2 * BORDER)) {
|
@image = Gosu.render(@box_size - (2 * BORDER), @box_size - (2 * BORDER)) {
|
||||||
# Render the item
|
# Render the item
|
||||||
Gosu.draw_rect(0, 0, @box_size - (2 * BORDER), @box_size - (2 * BORDER), Gosu::Color::RED, 0)
|
Gosu.draw_rect(0, 0, @box_size - (2 * BORDER), @box_size - (2 * BORDER), Gosu::Color::RED, 0)
|
||||||
Gosu::Image.from_text("#{@number}", 20).draw(5, 5, 1)
|
Gosu::Image.from_text("#{@number}", 20, font: FONT_PATH).draw(5, 5, 1)
|
||||||
}
|
}
|
||||||
|
|
||||||
@tooltip = DialougeBox.new(@x, @y, WIDTH, HEIGHT, "This is a string\nof test text!")
|
@tooltip = DialougeBox.new(@x, @y, WIDTH, HEIGHT, "Produces #{@rate} number per second")
|
||||||
puts @tooltip.methods.sort
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Creates numbers depending on the rate. This is done with knowing that the
|
# Creates numbers depending on the rate. This is done with knowing that the
|
||||||
@@ -47,7 +45,6 @@ class Producer
|
|||||||
@camera_zoom = camera_zoom
|
@camera_zoom = camera_zoom
|
||||||
if 0 < mouse_x - @draw_x && mouse_x - @draw_x < (@box_size * @camera_zoom) && 0 < mouse_y - @draw_y && mouse_y - @draw_y < (@box_size * @camera_zoom)
|
if 0 < mouse_x - @draw_x && mouse_x - @draw_x < (@box_size * @camera_zoom) && 0 < mouse_y - @draw_y && mouse_y - @draw_y < (@box_size * @camera_zoom)
|
||||||
@tooltip_timer += 60.0 * delta_mult
|
@tooltip_timer += 60.0 * delta_mult
|
||||||
puts @tooltip_timer
|
|
||||||
if @tooltip_timer > HOVER_TIME
|
if @tooltip_timer > HOVER_TIME
|
||||||
@tooltip.show = true
|
@tooltip.show = true
|
||||||
@tooltip.update(@draw_x, @draw_y, @camera_zoom)
|
@tooltip.update(@draw_x, @draw_y, @camera_zoom)
|
||||||
|
|||||||
Reference in New Issue
Block a user