Skip to content

Commit 2237365

Browse files
FallenDevFallenDev
committed
HealthBars & Entities
1 parent bf0c5a8 commit 2237365

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+170
-199
lines changed

‎Zolian.GameServer/Zolian.GameServer.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
</PropertyGroup>
4242

4343
<ItemGroup>
44-
<PackageReference Include="Chaos-Networking" Version="3.0.0" />
44+
<PackageReference Include="Chaos-Networking" Version="3.0.2" />
4545
<PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.0-preview2.25289.6" />
4646
<PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
47-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1">
47+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.2">
4848
<TreatAsUsed>true</TreatAsUsed>
4949
</PackageReference>
5050
<PackageReference Include="Sentry" Version="6.0.0" />

‎Zolian.Server.Base/Common/Extensions.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Darkages.Enums;
22
using Darkages.Sprites;
3+
using Darkages.Sprites.Entity;
34

45
using System.Numerics;
56
using System.Text;

‎Zolian.Server.Base/Database/AislingStorage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using Darkages.Enums;
99
using Darkages.Models;
1010
using Darkages.Network.Server;
11-
using Darkages.Sprites;
11+
using Darkages.Sprites.Entity;
1212
using Darkages.Templates;
1313

1414
using Microsoft.Data.SqlClient;

‎Zolian.Server.Base/Enums/AislingEnumConverters.cs‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
1-
namespace Darkages.Enums;
1+
using Darkages.Sprites;
2+
using Darkages.Sprites.Entity;
3+
4+
namespace Darkages.Enums;
25

36
public static class SpriteMaker
47
{
8+
public static byte SpriteKind(Sprite e)
9+
{
10+
return e switch
11+
{
12+
Aisling => 0x00,
13+
Mundane => 0x01,
14+
Monster => 0x02,
15+
_ => 0x00
16+
};
17+
}
18+
519
public static string GenderValue(Gender e)
620
{
721
return e switch

‎Zolian.Server.Base/Events/AbilityEvent.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Darkages.Sprites;
1+
using Darkages.Sprites.Entity;
22

33
namespace Darkages.Events;
44

‎Zolian.Server.Base/Events/ExperienceEvent.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Darkages.Sprites;
1+
using Darkages.Sprites.Entity;
22

33
namespace Darkages.Events;
44

‎Zolian.Server.Base/GameScripts/Areas/Generic/Hell.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Darkages.Common;
22
using Darkages.Network.Client;
33
using Darkages.ScriptingBase;
4-
using Darkages.Sprites;
4+
using Darkages.Sprites.Entity;
55
using Darkages.Types;
66

77
using System.Collections.Concurrent;

‎Zolian.Server.Base/GameScripts/Areas/Piet/EvermoreHallsA.cs‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
using Darkages.Network.Client;
2-
using Darkages.ScriptingBase;
3-
using Darkages.Types;
4-
using System.Numerics;
1+
using System.Numerics;
2+
53
using Darkages.Common;
4+
using Darkages.Enums;
5+
using Darkages.Network.Client;
6+
using Darkages.ScriptingBase;
7+
using Darkages.Sprites;
68
using Darkages.Sprites.Entity;
9+
using Darkages.Types;
710

811
namespace Darkages.GameScripts.Areas.Piet;
912

@@ -88,13 +91,15 @@ public override void OnGossip(WorldClient client, string message) { }
8891

8992
private static void OnPoleTrap(WorldClient client)
9093
{
91-
client.SendAnimation(140, client.Aisling.Position);
92-
client.Aisling.ApplyTrapDamage(client.Aisling, 150000, 59);
94+
client.Aisling.ApplyTrapDamage(client.Aisling, 500000);
95+
client.Aisling.SendAnimationNearby(140, client.Aisling.Position);
96+
client.Aisling.SendTargetedClientMethod(PlayerScope.NearbyAislings, c => c.SendSound(59, false));
9397
}
9498

9599
private static void OnSpikeTrap(WorldClient client)
96100
{
97-
client.SendAnimation(112, client.Aisling.Position);
98-
client.Aisling.ApplyTrapDamage(client.Aisling, 250000, 68);
101+
client.Aisling.ApplyTrapDamage(client.Aisling, 750000);
102+
client.Aisling.SendAnimationNearby(112, client.Aisling.Position);
103+
client.Aisling.SendTargetedClientMethod(PlayerScope.NearbyAislings, c => c.SendSound(68, false));
99104
}
100105
}

‎Zolian.Server.Base/GameScripts/Areas/Piet/EvermoreHallsB.cs‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
using Darkages.Network.Client;
2-
using Darkages.ScriptingBase;
3-
using Darkages.Sprites;
4-
using Darkages.Types;
5-
6-
using System.Collections.Concurrent;
1+
using System.Collections.Concurrent;
72
using System.Diagnostics;
83
using System.Numerics;
4+
95
using Darkages.Common;
6+
using Darkages.Enums;
7+
using Darkages.Network.Client;
8+
using Darkages.ScriptingBase;
9+
using Darkages.Sprites;
1010
using Darkages.Sprites.Entity;
11+
using Darkages.Types;
1112

1213
namespace Darkages.GameScripts.Areas.Piet;
1314

@@ -145,28 +146,32 @@ public override void OnGossip(WorldClient client, string message) { }
145146

146147
private static void OnPoleTrap(WorldClient client)
147148
{
148-
client.SendAnimation(140, client.Aisling.Position);
149-
client.Aisling.ApplyTrapDamage(client.Aisling, 500000, 59);
149+
client.Aisling.ApplyTrapDamage(client.Aisling, 500000);
150+
client.Aisling.SendAnimationNearby(140, client.Aisling.Position);
151+
client.Aisling.SendTargetedClientMethod(PlayerScope.NearbyAislings, c => c.SendSound(59, false));
152+
150153
}
151154

152155
private static void OnSpikeTrap(WorldClient client)
153156
{
154-
client.SendAnimation(112, client.Aisling.Position);
155-
client.Aisling.ApplyTrapDamage(client.Aisling, 750000, 68);
157+
client.Aisling.ApplyTrapDamage(client.Aisling, 750000);
158+
client.Aisling.SendAnimationNearby(112, client.Aisling.Position);
159+
client.Aisling.SendTargetedClientMethod(PlayerScope.NearbyAislings, c => c.SendSound(68, false));
156160
}
157161

158162
private void RollingSpikeTraps(List<Vector2> trapList)
159163
{
160164
foreach (var trapPosition in trapList)
161165
{
162166
if (_playersOnMap.IsEmpty) return;
163-
_playersOnMap.Values.FirstOrDefault()?.SendAnimationNearby(112, new Position(trapPosition));
164167

165168
foreach (var player in _playersOnMap.Values)
166169
{
167170
if (player == null) continue;
171+
player.Client?.SendAnimation(112, new Position(trapPosition));
168172
if (player.Pos != trapPosition) continue;
169-
player.ApplyTrapDamage(player, 750000, 68);
173+
player.ApplyTrapDamage(player, 750000);
174+
player.Client?.SendSound(68, false);
170175
}
171176
}
172177
}

‎Zolian.Server.Base/GameScripts/Areas/Tagor/NecroCourtyard.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using Darkages.GameScripts.Affects;
33
using Darkages.Network.Client;
44
using Darkages.ScriptingBase;
5-
using Darkages.Sprites;
5+
using Darkages.Sprites.Entity;
66
using Darkages.Types;
77
using System.Numerics;
88

0 commit comments

Comments
 (0)