mirror of
https://github.com/edubart/otclient.git
synced 2025-10-14 03:24:55 +02:00
Changed/Fixed Text Windows, Text Message, Hotkeys Manager, Game Interface and Quest Log
* Renamed game_textbooks to game_textwindow. * Fixed text window from opening multiple times, and is destroyed correctly. * Added new game_playerdeath module (moved death message and window here). * Hotkey window will hide on game end. * Logout/Exit/Stackable Items/Questlog/Hotkeys windows will now close on game end.
This commit is contained in:
29
modules/game_playerdeath/deathwindow.otui
Normal file
29
modules/game_playerdeath/deathwindow.otui
Normal file
@@ -0,0 +1,29 @@
|
||||
DeathWindow < MainWindow
|
||||
id: deathWindow
|
||||
!text: tr('You are dead')
|
||||
size: 350 155
|
||||
|
||||
Label
|
||||
!text: tr('Alas! Brave adventurer, you have met a sad fate.\nBut do not despair, for the gods will bring you back\ninto this world in exchange for a small sacrifice\n\nSimply click on Ok to resume your journeys!')
|
||||
width: 550
|
||||
height: 140
|
||||
anchors.left: parent.left
|
||||
anchors.top: parent.top
|
||||
margin-left: 10
|
||||
margin-top: 2
|
||||
|
||||
Button
|
||||
id: buttonOk
|
||||
!text: tr('Ok')
|
||||
width: 64
|
||||
anchors.left: parent.left
|
||||
anchors.bottom: parent.bottom
|
||||
margin-left: 160
|
||||
|
||||
Button
|
||||
id: buttonCancel
|
||||
!text: tr('Cancel')
|
||||
width: 64
|
||||
anchors.left: prev.right
|
||||
anchors.bottom: parent.bottom
|
||||
margin-left: 5
|
70
modules/game_playerdeath/playerdeath.lua
Normal file
70
modules/game_playerdeath/playerdeath.lua
Normal file
@@ -0,0 +1,70 @@
|
||||
PlayerDeath = {}
|
||||
|
||||
-- private variables
|
||||
local deathWindow
|
||||
|
||||
-- private functions
|
||||
|
||||
-- public functions
|
||||
function PlayerDeath.init()
|
||||
g_ui.importStyle('deathwindow.otui')
|
||||
|
||||
connect(g_game, { onDeath = PlayerDeath.display,
|
||||
onGameEnd = PlayerDeath.reset })
|
||||
end
|
||||
|
||||
function PlayerDeath.terminate()
|
||||
disconnect(g_game, { onDeath = PlayerDeath.display,
|
||||
onGameEnd = PlayerDeath.reset })
|
||||
|
||||
PlayerDeath.reset()
|
||||
PlayerDeath = nil
|
||||
end
|
||||
|
||||
function PlayerDeath.reset()
|
||||
GameInterface.getMapPanel():recursiveGetChildById('centerAdvance'):hide()
|
||||
if(deathWindow) then
|
||||
deathWindow:destroy()
|
||||
deathWindow = nil
|
||||
end
|
||||
end
|
||||
|
||||
function PlayerDeath.display()
|
||||
PlayerDeath.displayDeadMessage()
|
||||
PlayerDeath.openWindow()
|
||||
end
|
||||
|
||||
function PlayerDeath.displayDeadMessage()
|
||||
local advanceLabel = GameInterface.getMapPanel():recursiveGetChildById('centerAdvance')
|
||||
if advanceLabel:isVisible() then
|
||||
return
|
||||
end
|
||||
|
||||
TextMessage.displayEventAdvance(tr('You are dead.'))
|
||||
end
|
||||
|
||||
function PlayerDeath.openWindow()
|
||||
if(deathWindow) then
|
||||
return
|
||||
end
|
||||
deathWindow = g_ui.createWidget('DeathWindow', rootWidget)
|
||||
local okButton = deathWindow:getChildById('buttonOk')
|
||||
local cancelButton = deathWindow:getChildById('buttonCancel')
|
||||
|
||||
local okFunc = function()
|
||||
CharacterList.doLogin()
|
||||
okButton:getParent():destroy()
|
||||
deathWindow = nil
|
||||
end
|
||||
local cancelFunc = function()
|
||||
GameInterface.logout()
|
||||
cancelButton:getParent():destroy()
|
||||
deathWindow = nil
|
||||
end
|
||||
|
||||
deathWindow.onEnter = okFunc
|
||||
deathWindow.onEscape = cancelFunc
|
||||
|
||||
okButton.onClick = okFunc
|
||||
cancelButton.onClick = cancelFunc
|
||||
end
|
17
modules/game_playerdeath/playerdeath.otmod
Normal file
17
modules/game_playerdeath/playerdeath.otmod
Normal file
@@ -0,0 +1,17 @@
|
||||
Module
|
||||
name: game_playerdeath
|
||||
description: Manage player deaths
|
||||
author: edubart, BeniS
|
||||
website: www.otclient.info
|
||||
|
||||
dependencies:
|
||||
- game_interface
|
||||
- game_textmessage
|
||||
- client_entergame
|
||||
|
||||
@onLoad: |
|
||||
dofile 'playerdeath'
|
||||
PlayerDeath.init()
|
||||
|
||||
@onUnload: |
|
||||
PlayerDeath.terminate()
|
Reference in New Issue
Block a user