diff --git a/.sconsign.dblite b/.sconsign.dblite index 5812c62..139d6b9 100644 Binary files a/.sconsign.dblite and b/.sconsign.dblite differ diff --git a/extension/elements/all_elements.h b/extension/elements/all_elements.h index c395a59..263084f 100644 --- a/extension/elements/all_elements.h +++ b/extension/elements/all_elements.h @@ -139,6 +139,7 @@ #include "elements/chemical/silver.h" #include "elements/chemical/molten_silver.h" #include "elements/chemical/lead.h" +#include "elements/chemical/base.h" class AllElements { public: @@ -285,6 +286,7 @@ class AllElements { elements->at(133) = new Silver(); elements->at(134) = new MoltenSilver(); elements->at(135) = new Lead(); + elements->at(136) = new Base(); for (int i = 2048; i <= 4096; i++) { elements->at(i) = new CustomElementParticle(); diff --git a/extension/elements/chemical/acid.h b/extension/elements/chemical/acid.h index a5acbed..8c95b90 100644 --- a/extension/elements/chemical/acid.h +++ b/extension/elements/chemical/acid.h @@ -9,10 +9,11 @@ class Acid: public Element { const double DECAY = 1.0 / 2048; const double EVAPORATE = 1.0 / 64; const double EAT = 1.0 / 16; - const double MIX = 1.0 / 4; const double EMIT = 1.0 / 64; const double DOWN = 1.0 / 1.2; const double DOWN_BLOCK = 1.0 / 16; + const double MIX = 1.0 / 2; + const double REACT = 1.0 / 2; void process(SandSimulation *sim, int row, int col) override { // Decay @@ -55,6 +56,15 @@ class Acid: public Element { if (sim->randf() < EMIT) sim->grow(row - 1, col, 0, 22); + + if (sim->randf() < MIX && sim->touch_count(row, col, 136) > 0) { + sim->set_cell(row, col, 3); + } + + if (sim->randf() < REACT && sim->touch_count(row, col, 17) + sim->touch_count(row, col, 51) + sim->touch_count(row, col, 133) + sim->touch_count(row, col, 135) + sim->touch_count(row, col, 45) + sim->touch_count(row, col, 35) > 0) { + sim->set_cell(row, col, 70); + sim->grow(row - 1, col, -1, 47); + } } double get_density() override { diff --git a/extension/elements/chemical/acid_water.h b/extension/elements/chemical/acid_water.h index c0473ca..fbff469 100644 --- a/extension/elements/chemical/acid_water.h +++ b/extension/elements/chemical/acid_water.h @@ -12,6 +12,7 @@ class AcidWater: public Element { const double EMIT = 1.0 / 64; const double DOWN = 1.0 / 1.2; const double DOWN_BLOCK = 1.0 / 16; + const double MIX = 1.0 / 4; void process(SandSimulation *sim, int row, int col) override { // Decay @@ -53,6 +54,10 @@ class AcidWater: public Element { sim->set_cell(row, col, sim->randf() < EMIT ? 22 : 0); } + if (sim->randf() < MIX && sim->touch_count(row, col, 136) > 0) { + sim->set_cell(row, col, 3); + } + if (sim->randf() < EMIT) sim->grow(row - 1, col, 0, 22); } diff --git a/extension/elements/chemical/base.h b/extension/elements/chemical/base.h new file mode 100644 index 0000000..ff05d00 --- /dev/null +++ b/extension/elements/chemical/base.h @@ -0,0 +1,78 @@ +#ifndef BASE_H +#define BASE_H + +#include "../element.h" + +class Base: public Element { +public: + const double DECAY = 1.0 / 4098; + const double EVAPORATE = 1.0 / 64; + const double EAT = 1.0 / 16; + const double EMIT = 1.0 / 64; + const double DOWN = 1.0 / 1.2; + const double DOWN_BLOCK = 1.0 / 16; + const double MIX = 1.0 / 2; + const double REACT = 1.0 / 2; + + void process(SandSimulation *sim, int row, int col) override { + // Decay + if (sim->randf() < DECAY) { + sim->set_cell(row, col, 22); + return; + } + + sim->liquid_process(row, col, 2); + + bool blocked = !sim->in_bounds(row + 1, col) || sim->get_cell(row + 1, col) == 3; + int new_row = row, new_col = col; + + if (sim->randf() < (blocked ? DOWN_BLOCK : DOWN)) + new_row++; + else + new_col += sim->randf() < 0.5 ? 1 : -1; + + // Ensure that the swallowed cell is in bounds and not base + if (!sim->in_bounds(new_row, new_col) || sim->get_cell(new_row, new_col) == 133) + return; + + // Swap and delete + if (sim->get_cell(new_row, new_col) == 0 || sim->randf() < EAT * (1.0 - sim->elements.at(sim->get_cell(new_row, new_col))->get_acid_resistance())) { + sim->set_cell(new_row, new_col, sim->get_cell(row, col)); + } + + if (sim->randf() < MIX && sim->touch_count(row, col, 21) + sim->touch_count(row, col, 59) > 0) { + sim->set_cell(row, col, 3); + } + + if (sim->randf() < REACT && sim->touch_count(row, col, 17) + sim->touch_count(row, col, 51) + sim->touch_count(row, col, 133) + sim->touch_count(row, col, 135) + sim->touch_count(row, col, 45) + sim->touch_count(row, col, 35) > 0) { + sim->set_cell(row, col, 70); + sim->grow(row - 1, col, -1, 47); + } + } + + double get_density() override { + return 64.0; + } + + double get_explode_resistance() override { + return 0.85; + } + + double get_acid_resistance() override { + return 1.0; + } + + int get_state() override { + return 1; + } + + int get_temperature() override { + return 0; + } + + int get_toxicity() override { + return 1; + } +}; + +#endif // BASE_H \ No newline at end of file diff --git a/extension/elements/chemical/molten_silver.h b/extension/elements/chemical/molten_silver.h index fe8abbe..0e256f5 100644 --- a/extension/elements/chemical/molten_silver.h +++ b/extension/elements/chemical/molten_silver.h @@ -11,6 +11,7 @@ class MoltenSilver: public Element { const double DOWN = 1.0 / 1.5; const double COOL = 1.0 / 128; const double REG_COOL = 1.0 / 1900; + const double EXPLODE = 1.0 / 2; void process(SandSimulation *sim, int row, int col) override { // Conductivity @@ -22,6 +23,8 @@ class MoltenSilver: public Element { if (sim->randf() < COOL && (sim->is_cold(row, col) || sim->touch_count(row, col, 0) > 0) || sim->randf() < REG_COOL) { sim->set_cell(row, col, 133); return; + } else if (sim->randf() < EXPLODE && sim->touch_count(row, col, 23) + sim->touch_count(row, col, 32) > 0) { + sim->set_cell(row, col, 9); } sim->liquid_process(row, col, 3); diff --git a/extension/elements/chemical/silver.h b/extension/elements/chemical/silver.h index 2bdfe5a..e43ef2a 100644 --- a/extension/elements/chemical/silver.h +++ b/extension/elements/chemical/silver.h @@ -3,11 +3,12 @@ #include "../element.h" -class GoSilverld: public Element { +class Silver: public Element { public: const double PLASMA = 1.0 / 8; const double MELT = 1.0 / 32; - const double EXPLODE = 1.0 / 90; + const double EXPLODE = 1.0 / 16; + void process(SandSimulation *sim, int row, int col) override { if (sim->randf() < PLASMA && (sim->touch_count(row, col, 38) > 0 || sim->touch_count(row, col, 40) > 0 || sim->touch_count(row, col, 115) > 0)) { sim->grow(row + 1, col, 133, 38); @@ -15,8 +16,10 @@ class GoSilverld: public Element { sim->grow(row, col - 1, 133, 38); sim->grow(row, col + 1, 133, 38); return; - } else if (sim -> randf() < MELT && (sim->touch_count(row, col, 20) + sim->touch_count(row, col, 24) > 0)) { + } else if (sim->randf() < MELT && (sim->touch_count(row, col, 20) + sim->touch_count(row, col, 24) > 0)) { sim->set_cell(row, col, 134); + } else if (sim->randf() < EXPLODE && sim->touch_count(row, col, 23) + sim->touch_count(row, col, 32) > 0) { + sim->set_cell(row, col, 9); } } diff --git a/extension/elements/space/black_hole.h b/extension/elements/space/black_hole.h index c779d40..4045a54 100644 --- a/extension/elements/space/black_hole.h +++ b/extension/elements/space/black_hole.h @@ -17,7 +17,7 @@ class BlackHole: public Element { // Absorb anything in immediate proximity if not a black hole for (int y = row - 1; y <= row + 1; y++) { for (int x = col - 1; x <= col + 1; x++) { - if (sim->in_bounds(y, x) && sim->get_cell(y, x) != 29) { + if (sim->in_bounds(y, x) && sim->get_cell(y, x) != 29 && sim->get_cell(y, x) != 15) { sim->set_cell(y, x, 0); } } diff --git a/extension/elements/space/paradox.h b/extension/elements/space/paradox.h index 0cc93d0..820c386 100644 --- a/extension/elements/space/paradox.h +++ b/extension/elements/space/paradox.h @@ -21,6 +21,8 @@ class Paradox: public Element { int r = std::min(sim->get_height() - 1, (int) (sim->randf() * sim->get_height())); if (!sim->in_bounds(r, c) || !sim->in_bounds(y, x)) continue; + if (sim->get_cell(r, c) == 15 || sim->get_cell(y, x) == 15) + return; int temp = sim->get_cell(y, x); sim->set_cell(y, x, sim->get_cell(r, c)); @@ -46,6 +48,8 @@ class Paradox: public Element { if (col == x) dirCol = 0; if (!sim->in_bounds(y + dirRow, x + dirCol)) return; + if (sim->get_cell(y + dirRow, x + dirCol) == 15 || sim->get_cell(y, x) == 15) + return; int temp = sim->get_cell(y, x); sim->set_cell(y, x, sim->get_cell(y + dirRow, x + dirCol)); sim->set_cell(y + dirRow, x + dirCol, temp); diff --git a/extension/elements/space/worm_hole.h b/extension/elements/space/worm_hole.h index 45bfbd7..6ac62f6 100644 --- a/extension/elements/space/worm_hole.h +++ b/extension/elements/space/worm_hole.h @@ -21,6 +21,9 @@ class WormHole: public Element { int r = std::min(sim->get_height() - 1, (int) (sim->randf() * sim->get_height())); if (!sim->in_bounds(r, c) || !sim->in_bounds(y, x) || sim->get_cell(y, x) == 0 || sim->get_cell(y, x) == 81 || sim->get_cell(r, c) == 81) continue; + + if (sim->get_cell(r, c) == 15 || sim->get_cell(y, x) == 15) + continue; int temp = sim->get_cell(y, x); sim->set_cell(y, x, sim->get_cell(r, c)); @@ -37,7 +40,7 @@ class WormHole: public Element { // Keep moving particles closer into the worm hole for (int y = row - 8; y <= row + 8; y++) { for (int x = col - 8; x <= col + 8; x++) { - if (sim->randf() >= GRAB || !sim->in_bounds(y, x) || sim->get_cell(y, x) == 81) + if (sim->randf() >= GRAB || !sim->in_bounds(y, x) || sim->get_cell(y, x) == 81 || sim->get_cell(y, x) == 15) continue; if (sim->get_cell(y, x) == 29) sim->set_cell(y, x, 116); @@ -46,7 +49,7 @@ class WormHole: public Element { int dirCol = col - x < 0 ? -1 : 1; if (row == y) dirRow = 0; if (col == x) dirCol = 0; - if (!sim->in_bounds(y + dirRow, x + dirCol) || sim->get_cell(y + dirRow, x + dirCol) == 81) + if (!sim->in_bounds(y + dirRow, x + dirCol) || sim->get_cell(y + dirRow, x + dirCol) == 81 || sim->get_cell(y + dirRow, x + dirCol) == 15) return; int temp = sim->get_cell(y, x); sim->set_cell(y, x, sim->get_cell(y + dirRow, x + dirCol)); diff --git a/extension/sand_simulation.cpp b/extension/sand_simulation.cpp index 70d85b2..c48d48b 100644 --- a/extension/sand_simulation.cpp +++ b/extension/sand_simulation.cpp @@ -78,6 +78,9 @@ void SandSimulation::step(int iterations) { void SandSimulation::move_and_swap(int row, int col, int row2, int col2) { if (!in_bounds(row, col) || !in_bounds(row2, col2)) return; + if (get_cell(row, col) == 15 || get_cell(row2, col2) == 15) { + return; + } if (elements[get_cell(row2, col2)]->get_state() == 0) return; if (elements[get_cell(row, col)]->get_state() != 0) @@ -93,6 +96,7 @@ void SandSimulation::move_and_swap(int row, int col, int row2, int col2) { void SandSimulation::grow(int row, int col, int food, int replacer) { if (!in_bounds(row, col)) return; + if (food == -1) { // Since only explosions/lasers grow into all cells, we run a check for explosion resistance if (randf() >= (1.0 - elements[get_cell(row, col)]->get_explode_resistance())) @@ -221,7 +225,11 @@ int SandSimulation::get_cell(int row, int col) { return cells[row * width + col]; } -void SandSimulation::set_cell(int row, int col, int type) { +void SandSimulation::set_cell(int row, int col, int type) { + if (get_cell(row, col) == 15 && type != 0) { + return; + } + if (cells[row * width + col] == 0 && type != 0) chunks[(row / chunk_size) * chunk_width + (col / chunk_size)]++; else if (cells[row * width + col] != 0 && type == 0) diff --git a/extension/sand_simulation.windows.template_debug.x86_64.obj b/extension/sand_simulation.windows.template_debug.x86_64.obj index 04630f0..f023b4c 100644 Binary files a/extension/sand_simulation.windows.template_debug.x86_64.obj and b/extension/sand_simulation.windows.template_debug.x86_64.obj differ diff --git a/game/bin/fallingsand/libgdfallingsand.windows.template_debug.x86_64.dll b/game/bin/fallingsand/libgdfallingsand.windows.template_debug.x86_64.dll index 18ab423..ad0772a 100644 Binary files a/game/bin/fallingsand/libgdfallingsand.windows.template_debug.x86_64.dll and b/game/bin/fallingsand/libgdfallingsand.windows.template_debug.x86_64.dll differ diff --git a/game/bin/fallingsand/~libgdfallingsand.windows.template_debug.x86_64.dll b/game/bin/fallingsand/~libgdfallingsand.windows.template_debug.x86_64.dll index 18ab423..ad0772a 100644 Binary files a/game/bin/fallingsand/~libgdfallingsand.windows.template_debug.x86_64.dll and b/game/bin/fallingsand/~libgdfallingsand.windows.template_debug.x86_64.dll differ diff --git a/game/export_presets.cfg b/game/export_presets.cfg index 2e758e7..032b233 100644 --- a/game/export_presets.cfg +++ b/game/export_presets.cfg @@ -13,7 +13,6 @@ encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false -script_encryption_key="" [preset.0.options] @@ -27,12 +26,6 @@ architectures/armeabi-v7a=false architectures/arm64-v8a=true architectures/x86=false architectures/x86_64=false -keystore/debug="" -keystore/debug_user="" -keystore/debug_password="" -keystore/release="" -keystore/release_user="" -keystore/release_password="" version/code=9 version/name="4.0" package/unique_name="org.godotengine.sandslide" @@ -41,14 +34,14 @@ package/signed=true package/app_category=2 package/retain_data_on_uninstall=false package/exclude_from_recents=false +package/show_in_android_tv=false +package/show_in_app_library=true +package/show_as_launcher_app=false launcher_icons/main_192x192="res://icon.png" launcher_icons/adaptive_foreground_432x432="res://icon.png" launcher_icons/adaptive_background_432x432="res://icon.png" graphics/opengl_debug=false xr_features/xr_mode=0 -xr_features/hand_tracking=0 -xr_features/hand_tracking_frequency=0 -xr_features/passthrough=0 screen/immersive_mode=true screen/support_small=true screen/support_normal=true @@ -206,6 +199,9 @@ permissions/write_sms=false permissions/write_social_stream=false permissions/write_sync_settings=false permissions/write_user_dictionary=false +xr_features/hand_tracking=0 +xr_features/hand_tracking_frequency=0 +xr_features/passthrough=0 [preset.1] @@ -222,7 +218,6 @@ encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false -script_encryption_key="" [preset.1.options] @@ -236,12 +231,6 @@ architectures/armeabi-v7a=false architectures/arm64-v8a=true architectures/x86=false architectures/x86_64=false -keystore/debug="" -keystore/debug_user="" -keystore/debug_password="" -keystore/release="" -keystore/release_user="" -keystore/release_password="" version/code=10 version/name="4.1" package/unique_name="org.godotengine.sandslide" @@ -250,14 +239,14 @@ package/signed=true package/app_category=2 package/retain_data_on_uninstall=false package/exclude_from_recents=false +package/show_in_android_tv=false +package/show_in_app_library=true +package/show_as_launcher_app=false launcher_icons/main_192x192="res://icon.png" launcher_icons/adaptive_foreground_432x432="res://icon.png" launcher_icons/adaptive_background_432x432="res://icon.png" graphics/opengl_debug=false xr_features/xr_mode=0 -xr_features/hand_tracking=0 -xr_features/hand_tracking_frequency=0 -xr_features/passthrough=0 screen/immersive_mode=true screen/support_small=true screen/support_normal=true @@ -415,6 +404,9 @@ permissions/write_sms=false permissions/write_social_stream=false permissions/write_sync_settings=false permissions/write_user_dictionary=false +xr_features/hand_tracking=0 +xr_features/hand_tracking_frequency=0 +xr_features/passthrough=0 [preset.2] @@ -431,13 +423,12 @@ encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false -script_encryption_key="" [preset.2.options] custom_template/debug="" custom_template/release="" -debug/export_console_script=0 +debug/export_console_wrapper=1 binary_format/embed_pck=true texture_format/bptc=false texture_format/s3tc=true @@ -445,9 +436,6 @@ texture_format/etc=false texture_format/etc2=false binary_format/architecture="x86_64" codesign/enable=false -codesign/identity_type=0 -codesign/identity="" -codesign/password="" codesign/timestamp=true codesign/timestamp_server_url="" codesign/digest_algorithm=1 @@ -464,6 +452,7 @@ application/product_name="Sand Slide" application/file_description="" application/copyright="" application/trademarks="" +application/export_angle=0 ssh_remote_deploy/enabled=false ssh_remote_deploy/host="user@host_ip" ssh_remote_deploy/port="22" @@ -481,6 +470,7 @@ Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorActi ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue Remove-Item -Recurse -Force '{temp_dir}'" +debug/export_console_script=0 [preset.3] @@ -497,13 +487,12 @@ encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false -script_encryption_key="" [preset.3.options] custom_template/debug="" custom_template/release="" -debug/export_console_script=1 +debug/export_console_wrapper=1 binary_format/embed_pck=false texture_format/bptc=true texture_format/s3tc=true @@ -522,3 +511,4 @@ unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") rm -rf \"{temp_dir}\"" +debug/export_console_script=1 diff --git a/game/main/Main.tscn b/game/main/Main.tscn index 68da384..460fd90 100644 --- a/game/main/Main.tscn +++ b/game/main/Main.tscn @@ -28,8 +28,8 @@ background_mode = 3 background_canvas_max_layer = -1 glow_enabled = true -glow_strength = 1.25 -glow_bloom = 0.3 +glow_strength = 1.15 +glow_bloom = 0.2 [sub_resource type="ImageTexture" id="ImageTexture_y2are"] diff --git a/game/main/element_manager/element_material/ammonia.tres b/game/main/element_manager/element_material/ammonia.tres new file mode 100644 index 0000000..e7b1303 --- /dev/null +++ b/game/main/element_manager/element_material/ammonia.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" script_class="Fluid" load_steps=2 format=3 uid="uid://53yu1rar0b4p"] + +[ext_resource type="Script" path="res://main/element_manager/element_material/types/fluid.gd" id="1_hybin"] + +[resource] +script = ExtResource("1_hybin") +color_a = Color(0.901961, 0.905882, 0.988235, 1) +color_b = Color(0.654902, 0.729412, 0.960784, 1) +color_c = Color(0.513726, 0.427451, 0.631373, 1) +id = 136 diff --git a/game/main/painter/painter.gd b/game/main/painter/painter.gd index c7ba0a0..1fabec8 100644 --- a/game/main/painter/painter.gd +++ b/game/main/painter/painter.gd @@ -25,7 +25,7 @@ func _ready() -> void: await get_tree().get_root().ready sim = CommonReference.main.sim - for i in [3, 5, 20, 21, 24, 28, 30, 37, 39, 41, 44, 47, 66, 118, 127]: + for i in [3, 5, 20, 21, 24, 28, 30, 37, 39, 41, 44, 47, 66, 118, 127, 136]: is_fluid[i] = true for i in [1, 11, 12, 16, 42, 4, 8, 23, 31, 32, 33, 49, 63, 64, 45, 70, 72, 75, 85, 95, 98, 119, 128, 130]: is_powder[i] = true diff --git a/game/main/ui/element_selector/ElementSelector.tscn b/game/main/ui/element_selector/ElementSelector.tscn index ff747f8..26418fb 100644 --- a/game/main/ui/element_selector/ElementSelector.tscn +++ b/game/main/ui/element_selector/ElementSelector.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=221 format=3 uid="uid://danjqv04qm3f6"] +[gd_scene load_steps=224 format=3 uid="uid://danjqv04qm3f6"] [ext_resource type="Script" path="res://main/ui/element_selector/element_selector.gd" id="1_fxkbl"] [ext_resource type="Material" uid="uid://c5qvq03ayjd60" path="res://main/ui/element_selector/selected.tres" id="2_30e0c"] @@ -884,6 +884,27 @@ corner_radius_top_right = 4 corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dqtsi"] +bg_color = Color(0.72549, 0.741176, 0.988235, 1) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_klptu"] +bg_color = Color(0.862745, 0.870588, 0.988235, 1) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_4cehg"] +bg_color = Color(0.643137, 0.603922, 0.839216, 1) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7jmtd"] bg_color = Color(0.980392, 0.568627, 0.882353, 1) corner_radius_top_left = 4 @@ -1446,7 +1467,7 @@ size_flags_horizontal = 3 size_flags_vertical = 3 theme_override_constants/h_separation = 0 theme_override_constants/v_separation = 0 -columns = 6 +columns = 3 [node name="Sand" type="Button" parent="basic/Basic"] material = ExtResource("2_30e0c") @@ -2281,6 +2302,27 @@ text = "acid" script = ExtResource("3_bfdgk") id = 21 +[node name="Ammonia" type="Button" parent="basic/Basic"] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +focus_mode = 0 +mouse_filter = 1 +theme_override_colors/font_color = Color(1, 1, 1, 1) +theme_override_colors/font_pressed_color = Color(1, 1, 1, 1) +theme_override_colors/font_hover_color = Color(1, 1, 1, 1) +theme_override_colors/font_focus_color = Color(1, 1, 1, 1) +theme_override_colors/font_hover_pressed_color = Color(1, 1, 1, 1) +theme_override_colors/font_disabled_color = Color(1, 1, 1, 1) +theme_override_font_sizes/font_size = 15 +theme_override_styles/normal = SubResource("StyleBoxFlat_dqtsi") +theme_override_styles/hover = SubResource("StyleBoxFlat_klptu") +theme_override_styles/pressed = SubResource("StyleBoxFlat_4cehg") +text = "ammonia" +script = ExtResource("3_bfdgk") +id = 136 + [node name="Sponge" type="Button" parent="basic/Basic"] custom_minimum_size = Vector2(0, 48) layout_mode = 2 diff --git a/game/project.godot b/game/project.godot index 004d93a..13bbf14 100644 --- a/game/project.godot +++ b/game/project.godot @@ -30,6 +30,8 @@ file_logging/enable_file_logging=true [display] +window/size/viewport_width=400 +window/size/viewport_height=700 window/stretch/mode="canvas_items" window/stretch/aspect="expand" window/handheld/orientation=1 @@ -86,3 +88,4 @@ environment/ssao/quality=1 environment/ssil/quality=1 environment/glow/upscale_mode=0 environment/defaults/default_clear_color=Color(0.454902, 0.462745, 0.501961, 1) +viewport/hdr_2d=true