fix: combat control (#1094)

Author: kokekanon

README.md

@@ -1,6 +1,6 @@
 <h1><img src="https://github.com/mehah/otclient/blob/main/data/images/clienticon.png?raw=true" width="32" alt="logo"/> OTClient - Redemption</h1>
 
-[![Discord Shield](https://discordapp.com/api/guilds/888062548082061433/widget.png?style=shield)](https://discord.gg/HZN8yJJSyC)
+[![Discord Shield](https://discordapp.com/api/guilds/888062548082061433/widget.png?style=shield)](https://discord.gg/tUjTBZzMCy)
 [![Build - Ubuntu](https://github.com/mehah/otclient/actions/workflows/build-ubuntu.yml/badge.svg)](https://github.com/mehah/otclient/actions/workflows/build-ubuntu.yml)
 [![Build - Windows](https://github.com/mehah/otclient/actions/workflows/build-windows.yml/badge.svg)](https://github.com/mehah/otclient/actions/workflows/build-windows.yml)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
@@ -517,7 +517,7 @@ xhost -
 
 ## <a name="need-help?">🩺 Need help?</a>
 
-Try to ask questions in [discord](https://discord.gg/HZN8yJJSyC)
+Try to ask questions in [discord](https://discord.gg/tUjTBZzMCy)
 
 ## <a name="bugs">📑 Bugs?</a>
 

modules/game_inventory/inventory.lua

@@ -278,6 +278,21 @@ function inventoryController:onInit()
 end
 
 function inventoryController:onGameStart()
+    local player = g_game.getLocalPlayer()
+    if player then
+        local char = g_game.getCharacterName()
+        local lastCombatControls = g_settings.getNode('LastCombatControls')
+        if not table.empty(lastCombatControls) then
+            if lastCombatControls[char] then
+                g_game.setFightMode(lastCombatControls[char].fightMode)
+                g_game.setChaseMode(lastCombatControls[char].chaseMode)
+                g_game.setSafeFight(lastCombatControls[char].safeFight)
+                if lastCombatControls[char].pvpMode then
+                    g_game.setPVPMode(lastCombatControls[char].pvpMode)
+                end
+            end
+        end
+    end
     inventoryController:registerEvents(LocalPlayer, {
         onInventoryChange = inventoryEvent,
         onSoulChange = onSoulChange,
@@ -324,6 +339,24 @@ end
 
 function inventoryController:onGameEnd()
     stopEvent()
+
+    local lastCombatControls = g_settings.getNode('LastCombatControls')
+    if not lastCombatControls then
+        lastCombatControls = {}
+    end
+    local player = g_game.getLocalPlayer()
+    if player then
+        local char = g_game.getCharacterName()
+        lastCombatControls[char] = {
+            fightMode = g_game.getFightMode(),
+            chaseMode = g_game.getChaseMode(),
+            safeFight = g_game.isSafeFight()
+        }
+        if g_game.getFeature(GamePVPMode) then
+            lastCombatControls[char].pvpMode = g_game.getPVPMode()
+        end
+        g_settings.setNode('LastCombatControls', lastCombatControls)
+    end
 end
 
 function onSetSafeFight(self, checked)

tools/api/status.php

@@ -81,7 +81,7 @@
     $response = array(
         "playersonline" => "$playersOnline",
         "discord_online" => $online_discord,
-        "discord_link" => "https://discord.gg/HZN8yJJSyC",
+        "discord_link" => "https://discord.gg/tUjTBZzMCy",
         "youtube_link" => "https://www.youtube.com/watch?v=6_2zizoJKxQ",
         "gamingyoutubestreams" => "0",
         "gamingyoutubeviewer" => "0",