Added new Icons for eruption event (#5719)

* Added new Icons for irruption event * Fix formatting back to spaces * Renamed eruption icon to be "eruption" * Made eruption icon hidden by default like it was before * Add one minor TODO comment * Set a max size for the eruption event as it is not used any larger than that in the game so this saves a lot of graphics memory --------- Co-authored-by: Henri Hyyryläinen <[email protected]>
Revolutionary-Games · Dec 11, 2024 · 3bb7ac8 · 3bb7ac8
1 parent 70789f7
commit 3bb7ac8
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 4 deletions.
diff --git a/assets/textures/gui/bevel/Eruption.png b/assets/textures/gui/bevel/Eruption.png
diff --git a/assets/textures/gui/bevel/Eruption.png.import b/assets/textures/gui/bevel/Eruption.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://db157djiuw5ek"
+path="res://.godot/imported/Eruption.png-695a8e31f95ce98bf6964cabe9f4376f.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/textures/gui/bevel/Eruption.png"
+dest_files=["res://.godot/imported/Eruption.png-695a8e31f95ce98bf6964cabe9f4376f.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+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
diff --git a/assets/textures/gui/bevel/EruptionEvent.svg b/assets/textures/gui/bevel/EruptionEvent.svg
diff --git a/assets/textures/gui/bevel/EruptionEvent.svg.import b/assets/textures/gui/bevel/EruptionEvent.svg.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://de1udn5vsgnrn"
+path="res://.godot/imported/EruptionEvent.svg-dd990171d0bfeb3b49fc638fdcccac0d.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/textures/gui/bevel/EruptionEvent.svg"
+dest_files=["res://.godot/imported/EruptionEvent.svg-dd990171d0bfeb3b49fc638fdcccac0d.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=256
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false
diff --git a/src/general/world_effects/UnderwaterVentEruptionEffect.cs b/src/general/world_effects/UnderwaterVentEruptionEffect.cs
@@ -70,14 +70,15 @@ public void OnTimePassed(double elapsed, double totalTimePassed)
             patch.Biome.ApplyLongTermCompoundChanges(patch.BiomeTemplate, changes, cloudSizes);
 
             // Patch specific log
+            // TODO: should these events be highlighted always? It'll get busy when there are a lot of events.
             patch.LogEvent(new LocalizedString("UNDERWATER_VENT_ERUPTION"),
-                true, true, "PatchVents.svg");
+                true, true, "EruptionEvent.svg");
 
             if (patch.Visibility == MapElementVisibility.Shown)
             {
                 // Global log, but only if patch is known to the player
                 targetWorld.LogEvent(new LocalizedString("UNDERWATER_VENT_ERUPTION_IN", patch.Name),
-                    true, true, "PatchVents.svg");
+                    true, true, "EruptionEvent.svg");
             }
 
             patch.AddPatchEventRecord(WorldEffectVisuals.UnderwaterVentEruption, totalTimePassed);

diff --git a/src/microbe_stage/editor/Eruption.png b/src/microbe_stage/editor/Eruption.png
diff --git a/src/microbe_stage/editor/Eruption.png.import b/src/microbe_stage/editor/Eruption.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://wd8s7x2emt60"
+path="res://.godot/imported/Eruption.png-a1910a88507db8a41445fea3910d5f51.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://src/microbe_stage/editor/Eruption.png"
+dest_files=["res://.godot/imported/Eruption.png-a1910a88507db8a41445fea3910d5f51.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+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
diff --git a/src/microbe_stage/editor/PatchMapNode.tscn b/src/microbe_stage/editor/PatchMapNode.tscn
@@ -2,8 +2,8 @@
 
 [ext_resource type="Script" path="res://src/microbe_stage/editor/PatchMapNode.cs" id="2"]
 [ext_resource type="Texture2D" uid="uid://rckgbb1e3ia7" path="res://assets/textures/gui/bevel/PatchVents.svg" id="2_e0cfn"]
-[ext_resource type="Texture2D" uid="uid://dui1qqyh4jn7t" path="res://assets/textures/gui/bevel/HydrogenSulfide.svg" id="4_asr5c"]
 [ext_resource type="LabelSettings" uid="uid://dcekwe8j7ep16" path="res://src/gui_common/fonts/Title-SemiBold-AlmostHuge.tres" id="4_tygy2"]
+[ext_resource type="Texture2D" uid="uid://db157djiuw5ek" path="res://assets/textures/gui/bevel/Eruption.png" id="4_ymoit"]
 
 [sub_resource type="StyleBoxFlat" id="3"]
 bg_color = Color(0.592157, 0.788235, 0.823529, 1)
@@ -99,7 +99,7 @@ custom_minimum_size = Vector2(16, 16)
 layout_mode = 2
 tooltip_text = "EVENT_ERUPTION_TOOLTIP"
 mouse_filter = 0
-texture = ExtResource("4_asr5c")
+texture = ExtResource("4_ymoit")
 expand_mode = 2
 stretch_mode = 4