-
Notifications
You must be signed in to change notification settings - Fork 80
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: Add blackfroest scenario #1332
Open
Bienenstock
wants to merge
7
commits into
Refactorio:develop
Choose a base branch
from
Bienenstock:blackforest
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
1479726
feat: Add blackfroest scenario
Bienenstock a4fe163
fix: fix whitespace
Bienenstock 7d564dc
fix: fix _DEBUG errors
Bienenstock ef0141d
feat: Add room generator back and changed shop
Bienenstock b50b7df
fix: locale en / de
Bienenstock e910506
fix: fix stuff
Bienenstock 86cc535
fix: bugfix bay jacobwatkinsgit - not tested yet
Bienenstock File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,174 @@ | ||
-- dependencies | ||
local BaseDebug = require 'utils.debug' | ||
local Color = require 'resources.color_presets' | ||
|
||
local min = math.min | ||
local max = math.max | ||
local floor = math.floor | ||
local abs = math.abs | ||
|
||
-- this | ||
local Debug = {} | ||
|
||
local default_base_color = Color.white | ||
local default_delta_color = Color.black | ||
|
||
---@deprecated use 'utils.debug'.print instead | ||
function Debug.print(message) | ||
BaseDebug.print(message) | ||
end | ||
|
||
---@deprecated use 'utils.debug'.print_position instead | ||
function Debug.print_position(position, message) | ||
BaseDebug.print_position(position, message) | ||
end | ||
|
||
---@deprecated use 'utils.debug'.cheat instead | ||
function Debug.cheat(callback) | ||
BaseDebug.cheat(callback) | ||
end | ||
|
||
--[[-- | ||
Prints a colored value on a location. | ||
|
||
@param value between -1 and 1 | ||
@param surface LuaSurface | ||
@param position Position {x, y} | ||
@param scale float | ||
@param offset float | ||
@param immutable bool if immutable, only set, never do a surface lookup, values never change | ||
]] | ||
function Debug.print_grid_value(value, surface, position, scale, offset, immutable) | ||
local is_string = type(value) == 'string' | ||
local color = default_base_color | ||
local text = value | ||
|
||
if type(immutable) ~= 'boolean' then | ||
immutable = false | ||
end | ||
|
||
if not is_string then | ||
scale = scale or 1 | ||
offset = offset or 0 | ||
position = {x = position.x + offset, y = position.y + offset} | ||
local r = max(1, value) / scale | ||
local g = 1 - abs(value) / scale | ||
local b = min(1, value) / scale | ||
|
||
if (r > 0) then | ||
r = 0 | ||
end | ||
|
||
if (b < 0) then | ||
b = 0 | ||
end | ||
|
||
if (g < 0) then | ||
g = 0 | ||
end | ||
|
||
r = abs(r) | ||
|
||
color = { r = r, g = g, b = b} | ||
|
||
-- round at precision of 2 | ||
text = floor(100 * value) * 0.01 | ||
|
||
if (0 == text) then | ||
text = '0.00' | ||
end | ||
end | ||
|
||
if not immutable then | ||
local text_entity = surface.find_entity('flying-text', position) | ||
|
||
if text_entity then | ||
text_entity.text = text | ||
text_entity.color = color | ||
return | ||
end | ||
end | ||
|
||
surface.create_entity{ | ||
name = 'flying-text', | ||
color = color, | ||
text = text, | ||
position = position | ||
}.active = false | ||
end | ||
|
||
--[[-- | ||
Prints a colored value on a location. When given a color_value and a delta_color, | ||
will change the color of the text from the base to base + value * delta. This will | ||
make the color of the text range from 'base_color' to 'base_color + delta_color' | ||
as the color_value ranges from 0 to 1 | ||
|
||
@param value of number to be displayed | ||
@param surface LuaSurface | ||
@param position Position {x, y} | ||
@param offset float position offset | ||
@param immutable bool if immutable, only set, never do a surface lookup, values never change | ||
@param color_value float How far along the range of values of colors the value is to be displayed | ||
@param base_color {r,g,b} The color for the text to be if color_value is 0 | ||
@param delta_color {r,g,b} The amount to correct the base_color if color_value is 1 | ||
@param under_bound {r,g,b} The color to be used if color_value < 0 | ||
@param over_bound {r,g,b} The color to be used if color_value > 1 | ||
]] | ||
function Debug.print_colored_grid_value(value, surface, position, offset, immutable, | ||
color_value, base_color, delta_color, under_bound, over_bound) | ||
local is_string = type(value) == 'string' | ||
-- default values: | ||
local color = base_color or default_base_color | ||
local d_color = delta_color or default_delta_color | ||
local u_color = under_bound or color | ||
local o_color = over_bound or color | ||
|
||
if (color_value < 0) then | ||
color = u_color | ||
elseif (color_value > 1) then | ||
color = o_color | ||
else | ||
color = { | ||
r = color.r + color_value * d_color.r, | ||
g = color.g + color_value * d_color.g, | ||
b = color.b + color_value * d_color.b | ||
} | ||
end | ||
|
||
local text = value | ||
|
||
if type(immutable) ~= 'boolean' then | ||
immutable = false | ||
end | ||
|
||
if not is_string then | ||
offset = offset or 0 | ||
position = {x = position.x + offset, y = position.y + offset} | ||
|
||
-- round at precision of 2 | ||
text = floor(100 * value) * 0.01 | ||
|
||
if (0 == text) then | ||
text = '0.00' | ||
end | ||
end | ||
|
||
if not immutable then | ||
local text_entity = surface.find_entity('flying-text', position) | ||
|
||
if text_entity then | ||
text_entity.text = text | ||
text_entity.color = color | ||
return | ||
end | ||
end | ||
|
||
surface.create_entity{ | ||
name = 'flying-text', | ||
color = color, | ||
text = text, | ||
position = position | ||
}.active = false | ||
end | ||
|
||
return Debug |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These 3 are missing from the German translation. Any reason for that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ups, idk, I created it a long time ago. i don't think they are used. I will check tomorrow
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed