Merge pull request #8 from edgegamers/dev

Dev

.github/workflows/nightly.yml

@@ -31,7 +31,7 @@ jobs:
   post_webhook:
     needs: build
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/dev'
+    if: github.ref == 'refs/heads/aaaa'
 
     steps:
     - name: POST Webhook
@@ -40,4 +40,4 @@ jobs:
           --fail \
           -F token=${{ secrets.GITLAB_SECRET_TOKEN }} \
           -F ref=dev \
-          https://gitlab.edgegamers.io/api/v4/projects/2640/trigger/pipeline
+          https://gitlab.edgegamers.io/api/v4/projects/2640/trigger/pipeline

README.md

@@ -9,46 +9,6 @@ TTT is in heavy development and I want you to know that contributions are always
 > [Using Dependency Injection](https://learn.microsoft.com/en-us/dotnet/core/extensions/dependency-injection-usage),
 > [Dependency Injection Guidelines](https://learn.microsoft.com/en-us/dotnet/core/extensions/dependency-injection-guidelines).
 
-## Creating items
-
-Creating new items or modifying existing ones is easy. Create a new class in the correct directory, mod/TTT.Shop/Items/{group}. Then create it to your liking. Afterwards, compile the plugin and it's all set. The plugin handles loading all the items.
-
-> [!TIP]
-> Available groups are [All, Detective, Traitor]. <br>
-> SimpleName is used for /buy {name}
-
-#### Example Item
-```c#
-namespace TTT.Shop.Items.Traitor;
-
-public class AwpItem : IShopItem
-{
-    public string Name()
-    {
-        return "AWP";
-    }
-
-    public string SimpleName()
-    {
-        return "awp";
-    }
-
-    public int Price()
-    {
-        return 2000;
-    }
-
-    public BuyResult OnBuy(GamePlayer player)
-    {
-        if (player.Credits() < Price()) return BuyResult.NotEnoughCredits;
-        if (player.PlayerRole() != Role.Traitor) return BuyResult.IncorrectRole;
-        player.RemoveCredits(Price());
-        player.Player().GiveNamedItem(CsItem.AWP);
-        return BuyResult.Successful;
-    }
-}
-```
-
 ## Road Map
 - [✅] Role assignment
 - [✅] DNA Scanner

mod/TTT.Player/KarmaManager.cs

@@ -31,7 +31,7 @@ public HookResult OnPlayerDeath(EventPlayerDeath @event, GameEventInfo info)
         if (killerRole == killedRole)
         {
             gpKiller.RemoveKarma(5);
-            return HookResult.Stop;
+            return HookResult.Continue;
         }
 
         if (killedRole == Role.Traitor)
@@ -40,4 +40,4 @@ public HookResult OnPlayerDeath(EventPlayerDeath @event, GameEventInfo info)
         }
         return HookResult.Continue;
     }
-}
+}

mod/TTT.Roles/RoleBehavior.cs

@@ -82,7 +82,7 @@ public HookResult OnPlayerConnect(EventPlayerConnectFull @event, GameEventInfo i
         return HookResult.Continue;
     }
 
-    [GameEventHandler]
+    [GameEventHandler(HookMode.Pre)]
     public HookResult OnPlayerDeath(EventPlayerDeath @event, GameEventInfo info)
     {
         info.DontBroadcast = true;