Fixed basic playing through of all the prototypes (#5008)

* Fixed various GUI parts for the prototypes * Fixed panoramas not working * Fixed unnormalized quaternion error in multicellular input * Fixed panorama breaking in the stage after a little bit * Fixed panorama not working in editor * Fixed camera colliding with the multicellular creature * Fixed swim force and tipping over by disabling creature tipping * Fixed bad size for items on ground panel * Fixed wrong camera spring arm collision mask * Fixed RecipeListItem * Fixed InteractablePopup.tscn * Fixed building select popup * Fixed interactable popup being too narrow * Fixed progress bar styling * Fixed speed at which player moved into the society center * Fixed pan with middle mouse in strategic stages * Fixed resource display and some general society HUD parts * Fixed tech web GUI * Did research screen positioning with the new way * Fixed resource amount label colours * Industrial and society HUDs now work * Space structure popup fixed
Revolutionary-Games · Apr 9, 2024 · 5946964 · 5946964
1 parent 5e3d39a
commit 5946964
Show file tree

Hide file tree

Showing 45 changed files with 390 additions and 382 deletions.
diff --git a/assets/textures/background/panoramas/Abyssopelagic.png.import b/assets/textures/background/panoramas/Abyssopelagic.png.import
@@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/Abyssopelagic.png-e84069760bf0a7f29be5e5b5f42
 
 [params]
 
-compress/mode=0
+compress/mode=3
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/hdr_compression=1

diff --git a/assets/textures/background/panoramas/Bathypelagic.png.import b/assets/textures/background/panoramas/Bathypelagic.png.import
@@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/Bathypelagic.png-a34fbd82cd266a4ece0e0dcf02de
 
 [params]
 
-compress/mode=0
+compress/mode=3
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/hdr_compression=1

diff --git a/assets/textures/background/panoramas/Cave.png.import b/assets/textures/background/panoramas/Cave.png.import
@@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/Cave.png-6b58736ad3f4502a90a15958f4b4f33c.cte
 
 [params]
 
-compress/mode=0
+compress/mode=3
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/hdr_compression=1

diff --git a/assets/textures/background/panoramas/Epipelagic.png.import b/assets/textures/background/panoramas/Epipelagic.png.import
@@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/Epipelagic.png-859c8c0d5a2f212486ce2cc69bab73
 
 [params]
 
-compress/mode=0
+compress/mode=3
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/hdr_compression=1

diff --git a/assets/textures/background/panoramas/Estuary.png.import b/assets/textures/background/panoramas/Estuary.png.import
@@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/Estuary.png-565f3d18dbcd862b6c3ba50593340d21.
 
 [params]
 
-compress/mode=0
+compress/mode=3
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/hdr_compression=1

diff --git a/assets/textures/background/panoramas/HydrothermalVents.png.import b/assets/textures/background/panoramas/HydrothermalVents.png.import
@@ -15,13 +15,13 @@ dest_files=["res://.godot/imported/HydrothermalVents.png-7175b71f3b65732ef165a86
 
 [params]
 
-compress/mode=0
+compress/mode=3
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=2
 compress/channel_pack=0
-mipmaps/generate=false
+mipmaps/generate=true
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
@@ -31,4 +31,4 @@ process/normal_map_invert_y=false
 process/hdr_as_srgb=false
 process/hdr_clamp_exposure=false
 process/size_limit=0
-detect_3d/compress_to=1
+detect_3d/compress_to=0
diff --git a/assets/textures/background/panoramas/Mesopelagic.png.import b/assets/textures/background/panoramas/Mesopelagic.png.import
@@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/Mesopelagic.png-806c07a4177947cf81fdec2cde3cb
 
 [params]
 
-compress/mode=0
+compress/mode=3
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/hdr_compression=1

diff --git a/assets/textures/background/panoramas/PolarSea.png.import b/assets/textures/background/panoramas/PolarSea.png.import
@@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/PolarSea.png-dc700d0afbf08f1a76475fd1b9603898
 
 [params]
 
-compress/mode=0
+compress/mode=3
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/hdr_compression=1

diff --git a/assets/textures/background/panoramas/Tidepool.png.import b/assets/textures/background/panoramas/Tidepool.png.import
@@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/Tidepool.png-912955e6149eb5d7a57e15775484f077
 
 [params]
 
-compress/mode=0
+compress/mode=3
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/hdr_compression=1

diff --git a/src/awakening_stage/PlacedStructure.tscn b/src/awakening_stage/PlacedStructure.tscn
@@ -1,9 +1,9 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=2 format=3 uid="uid://bpiyd06epo3cd"]
 
-[ext_resource path="res://src/awakening_stage/PlacedStructure.cs" type="Script" id=1]
+[ext_resource type="Script" path="res://src/awakening_stage/PlacedStructure.cs" id="1"]
 
 [node name="PlacedStructure" type="Node3D"]
-script = ExtResource( 1 )
+script = ExtResource("1")
 
 [node name="VisualSceneHolder" type="Node3D" parent="."]
 

diff --git a/src/awakening_stage/ResourceEntity.tscn b/src/awakening_stage/ResourceEntity.tscn
@@ -1,16 +1,16 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=4 format=3 uid="uid://d3xp4eufysgd5"]
 
-[ext_resource path="res://src/awakening_stage/ResourceEntity.cs" type="Script" id=1]
+[ext_resource type="Script" path="res://src/awakening_stage/ResourceEntity.cs" id="1"]
 
-[sub_resource type="PhysicsMaterial" id=2]
+[sub_resource type="PhysicsMaterial" id="2"]
 bounce = 0.1
 
-[sub_resource type="BoxShape3D" id=1]
-extents = Vector3( 0.5, 0.5, 0.5 )
+[sub_resource type="BoxShape3D" id="1"]
 
 [node name="ResourceEntity" type="RigidBody3D"]
-physics_material_override = SubResource( 2 )
-script = ExtResource( 1 )
+collision_mask = 3
+physics_material_override = SubResource("2")
+script = ExtResource("1")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-shape = SubResource( 1 )
+shape = SubResource("1")
diff --git a/src/awakening_stage/gui/InteractablePopup.tscn b/src/awakening_stage/gui/InteractablePopup.tscn
@@ -28,7 +28,7 @@ Resizable = true
 Exclusive = true
 
 [node name="VBoxContainer" type="VBoxContainer" parent="CustomWindow"]
-custom_minimum_size = Vector2(300, 400)
+custom_minimum_size = Vector2(350, 400)
 layout_mode = 0
 offset_right = 40.0
 offset_bottom = 40.0
@@ -47,9 +47,11 @@ size_flags_vertical = 3
 
 [node name="ExtraInfo" type="Label" parent="CustomWindow/VBoxContainer/ScrollContainer/VBoxContainer"]
 visible = false
+custom_minimum_size = Vector2(50, 0)
 layout_mode = 2
 size_flags_horizontal = 3
 label_settings = ExtResource("4_ig0ml")
+autowrap_mode = 2
 
 [node name="ButtonContainer" type="VBoxContainer" parent="CustomWindow/VBoxContainer/ScrollContainer/VBoxContainer"]
 layout_mode = 2

diff --git a/src/awakening_stage/gui/InventoryScreen.tscn b/src/awakening_stage/gui/InventoryScreen.tscn
@@ -53,6 +53,8 @@ layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
 size_flags_horizontal = 3
 mouse_filter = 2
 script = ExtResource("1")
@@ -89,7 +91,7 @@ WindowTitle = "INVENTORY_ITEMS_ON_GROUND"
 Resizable = true
 
 [node name="ScrollContainer" type="ScrollContainer" parent="GroundPanel"]
-custom_minimum_size = Vector2(240, 40)
+custom_minimum_size = Vector2(240, 50)
 layout_mode = 0
 offset_right = 40.0
 offset_bottom = 40.0
@@ -142,7 +144,7 @@ size_flags_horizontal = 3
 size_flags_vertical = 3
 texture = ExtResource("3")
 expand_mode = 1
-stretch_mode = 6
+stretch_mode = 5
 
 [node name="HBoxContainer" type="HBoxContainer" parent="MainInventory/BaseInventoryContainer/VBoxContainer"]
 layout_mode = 2

diff --git a/src/awakening_stage/gui/RecipeListItem.cs b/src/awakening_stage/gui/RecipeListItem.cs
@@ -127,6 +127,6 @@ private void UpdateShownRecipe()
     private void OnToggledChanged(bool pressed)
     {
         if (pressed)
-            EmitSignal(SignalName.OnSelected);
+            EmitSignal(SignalName.OnSelected, this);
     }
 }
diff --git a/src/awakening_stage/gui/RecipeListItem.tscn b/src/awakening_stage/gui/RecipeListItem.tscn
@@ -42,23 +42,28 @@ Button/styles/pressed = SubResource("5")
 [node name="RecipeListItem" type="Button"]
 editor_description = "Clipping children is on to make sure line wrapping text doesn't overflow"
 clip_contents = true
-custom_minimum_size = Vector2(10, 25)
+custom_minimum_size = Vector2(10, 27)
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 size_flags_horizontal = 3
 theme = SubResource("2")
 toggle_mode = true
 script = ExtResource("1")
+MarginAroundLabel = 8
 
 [node name="Label" parent="." instance=ExtResource("3")]
-layout_mode = 0
+layout_mode = 1
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_right = -1258.0
-offset_bottom = -698.0
+offset_right = 0.0
+offset_bottom = 0.0
+grow_horizontal = 2
+grow_vertical = 2
 size_flags_horizontal = 3
 mouse_filter = 2
 text = "CRAFTING_RECIPE_DISPLAY"
+fit_content = true
 
 [connection signal="toggled" from="." to="." method="OnToggledChanged"]
diff --git a/src/awakening_stage/gui/SelectBuildingPopup.tscn b/src/awakening_stage/gui/SelectBuildingPopup.tscn
@@ -1,49 +1,48 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=3 format=3 uid="uid://borrsf8mdual2"]
 
-[ext_resource path="res://src/gui_common/dialogs/CustomWindow.tscn" type="PackedScene" id=1]
-[ext_resource path="res://src/awakening_stage/gui/SelectBuildingPopup.cs" type="Script" id=2]
+[ext_resource type="PackedScene" path="res://src/gui_common/dialogs/CustomWindow.tscn" id="1"]
+[ext_resource type="Script" path="res://src/awakening_stage/gui/SelectBuildingPopup.cs" id="2"]
 
 [node name="SelectBuildingPopup" type="Control"]
 visible = false
+layout_mode = 3
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 mouse_filter = 2
-script = ExtResource( 2 )
+script = ExtResource("2")
 PopupPath = NodePath("CustomWindow")
 ButtonsContainerPath = NodePath("CustomWindow/VBoxContainer/ScrollContainer/ButtonContainer")
 CancelButtonPath = NodePath("CustomWindow/VBoxContainer/Cancel")
 
-[node name="CustomWindow" parent="." instance=ExtResource( 1 )]
+[node name="CustomWindow" parent="." instance=ExtResource("1")]
+anchors_preset = 0
 offset_right = 0.0
 offset_bottom = 0.0
-Exclusive = true
 WindowTitle = "SELECT_STRUCTURE_POPUP_TITLE"
 Resizable = true
+Exclusive = true
 
 [node name="VBoxContainer" type="VBoxContainer" parent="CustomWindow"]
+custom_minimum_size = Vector2(300, 400)
+layout_mode = 0
 offset_right = 40.0
 offset_bottom = 40.0
-custom_minimum_size = Vector2( 300, 400 )
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
 [node name="ScrollContainer" type="ScrollContainer" parent="CustomWindow/VBoxContainer"]
-offset_right = 300.0
-offset_bottom = 361.0
+layout_mode = 2
 size_flags_vertical = 3
 follow_focus = true
-scroll_horizontal_enabled = false
 
 [node name="ButtonContainer" type="VBoxContainer" parent="CustomWindow/VBoxContainer/ScrollContainer"]
-offset_right = 300.0
+layout_mode = 2
 size_flags_horizontal = 3
 theme_override_constants/separation = 5
 
 [node name="Cancel" type="Button" parent="CustomWindow/VBoxContainer"]
-offset_left = 105.0
-offset_top = 365.0
-offset_right = 194.0
-offset_bottom = 400.0
+layout_mode = 2
 size_flags_horizontal = 4
 text = "CANCEL"
 

diff --git a/src/awakening_stage/gui/StructureToBuildPopupBase.cs b/src/awakening_stage/gui/StructureToBuildPopupBase.cs
@@ -108,6 +108,7 @@ protected void OpenWithButtonSelected(Control? firstButton)
 
         var richText = richTextScene.Instantiate<CustomRichTextLabel>();
         richText.SizeFlagsHorizontal = SizeFlags.ExpandFill;
+        richText.FitContent = true;
 
         structureContent.AddChild(richText);
         return (structureContent, button, richText);

diff --git a/src/early_multicellular_stage/editor/CellBodyPlanEditorComponent.tscn b/src/early_multicellular_stage/editor/CellBodyPlanEditorComponent.tscn
@@ -311,6 +311,8 @@ layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
 theme = ExtResource("5")
 script = ExtResource("1")
 TabButtonsPath = NodePath("LeftPanel/MainPanel/VBoxContainer/MarginContainer/EditingPanel/TabButtons")
@@ -535,9 +537,11 @@ layout_mode = 2
 FinishOrNextButtonPath = NodePath("")
 
 [node name="EditorComponentBottomLeftButtons" parent="." instance=ExtResource("13")]
-layout_mode = 0
-anchors_preset = 0
+layout_mode = 1
+offset_top = -56.0
 offset_right = 641.0
+offset_bottom = -1.0
+grow_vertical = 0
 ShowNewButton = false
 
 [node name="BottomRight" type="MarginContainer" parent="."]