diff --git a/data/particles/particles.otps b/data/particles/particles.otps index 928f752d..8424488f 100644 --- a/data/particles/particles.otps +++ b/data/particles/particles.otps @@ -1,35 +1,36 @@ Particle - name: default_particle + name: groupcooldown_particle - duration: 10 + duration: 0.4 min-position-radius: 0 - max-position-radius: 256 + max-position-radius: 32 min-position-angle: 0 max-position-angle: 360 velocity: 10 min-velocity-angle: 0 max-velocity-angle: 360 - colors: #ffffff00 #ffffffff #00000000 + colors: #ffffff00 #ffffffff #fff13000 colors-stops: 0 0.1 1 - size: 24 24 + size: 1 1 texture: /particles/particle composition-mode: normal Effect - name: background-effect - description: Effect for the game background + name: groupcooldown-effect + description: Effect for group cooldowns in the cooldown module System position: 0 0 Emitter position: 0 0 - delay: 0 - duration: 0 - burst-rate: 50 - burst-count: 1 - particle-type: default_particle + delay: 0.06 + duration: 0.2 + burst-rate: 350 + burst-count: 50 + particle-type: groupcooldown_particle AttractionAffector position: 0 0 acceleration: 1000 + diff --git a/modules/game_cooldown/cooldown.lua b/modules/game_cooldown/cooldown.lua index 2e4c704b..b71959c4 100644 --- a/modules/game_cooldown/cooldown.lua +++ b/modules/game_cooldown/cooldown.lua @@ -76,6 +76,11 @@ function turnOffCooldown(progressRect) progressRect.icon:setOn(false) progressRect.icon = nil end + + -- create particles + local particle = g_ui.createWidget('GroupCooldownParticles', progressRect) + particle:fill('parent') + progressRect = nil end diff --git a/modules/game_cooldown/cooldown.otui b/modules/game_cooldown/cooldown.otui index 3fffe85a..80cae0c6 100644 --- a/modules/game_cooldown/cooldown.otui +++ b/modules/game_cooldown/cooldown.otui @@ -6,27 +6,25 @@ SpellGroupIcon < UIWidget margin-top: 3 SpellIcon < UIWidget - size: 22 22 - image-size: 22 22 - margin-left: 2 - anchors.top: prev.top - anchors.left: prev.right + size: 24 24 + image-size: 24 24 focusable: false - - $first: - margin-top: 3 - anchors.top: parent.top - anchors.left: parent.left + + $!first: + margin-left: 1 SpellProgressRect < UIProgressRect background: #585858AA percent: 100 focusable: false + +GroupCooldownParticles < UIParticles + effect: groupcooldown-effect MiniWindow id: cooldownWindow !text: tr('Spell Cooldowns') - height: 85 + height: 82 icon: /images/topbuttons/cooldowns @onClose: modules.game_cooldown.onMiniWindowClose() &save: true @@ -37,7 +35,7 @@ MiniWindow image-clip: 0 0 20 20 anchors.top: parent.top anchors.left: parent.left - margin-left: 3 + margin-left: 2 $on: image-clip: 0 20 20 20 @@ -90,13 +88,16 @@ MiniWindow Panel id: spellCooldownPanel - margin-top: 5 + layout: + type: horizontalBox + height: 30 + margin-top: 3 + padding: 3 anchors.top: groupIconSpecial.bottom anchors.left: parent.left anchors.right: parent.right - height: 30 - padding: 1 - margin-left: 2 - margin-right: 2 - border: 1 #444444 + //border-width: 1 + //border-color: #00000077 + background-color: #ffffff11 + \ No newline at end of file