1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 08:23:51 +00:00
Commit graph

834 commits

Author SHA1 Message Date
David Cernat
c5b08d6109 [General] Simplify storing of attribute and skill index changes
(cherry picked from commit bd9e8bd10f)
2018-04-19 23:28:03 +03:00
David Cernat
7b702bf8c2 [General] Add and use utility function for int value checks in vectors
(cherry picked from commit a796f81444)
2018-04-19 18:16:10 +03:00
David Cernat
b6099024df [General] Rework PlayerAttribute packets so they are of minimal size
Previously, whenever a single attribute value changed for a player, that player then sent a PlayerAttribute packet with all values for all 8 attributes.

This did not cause anywhere as much packet spam as PlayerSkill used to, but there was no good reason not to fix it as well.

(cherry picked from commit b0965f094a)
2018-04-19 17:26:20 +03:00
David Cernat
78441c769a [General] Rework PlayerSkill packets so they are of minimal size
Previously, whenever a single skill value changed for a player, that player then sent a PlayerSkill packet with all values for all 27 skills, plus the player's progress towards the next level and the bonuses to each attribute on the next level up as the result of sklll increases thus far.

This commit makes PlayerSkill contain only the values of specific skills, moves the player's progress towards the next level to PlayerLevel packets, and moves the bonuses to each attribute on the next level up to PlayerAttribute packets.

Players now also send a PlayerSkill packet whenever their progress towards a new point in a skill changes. This was previously avoided so as to not have massive packet spam.

(cherry picked from commit ef79a98544)
2018-04-19 15:18:38 +03:00
David Cernat
28f1c1b0d3 [General] Rework CharGen slightly for clarity purposes
Previously, charGenStage.end was doing double duty as both the variable indicating the number of CharGen stages and – when set to 0 – the variable indicating that CharGen was over. The latter role is now filled by a new boolean.

(cherry picked from commit 926106cf8c)
2018-04-19 13:25:29 +03:00
David Cernat
306252ecdc [Server] Fix confusing script function names 2018-04-18 19:10:58 +03:00
David Cernat
e355dca4dd Merge pull request #409 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/CMakeLists.txt
	apps/openmw-mp/Script/Functions/GUI.cpp
	apps/openmw-mp/Script/Functions/GUI.hpp
	apps/openmw-mp/Script/Functions/Items.hpp
	apps/openmw-mp/Script/Functions/Mechanics.cpp
	apps/openmw-mp/Script/Functions/Mechanics.hpp
	apps/openmw-mp/Script/Functions/Stats.cpp
	apps/openmw-mp/Script/Functions/Stats.hpp
	apps/openmw-mp/Script/ScriptFunctions.cpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
2018-04-18 18:29:00 +03:00
David Cernat
311f770de7 [Server] Document script functions, part 4
Additionally, clean up some variable names.
2018-04-18 11:02:18 +03:00
David Cernat
76e7392a84 [Server] Create ShapeshiftFunctions and move relevant functions there 2018-04-18 10:45:39 +03:00
David Cernat
2bb7a4253e [Server] Forcibly kick players after too many handshake attempts 2018-04-18 10:16:38 +03:00
David Cernat
36e0f0471a [Server] Add SetCreatureNameDisplayState script function 2018-04-17 15:04:18 +03:00
David Cernat
db41704e52 [Server] Use clearer function name for checking creature name display 2018-04-13 17:28:28 +03:00
David Cernat
2390744b45 Merge pull request #404 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/Player.hpp
	apps/openmw-mp/Script/Functions/Mechanics.cpp
	apps/openmw-mp/Script/Functions/Mechanics.hpp
	apps/openmw-mp/Script/Functions/Settings.hpp
	apps/openmw-mp/Script/Functions/Stats.cpp
	apps/openmw-mp/Script/Functions/Stats.hpp
	components/openmw-mp/Base/BasePlayer.hpp
2018-04-10 08:20:23 +03:00
David Cernat
bdc9132e7c [General] Add SetResetStats server script function
Add reading and writing of resetStats variable to PlayerBaseInfo Packet

Fix typos in various server script function descriptions
2018-04-09 19:24:24 +03:00
David Cernat
34893ff631 [Server] Split up handshake handling into multiple functions for debug
Unfortunately, the handshake attempt limit implemented in 4ebfcc4a21 for 0.7 and then ported over to 0.6 in a3a341fee6 does not appear to work properly, which is why gathering more information on it is important.
2018-04-09 15:25:50 +03:00
David Cernat
c8abd11f5d [General] Move creature disguises for players to PlayerShapeshift packet
Additionally, make associated variables clearer, and move associated server script functions next to other shapeshifting functions.
2018-04-05 15:42:06 +03:00
David Cernat
f50637bdd4 Merge pull request #401 from TES3MP/0.6.3 while resolving conflicts
# Conflicts:
#	apps/openmw-mp/processors/world/ProcessorContainer.hpp
#	apps/openmw/mwmp/WorldEvent.cpp
2018-04-03 02:17:12 +03:00
David Cernat
76468dc8c6 [Server] Remove remnant of hardcoded container sync 2018-04-03 01:35:07 +03:00
David Cernat
3d5860d6f4 Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/Player.cpp
	apps/openmw-mp/Script/Functions/Settings.cpp
	apps/openmw-mp/Script/Functions/Settings.hpp
	apps/openmw-mp/Script/Functions/World.cpp
	apps/openmw-mp/Script/Functions/World.hpp
	apps/openmw/mwgui/container.cpp
	apps/openmw/mwmp/LocalActor.cpp
	apps/openmw/mwmp/LocalPlayer.cpp
	apps/openmw/mwmp/WorldEvent.cpp
	apps/openmw/mwmp/processors/world/ProcessorContainer.hpp
	components/openmw-mp/Base/BaseEvent.hpp
	components/openmw-mp/Log.cpp
	components/openmw-mp/Log.hpp
2018-03-30 09:32:43 +03:00
David Cernat
5f6ddcfc59 [General] Rework container sync to prevent item duping
A main priority in TES3MP development is to avoid making major changes to OpenMW code, so as to avoid merge conflicts in the future. Whenever avoiding potential conflicts seems especially difficult for the proper implementation of a particular multiplayer feature, that multiplayer feature is often put off until later or partially implemented with the intent of being revisited in the future.

Container sync is the perfect example. Previously, the OpenMW code for container actions was kept exactly as it was, with clients unilaterally accepting their own container changes as per singleplayer-specific code, with only the addition that clients sent container packets every time they made a change in a container, packets which were then forwarded unquestioningly by the server to other players. This meant that two players clicking on the same item in a container at the same time both managed to take it, thus duplicating the item.

Immediately after the packets were already forwarded, server scripts were able to check for incorrect changes, such as the removal of more items than should have existed in a container, but they had to send their own packets that attempted to fix what had already been accepted on the initial client and then forwarded to all clients, which was quite onerous in some scenarios, such as when a player on a slow connection immediately dropped items in the world after taking them from a container (which is why the default TES3MP serverside scripts made no attempt at sending corrective packets at all, preferring to expect the matter to be solved in a later C++ implementation).

This commit fixes item duping in containers by preventing container actions from initially running on clients and by ending the automatic forwarding of container packets by the server. Instead, clients now send container packets that act as requests for container actions, and serverside scripts have to forward these requests themselves. In other words, without a matching Container event in the server's Lua scripts, players are completely unable to affect containers for themselves or for others.

To forward a received Container packet, the following line must be used in a Container event in the Lua scripts:

tes3mp.SendContainer(true, true)

When an invalid action count is used in a container request, the serverside scripts can amend it using the following new function:

tes3mp.SetReceivedContainerItemActionCount(objectIndex, itemIndex, actionCount)

Thus, the serverside scripts are able to allow only container actions that are correct based on their own recorded contents for that container.

The OpenMW code allowing unilateral container actions in mwgui/container.cpp is now prevented from executing. When a player's container request is returned to them, code in mwmp/WorldEvent.cpp simulates those container actions instead.
2018-03-26 19:27:36 +03:00
David Cernat
b249162ca1 [General] Implement setting of enforced client log level in GameSettings
Certain servers do not want the players to have debug information about the locations and actions of other players, so a client's log level can now be enforced by the server via the GameSettings packet.
2018-03-11 04:50:59 +02:00
David Cernat
a3a341fee6 [Server] Reimplement 4ebfcc4a21 for 0.6 2018-03-10 22:19:44 +02:00
David Cernat
7ec08e125b Merge pull request #394 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/Script/Functions/Settings.cpp
	apps/openmw-mp/Script/Functions/Settings.hpp
2018-03-10 20:03:03 +02:00
David Cernat
b2a3dd9d60 Revert "[Server] Add previous state to ON_RECORD_DYNAMIC"
This reverts commit 2ac01dc02a.

Commit 2ac01dc02a had confused the ON_RECORD_DYNAMIC event meant for custom items with a hypothetical ON_PLAYER_STATS_DYNAMIC event meant for dynamic player stats and had added functionality appropriate for the latter.

ON_PLAYER_STATS_DYNAMIC was never implemented because it would have caused too much event spam, with it constantly being triggered by any running player losing fatigue. If it ends up being added, the reverted lines from 2ac01dc02a should be added to it instead.
2018-03-09 21:14:56 +02:00
Koncord
2ac01dc02a [Server] Add previous state to ON_RECORD_DYNAMIC 2018-03-05 15:40:38 +08:00
Koncord
4aff1f1833 [Server] Add previous state to ON_PLAYER_SKILL
That is array of struct with next content: {base, current, mod, damage, progress}
2018-03-05 15:30:24 +08:00
Koncord
017956366f [Server] Add previous state argument to ON_PLAYER_ATTRIBUTE event
That is array of struct with next content: {base, current, mod, damage}
2018-03-05 15:19:09 +08:00
Koncord
afbafdf806 [Server] Add PreReading virtual method
add "const" qualifier to exteriorCellPattern
2018-03-05 15:15:39 +08:00
Koncord
d0eef7c98e [Server] Add possibility to use previous state of data in events 2018-03-05 04:41:21 +08:00
Koncord
7deff7a42a [Server] Use "else if" instead "if" + "return" 2018-02-26 21:10:48 +08:00
Koncord
23da0b16ea [Server] Fix build 2018-02-26 21:03:42 +08:00
Koncord
24ba4ae404 [Server] Delete ON_GUI_ACTION 2018-02-17 14:24:57 +08:00
Koncord
73d030b779 [Server] Remove return value from ON_PLAYER_CONNECT event 2018-02-17 14:24:38 +08:00
Koncord
4e869a2974 [General] Use correct versions of C++ per target
C++11 for client, components and launcher
C++14 for server, browser and masterserver
2018-02-16 16:31:45 +08:00
Koncord
e85d0db771 [Server] Code style 2018-02-16 12:21:20 +08:00
Koncord
44c549211e [Server] use std::unique_ptr for packet controllers and MasterClient 2018-02-16 12:14:51 +08:00
Koncord
2bfd4627ed [Server] Use queue for MessageBox packets 2018-02-16 11:28:47 +08:00
Koncord
bb7c5ee34c [Server] Allow nil as callback 2018-02-16 06:28:35 +08:00
Koncord
54945b537d [Server] Get rid handwritten ids in GUI API 2018-02-16 06:08:36 +08:00
Koncord
4bde7d80f5 [Server] Use regular Ptrs where possible to avoid seizure Ptrs by lua 2018-02-16 05:12:01 +08:00
Koncord
f2a88e6a37 [Server] Use multiple parameters instead functions for Mark functions 2018-02-16 04:58:37 +08:00
Koncord
410eb353e8 [Server] Call GC after deleting player 2018-02-16 04:41:19 +08:00
Koncord
a9614ad28e [Server] Fix invalid read 2018-02-16 04:38:42 +08:00
Koncord
69436714f9 [Server] Fix uninitialized variable 2018-02-16 04:36:44 +08:00
David Cernat
60f686ee43 [General] Implement setting of physics framerate as part of GameSettings 2018-02-14 05:53:44 +02:00
David Cernat
3b865244d0 [Server] Fix typo related to player deletion 2018-02-12 07:23:52 +02:00
David Cernat
4e9cac96c7 [Server] Add scale and selected spell functions to Player in Sol 2018-02-12 07:08:47 +02:00
David Cernat
ac374a8ef9 Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
 	apps/openmw-mp/Player.cpp
	apps/openmw-mp/Script/Functions/Mechanics.cpp
	apps/openmw-mp/Script/Functions/Mechanics.hpp
	apps/openmw-mp/Script/Functions/Quests.cpp
	apps/openmw-mp/Script/Functions/Quests.hpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
	apps/openmw-mp/processors/player/ProcessorRecordDynamic.hpp
	apps/openmw/mwmp/LocalPlayer.hpp
	apps/openmw/mwmp/WorldEvent.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/openmw-mp/Base/BasePlayer.hpp
2018-02-12 06:50:52 +02:00
David Cernat
74765b3ace [General] Implement selected spell sync as part of PlayerMiscellaneous 2018-02-06 06:36:46 +02:00
David Cernat
029dfc56ba [General] Implement player scale as part of PlayerShapeshift 2018-02-01 02:11:45 +02:00
David Cernat
66078bfea7 [General] Implement Mark location sync as part of PlayerMiscellaneous 2018-01-31 04:50:29 +02:00
David Cernat
989f6e6b51 [General] Implement PlayerReputation packet 2018-01-30 22:55:29 +02:00
David Cernat
88ae0772cf [Server] Initialize new processors and fix issues with RecordDynamic 2018-01-30 22:51:35 +02:00
David Cernat
5858e05362 Merge pull request #378 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/CMakeLists.txt
	apps/openmw-mp/Script/ScriptFunctions.hpp
	components/CMakeLists.txt
2018-01-30 00:54:56 +02:00
David Cernat
02af7f6ba1 [General] Add placeholders for new packet types 2018-01-29 22:32:51 +02:00
David Cernat
1a8a518897 Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	README.md
	apps/openmw-mp/Script/Functions/World.cpp
	apps/openmw/mwmp/LocalPlayer.cpp
	apps/openmw/mwmp/LocalPlayer.hpp
	apps/openmw/mwworld/scene.cpp
	components/openmw-mp/Version.hpp
2018-01-29 02:57:48 +02:00
David Cernat
420dab10e1 [General] Track objects directly placed by players in ObjectPlace
This allows the OnPCDrop variable to get set correctly even when object placements have to go through the server first in order to gain a unique multiplayer index (mpNum).

Among other things, this makes it possible to roll marijuana joints in the popular mod "Tribunal Code Patch".
2018-01-28 17:46:51 +02:00
Koncord
edd883853d [Server] Add sendConsoleCommand function to lua api 2018-01-20 20:46:14 +08:00
Koncord
0e97b769f9 [General] Change type of Object::enchantmentCharge 2018-01-20 20:07:29 +08:00
Koncord
4cfb04aa7f [Server] Fix setBedRestAllowed 2018-01-20 20:06:41 +08:00
Koncord
7e5b929ea2 [General] Rework PacketPlayerFaction 2018-01-20 19:45:24 +08:00
Koncord
29ba07fe8c [General] Rework PacketPlayerInventory
Save the Action for each item. Now you can add or remove multiple items
2018-01-20 18:40:23 +08:00
Koncord
de0bb3cdab [General] Change type of Item::enchantmentCharge to float 2018-01-20 18:32:26 +08:00
Koncord
cb86557aca [Server] Init Player::inUpdateQueue 2018-01-20 15:46:25 +08:00
David Cernat
a037193e79 Merge pull request #372 from TES3MP/0.6.2 while resolving conflicts
Conflicts:
	apps/openmw-mp/Script/Functions/Actors.cpp
	apps/openmw-mp/Script/Functions/Actors.hpp
	apps/openmw-mp/Script/Functions/Items.cpp
	apps/openmw-mp/Script/Functions/Items.hpp
	apps/openmw-mp/Script/Functions/World.cpp
	apps/openmw-mp/Script/Functions/World.hpp
	apps/openmw/mwmp/WorldEvent.cpp
	components/openmw-mp/Packets/Player/PacketPlayerEquipment.cpp
	components/openmw-mp/Version.hpp
2018-01-18 13:40:13 +02:00
David Cernat
9935f56d46 [General] Use doubles instead of ints for enchantmentCharge
Additionally, include enchantmentCharges for items  in PlayerEquipment packets.
2018-01-17 08:10:49 +02:00
Koncord
1de9f30449 [Server] Fix iterating killed timers when kill() called in the callback
Instance new timers before new tick
2018-01-08 12:24:36 +08:00
Kyle Cooley
7248a5d037 Remove some duplication, standardize sol2 header inclusion 2018-01-05 20:25:57 -05:00
Kyle Cooley
ba4d2bd5fe Merge remote-tracking branch 'origin/master' into LibIssues 2018-01-05 17:35:47 -05:00
David Cernat
b6a7377692 Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try
Conflicts:
	apps/openmw-mp/Networking.cpp
	apps/openmw-mp/Script/Functions/Miscellaneous.cpp
	apps/openmw-mp/Script/Functions/Miscellaneous.hpp
	apps/openmw/mwmp/GUI/GUIChat.cpp
2018-01-05 21:24:14 +02:00
Kyle Cooley
e2103d0bea Clean up find file for LuaJit, add one for Sol2 2018-01-04 21:40:17 -05:00
Koncord
35922e4898 [General] Change "enum ACTOR_ACTION" to "enum class Action" 2018-01-05 09:40:11 +08:00
David Cernat
1cf2f35a28 [Server] Add script functions to set & get plugin enforcement state 2018-01-02 16:33:18 +02:00
Koncord
c4949ac5d9 [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
Koncord
8f5d31cb03 [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Koncord
4ab338bbb1 [Server] Register ON_PLAYER_QUICKKEYS event 2018-01-02 11:53:03 +08:00
Koncord
5777759aae [General] Change enum QuickKey::QUICKKEY_TYPE to enum class 2018-01-02 11:52:38 +08:00
Koncord
2019128d92 [Server] Change signature of TimerController::kill, validate callback 2018-01-02 08:17:26 +08:00
David Cernat
09958681cd Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try 2018-01-01 12:04:25 +02:00
David Cernat
47a3dc9ff2 [Server] Add broadcast argument to functions for sending WorldPackets 2017-12-30 21:52:30 +02:00
David Cernat
1e2517698d [Server] Send player speech and animation packets only to nearby players 2017-12-29 06:17:45 +02:00
David Cernat
cac2c6c1e8 Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 2017-12-25 02:25:01 +02:00
David Cernat
993081ba1e [General] Add enchantmentCharge to worldObjects and items 2017-12-23 13:16:38 +02:00
David Cernat
a84c4c7ecc [Server] Print module order on startup 2017-12-10 15:57:19 +02:00
David Cernat
f2eca2566f [Server] Add storedData table for Player to increase clarity
This way, customData is meant to hold module-specific and temporary data while storedData is meant to hold persistent core data.
2017-12-10 10:06:27 +02:00
Koncord
077a3d06b3 [General] Change type of BasePlayer::resurrectType to ResurrectType 2017-12-10 12:01:04 +08:00
Koncord
f9c4b847aa [Server] Make argument const reference 2017-12-10 11:46:50 +08:00
Koncord
c5388e49f2 [Server] Remove Pawn switcher in cmake 2017-12-10 10:29:10 +08:00
Koncord
ba07d7820f [Server] Remove Terra 2017-12-10 10:20:24 +08:00
Koncord
77d14211c9 [Server] Add Weather.cpp to build 2017-12-10 10:16:16 +08:00
Koncord
44dc153ebe [Server] Add Weather API 2017-12-10 09:51:03 +08:00
Koncord
aff1859759 [Server] Add new line for help strings 2017-12-10 09:47:35 +08:00
Koncord
122a30c183 [General] Change type of refNumIndex & mpNum to unsigned 2017-12-10 09:20:13 +08:00
Koncord
bfdf348a6c [Server] Fix Undefined behavior 2017-12-09 18:01:15 +08:00
Koncord
4d0072a74c [Server] Use foreach loop 2017-12-09 15:04:09 +08:00
Koncord
cd620e17ec [Server] Use std::move(tokens) 2017-12-09 15:03:44 +08:00
Koncord
dd352f0a91 [Server] Improve Player::sendToLoaded() 2017-12-09 15:03:06 +08:00
Koncord
f35d35741e [General] Remove redundant code
Remove BaseEvent::worldObjectCount
Remove BaseActor::count
Use foreach loops in packets and processors
Remove redundant "&" in CellController::get().getCell() calls
2017-12-09 14:59:41 +08:00
Koncord
585c24cee8 [Server] Optimize CellController 2017-12-09 11:44:56 +08:00
Koncord
ff8b5061b4 [Server] Modernize CellController singleton 2017-12-09 11:08:53 +08:00