Merge pull request #1148 from openmultiplayer/amir/changes

network, npcs, and docker script changes

Author: AmyrAhmady

SDK

@@ -828,6 +828,7 @@ void RakNetLegacyNetwork::start()
 
 	IConfig& config = core->getConfig();
 	int maxPlayers = *config.getInt("max_players");
+	int minimumSendBPS = *config.getFloat("network.minimum_send_bits_per_second");
 
 	int port = *config.getInt("network.port");
 	int sleep = static_cast<int>(*config.getFloat("sleep"));
@@ -837,6 +838,8 @@ void RakNetLegacyNetwork::start()
 	bool artwork = !artwork_config ? false : *artwork_config;
 	bool allow037 = *config.getBool("network.allow_037_clients");
 
+	SAMPRakNet::SetMinimumSendBitsPerSecond(minimumSendBPS); // Default: 96 kbps  (~12 KB/s)
+
 	query.setCore(core);
 
 	std::stringstream version;

Server/Components/LegacyNetwork/legacy_network_impl.cpp

@@ -1792,6 +1792,11 @@ void NPC::setWeaponState(PlayerWeaponState state)
 	}
 }
 
+Vector3 NPC::getPositionMovingTo() const
+{
+	return targetPosition_;
+}
+
 void NPC::updateWeaponState()
 {
 	switch (weapon_)

Server/Components/NPCs/NPC/npc.cpp

@@ -116,6 +116,8 @@ class NPC : public INPC, public PoolIDProvider, public NoCopy
 
 	void setWeaponState(PlayerWeaponState state) override;
 
+	Vector3 getPositionMovingTo() const override;
+
 	void setAmmoInClip(int ammo) override;
 
 	int getAmmoInClip() const override;

Server/Components/NPCs/NPC/npc.hpp

@@ -144,6 +144,21 @@ SCRIPT_API(NPC_GetSkin, bool(INPC& npc))
 	return -1;
 }
 
+SCRIPT_API(NPC_GetCustomSkin, bool(INPC& npc))
+{
+	auto player = npc.getPlayer();
+	if (player)
+	{
+		IPlayerCustomModelsData* data = queryExtension<IPlayerCustomModelsData>(player);
+		if (!data)
+		{
+			return -1;
+		}
+		return data->getCustomSkin();
+	}
+	return -1;
+}
+
 SCRIPT_API(NPC_IsStreamedIn, bool(INPC& npc, IPlayer& player))
 {
 	return npc.isStreamedInForPlayer(player);
@@ -535,7 +550,7 @@ SCRIPT_API(NPC_GetPathPoint, bool(int pathId, int pointIndex, Vector3& position,
 	return false;
 }
 
-SCRIPT_API(NPC_GetCurrentPathPointIndex, bool(INPC& npc))
+SCRIPT_API(NPC_GetCurrentPathPointIndex, int(INPC& npc))
 {
 	return npc.getCurrentPathPointIndex();
 }
@@ -1088,3 +1103,9 @@ SCRIPT_API(NPC_SetWeaponState, bool(INPC& npc, int weaponState))
 	npc.setWeaponState(PlayerWeaponState(weaponState));
 	return true;
 }
+
+SCRIPT_API(NPC_GetPosMovingTo, bool(INPC& npc, Vector3& position))
+{
+	position = npc.getPositionMovingTo();
+	return true;
+}

Server/Components/Pawn/Scripting/NPC/Natives.cpp

@@ -125,6 +125,7 @@ static const std::map<String, ConfigStorage> Defaults {
 	{ "network.allow_037_clients", true },
 	{ "network.grace_period", 5000 },
 	{ "network.use_omp_encryption", false },
+	{ "network.minimum_send_bits_per_second", 96000.0f }, // 96 kbps  (~12 KB/s)
 	// rcon
 	{ "rcon.allow_teleport", false },
 	{ "rcon.enable", false },

Server/Source/core_impl.hpp

@@ -1,5 +1,8 @@
 #!/bin/sh
 [ -z $CONFIG ] && config=Release || config="$CONFIG"
+[ -z $BUILD_SHARED ] && build_shared=1 || build_shared="$BUILD_SHARED"
+[ -z $BUILD_SERVER ] && build_server=1 || build_server="$BUILD_SERVER"
+[ -z $BUILD_TOOLS ] && build_tools=0 || build_tools="$BUILD_TOOLS"
 [ -z $TARGET_BUILD_ARCH ] && target_build_arch=x86 || target_build_arch="$TARGET_BUILD_ARCH"
 
 cd build \
@@ -8,6 +11,10 @@ cmake .. \
     -G Ninja \
     -DTARGET_BUILD_ARCH=$target_build_arch \
     -DCMAKE_BUILD_TYPE=$config \
+    -DSHARED_OPENSSL=$build_shared \
+    -DSTATIC_STDCXX=true \
+    -DBUILD_SERVER=$build_server \
+    -DBUILD_ABI_CHECK_TOOL=$build_tools \
 &&
 cmake \
     --build . \

docker/build_ubuntu-20.04/docker-entrypoint.sh

@@ -1,5 +1,8 @@
 #!/bin/sh
 [ -z $CONFIG ] && config=Release || config="$CONFIG"
+[ -z $BUILD_SHARED ] && build_shared=1 || build_shared="$BUILD_SHARED"
+[ -z $BUILD_SERVER ] && build_server=1 || build_server="$BUILD_SERVER"
+[ -z $BUILD_TOOLS ] && build_tools=0 || build_tools="$BUILD_TOOLS"
 [ -z $TARGET_BUILD_ARCH ] && target_build_arch=x86 || target_build_arch="$TARGET_BUILD_ARCH"
 
 cd build \
@@ -8,6 +11,10 @@ cmake .. \
     -G Ninja \
     -DTARGET_BUILD_ARCH=$target_build_arch \
     -DCMAKE_BUILD_TYPE=$config \
+    -DSHARED_OPENSSL=$build_shared \
+    -DSTATIC_STDCXX=true \
+    -DBUILD_SERVER=$build_server \
+    -DBUILD_ABI_CHECK_TOOL=$build_tools \
 &&
 cmake \
     --build . \