From 1b96fe2be4f31447f17f67cc53d6c0d5fc50e931 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sat, 7 Jan 2023 03:29:15 +0100 Subject: [PATCH] Unify names across the project --- assets/{grass_menu_tex.png => grass_menu_tile.png} | 0 ...enu_tex.png.import => grass_menu_tile.png.import} | 6 +++--- assets/{pixel-operator.ttf => pixel_operator.ttf} | 0 ...operator.ttf.import => pixel_operator.ttf.import} | 6 +++--- assets/{trees-adopt.png => trees_adopt.png} | 0 ...trees-adopt.png.import => trees_adopt.png.import} | 6 +++--- assets/{trees-surplus.png => trees_surplus.png} | 0 ...s-surplus.png.import => trees_surplus.png.import} | 6 +++--- assets/{water_tex.png => water_tile.png} | 0 .../{water_tex.png.import => water_tile.png.import} | 8 ++++---- {scenes => island}/Island.tscn | 4 ++-- menu/Menu.tscn | 12 ++++++------ project.godot | 4 ++++ 13 files changed, 28 insertions(+), 24 deletions(-) rename assets/{grass_menu_tex.png => grass_menu_tile.png} (100%) rename assets/{grass_menu_tex.png.import => grass_menu_tile.png.import} (70%) rename assets/{pixel-operator.ttf => pixel_operator.ttf} (100%) rename assets/{pixel-operator.ttf.import => pixel_operator.ttf.import} (65%) rename assets/{trees-adopt.png => trees_adopt.png} (100%) rename assets/{trees-adopt.png.import => trees_adopt.png.import} (71%) rename assets/{trees-surplus.png => trees_surplus.png} (100%) rename assets/{trees-surplus.png.import => trees_surplus.png.import} (71%) rename assets/{water_tex.png => water_tile.png} (100%) rename assets/{water_tex.png.import => water_tile.png.import} (59%) rename {scenes => island}/Island.tscn (93%) diff --git a/assets/grass_menu_tex.png b/assets/grass_menu_tile.png similarity index 100% rename from assets/grass_menu_tex.png rename to assets/grass_menu_tile.png diff --git a/assets/grass_menu_tex.png.import b/assets/grass_menu_tile.png.import similarity index 70% rename from assets/grass_menu_tex.png.import rename to assets/grass_menu_tile.png.import index 7f0e02e..d37383b 100644 --- a/assets/grass_menu_tex.png.import +++ b/assets/grass_menu_tile.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bxyximtgui1ux" -path="res://.godot/imported/grass_menu_tex.png-d1d46f8d90bb3c70a517784ed7c5ab24.ctex" +path="res://.godot/imported/grass_menu_tile.png-0a7ae763417ed9281e93a68e9182eada.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/grass_menu_tex.png" -dest_files=["res://.godot/imported/grass_menu_tex.png-d1d46f8d90bb3c70a517784ed7c5ab24.ctex"] +source_file="res://assets/grass_menu_tile.png" +dest_files=["res://.godot/imported/grass_menu_tile.png-0a7ae763417ed9281e93a68e9182eada.ctex"] [params] diff --git a/assets/pixel-operator.ttf b/assets/pixel_operator.ttf similarity index 100% rename from assets/pixel-operator.ttf rename to assets/pixel_operator.ttf diff --git a/assets/pixel-operator.ttf.import b/assets/pixel_operator.ttf.import similarity index 65% rename from assets/pixel-operator.ttf.import rename to assets/pixel_operator.ttf.import index 32ebcd5..b29a1c4 100644 --- a/assets/pixel-operator.ttf.import +++ b/assets/pixel_operator.ttf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://dvfq5l72ynw4s" -path="res://.godot/imported/pixel-operator.ttf-7dca05f861a9e35aa541a83a53d92665.fontdata" +path="res://.godot/imported/pixel_operator.ttf-1406ece90f8259adcdb3f2206eea6e6e.fontdata" [deps] -source_file="res://assets/pixel-operator.ttf" -dest_files=["res://.godot/imported/pixel-operator.ttf-7dca05f861a9e35aa541a83a53d92665.fontdata"] +source_file="res://assets/pixel_operator.ttf" +dest_files=["res://.godot/imported/pixel_operator.ttf-1406ece90f8259adcdb3f2206eea6e6e.fontdata"] [params] diff --git a/assets/trees-adopt.png b/assets/trees_adopt.png similarity index 100% rename from assets/trees-adopt.png rename to assets/trees_adopt.png diff --git a/assets/trees-adopt.png.import b/assets/trees_adopt.png.import similarity index 71% rename from assets/trees-adopt.png.import rename to assets/trees_adopt.png.import index ff797ef..661448d 100644 --- a/assets/trees-adopt.png.import +++ b/assets/trees_adopt.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b0q884y3qomog" -path="res://.godot/imported/trees-adopt.png-096e91228e493d9cfb94160e5e4065f1.ctex" +path="res://.godot/imported/trees_adopt.png-7c64434373e9b578ddaf45ca16b31bd2.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/trees-adopt.png" -dest_files=["res://.godot/imported/trees-adopt.png-096e91228e493d9cfb94160e5e4065f1.ctex"] +source_file="res://assets/trees_adopt.png" +dest_files=["res://.godot/imported/trees_adopt.png-7c64434373e9b578ddaf45ca16b31bd2.ctex"] [params] diff --git a/assets/trees-surplus.png b/assets/trees_surplus.png similarity index 100% rename from assets/trees-surplus.png rename to assets/trees_surplus.png diff --git a/assets/trees-surplus.png.import b/assets/trees_surplus.png.import similarity index 71% rename from assets/trees-surplus.png.import rename to assets/trees_surplus.png.import index fa4d565..1d4c100 100644 --- a/assets/trees-surplus.png.import +++ b/assets/trees_surplus.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://pn6sturkvodg" -path="res://.godot/imported/trees-surplus.png-7e05f19c1859ff93d5cbfb9cacf8208d.ctex" +path="res://.godot/imported/trees_surplus.png-c1dfc72e4acb0e00f9f6c6a7aa96e208.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/trees-surplus.png" -dest_files=["res://.godot/imported/trees-surplus.png-7e05f19c1859ff93d5cbfb9cacf8208d.ctex"] +source_file="res://assets/trees_surplus.png" +dest_files=["res://.godot/imported/trees_surplus.png-c1dfc72e4acb0e00f9f6c6a7aa96e208.ctex"] [params] diff --git a/assets/water_tex.png b/assets/water_tile.png similarity index 100% rename from assets/water_tex.png rename to assets/water_tile.png diff --git a/assets/water_tex.png.import b/assets/water_tile.png.import similarity index 59% rename from assets/water_tex.png.import rename to assets/water_tile.png.import index e22a6aa..0f192e3 100644 --- a/assets/water_tex.png.import +++ b/assets/water_tile.png.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://bdoifsf6k0qb8" -path.s3tc="res://.godot/imported/water_tex.png-c6bd53bb7eb5f8d45976d8e152ea2fe7.s3tc.ctex" -path.etc2="res://.godot/imported/water_tex.png-c6bd53bb7eb5f8d45976d8e152ea2fe7.etc2.ctex" +path.s3tc="res://.godot/imported/water_tile.png-3409e1652e492940c85ec86e868e691e.s3tc.ctex" +path.etc2="res://.godot/imported/water_tile.png-3409e1652e492940c85ec86e868e691e.etc2.ctex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://assets/water_tex.png" -dest_files=["res://.godot/imported/water_tex.png-c6bd53bb7eb5f8d45976d8e152ea2fe7.s3tc.ctex", "res://.godot/imported/water_tex.png-c6bd53bb7eb5f8d45976d8e152ea2fe7.etc2.ctex"] +source_file="res://assets/water_tile.png" +dest_files=["res://.godot/imported/water_tile.png-3409e1652e492940c85ec86e868e691e.s3tc.ctex", "res://.godot/imported/water_tile.png-3409e1652e492940c85ec86e868e691e.etc2.ctex"] [params] diff --git a/scenes/Island.tscn b/island/Island.tscn similarity index 93% rename from scenes/Island.tscn rename to island/Island.tscn index c831877..fce7b4c 100644 --- a/scenes/Island.tscn +++ b/island/Island.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=7 format=3 uid="uid://bn28lisdw1nuo"] +[gd_scene load_steps=7 format=3] -[ext_resource type="Texture2D" uid="uid://bdoifsf6k0qb8" path="res://assets/water_tex.png" id="1_w6ara"] +[ext_resource type="Texture2D" uid="uid://bdoifsf6k0qb8" path="res://assets/water_tile.png" id="1_w6ara"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_i4xeb"] shading_mode = 0 diff --git a/menu/Menu.tscn b/menu/Menu.tscn index 1b2a72a..76159c3 100644 --- a/menu/Menu.tscn +++ b/menu/Menu.tscn @@ -1,10 +1,10 @@ -[gd_scene load_steps=10 format=3 uid="uid://c4sm1qw01u1xq"] +[gd_scene load_steps=10 format=3 uid="uid://bufi0wh54u5x5"] -[ext_resource type="FontFile" uid="uid://dvfq5l72ynw4s" path="res://assets/pixel-operator.ttf" id="1_43bge"] -[ext_resource type="Texture2D" uid="uid://bxyximtgui1ux" path="res://assets/grass_menu_tex.png" id="2_cmvxt"] +[ext_resource type="FontFile" uid="uid://dvfq5l72ynw4s" path="res://assets/pixel_operator.ttf" id="1_t4wyx"] +[ext_resource type="Texture2D" uid="uid://bxyximtgui1ux" path="res://assets/grass_menu_tile.png" id="2_q14jx"] [sub_resource type="FontVariation" id="FontVariation_srw5c"] -base_font = ExtResource("1_43bge") +base_font = ExtResource("1_t4wyx") variation_embolden = 0.01 spacing_bottom = 2 @@ -61,7 +61,7 @@ Button/styles/pressed = SubResource("StyleBoxFlat_xmx50") Label/colors/font_color = Color(1, 1, 1, 1) Label/constants/line_spacing = 2 Label/font_sizes/font_size = 16 -Label/fonts/font = ExtResource("1_43bge") +Label/fonts/font = ExtResource("1_t4wyx") [node name="Menu" type="Control"] texture_filter = 1 @@ -81,7 +81,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("2_cmvxt") +texture = ExtResource("2_q14jx") stretch_mode = 1 [node name="Content" type="VBoxContainer" parent="."] diff --git a/project.godot b/project.godot index ea16320..b695500 100644 --- a/project.godot +++ b/project.godot @@ -22,6 +22,10 @@ window/size/viewport_width=284 window/size/viewport_height=160 window/stretch/mode="canvas_items" +[gui] + +fonts/dynamic_fonts/use_oversampling=false + [rendering] renderer/rendering_method="gl_compatibility"