mirror of
https://github.com/MSWS/TTT.git
synced 2025-12-07 23:06:33 -08:00
Compare commits
14 Commits
0.12.0-dev
...
0.13.0-dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e7dc5c02fe | ||
|
|
522e42a5ff | ||
|
|
871500fbdc | ||
|
|
f023d36aa9 | ||
|
|
a185b217e0 | ||
|
|
dbfd360c6c | ||
|
|
4a64741a8e | ||
|
|
7372ffda45 | ||
|
|
9ea9c78208 | ||
|
|
85601f1fc0 | ||
|
|
ddf52f057d | ||
|
|
c2ecba1847 | ||
|
|
67755c36c6 | ||
|
|
2e6743c25d |
8
.github/workflows/release.yml
vendored
8
.github/workflows/release.yml
vendored
@@ -112,14 +112,14 @@ jobs:
|
||||
curr="${{ steps.gitversion.outputs.fullSemVer }}"
|
||||
|
||||
# Choose what you want in the raw feed: %s = subject only, %B = full message
|
||||
GIT_LOG_FORMAT='%s'
|
||||
GIT_LOG_FORMAT='%B'
|
||||
|
||||
if [[ "$prev" == "0.0.0" ]]; then
|
||||
# First release: whole history to this tag, first-parent to reflect main’s narrative
|
||||
git log --first-parent --no-merges --format="${GIT_LOG_FORMAT}" --reverse "$curr" > CHANGELOG.md
|
||||
git log --no-merges --format="${GIT_LOG_FORMAT}" --reverse "$curr" > CHANGELOG.md
|
||||
else
|
||||
# Strict range between the previous reachable tag and the new tag on this lineage
|
||||
git log --first-parent --no-merges --format="${GIT_LOG_FORMAT}" --reverse "$prev..$curr" > CHANGELOG.md
|
||||
git log --no-merges --format="${GIT_LOG_FORMAT}" --reverse "$prev..$curr" > CHANGELOG.md
|
||||
fi
|
||||
|
||||
# Fallback in case nothing was captured
|
||||
@@ -158,7 +158,7 @@ jobs:
|
||||
|
||||
# Build the JSON body. We feed system guidance and the raw changelog
|
||||
# See OpenAI Responses API docs for the schema and output_text helper. :contentReference[oaicite:0]{index=0}
|
||||
jq -Rs --arg sys "You are an expert release-notes editor. Rewrite the text so it is grouped by Features, Fixes, Docs, and Chore. Use clear user-facing language. Remove internal ticket IDs and commit hashes unless essential. Merge duplicates. Use imperative voice. Output valid Markdown only. Include a short summary at the top." \
|
||||
jq -Rs --arg sys "You are an expert release-notes writer. Given a list of changes in various formats (e.g: commits, merges, etc.), write Release notes, grouping by features, features, and other pertinent groups where appropriate. Do not include a group if it is not necessary / populated. Remove internal ticket IDs and commit hashes unless essential. Merge duplicates. Use imperative, past tense voice voice. Output valid Markdown only." \
|
||||
--arg temp "${OPENAI_TEMPERATURE}" \
|
||||
--arg model "${OPENAI_MODEL}" \
|
||||
'{model:$model, temperature: ($temp|tonumber), input:[{role:"system", content:$sys},{role:"user", content:.}]}' CHANGELOG_RAW.md > request.json
|
||||
|
||||
@@ -1,34 +1,17 @@
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API;
|
||||
using TTT.API.Messages;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
using TTT.Game;
|
||||
using TTT.Locale;
|
||||
|
||||
namespace TTT.CS2;
|
||||
|
||||
public class CS2Body(IServiceProvider provider, CRagdollProp ragdoll,
|
||||
IPlayer player) : IBody {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly IMsgLocalizer locale =
|
||||
provider.GetRequiredService<IMsgLocalizer>();
|
||||
|
||||
private readonly IMessenger messenger =
|
||||
provider.GetRequiredService<IMessenger>();
|
||||
|
||||
private readonly IRoleAssigner roles =
|
||||
provider.GetRequiredService<IRoleAssigner>();
|
||||
|
||||
public class CS2Body(CRagdollProp ragdoll, IPlayer player) : IBody {
|
||||
public CRagdollProp Ragdoll { get; } = ragdoll;
|
||||
public IPlayer OfPlayer { get; } = player;
|
||||
public bool IsIdentified { get; set; }
|
||||
public IWeapon? MurderWeapon { get; private set; }
|
||||
|
||||
public IPlayer? Killer { get; private set; }
|
||||
public IPlayer? Killer { get; set; }
|
||||
public string Id { get; } = ragdoll.Index.ToString();
|
||||
public DateTime TimeOfDeath { get; } = DateTime.Now;
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI.Configs;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API.Command;
|
||||
using TTT.API.Extensions;
|
||||
using TTT.API.Game;
|
||||
@@ -39,6 +40,7 @@ public static class CS2ServiceCollection {
|
||||
collection.AddModBehavior<IStorage<ShopConfig>, CS2ShopConfig>();
|
||||
collection
|
||||
.AddModBehavior<IStorage<OneShotDeagleConfig>, CS2OneShotDeagleConfig>();
|
||||
collection.AddModBehavior<IStorage<C4Config>, CS2C4Config>();
|
||||
|
||||
// TTT - CS2 Specific optionals
|
||||
collection.AddScoped<ITextSpawner, TextSpawner>();
|
||||
|
||||
@@ -5,7 +5,6 @@ using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API;
|
||||
using TTT.API.Command;
|
||||
using TTT.API.Player;
|
||||
using TTT.Game;
|
||||
using TTT.Game.Commands;
|
||||
using TTT.Game.lang;
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
using ShopAPI;
|
||||
using TTT.API.Command;
|
||||
using TTT.API.Player;
|
||||
using TTT.Locale;
|
||||
|
||||
namespace TTT.CS2.Command.Test;
|
||||
|
||||
|
||||
61
TTT/CS2/Configs/ShopItems/CS2C4Config.cs
Normal file
61
TTT/CS2/Configs/ShopItems/CS2C4Config.cs
Normal file
@@ -0,0 +1,61 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Cvars;
|
||||
using CounterStrikeSharp.API.Modules.Cvars.Validators;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API;
|
||||
using TTT.API.Storage;
|
||||
using TTT.CS2.Validators;
|
||||
|
||||
namespace TTT.CS2.Configs.ShopItems;
|
||||
|
||||
public class CS2C4Config : IStorage<C4Config>, IPluginModule {
|
||||
public static readonly FakeConVar<int> CV_PRICE = new("css_ttt_shop_c4_price",
|
||||
"Price of the C4 item", 140, ConVarFlags.FCVAR_NONE,
|
||||
new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<string> CV_WEAPON = new(
|
||||
"css_ttt_shop_c4_weapon", "Weapon entity name used for the C4", "weapon_c4",
|
||||
ConVarFlags.FCVAR_NONE, new ItemValidator(allowMultiple: false));
|
||||
|
||||
public static readonly FakeConVar<int> CV_MAX_PER_ROUND = new(
|
||||
"css_ttt_shop_c4_max_per_round",
|
||||
"Maximum number of C4 that can be purchased per round", 0,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 64));
|
||||
|
||||
public static readonly FakeConVar<int> CV_MAX_AT_ONCE = new(
|
||||
"css_ttt_shop_c4_max_at_once",
|
||||
"Maximum number of C4 that can be active at once", 1,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 64));
|
||||
|
||||
public static readonly FakeConVar<float> CV_POWER = new(
|
||||
"css_ttt_shop_c4_power", "Explosion power (damage multiplier) of the C4",
|
||||
100f, ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 10000f));
|
||||
|
||||
public static readonly FakeConVar<int> CV_FUSE_TIME = new(
|
||||
"css_ttt_shop_c4_fuse_time", "Fuse time of the C4 in seconds", 30,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 300));
|
||||
|
||||
public static readonly FakeConVar<bool> CV_FRIENDLY_FIRE = new(
|
||||
"css_ttt_shop_c4_ff", "Whether the C4 damages teammates");
|
||||
|
||||
public void Dispose() { }
|
||||
|
||||
public void Start() { }
|
||||
|
||||
public void Start(BasePlugin? plugin) { plugin?.RegisterFakeConVars(this); }
|
||||
|
||||
public Task<C4Config?> Load() {
|
||||
var cfg = new C4Config {
|
||||
Price = CV_PRICE.Value,
|
||||
Weapon = CV_WEAPON.Value,
|
||||
MaxC4PerRound = CV_MAX_PER_ROUND.Value,
|
||||
MaxC4AtOnce = CV_MAX_AT_ONCE.Value,
|
||||
Power = CV_POWER.Value,
|
||||
FuseTime = TimeSpan.FromSeconds(CV_FUSE_TIME.Value),
|
||||
FriendlyFire = CV_FRIENDLY_FIRE.Value
|
||||
};
|
||||
|
||||
return Task.FromResult<C4Config?>(cfg);
|
||||
}
|
||||
}
|
||||
@@ -32,10 +32,7 @@ public class CS2OneShotDeagleConfig : IStorage<OneShotDeagleConfig>,
|
||||
|
||||
public void Start() { }
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
|
||||
plugin.RegisterFakeConVars(this);
|
||||
}
|
||||
public void Start(BasePlugin? plugin) { plugin?.RegisterFakeConVars(this); }
|
||||
|
||||
public Task<OneShotDeagleConfig?> Load() {
|
||||
var cfg = new OneShotDeagleConfig {
|
||||
|
||||
@@ -4,6 +4,7 @@ using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Core.Attributes.Registration;
|
||||
using CounterStrikeSharp.API.Modules.Entities.Constants;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API;
|
||||
using TTT.API.Events;
|
||||
@@ -27,6 +28,7 @@ public class BodySpawner(IServiceProvider provider) : IPluginModule {
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
|
||||
[UsedImplicitly]
|
||||
[GameEventHandler]
|
||||
public HookResult OnDeath(EventPlayerDeath ev, GameEventInfo _) {
|
||||
if (games.ActiveGame is not { State: State.IN_PROGRESS })
|
||||
@@ -36,7 +38,7 @@ public class BodySpawner(IServiceProvider provider) : IPluginModule {
|
||||
player.SetColor(Color.FromArgb(0, 255, 255, 255));
|
||||
|
||||
var ragdollBody = makeGameRagdoll(player);
|
||||
var body = new CS2Body(provider, ragdollBody, converter.GetPlayer(player));
|
||||
var body = new CS2Body(ragdollBody, converter.GetPlayer(player));
|
||||
|
||||
if (ev.Attacker != null && ev.Attacker.IsValid)
|
||||
body.WithKiller(converter.GetPlayer(ev.Attacker));
|
||||
@@ -50,6 +52,7 @@ public class BodySpawner(IServiceProvider provider) : IPluginModule {
|
||||
return HookResult.Continue;
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[GameEventHandler]
|
||||
public HookResult OnStart(EventRoundStart ev, GameEventInfo _) {
|
||||
Server.NextWorldUpdate(() => {
|
||||
|
||||
11
TTT/CS2/Items/Camouflage/CamoMsgs.cs
Normal file
11
TTT/CS2/Items/Camouflage/CamoMsgs.cs
Normal file
@@ -0,0 +1,11 @@
|
||||
using TTT.Locale;
|
||||
|
||||
namespace TTT.CS2.Items.Camouflage;
|
||||
|
||||
public class CamoMsgs {
|
||||
public static IMsg SHOP_ITEM_CAMO
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_CAMO));
|
||||
|
||||
public static IMsg SHOP_ITEM_CAMO_DESC
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_CAMO_DESC));
|
||||
}
|
||||
42
TTT/CS2/Items/Camouflage/CamouflageItem.cs
Normal file
42
TTT/CS2/Items/Camouflage/CamouflageItem.cs
Normal file
@@ -0,0 +1,42 @@
|
||||
using System.Drawing;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI;
|
||||
using ShopAPI.Configs;
|
||||
using TTT.API.Extensions;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Storage;
|
||||
using TTT.CS2.Extensions;
|
||||
|
||||
namespace TTT.CS2.Items.Camouflage;
|
||||
|
||||
public static class CamoServiceCollection {
|
||||
public static void AddCamoServices(this IServiceCollection collection) {
|
||||
collection.AddModBehavior<CamouflageItem>();
|
||||
}
|
||||
}
|
||||
|
||||
public class CamouflageItem(IServiceProvider provider) : BaseItem(provider) {
|
||||
private readonly CamoConfig config =
|
||||
provider.GetService<IStorage<CamoConfig>>()?.Load().GetAwaiter().GetResult()
|
||||
?? new CamoConfig();
|
||||
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
public override string Name => Locale[CamoMsgs.SHOP_ITEM_CAMO];
|
||||
public override string Description => Locale[CamoMsgs.SHOP_ITEM_CAMO_DESC];
|
||||
public override ShopItemConfig Config => config;
|
||||
|
||||
public override void OnPurchase(IOnlinePlayer player) {
|
||||
var gamePlayer = converter.GetPlayer(player);
|
||||
var alpha = (int)Math.Round(config.CamoVisibility * 255);
|
||||
gamePlayer?.SetColor(Color.FromArgb(alpha, Color.White));
|
||||
}
|
||||
|
||||
public override PurchaseResult CanPurchase(IOnlinePlayer player) {
|
||||
return Shop.HasItem<CamouflageItem>(player) ?
|
||||
PurchaseResult.ALREADY_OWNED :
|
||||
PurchaseResult.SUCCESS;
|
||||
}
|
||||
}
|
||||
@@ -16,6 +16,15 @@ namespace TTT.CS2.Items.DNA;
|
||||
public class DnaListener(IServiceProvider provider) : BaseListener(provider) {
|
||||
private static readonly TimeSpan cooldown = TimeSpan.FromSeconds(15);
|
||||
|
||||
private static readonly string[] missingDnaExplanations = {
|
||||
"the killer used gloves... for their bullets",
|
||||
"the killer was very careful", "the killer wiped the weapon clean",
|
||||
"the killer retrieved the bullets", "the bullets disintegrated on impact",
|
||||
"the killer was GOATed", "but no DNA was found",
|
||||
"but legal litigation caused the DNA to be lost",
|
||||
"and confirmed they were dead", "and they will remember that", "good job"
|
||||
};
|
||||
|
||||
private readonly IBodyTracker bodies =
|
||||
provider.GetRequiredService<IBodyTracker>();
|
||||
|
||||
@@ -28,15 +37,6 @@ public class DnaListener(IServiceProvider provider) : BaseListener(provider) {
|
||||
private readonly Dictionary<string, DateTime> lastMessages = new();
|
||||
private readonly IShop shop = provider.GetRequiredService<IShop>();
|
||||
|
||||
private static readonly string[] missingDnaExplanations = {
|
||||
"the killer used gloves... for their bullets",
|
||||
"the killer was very careful", "the killer wiped the weapon clean",
|
||||
"the killer retrieved the bullets", "the bullets disintegrated on impact",
|
||||
"the killer was GOATed", "but no DNA was found",
|
||||
"but legal litigation caused the DNA to be lost",
|
||||
"and confirmed they were dead", "and they will remember that", "good job"
|
||||
};
|
||||
|
||||
// Low priority to allow body identification to happen first
|
||||
[UsedImplicitly]
|
||||
[EventHandler(Priority = Priority.LOW)]
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
using TTT.Game;
|
||||
using TTT.Game.lang;
|
||||
using TTT.Locale;
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI.Configs;
|
||||
using TTT.API.Extensions;
|
||||
@@ -22,20 +21,20 @@ public class DamageStation(IServiceProvider provider) : StationItem(provider,
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new DamageStationConfig()) {
|
||||
public override string Name => "Damage Station";
|
||||
|
||||
public override string Description
|
||||
=> "Deployable damage station that harms nearby traitors over time.";
|
||||
|
||||
private readonly IRoleAssigner roles =
|
||||
provider.GetRequiredService<IRoleAssigner>();
|
||||
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly IPlayerFinder finder =
|
||||
provider.GetRequiredService<IPlayerFinder>();
|
||||
|
||||
private readonly IRoleAssigner roles =
|
||||
provider.GetRequiredService<IRoleAssigner>();
|
||||
|
||||
public override string Name => Locale[StationMsgs.SHOP_ITEM_STATION_HURT];
|
||||
|
||||
public override string Description
|
||||
=> Locale[StationMsgs.SHOP_ITEM_STATION_HURT_DESC];
|
||||
|
||||
override protected void onInterval() {
|
||||
var players = finder.GetOnline();
|
||||
foreach (var (prop, info) in props) {
|
||||
@@ -68,7 +67,7 @@ public class DamageStation(IServiceProvider provider) : StationItem(provider,
|
||||
player.Health += damageAmount;
|
||||
info.HealthGiven += damageAmount;
|
||||
|
||||
gamePlayer.ExecuteClientCommand("play sounds/buttons/blip2");
|
||||
gamePlayer.ExecuteClientCommand("play " + _Config.UseSound);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,10 +18,10 @@ public class HealthStation(IServiceProvider provider) : StationItem(provider,
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new HealthStationConfig()) {
|
||||
public override string Name => "Health Station";
|
||||
public override string Name => Locale[StationMsgs.SHOP_ITEM_STATION_HEALTH];
|
||||
|
||||
public override string Description
|
||||
=> "Deployable health station that heals nearby players over time.";
|
||||
=> Locale[StationMsgs.SHOP_ITEM_STATION_HEALTH_DESC];
|
||||
|
||||
override protected void onInterval() {
|
||||
var players = Utilities.GetPlayers();
|
||||
@@ -50,7 +50,7 @@ public class HealthStation(IServiceProvider provider) : StationItem(provider,
|
||||
player.SetHealth(newHealth);
|
||||
info.HealthGiven += healAmount;
|
||||
|
||||
player.ExecuteClientCommand("play sounds/buttons/blip1");
|
||||
player.ExecuteClientCommand("play " + _Config.UseSound);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Core.Attributes.Registration;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI;
|
||||
@@ -17,24 +18,25 @@ namespace TTT.CS2.Items.Station;
|
||||
public abstract class StationItem(IServiceProvider provider,
|
||||
StationConfig config)
|
||||
: RoleRestrictedItem<DetectiveRole>(provider), IPluginModule {
|
||||
private static readonly long PROP_SIZE_SQUARED = 500;
|
||||
protected readonly StationConfig _Config = config;
|
||||
|
||||
private readonly IScheduler scheduler =
|
||||
provider.GetRequiredService<IScheduler>();
|
||||
|
||||
protected readonly IPlayerConverter<CCSPlayerController> Converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
protected readonly Dictionary<CPhysicsPropMultiplayer, StationInfo> props =
|
||||
new();
|
||||
|
||||
private readonly IMessenger messenger =
|
||||
provider.GetRequiredService<IMessenger>();
|
||||
|
||||
private static readonly long PROP_SIZE_SQUARED = 500;
|
||||
protected readonly Dictionary<CPhysicsPropMultiplayer, StationInfo> props =
|
||||
new();
|
||||
|
||||
private readonly IScheduler scheduler =
|
||||
provider.GetRequiredService<IScheduler>();
|
||||
|
||||
private IDisposable? intervalHandle;
|
||||
|
||||
public override ShopItemConfig Config => _Config;
|
||||
|
||||
public override void Start() {
|
||||
base.Start();
|
||||
intervalHandle = scheduler.SchedulePeriodic(_Config.HealthInterval,
|
||||
@@ -51,16 +53,18 @@ public abstract class StationItem(IServiceProvider provider,
|
||||
});
|
||||
}
|
||||
|
||||
public override ShopItemConfig Config => _Config;
|
||||
public override void Dispose() {
|
||||
base.Dispose();
|
||||
intervalHandle?.Dispose();
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[GameEventHandler]
|
||||
public HookResult OnBulletImpact(EventBulletImpact ev, GameEventInfo info) {
|
||||
var hitVec =
|
||||
new CounterStrikeSharp.API.Modules.Utils.Vector(ev.X, ev.Y, ev.Z);
|
||||
var hitVec = new Vector(ev.X, ev.Y, ev.Z);
|
||||
|
||||
var nearest = props
|
||||
.Select(kv => (Key: kv.Key, Value: kv.Value,
|
||||
.Select(kv => (kv.Key, kv.Value,
|
||||
Distance: kv.Key.AbsOrigin!.DistanceSquared(hitVec)))
|
||||
.Where(t => t.Key is { IsValid: true, AbsOrigin: not null })
|
||||
.OrderBy(t => t.Distance)
|
||||
@@ -88,8 +92,7 @@ public abstract class StationItem(IServiceProvider provider,
|
||||
var user = ev.Userid;
|
||||
var weapon = user?.Pawn.Value?.WeaponServices?.ActiveWeapon.Value;
|
||||
var dist =
|
||||
(user?.Pawn.Value?.AbsOrigin?.Distance(
|
||||
new CounterStrikeSharp.API.Modules.Utils.Vector(ev.X, ev.Y, ev.Z))
|
||||
(user?.Pawn.Value?.AbsOrigin?.Distance(new Vector(ev.X, ev.Y, ev.Z))
|
||||
?? null) ?? 1;
|
||||
var distScale = Math.Clamp(256 / dist, 0.1, 1);
|
||||
var baseDamage = getBaseDamage(weapon?.DesignerName ?? "");
|
||||
@@ -129,9 +132,10 @@ public abstract class StationItem(IServiceProvider provider,
|
||||
|| gamePlayer.Pawn.Value == null)
|
||||
return;
|
||||
var spawnPos = gamePlayer.Pawn.Value.AbsOrigin.Clone();
|
||||
if (spawnPos != null) {
|
||||
if (gamePlayer.PlayerPawn.Value != null)
|
||||
spawnPos += gamePlayer.PlayerPawn.Value?.EyeAngles.ToForward()! * 8;
|
||||
if (spawnPos != null && gamePlayer.PlayerPawn.Value != null) {
|
||||
var forward = gamePlayer.PlayerPawn.Value.EyeAngles.ToForward();
|
||||
forward.Z = 0;
|
||||
spawnPos += forward.Normalized() * 8;
|
||||
}
|
||||
|
||||
prop.Teleport(spawnPos);
|
||||
@@ -139,9 +143,4 @@ public abstract class StationItem(IServiceProvider provider,
|
||||
}
|
||||
|
||||
abstract protected void onInterval();
|
||||
|
||||
public override void Dispose() {
|
||||
base.Dispose();
|
||||
intervalHandle?.Dispose();
|
||||
}
|
||||
}
|
||||
17
TTT/CS2/Items/Station/StationMsgs.cs
Normal file
17
TTT/CS2/Items/Station/StationMsgs.cs
Normal file
@@ -0,0 +1,17 @@
|
||||
using TTT.Locale;
|
||||
|
||||
namespace TTT.CS2.Items.Station;
|
||||
|
||||
public class StationMsgs {
|
||||
public static IMsg SHOP_ITEM_STATION_HEALTH
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_STATION_HEALTH));
|
||||
|
||||
public static IMsg SHOP_ITEM_STATION_HEALTH_DESC
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_STATION_HEALTH_DESC));
|
||||
|
||||
public static IMsg SHOP_ITEM_STATION_HURT
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_STATION_HURT));
|
||||
|
||||
public static IMsg SHOP_ITEM_STATION_HURT_DESC
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_STATION_HURT_DESC));
|
||||
}
|
||||
@@ -7,7 +7,6 @@ using TTT.API.Player;
|
||||
using TTT.CS2.API;
|
||||
using TTT.CS2.Events;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.Game;
|
||||
using TTT.Game.Events.Body;
|
||||
using TTT.Game.lang;
|
||||
using TTT.Game.Listeners;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using TTT.API.Player;
|
||||
using TTT.CS2.Extensions;
|
||||
|
||||
namespace TTT.CS2.Player;
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
using TTT.Game;
|
||||
using TTT.Game.lang;
|
||||
using TTT.Locale;
|
||||
|
||||
|
||||
@@ -1,8 +1,17 @@
|
||||
ROLE_SPECTATOR: "Spectator"
|
||||
TASER_SCANNED: "%PREFIX%You scanned {0}{grey}, they are %an% {1}{grey}!"
|
||||
DNA_PREFIX: " {darkblue}D{blue}N{lightblue}A{grey} | {grey}"
|
||||
DNA_PREFIX: "{darkblue}D{blue}N{lightblue}A{grey} | {grey}"
|
||||
|
||||
SHOP_ITEM_DNA: "DNA Scanner"
|
||||
SHOP_ITEM_DNA_DESC: "Scan bodies to reveal the person who killed them."
|
||||
SHOP_ITEM_DNA_SCANNED: "%DNA_PREFIX%You scanned {0}{1}'%s% {grey}body, their killer was {red}{2}{grey}."
|
||||
SHOP_ITEM_DNA_SCANNED_OTHER: "%DNA_PREFIX%You scanned {0}{1}'%s% {grey}body, {2}."
|
||||
SHOP_ITEM_DNA_EXPIRED: "%DNA_PREFIX%You scanned {0}{1}'%s% {grey}body, but the DNA has expired."
|
||||
SHOP_ITEM_DNA_EXPIRED: "%DNA_PREFIX%You scanned {0}{1}'%s% {grey}body, but the DNA has expired."
|
||||
|
||||
SHOP_ITEM_STATION_HEALTH: "Health Station"
|
||||
SHOP_ITEM_STATION_HEALTH_DESC: "A health station that heals players around it."
|
||||
SHOP_ITEM_STATION_HURT: "Hurt Station"
|
||||
SHOP_ITEM_STATION_HURT_DESC: "A station that hurts non-Traitors around it."
|
||||
|
||||
SHOP_ITEM_CAMO: "Camouflage"
|
||||
SHOP_ITEM_CAMO_DESC: "Disguise yourself and make yourself harder to see."
|
||||
@@ -7,7 +7,7 @@ public interface IBody {
|
||||
IPlayer OfPlayer { get; }
|
||||
bool IsIdentified { get; set; }
|
||||
IWeapon? MurderWeapon { get; }
|
||||
IPlayer? Killer { get; }
|
||||
IPlayer? Killer { get; set; }
|
||||
string Id { get; }
|
||||
DateTime TimeOfDeath { get; }
|
||||
}
|
||||
@@ -1,4 +1,3 @@
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI;
|
||||
using TTT.API.Command;
|
||||
|
||||
@@ -2,7 +2,6 @@ using CounterStrikeSharp.API.Modules.Utils;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API.Command;
|
||||
using TTT.API.Player;
|
||||
using TTT.Game;
|
||||
using TTT.Game.lang;
|
||||
using TTT.Locale;
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI;
|
||||
using TTT.API.Events;
|
||||
@@ -17,6 +18,7 @@ public class StickerListener(IServiceProvider provider)
|
||||
private readonly IIconManager? icons = provider.GetService<IIconManager>();
|
||||
private readonly IShop shop = provider.GetRequiredService<IShop>();
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler(Priority = Priority.MONITOR)]
|
||||
public void OnHurt(PlayerDamagedEvent ev) {
|
||||
if (icons == null || ev.Attacker == null
|
||||
|
||||
11
TTT/Shop/Items/M4A1/M4A1Msgs.cs
Normal file
11
TTT/Shop/Items/M4A1/M4A1Msgs.cs
Normal file
@@ -0,0 +1,11 @@
|
||||
using TTT.Locale;
|
||||
|
||||
namespace TTT.Shop.Items.M4A1;
|
||||
|
||||
public class M4A1Msgs {
|
||||
public static IMsg SHOP_ITEM_M4A1
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_M4A1));
|
||||
|
||||
public static IMsg SHOP_ITEM_M4A1_DESC
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_M4A1_DESC));
|
||||
}
|
||||
40
TTT/Shop/Items/M4A1/M4A1ShopItem.cs
Normal file
40
TTT/Shop/Items/M4A1/M4A1ShopItem.cs
Normal file
@@ -0,0 +1,40 @@
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI;
|
||||
using ShopAPI.Configs;
|
||||
using TTT.API.Extensions;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Storage;
|
||||
using TTT.Game.Roles;
|
||||
|
||||
namespace TTT.Shop.Items.M4A1;
|
||||
|
||||
public static class M4A1ServiceCollection {
|
||||
public static void AddM4A1Services(this IServiceCollection collection) {
|
||||
collection.AddModBehavior<M4A1ShopItem>();
|
||||
}
|
||||
}
|
||||
|
||||
public class M4A1ShopItem(IServiceProvider provider) : BaseItem(provider) {
|
||||
private readonly M4A1Config config =
|
||||
provider.GetService<IStorage<M4A1Config>>()?.Load().GetAwaiter().GetResult()
|
||||
?? new M4A1Config();
|
||||
|
||||
public override string Name => Locale[M4A1Msgs.SHOP_ITEM_M4A1];
|
||||
public override string Description => Locale[M4A1Msgs.SHOP_ITEM_M4A1_DESC];
|
||||
|
||||
public override ShopItemConfig Config => config;
|
||||
|
||||
public override void OnPurchase(IOnlinePlayer player) {
|
||||
Task.Run(async () => {
|
||||
foreach (var slot in config.ClearSlots)
|
||||
await Inventory.RemoveWeaponInSlot(player, slot);
|
||||
|
||||
foreach (var weapon in config.Weapons)
|
||||
await Inventory.GiveWeapon(player, new BaseWeapon(weapon));
|
||||
});
|
||||
}
|
||||
|
||||
public override PurchaseResult CanPurchase(IOnlinePlayer player) {
|
||||
return PurchaseResult.SUCCESS;
|
||||
}
|
||||
}
|
||||
10
TTT/Shop/Items/Traitor/C4/C4Msgs.cs
Normal file
10
TTT/Shop/Items/Traitor/C4/C4Msgs.cs
Normal file
@@ -0,0 +1,10 @@
|
||||
using TTT.Locale;
|
||||
|
||||
namespace TTT.Shop.Items.Traitor.C4;
|
||||
|
||||
public class C4Msgs {
|
||||
public static IMsg SHOP_ITEM_C4_DESC =
|
||||
MsgFactory.Create(nameof(SHOP_ITEM_C4_DESC));
|
||||
|
||||
public static IMsg SHOP_ITEM_C4 => MsgFactory.Create(nameof(SHOP_ITEM_C4));
|
||||
}
|
||||
64
TTT/Shop/Items/Traitor/C4/C4ShopItem.cs
Normal file
64
TTT/Shop/Items/Traitor/C4/C4ShopItem.cs
Normal file
@@ -0,0 +1,64 @@
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI;
|
||||
using ShopAPI.Configs;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API.Events;
|
||||
using TTT.API.Extensions;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Storage;
|
||||
using TTT.Game.Events.Game;
|
||||
using TTT.Game.Roles;
|
||||
|
||||
namespace TTT.Shop.Items.Traitor.C4;
|
||||
|
||||
public static class C4ServiceCollection {
|
||||
public static void AddC4Services(this IServiceCollection collection) {
|
||||
collection.AddModBehavior<C4ShopItem>();
|
||||
}
|
||||
}
|
||||
|
||||
public class C4ShopItem(IServiceProvider provider)
|
||||
: RoleRestrictedItem<TraitorRole>(provider), IListener {
|
||||
private readonly C4Config config = provider.GetService<IStorage<C4Config>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new C4Config();
|
||||
|
||||
private readonly IPlayerFinder finder =
|
||||
provider.GetRequiredService<IPlayerFinder>();
|
||||
|
||||
private int c4sBought;
|
||||
public override string Name => Locale[C4Msgs.SHOP_ITEM_C4];
|
||||
public override string Description => Locale[C4Msgs.SHOP_ITEM_C4_DESC];
|
||||
|
||||
public override ShopItemConfig Config => config;
|
||||
|
||||
public override void OnPurchase(IOnlinePlayer player) {
|
||||
Inventory.GiveWeapon(player, new BaseWeapon(config.Weapon));
|
||||
}
|
||||
|
||||
public override PurchaseResult CanPurchase(IOnlinePlayer player) {
|
||||
if (config.MaxC4PerRound > 0)
|
||||
if (c4sBought > config.MaxC4PerRound)
|
||||
return PurchaseResult.ITEM_NOT_PURCHASABLE;
|
||||
|
||||
if (config.MaxC4AtOnce > 0) {
|
||||
var count = 0;
|
||||
if (finder.GetOnline()
|
||||
.Where(p => Shop.HasItem<C4ShopItem>(p))
|
||||
.Any(_ => count++ >= config.MaxC4AtOnce))
|
||||
return PurchaseResult.ITEM_NOT_PURCHASABLE;
|
||||
}
|
||||
|
||||
return base.CanPurchase(player);
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnRoundStart(GameStateUpdateEvent ev) {
|
||||
if (ev.NewState != State.IN_PROGRESS) return;
|
||||
c4sBought = 0;
|
||||
}
|
||||
}
|
||||
35
TTT/Shop/Items/Traitor/Gloves/GlovesItem.cs
Normal file
35
TTT/Shop/Items/Traitor/Gloves/GlovesItem.cs
Normal file
@@ -0,0 +1,35 @@
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI;
|
||||
using ShopAPI.Configs;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API.Extensions;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Storage;
|
||||
using TTT.Game.Roles;
|
||||
|
||||
namespace TTT.Shop.Items.Traitor.Gloves;
|
||||
|
||||
public static class GlovesServiceCollection {
|
||||
public static void AddGlovesServices(this IServiceCollection collection) {
|
||||
collection.AddModBehavior<GlovesItem>();
|
||||
collection.AddModBehavior<GlovesListener>();
|
||||
}
|
||||
}
|
||||
|
||||
public class GlovesItem(IServiceProvider provider)
|
||||
: RoleRestrictedItem<TraitorRole>(provider) {
|
||||
private readonly GlovesConfig config =
|
||||
provider.GetService<IStorage<GlovesConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new GlovesConfig();
|
||||
|
||||
public override string Name => Locale[GlovesMsgs.SHOP_ITEM_GLOVES];
|
||||
|
||||
public override string Description
|
||||
=> Locale[GlovesMsgs.SHOP_ITEM_GLOVES_DESC];
|
||||
|
||||
public override ShopItemConfig Config => config;
|
||||
|
||||
public override void OnPurchase(IOnlinePlayer player) { }
|
||||
}
|
||||
75
TTT/Shop/Items/Traitor/Gloves/GlovesListener.cs
Normal file
75
TTT/Shop/Items/Traitor/Gloves/GlovesListener.cs
Normal file
@@ -0,0 +1,75 @@
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API.Events;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Storage;
|
||||
using TTT.Game.Events.Body;
|
||||
using TTT.Game.Events.Game;
|
||||
using TTT.Game.Listeners;
|
||||
using TTT.Shop.Events;
|
||||
|
||||
namespace TTT.Shop.Items.Traitor.Gloves;
|
||||
|
||||
public class GlovesListener(IServiceProvider provider)
|
||||
: BaseListener(provider) {
|
||||
private readonly GlovesConfig item =
|
||||
provider.GetService<IStorage<GlovesConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new GlovesConfig();
|
||||
|
||||
private readonly IShop shop = provider.GetRequiredService<IShop>();
|
||||
|
||||
private readonly Dictionary<IPlayer, int> uses = new();
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnPurchase(PlayerPurchaseItemEvent ev) {
|
||||
if (ev.Item is not GlovesItem) return;
|
||||
uses[ev.Player] = item.MaxUses;
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void BodyCreate(BodyCreateEvent ev) {
|
||||
if (ev.Body.Killer == null || !useGloves(ev.Body.Killer)) return;
|
||||
if (ev.Body.Killer is not IOnlinePlayer online) return;
|
||||
ev.Body.Killer = null;
|
||||
Messenger.Message(online,
|
||||
Locale[
|
||||
GlovesMsgs.SHOP_ITEM_GLOVES_USED_KILL(uses[online], item.MaxUses)]);
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void BodyIdentify(BodyIdentifyEvent ev) {
|
||||
if (ev.Identifier == null || !useGloves(ev.Identifier)) return;
|
||||
ev.IsCanceled = true;
|
||||
|
||||
Messenger.Message(ev.Identifier,
|
||||
Locale[
|
||||
GlovesMsgs.SHOP_ITEM_GLOVES_USED_BODY(uses[ev.Identifier],
|
||||
item.MaxUses)]);
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnGameState(GameStateUpdateEvent ev) {
|
||||
if (ev.NewState != State.IN_PROGRESS) return;
|
||||
uses.Clear();
|
||||
}
|
||||
|
||||
private bool useGloves(IPlayer player) {
|
||||
uses.TryGetValue(player, out var useCount);
|
||||
if (useCount <= 0) return false;
|
||||
uses[player] = useCount - 1;
|
||||
if (useCount - 1 > 0) return true;
|
||||
if (player is not IOnlinePlayer online) return true;
|
||||
shop.RemoveItem<GlovesItem>(online);
|
||||
Messenger.Message(online, Locale[GlovesMsgs.SHOP_ITEM_GLOVES_WORN_OUT]);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
24
TTT/Shop/Items/Traitor/Gloves/GlovesMsgs.cs
Normal file
24
TTT/Shop/Items/Traitor/Gloves/GlovesMsgs.cs
Normal file
@@ -0,0 +1,24 @@
|
||||
using TTT.Locale;
|
||||
|
||||
namespace TTT.Shop.Items.Traitor.Gloves;
|
||||
|
||||
public class GlovesMsgs {
|
||||
public static IMsg SHOP_ITEM_GLOVES
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_GLOVES));
|
||||
|
||||
public static IMsg SHOP_ITEM_GLOVES_DESC
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_GLOVES_DESC));
|
||||
|
||||
public static IMsg SHOP_ITEM_GLOVES_WORN_OUT
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_GLOVES_WORN_OUT));
|
||||
|
||||
public static IMsg SHOP_ITEM_GLOVES_USED_BODY(int usesLeft, int maxUses) {
|
||||
return MsgFactory.Create(nameof(SHOP_ITEM_GLOVES_USED_BODY), usesLeft,
|
||||
maxUses);
|
||||
}
|
||||
|
||||
public static IMsg SHOP_ITEM_GLOVES_USED_KILL(int usesLeft, int maxUses) {
|
||||
return MsgFactory.Create(nameof(SHOP_ITEM_GLOVES_USED_KILL), usesLeft,
|
||||
maxUses);
|
||||
}
|
||||
}
|
||||
@@ -2,8 +2,8 @@
|
||||
xmlns:s="clr-namespace:System;assembly=mscorlib"
|
||||
xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xml:space="preserve">
|
||||
<s:Boolean
|
||||
x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=items_005Coneshotdeagle/@EntryIndexedValue">True</s:Boolean>
|
||||
x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=items_005Coneshotdeagle/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean
|
||||
x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=lang/@EntryIndexedValue">True</s:Boolean>
|
||||
x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=lang/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean
|
||||
x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=shop/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
|
||||
x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=shop/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
|
||||
@@ -1,11 +1,15 @@
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI;
|
||||
using TTT.API.Extensions;
|
||||
using TTT.CS2.Items.Camouflage;
|
||||
using TTT.CS2.Items.DNA;
|
||||
using TTT.CS2.Items.Station;
|
||||
using TTT.Shop.Commands;
|
||||
using TTT.Shop.Items;
|
||||
using TTT.Shop.Items.Detective.Stickers;
|
||||
using TTT.Shop.Items.M4A1;
|
||||
using TTT.Shop.Items.Traitor.C4;
|
||||
using TTT.Shop.Items.Traitor.Gloves;
|
||||
using TTT.Shop.Listeners;
|
||||
|
||||
namespace TTT.Shop;
|
||||
@@ -21,10 +25,14 @@ public static class ShopServiceCollection {
|
||||
collection.AddModBehavior<BuyCommand>();
|
||||
collection.AddModBehavior<BalanceCommand>();
|
||||
|
||||
collection.AddDeagleServices();
|
||||
collection.AddStickerServices();
|
||||
collection.AddDnaScannerServices();
|
||||
collection.AddHealthStation();
|
||||
collection.AddC4Services();
|
||||
collection.AddCamoServices();
|
||||
collection.AddDamageStation();
|
||||
collection.AddDeagleServices();
|
||||
collection.AddDnaScannerServices();
|
||||
collection.AddGlovesServices();
|
||||
collection.AddHealthStation();
|
||||
collection.AddM4A1Services();
|
||||
collection.AddStickerServices();
|
||||
}
|
||||
}
|
||||
@@ -6,14 +6,15 @@ namespace TTT.Shop;
|
||||
public static class ShopMsgs {
|
||||
public static IMsg SHOP_INACTIVE => MsgFactory.Create(nameof(SHOP_INACTIVE));
|
||||
|
||||
public static IMsg SHOP_ITEM_NOT_FOUND(string query)
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_NOT_FOUND), query);
|
||||
|
||||
public static IMsg CREDITS_NAME => MsgFactory.Create(nameof(CREDITS_NAME));
|
||||
|
||||
public static IMsg SHOP_CANNOT_PURCHASE
|
||||
=> MsgFactory.Create(nameof(SHOP_CANNOT_PURCHASE));
|
||||
|
||||
public static IMsg SHOP_ITEM_NOT_FOUND(string query) {
|
||||
return MsgFactory.Create(nameof(SHOP_ITEM_NOT_FOUND), query);
|
||||
}
|
||||
|
||||
public static IMsg CREDITS_GIVEN(int amo) {
|
||||
return MsgFactory.Create(nameof(CREDITS_GIVEN), amo > 0 ? "+" : "-",
|
||||
Math.Abs(amo));
|
||||
|
||||
@@ -9,9 +9,22 @@ SHOP_ITEM_STICKERS: "Stickers"
|
||||
SHOP_ITEM_STICKERS_DESC: "Reveal the roles of all players you taser to others."
|
||||
SHOP_ITEM_STICKERS_HIT: "%PREFIX%You got stickered, your role is now visible to everyone."
|
||||
|
||||
SHOP_ITEM_C4: "C4 Explosive"
|
||||
SHOP_ITEM_C4_DESC: "A powerful explosive that blows up after a delay."
|
||||
|
||||
SHOP_ITEM_M4A1: "M4A1 Rifle and USP-S"
|
||||
SHOP_ITEM_M4A1_DESC: "A fully automatic rifle with a silencer accompanied by a silenced pistol."
|
||||
|
||||
SHOP_ITEM_GLOVES: "Gloves"
|
||||
SHOP_ITEM_GLOVES_DESC: "Lets you kill without DNA being left behind, or move bodies without identifying the body."
|
||||
SHOP_ITEM_GLOVES_USED_BODY: "%PREFIX%You used your gloves to move a body without leaving DNA. ({yellow}{0}{grey}/{yellow}{1}{grey} use%s% left)."
|
||||
SHOP_ITEM_GLOVES_USED_KILL: "%PREFIX%You used your gloves to kill without leaving DNA evidence. ({yellow}{0}{grey}/{yellow}{1}{grey} use%s% left)."
|
||||
SHOP_ITEM_GLOVES_WORN_OUT: "%PREFIX%Your gloves worn out."
|
||||
|
||||
SHOP_INSUFFICIENT_BALANCE: "%PREFIX%You cannot afford {white}{0}{grey}, it costs {yellow}{1}{grey} credit%s%, and you have {yellow}{2}{grey}."
|
||||
SHOP_CANNOT_PURCHASE: "%PREFIX%You cannot purchase this item."
|
||||
SHOP_CANNOT_PURCHASE_WITH_REASON: "%PREFIX%You cannot purchase this item: {red}{0}{grey}."
|
||||
|
||||
CREDITS_NAME: "credit"
|
||||
CREDITS_GIVEN: "%PREFIX%{0}{1} %CREDITS_NAME%%s%"
|
||||
CREDITS_GIVEN_REASON: "%PREFIX%{0}{1} %CREDITS_NAME%%s% {grey}({white}{2}{grey})"
|
||||
|
||||
6
TTT/ShopAPI/Configs/CamoConfig.cs
Normal file
6
TTT/ShopAPI/Configs/CamoConfig.cs
Normal file
@@ -0,0 +1,6 @@
|
||||
namespace ShopAPI.Configs;
|
||||
|
||||
public record CamoConfig : ShopItemConfig {
|
||||
public override int Price { get; init; } = 100;
|
||||
public float CamoVisibility { get; init; } = 0.5f;
|
||||
}
|
||||
@@ -3,6 +3,8 @@
|
||||
namespace ShopAPI.Configs;
|
||||
|
||||
public record HealthStationConfig : StationConfig {
|
||||
public override string UseSound { get; init; } = "sounds/buttons/blip1";
|
||||
|
||||
public override Color GetColor(float health) {
|
||||
// 100% health = white
|
||||
// 10% health = green
|
||||
7
TTT/ShopAPI/Configs/M4A1Config.cs
Normal file
7
TTT/ShopAPI/Configs/M4A1Config.cs
Normal file
@@ -0,0 +1,7 @@
|
||||
namespace ShopAPI.Configs;
|
||||
|
||||
public record M4A1Config : ShopItemConfig {
|
||||
public override int Price { get; init; } = 90;
|
||||
public int[] ClearSlots { get; init; } = [0, 1];
|
||||
public string[] Weapons { get; init; } = ["m4a1", "usps"];
|
||||
}
|
||||
12
TTT/ShopAPI/Configs/Traitor/C4Config.cs
Normal file
12
TTT/ShopAPI/Configs/Traitor/C4Config.cs
Normal file
@@ -0,0 +1,12 @@
|
||||
namespace ShopAPI.Configs.Traitor;
|
||||
|
||||
// TODO: Support this config
|
||||
public record C4Config : ShopItemConfig {
|
||||
public override int Price { get; init; } = 140;
|
||||
public string Weapon { get; init; } = "c4";
|
||||
public int MaxC4PerRound { get; init; } = 0;
|
||||
public int MaxC4AtOnce { get; init; } = 1;
|
||||
public float Power { get; init; } = 100f;
|
||||
public TimeSpan FuseTime { get; init; } = TimeSpan.FromSeconds(30);
|
||||
public bool FriendlyFire { get; init; } = false;
|
||||
}
|
||||
@@ -6,6 +6,8 @@ public record DamageStationConfig : StationConfig {
|
||||
public override int HealthIncrements { get; init; } = -15;
|
||||
public override int TotalHealthGiven { get; init; } = -300;
|
||||
|
||||
public override string UseSound { get; init; } = "sounds/buttons/blip2";
|
||||
|
||||
public override Color GetColor(float health) {
|
||||
// 101% health = white
|
||||
// 10% health = red
|
||||
6
TTT/ShopAPI/Configs/Traitor/GlovesConfig.cs
Normal file
6
TTT/ShopAPI/Configs/Traitor/GlovesConfig.cs
Normal file
@@ -0,0 +1,6 @@
|
||||
namespace ShopAPI.Configs.Traitor;
|
||||
|
||||
public record GlovesConfig : ShopItemConfig {
|
||||
public override int Price { get; init; }
|
||||
public int MaxUses { get; init; } = 3;
|
||||
}
|
||||
@@ -30,4 +30,9 @@ public interface IShop : IKeyedStorage<IPlayer, int>,
|
||||
}
|
||||
|
||||
void RemoveItem(IOnlinePlayer player, IShopItem item);
|
||||
|
||||
void RemoveItem<T>(IOnlinePlayer player) where T : IShopItem {
|
||||
var owned = GetOwnedItems(player).FirstOrDefault(i => i is T);
|
||||
if (owned != null) RemoveItem(player, owned);
|
||||
}
|
||||
}
|
||||
@@ -13,5 +13,6 @@ public abstract record StationConfig : ShopItemConfig {
|
||||
public virtual TimeSpan HealthInterval { get; init; } =
|
||||
TimeSpan.FromSeconds(1);
|
||||
|
||||
public abstract string UseSound { get; init; }
|
||||
public abstract Color GetColor(float health);
|
||||
}
|
||||
@@ -2,7 +2,6 @@ using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API.Command;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.Game;
|
||||
using TTT.Game.Commands;
|
||||
using TTT.Game.lang;
|
||||
using TTT.Locale;
|
||||
|
||||
@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Modules.Utils;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
using TTT.Game;
|
||||
using TTT.Game.lang;
|
||||
using TTT.Locale;
|
||||
using Xunit;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
using ShopAPI;
|
||||
using ShopAPI.Configs;
|
||||
using TTT.API.Player;
|
||||
using TTT.Shop;
|
||||
|
||||
namespace TTT.Test.Shop;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user