forked from AscensionGameDev/Intersect-Engine
-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathdiag.patch
3056 lines (2823 loc) · 126 KB
/
diag.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
From 3c480d6a7346cc841cb756478995ed65423f6249 Mon Sep 17 00:00:00 2001
From: Bandana <[email protected]>
Date: Thu, 2 Apr 2020 14:35:33 -0400
Subject: [PATCH 01/10] diagonal movement
Signed-off-by: Bandana <[email protected]>
---
.../Network/Packets/Client/MovePacket.cs | 5 +-
Intersect.Client/Entities/Entity.cs | 77 +++++++++--
Intersect.Client/Entities/Player.cs | 127 ++++++++++++++----
Intersect.Client/Networking/PacketSender.cs | 2 +-
Intersect.Server/Networking/PacketHandler.cs | 4 +-
5 files changed, 177 insertions(+), 38 deletions(-)
diff --git a/Intersect (Core)/Network/Packets/Client/MovePacket.cs b/Intersect (Core)/Network/Packets/Client/MovePacket.cs
index f4c3a02e..5e0e71c1 100644
--- a/Intersect (Core)/Network/Packets/Client/MovePacket.cs
+++ b/Intersect (Core)/Network/Packets/Client/MovePacket.cs
@@ -6,12 +6,13 @@ namespace Intersect.Network.Packets.Client
public class MovePacket : CerasPacket
{
- public MovePacket(Guid mapId, byte x, byte y, byte dir)
+ public MovePacket(Guid mapId, byte x, byte y, byte dir, byte deplDir)
{
MapId = mapId;
X = x;
Y = y;
Dir = dir;
+ DeplacementDir = deplDir;
}
public Guid MapId { get; set; }
@@ -22,6 +23,8 @@ public MovePacket(Guid mapId, byte x, byte y, byte dir)
public byte Dir { get; set; }
+ public byte DeplacementDir { get; set; }
+
}
}
diff --git a/Intersect.Client/Entities/Entity.cs b/Intersect.Client/Entities/Entity.cs
index 1ad7b70f..e6a7210a 100644
--- a/Intersect.Client/Entities/Entity.cs
+++ b/Intersect.Client/Entities/Entity.cs
@@ -109,6 +109,8 @@ public enum LabelType
private byte mDir;
+ private byte mDeplDir;
+
protected bool mDisposed;
private long mLastUpdate;
@@ -225,6 +227,15 @@ public byte Dir
set => mDir = (byte) ((value + 4) % 4);
}
+ // DeplacementDir is used because I don't know how to set the sprite animation for the diagonal mouvement.
+ public byte DeplacementDir
+ {
+ get => mDeplDir;
+ set => mDeplDir = (byte)((value + 8) % 8);
+ // I don't know why there was a +4 % 4 for the Dir field, but I just repeated the same thing here.
+ // I guess it's to be sure the value is in the acceptable range.
+ }
+
public virtual string TransformedSprite
{
get => mTransformedSprite;
@@ -532,11 +543,18 @@ public virtual bool Update()
}
else if (IsMoving)
{
- switch (Dir)
+ float deplacementTime = ecTime * Options.TileHeight / GetMovementTime();
+
+ // Dir = facing direction (only 4)
+ // delta offset Must be more than 0 for movements. 0 = slowest
+ // Direction is related to the sprite animation, I don't know how to set a sprite animation for eache direction
+ // so I use DeplacementDir...
+ switch (DeplacementDir)
{
- case 0:
- OffsetY -= (float) ecTime * (float) Options.TileHeight / GetMovementTime();
+ case 0: // Up
+ OffsetY -= deplacementTime;
OffsetX = 0;
+
if (OffsetY < 0)
{
OffsetY = 0;
@@ -544,8 +562,8 @@ public virtual bool Update()
break;
- case 1:
- OffsetY += (float) ecTime * (float) Options.TileHeight / GetMovementTime();
+ case 1: // Down
+ OffsetY += deplacementTime;
OffsetX = 0;
if (OffsetY > 0)
{
@@ -554,9 +572,10 @@ public virtual bool Update()
break;
- case 2:
- OffsetX -= (float) ecTime * (float) Options.TileHeight / GetMovementTime();
+ case 2: // Left
+ OffsetX -= deplacementTime;
OffsetY = 0;
+
if (OffsetX < 0)
{
OffsetX = 0;
@@ -564,14 +583,54 @@ public virtual bool Update()
break;
- case 3:
- OffsetX += (float) ecTime * (float) Options.TileHeight / GetMovementTime();
+ case 3: // Right
+ OffsetX += deplacementTime;
OffsetY = 0;
if (OffsetX > 0)
{
OffsetX = 0;
}
+ break;
+ case 4: // NW
+ OffsetY -= deplacementTime;
+ OffsetX -= deplacementTime;
+
+ if (OffsetY < 0)
+ OffsetY = 0;
+ if (OffsetX < 0)
+ OffsetX = 0;
+
+ break;
+ case 5: // NE
+ OffsetY -= deplacementTime;
+ OffsetX += deplacementTime;
+
+ if (OffsetY < 0)
+ OffsetY = 0;
+ if (OffsetX > 0)
+ OffsetX = 0;
+
+ break;
+ case 6: //SW
+ OffsetY += deplacementTime;
+ OffsetX -= deplacementTime;
+
+ if (OffsetY > 0)
+ OffsetY = 0;
+ if (OffsetX < 0)
+ OffsetX = 0;
+
+ break;
+ case 7: // SE
+ OffsetY += deplacementTime;
+ OffsetX += deplacementTime;
+
+ if (OffsetY > 0)
+ OffsetY = 0;
+ if (OffsetX > 0)
+ OffsetX = 0;
+
break;
}
diff --git a/Intersect.Client/Entities/Player.cs b/Intersect.Client/Entities/Player.cs
index e7af06e0..304a1d86 100644
--- a/Intersect.Client/Entities/Player.cs
+++ b/Intersect.Client/Entities/Player.cs
@@ -814,28 +814,49 @@ private void HandleInput()
movex = 1;
}
+
+ // Used this so I can do multiple switch case
+ var move = movex / 10 + movey;
+
Globals.Me.MoveDir = -1;
if (movex != 0f || movey != 0f)
{
- if (movey < 0)
+ switch (move)
{
- Globals.Me.MoveDir = 1;
- }
+ case 1.0f:
+ Globals.Me.MoveDir = 0; // Up
- if (movey > 0)
- {
- Globals.Me.MoveDir = 0;
- }
+ break;
+ case -1.0f:
+ Globals.Me.MoveDir = 1; // Down
- if (movex < 0)
- {
- Globals.Me.MoveDir = 2;
- }
+ break;
+ case -0.1f: // x = 0, y = -1
+ Globals.Me.MoveDir = 2; // Left
- if (movex > 0)
- {
- Globals.Me.MoveDir = 3;
+ break;
+ case 0.1f:
+ Globals.Me.MoveDir = 3; // Right
+
+ break;
+ case 0.9f:
+ Globals.Me.MoveDir = 4; // NW
+
+ break;
+ case 1.1f:
+ Globals.Me.MoveDir = 5; // NE
+
+ break;
+ case -1.1f:
+ Globals.Me.MoveDir = 6; // SW
+
+ break;
+ case -0.9f:
+ Globals.Me.MoveDir = 7; // SE
+
+ break;
}
+
}
}
@@ -1367,49 +1388,105 @@ private void ProcessDirectionalInput()
{
switch (MoveDir)
{
- case 0:
+ // Dir is the direction the player faces
+ // tmp the next position of the player
+ // DeplacementDir is used because I don't know how to set the sprite animation for the diagonal mouvement.
+
+ case 0: // Up
+ Dir = 0; // Set the sprite direction
if (IsTileBlocked(X, Y - 1, Z, CurrentMap, ref blockedBy) == -1)
{
tmpY--;
- Dir = 0;
+ DeplacementDir = 0;
IsMoving = true;
OffsetY = Options.TileHeight;
OffsetX = 0;
}
break;
- case 1:
+ case 1: // Down
+ Dir = 1;
if (IsTileBlocked(X, Y + 1, Z, CurrentMap, ref blockedBy) == -1)
{
tmpY++;
- Dir = 1;
+ DeplacementDir = 1;
IsMoving = true;
OffsetY = -Options.TileHeight;
OffsetX = 0;
}
break;
- case 2:
+ case 2: // Left
+ Dir = 2;
if (IsTileBlocked(X - 1, Y, Z, CurrentMap, ref blockedBy) == -1)
{
tmpX--;
- Dir = 2;
+ DeplacementDir = 2;
IsMoving = true;
OffsetY = 0;
OffsetX = Options.TileWidth;
}
break;
- case 3:
+ case 3: // Right
+ Dir = 3;
if (IsTileBlocked(X + 1, Y, Z, CurrentMap, ref blockedBy) == -1)
{
tmpX++;
- Dir = 3;
+ DeplacementDir = 3;
IsMoving = true;
OffsetY = 0;
OffsetX = -Options.TileWidth;
}
+ break;
+ case 4: // NW
+ Dir = 2;
+ if (IsTileBlocked(X - 1, Y - 1, Z, CurrentMap, ref blockedBy) == -1)
+ {
+ tmpY--;
+ tmpX--;
+ DeplacementDir = 4;
+ IsMoving = true;
+ OffsetY = Options.TileHeight;
+ OffsetX = Options.TileWidth;
+ }
+ break;
+ case 5: // NE
+ Dir = 3;
+ if (IsTileBlocked(X + 1, Y - 1, Z, CurrentMap, ref blockedBy) == -1)
+ {
+ tmpY--;
+ tmpX++;
+ DeplacementDir = 5;
+ IsMoving = true;
+ OffsetY = Options.TileHeight;
+ OffsetX = -Options.TileWidth;
+ }
+ break;
+ case 6: // SW
+ Dir = 2;
+ if (IsTileBlocked(X - 1, Y + 1, Z, CurrentMap, ref blockedBy) == -1)
+ {
+ tmpY++;
+ tmpX--;
+ DeplacementDir = 6;
+ IsMoving = true;
+ OffsetY = -Options.TileHeight;
+ OffsetX = Options.TileWidth;
+ }
+ break;
+ case 7: // SE
+ Dir = 3;
+ if (IsTileBlocked(X + 1, Y + 1, Z, CurrentMap, ref blockedBy) == -1)
+ {
+ tmpY++;
+ tmpX++;
+ DeplacementDir = 7;
+ IsMoving = true;
+ OffsetY = -Options.TileHeight;
+ OffsetX = -Options.TileWidth;
+ }
break;
}
@@ -1472,10 +1549,10 @@ private void ProcessDirectionalInput()
}
else
{
- if (MoveDir != Dir)
+ if (MoveDir != DeplacementDir)
{
- Dir = (byte) MoveDir;
- PacketSender.SendDirection(Dir);
+ DeplacementDir = (byte) MoveDir;
+ PacketSender.SendDirection(DeplacementDir);
}
if (blockedBy != null && mLastBumpedEvent != blockedBy && blockedBy.GetType() == typeof(Event))
diff --git a/Intersect.Client/Networking/PacketSender.cs b/Intersect.Client/Networking/PacketSender.cs
index 41082f45..38edb70f 100644
--- a/Intersect.Client/Networking/PacketSender.cs
+++ b/Intersect.Client/Networking/PacketSender.cs
@@ -43,7 +43,7 @@ public static void SendNeedMap(Guid mapId)
public static void SendMove()
{
- Network.SendPacket(new MovePacket(Globals.Me.CurrentMap, Globals.Me.X, Globals.Me.Y, Globals.Me.Dir));
+ Network.SendPacket(new MovePacket(Globals.Me.CurrentMap, Globals.Me.X, Globals.Me.Y, Globals.Me.Dir, Globals.Me.DeplacementDir));
}
public static void SendChatMsg(string msg, byte channel)
diff --git a/Intersect.Server/Networking/PacketHandler.cs b/Intersect.Server/Networking/PacketHandler.cs
index 831504ca..e537af2e 100644
--- a/Intersect.Server/Networking/PacketHandler.cs
+++ b/Intersect.Server/Networking/PacketHandler.cs
@@ -408,10 +408,10 @@ public void HandlePacket(Client client, Player player, MovePacket packet)
return;
}
- var canMove = player.CanMove(packet.Dir);
+ var canMove = player.CanMove(packet.DeplacementDir);
if ((canMove == -1 || canMove == -4) && client.Entity.MoveRoute == null)
{
- player.Move(packet.Dir, player, false);
+ player.Move(packet.DeplacementDir, player, false);
if (player.MoveTimer > Globals.Timing.TimeMs)
{
//TODO: Make this based moreso on the players current ping instead of a flat value that can be abused
--
2.25.0.windows.1
From bc8f0aa4d80890deabbb4e152814a33d5b6abbaf Mon Sep 17 00:00:00 2001
From: Bandana <[email protected]>
Date: Thu, 2 Apr 2020 21:55:29 -0400
Subject: [PATCH 02/10] npcdiagonal
Signed-off-by: Bandana <[email protected]>
---
Intersect (Core)/Enums/Directions.cs | 10 +-
Intersect (Core)/GameObjects/Events/Enums.cs | 8 +
.../Network/Packets/Client/MovePacket.cs | 5 +-
Intersect.Client/Entities/Entity.cs | 59 +++++--
Intersect.Client/Entities/Player.cs | 152 +++++++++---------
Intersect.Client/Networking/PacketHandler.cs | 20 +++
Intersect.Client/Networking/PacketSender.cs | 2 +-
Intersect.Server/Entities/Entity.cs | 48 ++++--
Intersect.Server/Entities/Npc.cs | 36 ++++-
Intersect.Server/Networking/PacketHandler.cs | 4 +-
10 files changed, 225 insertions(+), 119 deletions(-)
diff --git a/Intersect (Core)/Enums/Directions.cs b/Intersect (Core)/Enums/Directions.cs
index 027b9840..8beff271 100644
--- a/Intersect (Core)/Enums/Directions.cs
+++ b/Intersect (Core)/Enums/Directions.cs
@@ -10,7 +10,15 @@ public enum Directions
Left,
- Right
+ Right,
+
+ UpLeft,
+
+ UpRight,
+
+ DownLeft,
+
+ DownRight
}
diff --git a/Intersect (Core)/GameObjects/Events/Enums.cs b/Intersect (Core)/GameObjects/Events/Enums.cs
index a5d59d83..86d6b6fa 100644
--- a/Intersect (Core)/GameObjects/Events/Enums.cs
+++ b/Intersect (Core)/GameObjects/Events/Enums.cs
@@ -12,6 +12,14 @@ public enum MoveRouteEnum
MoveRight,
+ MoveUpLeft,
+
+ MoveUpRight,
+
+ MoveDownLeft,
+
+ MoveDownRight,
+
MoveRandomly,
MoveTowardsPlayer,
diff --git a/Intersect (Core)/Network/Packets/Client/MovePacket.cs b/Intersect (Core)/Network/Packets/Client/MovePacket.cs
index 5e0e71c1..f4c3a02e 100644
--- a/Intersect (Core)/Network/Packets/Client/MovePacket.cs
+++ b/Intersect (Core)/Network/Packets/Client/MovePacket.cs
@@ -6,13 +6,12 @@ namespace Intersect.Network.Packets.Client
public class MovePacket : CerasPacket
{
- public MovePacket(Guid mapId, byte x, byte y, byte dir, byte deplDir)
+ public MovePacket(Guid mapId, byte x, byte y, byte dir)
{
MapId = mapId;
X = x;
Y = y;
Dir = dir;
- DeplacementDir = deplDir;
}
public Guid MapId { get; set; }
@@ -23,8 +22,6 @@ public MovePacket(Guid mapId, byte x, byte y, byte dir, byte deplDir)
public byte Dir { get; set; }
- public byte DeplacementDir { get; set; }
-
}
}
diff --git a/Intersect.Client/Entities/Entity.cs b/Intersect.Client/Entities/Entity.cs
index e6a7210a..85498404 100644
--- a/Intersect.Client/Entities/Entity.cs
+++ b/Intersect.Client/Entities/Entity.cs
@@ -109,7 +109,7 @@ public enum LabelType
private byte mDir;
- private byte mDeplDir;
+ // private byte mDeplDir;
protected bool mDisposed;
@@ -224,17 +224,17 @@ public Entity(Guid id, EntityPacket packet, bool isEvent = false)
public byte Dir
{
get => mDir;
- set => mDir = (byte) ((value + 4) % 4);
+ set => mDir = (byte) ((value + 8) % 8);
}
// DeplacementDir is used because I don't know how to set the sprite animation for the diagonal mouvement.
- public byte DeplacementDir
- {
- get => mDeplDir;
- set => mDeplDir = (byte)((value + 8) % 8);
- // I don't know why there was a +4 % 4 for the Dir field, but I just repeated the same thing here.
- // I guess it's to be sure the value is in the acceptable range.
- }
+ //public byte DeplacementDir
+ //{
+ // get => mDeplDir;
+ // set => mDeplDir = (byte)((value + 8) % 8);
+ // // I don't know why there was a +4 % 4 for the Dir field, but I just repeated the same thing here.
+ // // I guess it's to be sure the value is in the acceptable range.
+ //}
public virtual string TransformedSprite
{
@@ -549,7 +549,7 @@ public virtual bool Update()
// delta offset Must be more than 0 for movements. 0 = slowest
// Direction is related to the sprite animation, I don't know how to set a sprite animation for eache direction
// so I use DeplacementDir...
- switch (DeplacementDir)
+ switch (Dir)
{
case 0: // Up
OffsetY -= deplacementTime;
@@ -921,22 +921,39 @@ public virtual void Draw()
destRectangle.X -= texture.GetWidth() / 8;
switch (Dir)
{
- case 0:
+ case 0: // Up
d = 3;
break;
- case 1:
+ case 1: // Down
d = 0;
break;
- case 2:
+ case 2: // Left
d = 1;
break;
- case 3:
+ case 3: // Right
d = 2;
break;
+ case 4: // UpLeft
+ d = 1;
+
+ break;
+ case 5: // UpRight
+ d = 2;
+
+ break;
+ case 6: // DownLeft
+ d = 1;
+
+ break;
+ case 7: // DownRight
+ d = 2;
+
+ break;
+
default:
Dir = 0;
d = 3;
@@ -991,10 +1008,20 @@ public virtual void Draw()
WorldPos = destRectangle;
+ int pDollIndex = Dir; // Actually it's because the index would've been outside of the bounds
+ if (Dir == 4 || Dir == 6)
+ {
+ pDollIndex = 2;
+ }
+ else if (Dir == 5 || Dir == 7)
+ {
+ pDollIndex = 3;
+ }
+
//Order the layers of paperdolls and sprites
- for (var z = 0; z < Options.PaperdollOrder[Dir].Count; z++)
+ for (var z = 0; z < Options.PaperdollOrder[pDollIndex].Count; z++)
{
- var paperdoll = Options.PaperdollOrder[Dir][z];
+ var paperdoll = Options.PaperdollOrder[pDollIndex][z];
var equipSlot = Options.EquipmentSlots.IndexOf(paperdoll);
//Check for player
diff --git a/Intersect.Client/Entities/Player.cs b/Intersect.Client/Entities/Player.cs
index 304a1d86..afb7861b 100644
--- a/Intersect.Client/Entities/Player.cs
+++ b/Intersect.Client/Entities/Player.cs
@@ -183,21 +183,21 @@ public override bool Update()
public override void Load(EntityPacket packet)
{
base.Load(packet);
- var pkt = (PlayerEntityPacket) packet;
+ var pkt = (PlayerEntityPacket)packet;
Gender = pkt.Gender;
Class = pkt.ClassId;
Type = pkt.AccessLevel;
CombatTimer = pkt.CombatTimeRemaining + Globals.System.GetTimeMs();
- if (((PlayerEntityPacket) packet).Equipment != null)
+ if (((PlayerEntityPacket)packet).Equipment != null)
{
- if (this == Globals.Me && ((PlayerEntityPacket) packet).Equipment.InventorySlots != null)
+ if (this == Globals.Me && ((PlayerEntityPacket)packet).Equipment.InventorySlots != null)
{
- this.MyEquipment = ((PlayerEntityPacket) packet).Equipment.InventorySlots;
+ this.MyEquipment = ((PlayerEntityPacket)packet).Equipment.InventorySlots;
}
- else if (((PlayerEntityPacket) packet).Equipment.ItemIds != null)
+ else if (((PlayerEntityPacket)packet).Equipment.ItemIds != null)
{
- this.Equipment = ((PlayerEntityPacket) packet).Equipment.ItemIds;
+ this.Equipment = ((PlayerEntityPacket)packet).Equipment.ItemIds;
}
}
}
@@ -240,16 +240,16 @@ public void TryDropItem(int index)
private void DropItemInputBoxOkay(object sender, EventArgs e)
{
- var value = (int) ((InputBox) sender).Value;
+ var value = (int)((InputBox)sender).Value;
if (value > 0)
{
- PacketSender.SendDropItem((int) ((InputBox) sender).UserData, value);
+ PacketSender.SendDropItem((int)((InputBox)sender).UserData, value);
}
}
private void DropInputBoxOkay(object sender, EventArgs e)
{
- PacketSender.SendDropItem((int) ((InputBox) sender).UserData, 1);
+ PacketSender.SendDropItem((int)((InputBox)sender).UserData, 1);
}
public int FindItem(Guid itemId, int itemVal = 1)
@@ -456,16 +456,16 @@ public void TrySellItem(int index)
private void SellItemInputBoxOkay(object sender, EventArgs e)
{
- var value = (int) ((InputBox) sender).Value;
+ var value = (int)((InputBox)sender).Value;
if (value > 0)
{
- PacketSender.SendSellItem((int) ((InputBox) sender).UserData, value);
+ PacketSender.SendSellItem((int)((InputBox)sender).UserData, value);
}
}
private void SellInputBoxOkay(object sender, EventArgs e)
{
- PacketSender.SendSellItem((int) ((InputBox) sender).UserData, 1);
+ PacketSender.SendSellItem((int)((InputBox)sender).UserData, 1);
}
//bank
@@ -490,10 +490,10 @@ public void TryDepositItem(int index)
private void DepositItemInputBoxOkay(object sender, EventArgs e)
{
- var value = (int) ((InputBox) sender).Value;
+ var value = (int)((InputBox)sender).Value;
if (value > 0)
{
- PacketSender.SendDepositItem((int) ((InputBox) sender).UserData, value);
+ PacketSender.SendDepositItem((int)((InputBox)sender).UserData, value);
}
}
@@ -518,10 +518,10 @@ public void TryWithdrawItem(int index)
private void WithdrawItemInputBoxOkay(object sender, EventArgs e)
{
- var value = (int) ((InputBox) sender).Value;
+ var value = (int)((InputBox)sender).Value;
if (value > 0)
{
- PacketSender.SendWithdrawItem((int) ((InputBox) sender).UserData, value);
+ PacketSender.SendWithdrawItem((int)((InputBox)sender).UserData, value);
}
}
@@ -547,10 +547,10 @@ public void TryStoreBagItem(int index)
private void StoreBagItemInputBoxOkay(object sender, EventArgs e)
{
- var value = (int) ((InputBox) sender).Value;
+ var value = (int)((InputBox)sender).Value;
if (value > 0)
{
- PacketSender.SendStoreBagItem((int) ((InputBox) sender).UserData, value);
+ PacketSender.SendStoreBagItem((int)((InputBox)sender).UserData, value);
}
}
@@ -575,10 +575,10 @@ public void TryRetreiveBagItem(int index)
private void RetreiveBagItemInputBoxOkay(object sender, EventArgs e)
{
- var value = (int) ((InputBox) sender).Value;
+ var value = (int)((InputBox)sender).Value;
if (value > 0)
{
- PacketSender.SendRetrieveBagItem((int) ((InputBox) sender).UserData, value);
+ PacketSender.SendRetrieveBagItem((int)((InputBox)sender).UserData, value);
}
}
@@ -604,10 +604,10 @@ public void TryTradeItem(int index)
private void TradeItemInputBoxOkay(object sender, EventArgs e)
{
- var value = (int) ((InputBox) sender).Value;
+ var value = (int)((InputBox)sender).Value;
if (value > 0)
{
- PacketSender.SendOfferTradeItem((int) ((InputBox) sender).UserData, value);
+ PacketSender.SendOfferTradeItem((int)((InputBox)sender).UserData, value);
}
}
@@ -632,10 +632,10 @@ public void TryRevokeItem(int index)
private void RevokeItemInputBoxOkay(object sender, EventArgs e)
{
- var value = (int) ((InputBox) sender).Value;
+ var value = (int)((InputBox)sender).Value;
if (value > 0)
{
- PacketSender.SendRevokeTradeItem((int) ((InputBox) sender).UserData, value);
+ PacketSender.SendRevokeTradeItem((int)((InputBox)sender).UserData, value);
}
}
@@ -661,7 +661,7 @@ public void TryForgetSpell(int index)
private void ForgetSpellInputBoxOkay(object sender, EventArgs e)
{
- PacketSender.SendForgetSpell((int) ((InputBox) sender).UserData);
+ PacketSender.SendForgetSpell((int)((InputBox)sender).UserData);
}
public void TryUseSpell(int index)
@@ -722,7 +722,7 @@ public int FindHotbarSpell(HotbarInstance hotbarInstance)
public void AddToHotbar(byte hotbarSlot, sbyte itemType, int itemSlot)
{
Hotbar[hotbarSlot].ItemOrSpellId = Guid.Empty;
- Hotbar[hotbarSlot].PreferredStatBuffs = new int[(int) Stats.StatCount];
+ Hotbar[hotbarSlot].PreferredStatBuffs = new int[(int)Stats.StatCount];
if (itemType == 0)
{
var item = Inventory[itemSlot];
@@ -772,9 +772,9 @@ private void TryToChangeDimension()
{
if (MapInstance.Get(CurrentMap).Attributes[X, Y].Type == MapAttributes.ZDimension)
{
- if (((MapZDimensionAttribute) MapInstance.Get(CurrentMap).Attributes[X, Y]).GatewayTo > 0)
+ if (((MapZDimensionAttribute)MapInstance.Get(CurrentMap).Attributes[X, Y]).GatewayTo > 0)
{
- Z = (byte) (((MapZDimensionAttribute) MapInstance.Get(CurrentMap).Attributes[X, Y])
+ Z = (byte)(((MapZDimensionAttribute)MapInstance.Get(CurrentMap).Attributes[X, Y])
.GatewayTo -
1);
}
@@ -876,7 +876,7 @@ protected int GetDistanceTo(Entity target)
var x2 = target.X + targetMap.MapGridX * Options.MapWidth;
var y2 = target.Y + targetMap.MapGridY * Options.MapHeight;
- return (int) Math.Sqrt(Math.Pow(x1 - x2, 2) + Math.Pow(y1 - y2, 2));
+ return (int)Math.Sqrt(Math.Pow(x1 - x2, 2) + Math.Pow(y1 - y2, 2));
}
}
@@ -1105,8 +1105,8 @@ public bool GetRealLocation(ref int x, ref int y, ref Guid mapId)
{
if (MapInstance.Get(Globals.MapGrid[gridX, gridY]) != null)
{
- x = (byte) tmpX;
- y = (byte) tmpY;
+ x = (byte)tmpX;
+ y = (byte)tmpY;
mapId = Globals.MapGrid[gridX, gridY];
return true;
@@ -1128,8 +1128,8 @@ public bool TryTarget()
}
}
- var x = (int) Math.Floor(Globals.InputManager.GetMousePosition().X + Graphics.CurrentView.Left);
- var y = (int) Math.Floor(Globals.InputManager.GetMousePosition().Y + Graphics.CurrentView.Top);
+ var x = (int)Math.Floor(Globals.InputManager.GetMousePosition().X + Graphics.CurrentView.Left);
+ var y = (int)Math.Floor(Globals.InputManager.GetMousePosition().Y + Graphics.CurrentView.Top);
foreach (MapInstance map in MapInstance.Lookup.Values)
{
@@ -1138,8 +1138,8 @@ public bool TryTarget()
if (y >= map.GetY() && y <= map.GetY() + Options.MapHeight * Options.TileHeight)
{
//Remove the offsets to just be dealing with pixels within the map selected
- x -= (int) map.GetX();
- y -= (int) map.GetY();
+ x -= (int)map.GetX();
+ y -= (int)map.GetY();
//transform pixel format to tile format
x /= Options.TileWidth;
@@ -1222,7 +1222,7 @@ public bool TryTarget()
if (en.Value.CurrentMap == mapId &&
en.Value.X == x &&
en.Value.Y == y &&
- !((Event) en.Value).DisablePreview &&
+ !((Event)en.Value).DisablePreview &&
(!en.Value.IsStealthed() || Globals.Me.IsInMyParty(en.Value)))
{
if (TargetBox != null)
@@ -1341,7 +1341,7 @@ public override int CalculateAttackTime()
}
else if (weapon.AttackSpeedModifier == 2) //Percentage
{
- attackTime = (int) (attackTime * (100f / weapon.AttackSpeedValue));
+ attackTime = (int)(attackTime * (100f / weapon.AttackSpeedValue));
}
}
@@ -1377,8 +1377,8 @@ private void ProcessDirectionalInput()
return;
}
- var tmpX = (sbyte) X;
- var tmpY = (sbyte) Y;
+ var tmpX = (sbyte)X;
+ var tmpY = (sbyte)Y;
Entity blockedBy = null;
if (MoveDir > -1 && Globals.EventDialogs.Count == 0)
@@ -1393,96 +1393,88 @@ private void ProcessDirectionalInput()
// DeplacementDir is used because I don't know how to set the sprite animation for the diagonal mouvement.
case 0: // Up
- Dir = 0; // Set the sprite direction
if (IsTileBlocked(X, Y - 1, Z, CurrentMap, ref blockedBy) == -1)
{
tmpY--;
- DeplacementDir = 0;
IsMoving = true;
+ Dir = 0; // Set the sprite direction
OffsetY = Options.TileHeight;
OffsetX = 0;
}
break;
case 1: // Down
- Dir = 1;
if (IsTileBlocked(X, Y + 1, Z, CurrentMap, ref blockedBy) == -1)
{
tmpY++;
- DeplacementDir = 1;
IsMoving = true;
+ Dir = 1;
OffsetY = -Options.TileHeight;
OffsetX = 0;
}
break;
case 2: // Left
- Dir = 2;
if (IsTileBlocked(X - 1, Y, Z, CurrentMap, ref blockedBy) == -1)
{
tmpX--;
- DeplacementDir = 2;
IsMoving = true;
+ Dir = 2;
OffsetY = 0;
OffsetX = Options.TileWidth;
}
break;
case 3: // Right
- Dir = 3;
if (IsTileBlocked(X + 1, Y, Z, CurrentMap, ref blockedBy) == -1)
{
tmpX++;
- DeplacementDir = 3;
IsMoving = true;
+ Dir = 3;
OffsetY = 0;
OffsetX = -Options.TileWidth;
}
break;
case 4: // NW
- Dir = 2;
if (IsTileBlocked(X - 1, Y - 1, Z, CurrentMap, ref blockedBy) == -1)
{
tmpY--;
tmpX--;
- DeplacementDir = 4;
+ Dir = 4;
IsMoving = true;
OffsetY = Options.TileHeight;
OffsetX = Options.TileWidth;
}
break;
case 5: // NE
- Dir = 3;
if (IsTileBlocked(X + 1, Y - 1, Z, CurrentMap, ref blockedBy) == -1)
{
tmpY--;
tmpX++;
- DeplacementDir = 5;
+ Dir = 5;
IsMoving = true;
OffsetY = Options.TileHeight;
OffsetX = -Options.TileWidth;
}
break;
case 6: // SW
- Dir = 2;
if (IsTileBlocked(X - 1, Y + 1, Z, CurrentMap, ref blockedBy) == -1)
{
tmpY++;
tmpX--;
- DeplacementDir = 6;
+ Dir = 6;
IsMoving = true;
OffsetY = -Options.TileHeight;
OffsetX = Options.TileWidth;
}
break;
case 7: // SE
- Dir = 3;
if (IsTileBlocked(X + 1, Y + 1, Z, CurrentMap, ref blockedBy) == -1)
{
tmpY++;
tmpX++;
- DeplacementDir = 7;
+ Dir = 7;
IsMoving = true;
OffsetY = -Options.TileHeight;
OffsetX = -Options.TileWidth;
@@ -1506,7 +1498,7 @@ private void ProcessDirectionalInput()
if (tmpX < 0)
{
gridX--;
- X = (byte) (Options.MapWidth - 1);
+ X = (byte)(Options.MapWidth - 1);
}
else if (tmpX >= Options.MapWidth)
{
@@ -1515,13 +1507,13 @@ private void ProcessDirectionalInput()
}
else
{
- X = (byte) tmpX;
+ X = (byte)tmpX;
}
if (tmpY < 0)
{
gridY--;
- Y = (byte) (Options.MapHeight - 1);
+ Y = (byte)(Options.MapHeight - 1);
}
else if (tmpY >= Options.MapHeight)
{
@@ -1530,7 +1522,7 @@ private void ProcessDirectionalInput()
}
else
{
- Y = (byte) tmpY;
+ Y = (byte)tmpY;
}
if (CurrentMap != Globals.MapGrid[gridX, gridY])
@@ -1541,18 +1533,18 @@ private void ProcessDirectionalInput()
}
else
{