* make inventory/healthbar work again allowing reload * changes in top menu toggle buttons * all modules are now reloadable by default * fix warning when using fade in * remove some unused filesmaster
Eduardo Bart
12 years ago
parent
b301aa1a2b
commit
239f58296e
@ -1,26 +1,34 @@
|
|||||||
Effects = {}
|
Effects = {}
|
||||||
|
|
||||||
function Effects.fadeIn(widget, time, elapsed)
|
function Effects.fadeIn(widget, time, elapsed)
|
||||||
if not elapsed then elapsed = 0 end
|
if not elapsed then elapsed = 0 end
|
||||||
if not time then time = 250 end
|
if not time then time = 250 end
|
||||||
widget:setOpacity(math.min(elapsed/time, 1))
|
widget:setOpacity(math.min(elapsed/time, 1))
|
||||||
if elapsed < time then
|
if elapsed < time then
|
||||||
scheduleEvent(function()
|
removeEvent(widget.fadeEvent)
|
||||||
Effects.fadeIn(widget, time, elapsed + 30)
|
widget.fadeEvent = scheduleEvent(function()
|
||||||
end, 30)
|
Effects.fadeIn(widget, time, elapsed + 30)
|
||||||
end
|
end, 30)
|
||||||
|
else
|
||||||
|
widget.fadeEvent = nil
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function Effects.fadeOut(widget, time, elapsed)
|
function Effects.fadeOut(widget, time, elapsed)
|
||||||
if not elapsed then elapsed = 0 end
|
if not elapsed then elapsed = 0 end
|
||||||
if not time then time = 250 end
|
if not time then time = 250 end
|
||||||
widget:setOpacity(math.max((time - elapsed)/time, 0))
|
widget:setOpacity(math.max((time - elapsed)/time, 0))
|
||||||
if elapsed < time then
|
if elapsed < time then
|
||||||
scheduleEvent(function()
|
removeEvent(widget.fadeEvent)
|
||||||
Effects.fadeOut(widget, time, elapsed + 30)
|
widget.fadeEvent = scheduleEvent(function()
|
||||||
end, 30)
|
Effects.fadeOut(widget, time, elapsed + 30)
|
||||||
else
|
end, 30)
|
||||||
widget:destroy()
|
else
|
||||||
end
|
widget.fadeEvent = nil
|
||||||
|
widget:destroy()
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function Effects.cancelFade(widget)
|
||||||
|
removeEvent(widget.fadeEvent)
|
||||||
|
end
|
||||||
|
|||||||
@ -1,199 +0,0 @@
|
|||||||
GameInterface = {}
|
|
||||||
|
|
||||||
-- private variables
|
|
||||||
local WALK_AUTO_REPEAT_DELAY = 90
|
|
||||||
local gameRootPanel
|
|
||||||
local gameMapPanel
|
|
||||||
local gameRightPanel
|
|
||||||
local gameLeftPanel
|
|
||||||
local gameBottomPanel
|
|
||||||
|
|
||||||
-- private functions
|
|
||||||
function onGameStart()
|
|
||||||
-- hook window close event
|
|
||||||
setonclose(GameInterface.tryLogout)
|
|
||||||
GameInterface.show()
|
|
||||||
end
|
|
||||||
|
|
||||||
function onGameEnd()
|
|
||||||
setonclose(exit)
|
|
||||||
GameInterface.hide()
|
|
||||||
end
|
|
||||||
|
|
||||||
-- public functions
|
|
||||||
function GameInterface.init()
|
|
||||||
gameRootPanel = displayUI('gameinterface.otui')
|
|
||||||
gameRootPanel:lower()
|
|
||||||
connect(g_game, { onGameStart = onGameStart }, true)
|
|
||||||
connect(g_game, { onGameEnd = onGameEnd })
|
|
||||||
|
|
||||||
Keyboard.bindKeyPress('Up', function() g_game.walk(North) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Right', function() g_game.walk(East) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Down', function() g_game.walk(South) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Left', function() g_game.walk(West) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Numpad8', function() g_game.walk(North) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Numpad9', function() g_game.walk(NorthEast) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Numpad6', function() g_game.walk(East) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Numpad3', function() g_game.walk(SouthEast) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Numpad2', function() g_game.walk(South) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Numpad1', function() g_game.walk(SouthWest) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Numpad4', function() g_game.walk(West) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Numpad7', function() g_game.walk(NorthWest) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Ctrl+Up', function() g_game.turn(North) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Ctrl+Right', function() g_game.turn(East) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Ctrl+Down', function() g_game.turn(South) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Ctrl+Left', function() g_game.turn(West) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Ctrl+Numpad8', function() g_game.turn(North) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Ctrl+Numpad6', function() g_game.turn(East) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Ctrl+Numpad2', function() g_game.turn(South) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Ctrl+Numpad4', function() g_game.turn(West) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
Keyboard.bindKeyPress('Esc', function() g_game.cancelAttackAndFollow() end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
|
|
||||||
end
|
|
||||||
|
|
||||||
function GameInterface.terminate()
|
|
||||||
disconnect(g_game, { onGameStart = onGameStart }, true)
|
|
||||||
disconnect(g_game, { onGameEnd = onGameEnd })
|
|
||||||
end
|
|
||||||
|
|
||||||
function GameInterface.show()
|
|
||||||
gameRootPanel:show()
|
|
||||||
end
|
|
||||||
|
|
||||||
function GameInterface.hide()
|
|
||||||
gameRootPanel:hide()
|
|
||||||
end
|
|
||||||
|
|
||||||
function GameInterface.tryLogout()
|
|
||||||
if g_game.isOnline() then
|
|
||||||
g_game.forceLogout()
|
|
||||||
else
|
|
||||||
exit()
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function GameInterface.getRootPanel()
|
|
||||||
return gameRootPanel
|
|
||||||
end
|
|
||||||
|
|
||||||
function GameInterface.getMapPanel()
|
|
||||||
return gameMapPanel
|
|
||||||
end
|
|
||||||
|
|
||||||
function GameInterface.getRightPanel()
|
|
||||||
return gameRightPanel
|
|
||||||
end
|
|
||||||
|
|
||||||
function GameInterface.getLeftPanel()
|
|
||||||
return gameLeftPanel
|
|
||||||
end
|
|
||||||
|
|
||||||
function GameInterface.getBottomPanel()
|
|
||||||
return gameBottomPanel
|
|
||||||
end
|
|
||||||
|
|
||||||
function GameInterface.createThingMenu(menuPosition, lookThing, useThing, creatureThing)
|
|
||||||
local menu = createWidget('PopupMenu')
|
|
||||||
|
|
||||||
if lookThing then
|
|
||||||
menu:addOption('Look', function() g_game.look(lookThing) end)
|
|
||||||
end
|
|
||||||
|
|
||||||
if useThing then
|
|
||||||
if useThing:isContainer() then
|
|
||||||
if useThing:isInsideContainer() then
|
|
||||||
menu:addOption('Open', function() g_game.open(useThing, useThing:getContainerId()) end)
|
|
||||||
menu:addOption('Open in new window', function() g_game.open(useThing, Containers.getFreeContainerId()) end)
|
|
||||||
else
|
|
||||||
menu:addOption('Open', function() g_game.open(useThing, Containers.getFreeContainerId()) end)
|
|
||||||
end
|
|
||||||
else
|
|
||||||
if useThing:isMultiUse() then
|
|
||||||
menu:addOption('Use with ...', function() g_game.startUseWith(useThing) end)
|
|
||||||
else
|
|
||||||
menu:addOption('Use', function() g_game.use(useThing) end)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
if useThing:isRotateable() then
|
|
||||||
menu:addOption('Rotate', function() g_game.rotate(useThing) end)
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
if lookThing and not lookThing:asCreature() and not lookThing:isNotMoveable() and lookThing:isPickupable() then
|
|
||||||
menu:addSeparator()
|
|
||||||
menu:addOption('Trade with ...', function() print('trade with') end)
|
|
||||||
end
|
|
||||||
|
|
||||||
-- check for move up
|
|
||||||
|
|
||||||
if creatureThing then
|
|
||||||
menu:addSeparator()
|
|
||||||
|
|
||||||
if creatureThing:asLocalPlayer() then
|
|
||||||
menu:addOption('Set Outfit', function() g_game.requestOutfit() end)
|
|
||||||
|
|
||||||
if creatureThing:asPlayer():isPartyMember() --[[and not fighting]] then
|
|
||||||
if creatureThing:asPlayer():isPartyLeader() then
|
|
||||||
if creatureThing:asPlayer():isPartySharedExperienceActive() then
|
|
||||||
menu:addOption('Disable Shared Experience', function() g_game.partyShareExperience(false) end)
|
|
||||||
else
|
|
||||||
menu:addOption('Enable Shared Experience', function() g_game.partyShareExperience(true) end)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
menu:addOption('Leave Party', function() g_game.partyLeave() end)
|
|
||||||
end
|
|
||||||
|
|
||||||
else
|
|
||||||
local localPlayer = g_game.getLocalPlayer()
|
|
||||||
if localPlayer then
|
|
||||||
if g_game.getAttackingCreature() ~= creatureThing then
|
|
||||||
menu:addOption('Attack', function() g_game.attack(creatureThing) end)
|
|
||||||
else
|
|
||||||
menu:addOption('Stop Attack', function() g_game.cancelAttack() end)
|
|
||||||
end
|
|
||||||
|
|
||||||
if g_game.getFollowingCreature() ~= creatureThing then
|
|
||||||
menu:addOption('Follow', function() g_game.follow(creatureThing) end)
|
|
||||||
else
|
|
||||||
menu:addOption('Stop Follow', function() g_game.cancelFollow() end)
|
|
||||||
end
|
|
||||||
|
|
||||||
if creatureThing:asPlayer() then
|
|
||||||
menu:addSeparator()
|
|
||||||
menu:addOption('Message to ' .. creatureThing:getName(), function() print('message') end)
|
|
||||||
menu:addOption('Add to VIP list', function() g_game.addVip(creatureThing:getName()) end)
|
|
||||||
|
|
||||||
local localPlayerShield = localPlayer:asCreature():getShield()
|
|
||||||
local creatureShield = creatureThing:getShield()
|
|
||||||
|
|
||||||
if localPlayerShield == ShieldNone or localPlayerShield == ShieldWhiteBlue then
|
|
||||||
if creatureShield == ShieldWhiteYellow then
|
|
||||||
menu:addOption('Join ' .. creatureThing:getName() .. '\'s Party', function() g_game.partyJoin(creatureThing:getId()) end)
|
|
||||||
else
|
|
||||||
menu:addOption('Invite to Party', function() g_game.partyInvite(creatureThing:getId()) end)
|
|
||||||
end
|
|
||||||
elseif localPlayerShield == ShieldWhiteYellow then
|
|
||||||
if creatureShield == ShieldWhiteBlue then
|
|
||||||
menu:addOption('Revoke ' .. creatureThing:getName() .. '\'s Invitation', function() g_game.partyRevokeInvitation(creatureThing:getId()) end)
|
|
||||||
end
|
|
||||||
elseif localPlayerShield == ShieldYellow or localPlayerShield == ShieldYellowSharedExp or localPlayerShield == ShieldYellowNoSharedExpBlink or localPlayerShield == ShieldYellowNoSharedExp then
|
|
||||||
if creatureShield == ShieldWhiteBlue then
|
|
||||||
menu:addOption('Revoke ' .. creatureThing:getName() .. '\'s Invitation', function() g_game.partyRevokeInvitation(creatureThing:getId()) end)
|
|
||||||
elseif creatureShield == ShieldBlue or creatureShield == ShieldBlueSharedExp or creatureShield == ShieldBlueNoSharedExpBlink or creatureShield == ShieldBlueNoSharedExp then
|
|
||||||
menu:addOption('Pass Leadership to ' .. creatureThing:getName(), function() g_game.partyPassLeadership(creatureThing:getId()) end)
|
|
||||||
else
|
|
||||||
menu:addOption('Invite to Party', function() g_game.partyInvite(creatureThing:getId()) end)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
menu:addSeparator()
|
|
||||||
menu:addOption('Copy Name', function() g_window.setClipboardText(creatureThing:getName()) end)
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
menu:display(menuPosition)
|
|
||||||
end
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
Module
|
|
||||||
name: game_interface
|
|
||||||
description: |
|
|
||||||
Create the game main interface (map and bottom/left/right panels),
|
|
||||||
any game module must use it to add ingame interfaces
|
|
||||||
|
|
||||||
author: OTClient team
|
|
||||||
website: https://github.com/edubart/otclient
|
|
||||||
|
|
||||||
@onLoad: |
|
|
||||||
dofile 'uiminiwindow'
|
|
||||||
dofile 'uiminiwindowcontainer'
|
|
||||||
dofile 'uiitem'
|
|
||||||
dofile 'uimap'
|
|
||||||
dofile 'gameinterface'
|
|
||||||
|
|
||||||
GameInterface.init()
|
|
||||||
|
|
||||||
@onUnload: |
|
|
||||||
GameInterface.terminate()
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
GameSidePanel < UIMiniWindowContainer
|
|
||||||
image-source: images/sidepanel.png
|
|
||||||
image-border: 4
|
|
||||||
|
|
||||||
GameBottomPanel < Panel
|
|
||||||
image-source: images/bottompanel.png
|
|
||||||
image-border: 4
|
|
||||||
|
|
||||||
GameMapPanel < UIMap
|
|
||||||
padding: 4
|
|
||||||
image-source: images/mappanel.png
|
|
||||||
image-border: 4
|
|
||||||
|
|
||||||
UIGame
|
|
||||||
id: gameRootPanel
|
|
||||||
anchors.fill: parent
|
|
||||||
anchors.top: topMenu.bottom
|
|
||||||
|
|
||||||
GameSidePanel
|
|
||||||
id: gameRightPanel
|
|
||||||
width: 190
|
|
||||||
layout: verticalBox
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.top: parent.top
|
|
||||||
anchors.bottom: parent.bottom
|
|
||||||
|
|
||||||
GameBottomPanel
|
|
||||||
id: gameBottomPanel
|
|
||||||
height: 170
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.right: gameRightPanel.left
|
|
||||||
anchors.bottom: parent.bottom
|
|
||||||
|
|
||||||
GameMapPanel
|
|
||||||
id: gameMapPanel
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.right: gameRightPanel.left
|
|
||||||
anchors.top: parent.top
|
|
||||||
anchors.bottom: gameBottomPanel.top
|
|
||||||
focusable: false
|
|
||||||
|
|
||||||
UIWidget
|
|
||||||
id: mouseGrabber
|
|
||||||
focusable: false
|
|
||||||
visible: false
|
|
||||||
|
|
||||||
@ -1,56 +0,0 @@
|
|||||||
function UIMap:onDragEnter(mousePos)
|
|
||||||
local tile = self:getTile(mousePos)
|
|
||||||
if not tile then return false end
|
|
||||||
|
|
||||||
local thing = tile:getTopMoveThing()
|
|
||||||
if not thing then return false end
|
|
||||||
|
|
||||||
self.parsed = false
|
|
||||||
self.currentDragThing = thing
|
|
||||||
Mouse.setTargetCursor()
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
|
|
||||||
function UIMap:onDragLeave(droppedWidget, mousePos)
|
|
||||||
if not self.parsed then
|
|
||||||
self.currentDragThing = nil
|
|
||||||
end
|
|
||||||
|
|
||||||
Mouse.restoreCursor()
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
|
|
||||||
function UIMap:onDrop(widget, mousePos)
|
|
||||||
if not widget or not widget.currentDragThing then return false end
|
|
||||||
|
|
||||||
local tile = self:getTile(mousePos)
|
|
||||||
if not tile then return false end
|
|
||||||
|
|
||||||
local count = widget.currentDragThing:getCount()
|
|
||||||
if widget.currentDragThing:isStackable() and count > 1 then
|
|
||||||
widget.parsed = true
|
|
||||||
local moveWindow = displayUI('/game/movewindow.otui')
|
|
||||||
local spinbox = moveWindow:getChildById('spinbox')
|
|
||||||
spinbox:setMaximum(count)
|
|
||||||
spinbox:setMinimum(1)
|
|
||||||
spinbox:setCurrentIndex(count)
|
|
||||||
|
|
||||||
local okButton = moveWindow:getChildById('buttonOk')
|
|
||||||
okButton.onClick = function()
|
|
||||||
g_game.move(widget.currentDragThing, tile:getPosition(), spinbox:getCurrentIndex())
|
|
||||||
okButton:getParent():destroy()
|
|
||||||
widget.currentDragThing = nil
|
|
||||||
end
|
|
||||||
moveWindow.onEnter = okButton.onClick
|
|
||||||
else
|
|
||||||
g_game.move(widget.currentDragThing, tile:getPosition(), 1)
|
|
||||||
end
|
|
||||||
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
|
|
||||||
function UIMap:onMouseRelease(mousePosition, mouseButton)
|
|
||||||
local tile = self:getTile(mousePosition)
|
|
||||||
if tile and g_game.processMouseAction(mousePosition, mouseButton, nil, tile:getTopLookThing(), tile:getTopUseThing(), tile:getTopCreature(), tile:getTopMultiUseThing()) then return true end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
Loading…
Reference in new issue