Skip to content

Commit

Permalink
Add eject all engulfed objects action (#4816)
Browse files Browse the repository at this point in the history
* Add eject engulfed objects action

* Add eject engulfed hotbar icon

* Add input to input_options.json

* Update translations and eject engulfed hotbar tooltip text

* Make eject engulfed ability work and show on hotbar only when there is something engulfed

* Fix dents

* Another fix

* Removed redundant space

* Style and logic fixes

* Ensure new hotbar action has styles set up

* Add dummy eject engulfed hotbar action

* Cleaned up the code check pattern to be correct

and cleaned up unnecessary new style objects in MulticellularHUD.tscn

---------

Co-authored-by: Henri Hyyryläinen <henri.hyyrylainen@gmail.com>
  • Loading branch information
CI09 and hhyyrylainen authored Jan 24, 2024
1 parent 12cedcc commit ea01946
Show file tree
Hide file tree
Showing 61 changed files with 682 additions and 189 deletions.
3 changes: 3 additions & 0 deletions assets/textures/gui/bevel/actions/EngulfEject.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions assets/textures/gui/bevel/actions/EngulfEject.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/EngulfEject.png-b615e512af76b24d8290c625a6b9bf50.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/textures/gui/bevel/actions/EngulfEject.png"
dest_files=[ "res://.import/EngulfEject.png-b615e512af76b24d8290c625a6b9bf50.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=true
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
9 changes: 8 additions & 1 deletion locale/af.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion locale/ar.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion locale/be.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion locale/bg.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion locale/bn.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion locale/ca.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion locale/cs.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion locale/da.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion locale/de.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion locale/el.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions locale/en.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-01-19 14:56+0100\n"
"PO-Revision-Date: 2024-01-19 14:56+0100\n"
"POT-Creation-Date: 2024-01-22 18:28+0100\n"
"PO-Revision-Date: 2024-01-22 18:28+0100\n"
"Last-Translator: Henri Hyyryläinen <hhyyrylainen@revolutionarygamesstudio.com>\n"
"Language-Team: English <https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/en/>\n"
"Language: en\n"
Expand Down Expand Up @@ -1400,6 +1400,12 @@ msgstr ""
msgid "EIGHT_TIMES"
msgstr "8x"

msgid "EJECT_ENGULFED"
msgstr "Eject engulfed objects"

msgid "EJECT_ENGULFED_TOOLTIP"
msgstr "Eject engulfed objects"

msgid "ENABLED_MODS"
msgstr "Enabled Mods"

Expand Down
10 changes: 9 additions & 1 deletion locale/eo.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion locale/es.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion locale/es_AR.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion locale/et.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ea01946

Please sign in to comment.