Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for Unturned v3.21.21.0 #1

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+226 −129
Open

Update for Unturned v3.21.21.0 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6dc071e
Update for Unturned v3.21.21.0
nic96 Jun 29, 2021
1d2de68
modified default translation
nic96 Dec 17, 2022
cdafbf6
fixed melee death message
nic96 Dec 17, 2022
a270d97
fixed death message color
nic96 Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
179 changes: 87 additions & 92 deletions Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,86 +1,83 @@
using System.Collections.Generic;
using System.Drawing;
using Rocket.API.DependencyInjection;
using Rocket.API.Eventing;
using Rocket.API.User;
using Rocket.Core.I18N;
using Rocket.Core.Logging;
using Rocket.Unturned.Player;
using SDG.Unturned;
using Rocket.Core.Plugins;
using Rocket.Unturned.Player.Events;
using Rocket.API.Collections;
using Rocket.Unturned.Events;
using Rocket.Unturned.Chat;
using Rocket.Core.Logging;
using Color = UnityEngine.Color;
using Steamworks;

namespace coolpuppy24.simpledeathmessages
{
public class Main : Plugin<SimpleDeathMessagesConfiguration>, IEventListener<UnturnedPlayerDeathEvent>
public class Main : RocketPlugin<SimpleDeathMessagesConfiguration>
{
private readonly IUserManager _userManager;

protected override void OnLoad(bool isFromReload)
protected override void Load()
{
Logger.LogInformation("Successfully Loaded!");
UnturnedPlayerEvents.OnPlayerDeath += OnPlayerDeath;
Logger.Log("Successfully Loaded!");
}

protected override void OnUnload()
protected override void Unload()
{
Logger.LogInformation("Unloaded!");
UnturnedPlayerEvents.OnPlayerDeath -= OnPlayerDeath;
Logger.Log("Unloaded!");
}

public override Dictionary<string, string> DefaultTranslations => new Dictionary<string, string>
{
{"gun_headshot","{1} [GUN - {3}] {2} {0}"},
{"gun","{1} [GUN - {2}] {0}"},
{"food","[FOOD] {0}"},
{"arena","[ARENA] {0}"},
{"shred","[SHRED] {0}"},
{"punch_headshot","{1} [PUNCH] {2} {0}"},
{"punch","{0} [PUNCH] {1}"},
{"bones","[BONES] {0}"},
{"melee_headshot","{1} [MELEE - {3}] {2} {0}"},
{"melee","{0} [MELEE- {2}] {1}"},
{"water","[WATER] {0}"},
{"breath","[BREATH] {0}"},
{"zombie","[ZOMBIE] {0}"},
{"animal","[ANIMAL] {0}"},
{"grenade","[GRENADE] {0}"},
{"vehicle","[VEHICLE] {0}"},
{"suicide","[SUICIDE] {0}"},
{"burning","[BURNING] {0}"},
{"headshot","+ [HEADSHOT]" },
{"landmine","[LANDMINE] {0}"},
{"roadkill","{1} [ROADKILL] {0}"},
{"bleeding","[BLEEDING] {0}"},
{"freezing","[FREEZING] {0}"},
{"sentry","[SENTRY] {0}"},
{"charge","[CHARGE] {0}"},
{"missile","[MISSILE] {0}"},
{"splash","[SPLASH] {0}"},
{"acid","[ACID] {0}"},
{"spark", "[SPARK] {0}"},
{"infection", "[INFECTION] {0}"},
{"spit","[SPIT] {0}"},
{"kill","[ADMIN KILL] {0}"},
{"boulder","[BOULDER] {0}"},
};

public Main(IDependencyContainer container, IEventManager eventManager, IUserManager userManager) : base("SimpleDeathMessages", container)
{
_userManager = userManager;
eventManager.AddEventListener(this, this);
}
public override TranslationList DefaultTranslations =>
new TranslationList
{
{"gun","{0} was shot in the {1} by {2} using a {3}"},
{"food","{0} starved to death!"},
{"arena","{0} was eliminated by the arena!"},
{"shred","{0} was shreaded to bits!"},
{"punch","{0} was punched in the {1} by {2}"},
{"bones","{0} shattered his bones and died!"},
{"melee","{0} was chopped to death in the {1} by {2} using a {3}"},
{"water","{0} dehydrated to death!"},
{"breath","{0} suffocated to death!"},
{"zombie","{0} was mauled by a zombie!"},
{"animal","{0} was mauled by an animal!"},
{"grenade","{0} was blown up by {1} with a grenade!"},
{"vehicle","{0} was blown up by a vehicle!"},
{"suicide","{0} died at their own hand. Everyone is disappointed."},
{"burning","{0} burned to death!"},
{"landmine","{0} was blown up by a landmine!"},
{"roadkill","{0} was roadkilled by {1}"},
{"bleeding","{0} bled to death!"},
{"freezing","{0} froze to death!"},
{"sentry","{0} was shot by a sentry gun!"},
{"charge","{0} was obliterated by {1} with a remote detonator!"},
{"missile","{0} was annihilated by {1} with a missile!"},
{"splash","{0} was blown up by {1} with an explosive bullet!"},
{"acid","{0} was blown up by a zombie!"},
{"spark", "{0} was electrocuted by a zombie!"},
{"infection", "{0} died of infection"},
{"spit","{0} was dissolved by a zombie!"},
{"kill","{0} was killed by an admin!"},
{"boulder","{0} was crushed by a zombie using a big boulder!"},
{"left_foot", "left foot"},
{"left_leg", "left leg"},
{"right_foot", "right foot"},
{"right_leg", "right leg"},
{"left_hand", "left hand"},
{"left_arm", "left arm"},
{"right_hand", "right hand"},
{"right_arm", "right arm"},
{"left_back", "back"},
{"right_back", "back"},
{"left_front", "torso"},
{"right_front", "torso"},
{"spine", "spine"},
{"skull", "head"},
};

public void HandleEvent(IEventEmitter emitter, UnturnedPlayerDeathEvent @event)
private void OnPlayerDeath(UnturnedPlayer player, EDeathCause cause, ELimb limb, CSteamID murderer)
{
var player = (UnturnedPlayer)@event.Player;

UnturnedPlayer killer = ((UnturnedPlayerEntity)@event.Killer).Player;
var cause = @event.DeathCause;
var limb = @event.Limb;
var deathMessageColor = Color.red;

var deathmessageColor = Color.Red; //ConfigurationInstance.DeathMessagesColor;
var killer = UnturnedPlayer.FromCSteamID(murderer);


string headshot = Translations.Get("headshot");
if (cause.ToString() == "SHRED" || cause.ToString() == "ZOMBIE" || cause.ToString() == "ANIMAL" ||
cause.ToString() == "SPARK" || cause.ToString() == "VEHICLE" || cause.ToString() == "FOOD" ||
cause.ToString() == "WATER" || cause.ToString() == "INFECTION" || cause.ToString() == "BLEEDING" ||
Expand All @@ -90,45 +87,43 @@ public void HandleEvent(IEventEmitter emitter, UnturnedPlayerDeathEvent @event)
cause.ToString() == "ACID" || cause.ToString() == "SPIT" || cause.ToString() == "BURNING" ||
cause.ToString() == "BURNER" || cause.ToString() == "BOULDER" || cause.ToString() == "ARENA" ||
cause.ToString() == "GRENADE" ||
(ConfigurationInstance.ShowSuicideMSG && cause.ToString() == "SUICIDE") ||
(Configuration.Instance.ShowSuicideMSG && cause.ToString() == "SUICIDE") ||
cause.ToString() == "ROADKILL" || cause.ToString() == "MELEE" || cause.ToString() == "GUN" ||
cause.ToString() == "PUNCH")
{
if (cause.ToString() != "ROADKILL" && cause.ToString() != "MELEE" && cause.ToString() != "GUN" &&
cause.ToString() != "PUNCH")
{
_userManager.BroadcastLocalized(Translations, cause.ToString().ToLower(), deathmessageColor, player.DisplayName);
}
else if (cause.ToString() == "ROADKILL")
{
_userManager.BroadcastLocalized(Translations, "roadkill", deathmessageColor, player.DisplayName, killer.DisplayName);
}
else if (cause.ToString() == "MELEE" || cause.ToString() == "GUN")
cause.ToString() != "PUNCH" && cause.ToString() != "GRENADE" && cause.ToString() != "MISSILE" &&
cause.ToString() != "CHARGE" && cause.ToString() != "SPLASH")
{
if (limb == ELimb.SKULL)
_userManager.BroadcastLocalized(Translations, cause.ToString().ToLower() + "_headshot", deathmessageColor, player.DisplayName, killer.DisplayName, headshot, killer.NativePlayer.equipment.asset.itemName);
else
_userManager.BroadcastLocalized(Translations, cause.ToString().ToLower(), deathmessageColor, player.DisplayName, killer.DisplayName, headshot, killer.NativePlayer.equipment.asset.itemName);
UnturnedChat.Say(Translate(cause.ToString().ToLower(), player.DisplayName), deathMessageColor);
}
else if (cause.ToString() == "PUNCH")
else switch (cause.ToString())
{
_userManager.BroadcastLocalized(Translations,
limb == ELimb.SKULL ? "punch_headshot" : "punch", deathmessageColor, player.DisplayName, killer.DisplayName, headshot);
case "ROADKILL":
case "MISSILE":
case "CHARGE":
case "SPLASH":
UnturnedChat.Say(Translate(cause.ToString().ToLower(), player.DisplayName, killer.DisplayName), deathMessageColor);
break;
case "PUNCH":
UnturnedChat.Say(Translate(cause.ToString().ToLower(), player.DisplayName, Translate(limb.ToString().ToLower()), killer.DisplayName), deathMessageColor);
break;
case "MELEE":
case "GUN":
var limbString = Translate(limb.ToString().ToLower());
UnturnedChat.Say(Translate(cause.ToString().ToLower(), player.DisplayName, limbString, killer.DisplayName, killer.Player.equipment.asset.itemName), deathMessageColor);
break;
}

return;
}

if (Translations.Get(cause.ToString().ToLower()) != null)
if (Translate(cause.ToString().ToLower()) != null)
{
if (Translations.Get(cause.ToString().ToLower()).Contains("{1}"))
{
_userManager.BroadcastLocalized(Translations, cause.ToString().ToLower(), deathmessageColor, player.DisplayName, killer.DisplayName, headshot);
}
else
{
_userManager.BroadcastLocalized(Translations, cause.ToString().ToLower(), deathmessageColor, player.DisplayName, headshot);
}
UnturnedChat.Say(
Translate(cause.ToString().ToLower()).Contains("{1}")
? Translate(cause.ToString().ToLower(), player.DisplayName, killer.DisplayName)
: Translate(cause.ToString().ToLower(), player.DisplayName), deathMessageColor);

return;
}
Expand Down
35 changes: 35 additions & 0 deletions Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
using System.Reflection;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("SimpleDeathMessages")]
[assembly: AssemblyDescription("Adds death messages.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SimpleDeathMessages")]
[assembly: AssemblyCopyright("Copyright © 2021")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("602882B6-F16C-4247-9F5D-21846BC4C09A")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.3.1.2")]
[assembly: AssemblyFileVersion("1.3.1.2")]
107 changes: 83 additions & 24 deletions SimpleDeathMessages.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,92 @@
<Project Sdk="Microsoft.NET.Sdk">
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<TargetFrameworks>net35</TargetFrameworks>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{602882B6-F16C-4247-9F5D-21846BC4C09A}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<AssemblyName>SimpleDeathMessages</AssemblyName>
<RootNamespace>coolpuppy24.SimpleDeathMessages</RootNamespace>
<OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup>
<PackageId>SimpleDeathMessages</PackageId>
<PackageTags>RocketMod Unturned</PackageTags>
<PackageAuthors>Coopyy, Enes Sadık Özbek &lt;esozbek.me&gt;</PackageAuthors>
<PackageOwners>Coopyy</PackageOwners>
<Version>1.0.0</Version>
<PackageVersion>1.0.0</PackageVersion>
<Authors>Coopyy, Enes Sadık Özbek &lt;esozbek.me&gt;</Authors>
<Description>Show death messages in the server's chat!</Description>
<Copyright>Coopyy</Copyright>
<AssemblyVersion>1.0.0</AssemblyVersion>
<FileVersion>1.0.0</FileVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<TargetFramework>netcoreapp3.1</TargetFramework>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<ReleaseVersion>0.2.1</ReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Rocket.Core" Version="5.0.0.566">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</PackageReference>
<PackageReference Include="Rocket.Unturned" Version="5.0.0.162" />
</ItemGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp">
<HintPath>lib\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Rocket.API">
<HintPath>lib\Rocket.API.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Rocket.Core">
<HintPath>lib\Rocket.Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Rocket.Unturned">
<HintPath>lib\Rocket.Unturned.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="UnityEngine">
<HintPath>lib\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>lib\UnityEngine.CoreModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="com.rlabrecque.steamworks.net">
<HintPath>lib\com.rlabrecque.steamworks.net.dll</HintPath>
</Reference>
</ItemGroup>
</Project>
<ItemGroup>
<Compile Include="Main.cs" />
<Compile Include="SimpleDeathMessagesConfiguration.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="lib\Assembly-CSharp.dll" />
<Content Include="lib\Rocket.API.dll" />
<Content Include="lib\Rocket.Core.dll" />
<Content Include="lib\Rocket.Unturned.dll" />
<Content Include="lib\UnityEngine.CoreModule.dll" />
<Content Include="lib\UnityEngine.dll" />
<Content Include="lib\Steamworks.NET.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
Loading