Merge branch 'master' into ui-olympUI

CelestialCartographers · Jul 11, 2023 · ab92cc7 · ab92cc7
2 parents de580fe + b99f32a
commit ab92cc7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/defaults/editor/metadata.lua b/src/defaults/editor/metadata.lua
@@ -60,7 +60,7 @@ defaultMetadata.mode = {
 }
 
 defaultMetadata.audioState = {
-    Ambience = "event:/env/amb/01_main",
+    Ambience = "event:/env/amb/02_awake",
     Music = "event:/music/lvl2/awake"
 }
 

diff --git a/src/triggers.lua b/src/triggers.lua
@@ -434,6 +434,7 @@ end
 local function getPlacement(placementInfo, defaultPlacement, name, handler, language)
     local placementType = "rectangle"
     local modPrefix = modHandler.getEntityModPrefix(name)
+    local simpleName = string.format("%s#%s", name, placementInfo.name)
     local placementName = placementInfo.name
     local displayName = getPlacementLanguage(language, name, placementName, "name", placementInfo.name)
     local tooltipText = getPlacementLanguage(language, name, placementName, "description")