diff --git a/modsettings/CustomUIAssets.json b/modsettings/CustomUIAssets.json index 4b490189..4d7616d1 100644 --- a/modsettings/CustomUIAssets.json +++ b/modsettings/CustomUIAssets.json @@ -198,5 +198,10 @@ "Name": "Inv-Jacqueline", "Type": 0, "URL": "https://i.imgur.com/AFuB9II.png" + }, + { + "Name": "TitleGradient", + "Type": 0, + "URL": "https://i.imgur.com/Mdjm349.png" } ] diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index 6ede2b21..6fe49f4a 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -875,7 +875,7 @@ function applyOptionPanelChange(id, state) -- option: Show CYOA campaign guides elseif id == "showCYOA" then optionPanel[id] = spawnOrRemoveHelper(state, "CYOA Campaign Guides", {65, 1.6, -11}) - + -- option: Show custom playmat images elseif id == "showCustomPlaymatImages" then optionPanel[id] = spawnOrRemoveHelper(state, "Custom Playmat Images", {67.5, 1.6, 37}) @@ -1018,7 +1018,7 @@ function titleSplash(scenarioName) -- display scenario name and set a 4 seconds (2 seconds animation and 2 seconds on screen) -- wait timer to hide the scenario name - UI.setValue('title_splash', scenarioName) + UI.setValue('title_splash_text', scenarioName) UI.show('title_splash') hideTitleSplashWaitFunctionId = Wait.time(function() UI.hide('title_splash') diff --git a/src/core/MythosArea.ttslua b/src/core/MythosArea.ttslua index 79a02fa4..5877a4fa 100644 --- a/src/core/MythosArea.ttslua +++ b/src/core/MythosArea.ttslua @@ -11,12 +11,15 @@ local ENCOUNTER_DISCARD_AREA = { } local currentScenario +-- we use this to turn off collision handling until onLoad() is complete +local COLLISION_ENABLED = false function onLoad(saveState) if saveState ~= nil then local loadedState = JSON.decode(saveState) or { } currentScenario = loadedState.currentScenario end + COLLISION_ENABLED = true end function onSave() @@ -27,6 +30,9 @@ end -- TTS event handler. Handles scenario name event triggering and encounter card token resets. function onCollisionEnter(collisionInfo) + if not COLLISION_ENABLED then + return + end local object = collisionInfo.collision_object if object.getName() == "Scenario" then if currentScenario ~= object.getDescription() then diff --git a/xml/Global.xml b/xml/Global.xml index fbc4f59d..31e7adb6 100644 --- a/xml/Global.xml +++ b/xml/Global.xml @@ -98,16 +98,28 @@ - - - + animationDuration="2"> + + + +