SuperTux · tobbi · Jun 3, 2025 · Jun 3, 2025 · Jun 3, 2025 · Jun 3, 2025
diff --git a/data/images/autotiles.satc b/data/images/autotiles.satc
@@ -10849,6 +10849,56 @@
 
   )
 
+
+  (autotileset
+    (name "industrial_horiz")
+    (default 3170)
+    (autotile
+      (id 3183)
+      (solid #t)
+      (mask "***01***")
+    )
+    (autotile
+      (id 4623)
+      (solid #t)
+      (mask "***11***")
+    )
+    (autotile
+      (id 3184)
+      (solid #t)
+      (mask "***10***")
+    )
+    (autotile
+      (id 3170)
+      (solid #t)
+      (mask "***00***")
+    )
+  )
+
+  (autotileset
+    (name "industrial_vert")
+    (default 3170)
+    (autotile
+      (id 3189)
+      (solid #t)
+      (mask "*0****1*")
+    )
+    (autotile
+      (id 4627)
+      (solid #t)
+      (mask "*1****1*")
+    )
+    (autotile
+      (id 3190)
+      (solid #t)
+      (mask "*1****0*")
+    )
+    (autotile
+      (id 3170)
+      (solid #t)
+      (mask "*0****0*")
+    )
+  )
   ;; SUPPORT MULTIPLE AUTOTILESETS PER TILE - END
 
 )
diff --git a/data/images/engine/editor/grid_button.png b/data/images/engine/editor/grid_button.png
diff --git a/data/images/engine/editor/play_button.png b/data/images/engine/editor/play_button.png
diff --git a/data/images/engine/editor/redo.png b/data/images/engine/editor/redo.png
diff --git a/data/images/engine/editor/save.png b/data/images/engine/editor/save.png
diff --git a/data/images/engine/editor/shadow.png b/data/images/engine/editor/shadow.png
diff --git a/data/images/engine/editor/shadow2.png b/data/images/engine/editor/shadow2.png
diff --git a/data/images/engine/editor/toggle_tile_object_mode.png b/data/images/engine/editor/toggle_tile_object_mode.png
diff --git a/data/images/engine/editor/undo.png b/data/images/engine/editor/undo.png
diff --git a/data/shader/shader330.frag b/data/shader/shader330.frag
@@ -9,6 +9,7 @@ uniform float game_time;
 uniform vec2 animate;
 uniform vec2 displacement_animate;
 uniform bool is_displacement;
+uniform int blur;
 
 in vec4 diffuse_var;
 in vec2 texcoord_var;
@@ -17,10 +18,33 @@ out vec4 fragColor;
 
 void main(void)
 {
-  if (backbuffer == 0.0 || !is_displacement)
+  if (backbuffer == 0.0 || !is_displacement || blur != 0.0)
   {
-    vec4 color =  diffuse_var * texture(diffuse_texture, texcoord_var.st + (animate * game_time));
-    fragColor = color;
+    vec4 color = diffuse_var * texture(diffuse_texture, texcoord_var.st + (animate * game_time));
+    if (blur != 0.0)
+    {
+      vec2 uv = (fragcoord2uv * gl_FragCoord.xyw).xy;
+      uv.y = 1.0 - uv.y;
+      vec2 texel = vec2(fragcoord2uv[0].x, fragcoord2uv[1].y);
+      float num = 0.0;
+      vec4 sum = vec4(0.0);
+
+      for (float y = -blur; y <= blur; ++y)
+      {
+        for (float x = -blur; x <= blur; ++x)
+        {
+          vec2 offset = vec2(x, y) * texel;
+          sum += texture(framebuffer_texture, uv + offset);
+          num++;
+        }
+      }
+
+      fragColor = vec4(mix(color.rgb, (sum/num).rgb * 1.05, color.a), 1.0);
+    }
+    else
+    {
+      fragColor = color;
+    }
   }
   else if (is_displacement)
   {

diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
@@ -1267,8 +1267,10 @@ BadGuy::get_settings()
   ObjectSettings result = MovingSprite::get_settings();
 
   if (!get_allowed_directions().empty())
-    result.add_direction(_("Direction"), &m_start_dir, get_allowed_directions(), "direction");
-  result.add_script(_("Death script"), &m_dead_script, "dead-script");
+    result.add_direction(_("Direction"), &m_start_dir, get_allowed_directions(), "direction")
+      ->set_description(_("The direction the badguy is facing at the start of the level. AUTO makes the badguy face towards the player when activated."));
+  result.add_script(get_uid(), _("Death script"), &m_dead_script, "dead-script")
+    ->set_description(_("Script that is executed when the badguy dies."));
 
   result.reorder({"direction", "sprite", "x", "y"});
 

diff --git a/src/badguy/boss.cpp b/src/badguy/boss.cpp
@@ -22,6 +22,7 @@ namespace
 
 #include "badguy/boss.hpp"
 
+#include "editor/editor.hpp"
 #include "object/player.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/sector.hpp"
@@ -67,7 +68,7 @@ Boss::draw(DrawingContext& context)
 void
 Boss::draw_hit_points(DrawingContext& context)
 {
-  if (m_hud_head)
+  if (m_hud_head && !Editor::is_active())
   {
     context.push_transform();
     context.set_translation(Vector(0, 0));
@@ -91,19 +92,23 @@ Boss::get_settings()
 {
   ObjectSettings result = BadGuy::get_settings();
 
-  result.add_text("hud-icon", &m_hud_icon, "hud-icon", "images/creatures/yeti/hudlife.png", OPTION_HIDDEN);
-  result.add_int(_("Lives"), &m_lives, "lives", DEFAULT_LIVES);
+  result.add_text("hud-icon", &m_hud_icon, "hud-icon", "images/creatures/yeti/hudlife.png", OPTION_HIDDEN)
+    ->set_description(_("The icon that is displayed at the top indicating how many lives this boss has left"));
+  result.add_int(_("Lives"), &m_lives, "lives", DEFAULT_LIVES)
+    ->set_description(_("The maximum number of lives this boss has"));
 
   /* l10n: Pinch Mode refers to a particular boss mode that gets
      activated once the boss has lost the specified amounts of lives.
      This setting specifies how many lives need to be spent until pinch
      mode is activated. */
-  result.add_int(_("Lives to Pinch Mode"), &m_pinch_lives, "pinch-lives", DEFAULT_PINCH_LIVES);
+  result.add_int(_("Lives to Pinch Mode"), &m_pinch_lives, "pinch-lives", DEFAULT_PINCH_LIVES)
+    ->set_description(_("Specifies how many lives need to be spent until pinch mode (a special boss mode) is activated"));
 
   /* l10n: Pinch Mode refers to a particular boss mode that gets
     activated once the boss has lost the specified amounts of lives.
     This setting specifies the squirrel script that gets run to activate boss mode.  */
-  result.add_script(_("Pinch Mode Activation Script"), &m_pinch_activation_script, "pinch-activation-script");
+  result.add_script(get_uid(), _("Pinch Mode Activation Script"), &m_pinch_activation_script, "pinch-activation-script")
+    ->set_description(_("The script that gets run when pinch mode is activated"));
 
   return result;
 }
diff --git a/src/badguy/crusher.cpp b/src/badguy/crusher.cpp
@@ -1229,7 +1229,7 @@ Crusher::get_settings()
                   static_cast<int>(CrusherDirection::DOWN),
                   "direction");
 
-  result.add_script(_("Crush script"), &m_crush_script, "crush-script");
+  result.add_script(get_uid(), _("Crush script"), &m_crush_script, "crush-script");
   result.reorder({ "direction", "sprite", "crush-script", "x", "y" });
 
   return result;

diff --git a/src/badguy/darttrap.cpp b/src/badguy/darttrap.cpp
@@ -152,11 +152,16 @@ DartTrap::get_settings()
 {
   ObjectSettings result = StickyBadguy::get_settings();
 
-  result.add_float(_("Initial delay"), &m_initial_delay, "initial-delay");
-  result.add_bool(_("Enabled"), &m_enabled, "enabled", true);
-  result.add_float(_("Fire delay"), &m_fire_delay, "fire-delay");
-  result.add_int(_("Ammo"), &m_ammo, "ammo");
-  result.add_sprite(_("Dart sprite"), &m_dart_sprite, "dart-sprite", "images/creatures/darttrap/granito/root_dart.sprite");
+  result.add_float(_("Initial delay"), &m_initial_delay, "initial-delay")
+    ->set_description(_("Time until the first dart is fired after the trap is activated."));
+  result.add_bool(_("Enabled"), &m_enabled, "enabled", true)
+    ->set_description(_("Whether the trap is enabled."));
+  result.add_float(_("Fire delay"), &m_fire_delay, "fire-delay")
+    ->set_description(_("Time between consecutive darts."));
+  result.add_int(_("Ammo"), &m_ammo, "ammo")
+    ->set_description(_("Number of darts the trap can fire. A value of -1 means infinite."));
+  result.add_sprite(_("Dart sprite"), &m_dart_sprite, "dart-sprite", "images/creatures/darttrap/granito/root_dart.sprite")
+    ->set_description(_("Sprite used for the dart."));
 
   result.reorder({"initial-delay", "fire-delay", "ammo", "sticky", "direction", "x", "y", "dart-sprite"});
 

diff --git a/src/badguy/granito.cpp b/src/badguy/granito.cpp
@@ -279,8 +279,8 @@ Granito::get_settings()
 
   settings.remove("dead-script");
 
-  settings.add_script(_("Detect script"), &m_detect_script, "detect-script");
-  settings.add_script(_("Carried script"), &m_carried_script, "carried-script");
+  settings.add_script(get_uid(), _("Detect script"), &m_detect_script, "detect-script");
+  settings.add_script(get_uid(), _("Carried script"), &m_carried_script, "carried-script");
 
   return settings;
 }

diff --git a/src/badguy/granito_big.cpp b/src/badguy/granito_big.cpp
@@ -62,7 +62,7 @@ GranitoBig::get_settings()
 
   // No need to make another member for the carrying script.
   // Just repurpose the carried script.
-  settings.add_script(_("Carrying Script"), &m_carried_script, "carrying-script");
+  settings.add_script(get_uid(), _("Carrying Script"), &m_carried_script, "carrying-script");
 
   return settings;
 }

diff --git a/src/editor/button_widget.cpp b/src/editor/button_widget.cpp
@@ -18,37 +18,62 @@
 
 #include "supertux/gameconfig.hpp"
 #include "supertux/globals.hpp"
+#include "supertux/resources.hpp"
+#include "util/log.hpp"
 #include "video/viewport.hpp"
 #include "video/video_system.hpp"
 
 ButtonWidget::ButtonWidget(SpritePtr sprite, const Vector& pos,
-                           std::function<void()> sig_click) :
+                           std::function<void()> sig_click, std::optional<Sizef> sprite_size) :
   m_sprite(std::move(sprite)),
-  m_rect(pos, Sizef(static_cast<float>(m_sprite->get_width()),
-                    static_cast<float>(m_sprite->get_height()))),
+  m_rect(pos, sprite_size ? *sprite_size :
+    Sizef(static_cast<float>(m_sprite->get_width()),
+          static_cast<float>(m_sprite->get_height()))),
   m_grab(false),
   m_hover(false),
-  m_sig_click(std::move(sig_click))
+  m_sig_click(std::move(sig_click)),
+  m_mouse_pos(),
+  m_help_text(),
+  m_flat(false),
+  m_disabled(false)
 {
 }
 
+void
+ButtonWidget::set_position(const Vector& pos)
+{
+  float w = m_rect.get_width(),
+        h = m_rect.get_height();
+
+  m_rect.set_left(pos.x);
+  m_rect.set_width(w);
+  m_rect.set_top(pos.y);
+  m_rect.set_height(h);
+}
+
 void
 ButtonWidget::draw(DrawingContext& context)
 {
-  context.color().draw_filled_rect(m_rect, Color(0.0f, 0.0f, 0.0f, 0.6f), 4.0f,
-                                   LAYER_GUI-5);
+  if (!m_flat)
+    context.color().draw_filled_rect(m_rect, Color(0.0f, 0.0f, 0.0f, 0.6f), 4.0f,
+                                     LAYER_GUI-5);
 
   if (m_sprite) {
-    m_sprite->draw(context.color(), m_rect.p1(), LAYER_GUI-5);
+    if (m_disabled) context.set_alpha(0.4);
+    m_sprite->draw_scaled(context.color(), m_rect.grown(-4.0f), LAYER_GUI - 5);
+    if (m_disabled) context.set_alpha(1.0);
   }
 
   if (m_grab) {
     context.color().draw_filled_rect(m_rect, g_config->editorgrabcolor, 4.0f,
                                      LAYER_GUI-5);
-  } else if (m_hover) {
+  } else if (m_hover && !m_disabled) {
     context.color().draw_filled_rect(m_rect, g_config->editorhovercolor, 4.0f,
                                      LAYER_GUI-5);
   }
+
+  if (m_hover && !m_help_text.empty())
+    context.color().draw_text(Resources::normal_font, m_help_text, m_mouse_pos + Vector(32, 32), FontAlignment::ALIGN_LEFT, INT_MAX);
 }
 
 void
@@ -70,11 +95,13 @@ bool
 ButtonWidget::on_mouse_button_up(const SDL_MouseButtonEvent& button)
 {
   if (button.button != SDL_BUTTON_LEFT) return false;
-
-  Vector mouse_pos = VideoSystem::current()->get_viewport().to_logical(button.x, button.y);
+  // XXX: these shouldn't pass through
+  if (m_disabled) return false;
+
+  m_mouse_pos = VideoSystem::current()->get_viewport().to_logical(button.x, button.y);
 
   if (m_grab) {
-    if (m_rect.contains(mouse_pos)) {
+    if (m_rect.contains(m_mouse_pos)) {
       if (m_sig_click) {
         m_sig_click();
       }
@@ -90,11 +117,13 @@ ButtonWidget::on_mouse_button_up(const SDL_MouseButtonEvent& button)
 bool
 ButtonWidget::on_mouse_button_down(const SDL_MouseButtonEvent& button)
 {
-  if (button.button != SDL_BUTTON_LEFT) return false;
+  if (button.button != SDL_BUTTON_LEFT || m_disabled) return false;
+  // XXX: these shouldn't pass through
+  if (m_disabled) return false;
 
-  Vector mouse_pos = VideoSystem::current()->get_viewport().to_logical(button.x, button.y);
+  m_mouse_pos = VideoSystem::current()->get_viewport().to_logical(button.x, button.y);
 
-  if (m_rect.contains(mouse_pos)) {
+  if (m_rect.contains(m_mouse_pos)) {
     m_hover = true;
     m_grab = true;
     return true;
@@ -107,16 +136,35 @@ ButtonWidget::on_mouse_button_down(const SDL_MouseButtonEvent& button)
 bool
 ButtonWidget::on_mouse_motion(const SDL_MouseMotionEvent& motion)
 {
-  Vector mouse_pos = VideoSystem::current()->get_viewport().to_logical(motion.x, motion.y);
+  m_mouse_pos = VideoSystem::current()->get_viewport().to_logical(motion.x, motion.y);
 
   if (m_grab) {
-    m_hover = m_rect.contains(mouse_pos);
+    m_hover = m_rect.contains(m_mouse_pos);
     return true;
-  } else if (m_rect.contains(mouse_pos)) {
+  } else if (m_rect.contains(m_mouse_pos)) {
     m_hover = true;
     return false;
   } else {
     m_hover = false;
     return false;
   }
 }
+
+void
+ButtonWidget::set_sprite(SpritePtr sprite)
+{
+  m_sprite = std::move(sprite);
+  m_rect.set_size(sprite->get_width() * 1.0f, sprite->get_height() * 1.0f);
+}
+
+void
+ButtonWidget::set_sprite(const std::string& path)
+{
+  set_sprite(SpriteManager::current()->create(path));
+}
+
+void
+ButtonWidget::set_help_text(const std::string& help_text)
+{
+  m_help_text = help_text;
+}