sapphire

mirrors/sapphire

Fork 0

mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-21 09:37:46 +00:00

Commit graph

Select branches

Hide pull requests

Sapphire5.58

Sapphire5.58_action

Sapphire_Retail

ThreePointOh

ThreePointThree

develop5.58

event_system_test

master

those_who_fight

want_some_action

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#121

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#135

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#179

#18

#184

#185

#186

#187

#188

#189

#19

#190

#191

#193

#194

#195

#196

#197

#198

#199

#200

#201

#202

#203

#204

#206

#207

#208

#209

#21

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#278

#279

#28

#280

#281

#282

#283

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#297

#298

#299

#30

#300

#301

#302

#303

#304

#305

#306

#307

#316

#317

#318

#319

#320

#321

#322

#323

#324

#325

#326

#327

#331

#333

#334

#335

#336

#337

#340

#342

#343

#344

#345

#346

#347

#348

#350

#351

#352

#353

#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

#384

#385

#386

#387

#389

#39

#390

#392

#393

#394

#395

#396

#397

#398

#399

#401

#402

#403

#404

#405

#406

#407

#408

#409

#410

#411

#412

#413

#414

#415

#416

#417

#418

#419

#42

#420

#421

#422

#423

#424

#425

#426

#427

#428

#429

#43

#430

#433

#434

#435

#436

#437

#438

#439

#44

#440

#441

#442

#443

#444

#445

#446

#447

#449

#45

#451

#452

#453

#454

#455

#456

#457

#458

#459

#46

#460

#461

#462

#463

#464

#465

#466

#467

#468

#469

#47

#470

#471

#473

#475

#476

#477

#478

#479

#480

#481

#482

#483

#484

#485

#486

#487

#49

#499

#501

#502

#503

#504

#505

#506

#507

#508

#51

#510

#511

#512

#514

#515

#516

#517

#518

#519

#52

#520

#521

#522

#523

#524

#525

#527

#528

#529

#53

#530

#531

#532

#533

#534

#535

#536

#537

#538

#539

#54

#540

#541

#542

#543

#544

#545

#546

#547

#548

#549

#55

#550

#551

#552

#553

#554

#555

#556

#557

#558

#559

#56

#560

#561

#562

#563

#564

#566

#567

#568

#569

#570

#571

#572

#573

#574

#578

#579

#581

#582

#584

#585

#586

#587

#588

#589

#59

#590

#591

#592

#593

#594

#595

#596

#597

#599

#60

#600

#601

#602

#603

#604

#605

#607

#608

#609

#610

#611

#612

#613

#614

#615

#616

#617

#618

#619

#62

#620

#621

#622

#623

#624

#625

#626

#627

#628

#629

#63

#630

#631

#633

#634

#637

#638

#639

#64

#640

#641

#642

#643

#644

#645

#646

#647

#648

#649

#65

#650

#651

#652

#653

#654

#655

#656

#657

#658

#659

#66

#660

#661

#662

#663

#665

#666

#667

#668

#669

#670

#671

#672

#673

#674

#675

#676

#677

#678

#679

#680

#681

#682

#683

#684

#685

#686

#687

#689

#69

#691

#696

#697

#698

#699

#700

#701

#705

#706

#707

#708

#709

#71

#710

#711

#713

#714

#715

#716

#717

#718

#719

#72

#720

#721

#722

#723

#724

#725

#726

#727

#728

#729

#73

#730

#731

#732

#733

#734

#735

#736

#737

#738

#739

#74

#740

#741

#742

#743

#744

#745

#747

#748

#749

#75

#750

#751

#752

#753

#754

#755

#756

#757

#758

#759

#76

#760

#761

#762

#763

#764

#765

#766

#767

#768

#769

#77

#770

#771

#772

#773

#774

#775

#776

#777

#778

#779

#78

#780

#781

#782

#783

#784

#785

#786

#787

#788

#789

#79

#790

#791

#792

#793

#794

#795

#796

#797

#798

#799

#80

#800

#801

#802

#803

#804

#805

#806

#807

#808

#809

#81

#810

#811

#812

#813

#814

#815

#817

#819

#82

#820

#821

#822

#823

#824

#825

#826

#827

#828

#829

#83

#830

#831

#832

#833

#834

#835

#836

#837

#838

#839

#84

#840

#841

#842

#843

#844

#845

#846

#847

#848

#849

#85

#850

#851

#852

#853

#854

#855

#856

#857

#858

#859

#86

#860

#861

#862

#863

#864

#865

#866

#867

#868

#869

#87

#870

#871

#872

#873

#874

#875

#876

#877

#878

#879

#88

#880

#881

#882

#883

#884

#885

#886

#887

#888

#889

#89

#890

#891

#892

#893

#894

#895

#896

#897

#898

#899

#90

#900

#901

#902

#903

#904

#905

#906

#907

#908

#909

#91

#910

#911

#912

#913

#914

#915

#916

#917

#918

#919

#92

#920

#921

#922

#923

#924

#925

#926

#927

#928

#929

#93

#930

#931

#933

#934

#935

#937

#938

#939

#940

#941

#942

#943

#944

#945

#946

#947

#948

#949

#95

#950

#952

#953

#954

#955

#956

#957

#958

#959

#96

#960

#961

#962

#963

#964

#965

#967

#969

#97

#970

#971

#972

#973

#974

#975

#98

#99

v4.18

v4.25

v4.36

v4.45

v4.58

v5.08

v5.10

v5.11

v5.18

v5.20

v5.21

v5.211

v5.25

v5.31

a92076b42d Add SET_STATUS_ME to ActionIntegrity Lucy 2023-03-12 20:05:34 +01:00
fb65f728a7 Merge branch 'master' of https://github.com/SapphireServer/Sapphire into actions-war Lucy 2023-03-12 20:04:12 +01:00
5503e73352 basic BattleNpcScript support collett 2023-03-13 02:40:13 +09:00
3f30027742 Add missing changeclass Lucy 2023-03-12 16:46:39 +01:00
63d9ce5ba4 Add flags to lut Lucy 2023-03-12 16:46:14 +01:00
49486f5d02 Some aoe work Lucy 2023-03-12 16:45:52 +01:00
293c281eba Some exd struct fixes Lucy 2023-03-12 16:38:09 +01:00
5bb8f11881 Add flags to StatusEffects Lucy 2023-03-12 16:37:33 +01:00
d6918a88e0 Basic gambit work, still needs cleanup and improvements Mordred 2023-03-12 16:33:33 +01:00
34770bd70f debug command to force bnpc action collett 2023-03-12 08:55:40 +09:00
5cc7b0c87b Converted autoattacks to the action system Mordred 2023-03-11 20:52:52 +01:00
542f37fb3d allow bnpc to perform actions collett 2023-03-12 00:39:46 +09:00
4411f22123 store item hq state in flags field collett 2023-03-11 18:44:37 +09:00
8e77266b30 getType in EffectResult collett 2023-03-11 18:10:32 +09:00
7c4a053bea further simplified the action builder. Mordred 2023-03-10 22:59:53 +01:00
54ba2b529f Fixed another bug with self target actions. Mordred 2023-03-10 22:50:38 +01:00
72f06fb072 Status effect rework for actionintegrity. Mordred 2023-03-10 22:34:12 +01:00
f4a3c9493b Persistence for cross-class skills Lucy 2023-03-09 17:17:27 +01:00
cf32d4fe4d Remove unused method Lucy 2023-03-09 17:31:10 +01:00
5d353de158 Action logic rework #1 statuseffects and autoattack still on the todo list Mordred 2023-03-10 17:32:52 +01:00
0def7896ec Refactoring of action logic, ongoing. Fixing source of actorcontrols being always player for single target packets. Mordred 2023-03-09 21:54:30 +01:00
ff0a1c8be0 Apply modifiers in applyStatus Lucy 2023-03-09 00:25:18 +01:00
df9c51f27b Remove wrath when Defiance ends Lucy 2023-03-09 00:16:12 +01:00
f12e7ec651 Add ParryPercent modifier Lucy 2023-03-09 00:15:55 +01:00
38a0cd12ca Move modifiers to statuseffect Lucy 2023-03-09 00:14:48 +01:00
4870b0b771

Merge pull request #919 from Skyliegirl33/actions-war Mordred 2023-03-08 21:49:57 +01:00
2c7b790da3

Merge pull request #916 from hkAlice/bs-stuff Mordred 2023-03-08 21:49:42 +01:00
5b6131fdce

Merge pull request #918 from collett8192/Sapphire5.58_action Mordred 2023-03-08 21:48:51 +01:00
3f2cb2f7e9 more instancecontent work; Alice Ogeda 2023-03-08 17:18:13 -03:00
9d5fc7930a fix typos; Alice Ogeda 2023-03-08 16:37:13 -03:00
d621633137 more duty reset work, respawn players on duty reset; Alice Ogeda 2023-03-08 16:36:13 -03:00
692c557f6d more work on duty resets; Alice Ogeda 2023-03-08 16:27:13 -03:00
df4977cca5 Remove status tick logging Lucy 2023-03-08 19:18:12 +01:00
8d08234854 Fix modifier name for Defiance Lucy 2023-03-08 19:17:00 +01:00
b4cd677264 fix indentation Lucy 2023-03-08 19:12:35 +01:00
ade5cfa38f Add enums for common action values Lucy 2023-03-08 18:16:49 +01:00
9daf224019 Add option for scripts to enable the generic/lut handler Lucy 2023-03-08 18:13:29 +01:00
ec3c109898 Change delModifier assert to return early instead Lucy 2023-03-08 18:12:49 +01:00
b5c603ac63 Add option to not send statusremove order Lucy 2023-03-08 18:12:12 +01:00
390a53a6c6 Add statuseffect cost type Lucy 2023-03-08 18:10:51 +01:00
995bce495d Add even more modifiers Lucy 2023-03-08 18:10:15 +01:00
b56aab72e5 Add some actions and statuses for war Lucy 2023-03-08 18:09:10 +01:00
f80f210ad7 add timers and enrage mechanic; Alice Ogeda 2023-03-08 14:36:53 -03:00
aaad18bf7b Add job actions for warrior Lucy 2023-03-08 18:07:15 +01:00
e3a140da40 add encounter to instancecontent; basic status handling; Alice Ogeda 2023-03-08 14:15:13 -03:00
5217a474a5 encounter status control; Alice Ogeda 2023-03-08 12:07:08 -03:00
a92bd336e7 add EncounterFight, EncounterState; add example ifritnormal; Alice Ogeda 2023-03-08 11:59:45 -03:00
03d46ff2b8 remove scripts for battle; Alice Ogeda 2023-03-08 11:59:21 -03:00
17b06e31d8 add invuln to EffectBuilder collett 2023-03-08 19:57:03 +09:00
801fc9da8a

Merge pull request #915 from Skyliegirl33/actions Mordred 2023-03-08 09:21:39 +01:00
1341c53ff2

Merge pull request #917 from collett8192/Sapphire5.58_action Mordred 2023-03-08 09:21:15 +01:00
859f2329bb Another big batch of refactoring for readability. Mordred 2023-03-08 09:20:08 +01:00
6cbf94d9c2 Add method to simplify applying statuses to self Lucy 2023-03-08 00:34:36 +01:00
6fce046225 Apply effect to correct target Lucy 2023-03-07 23:05:18 +01:00
0cf8009c3a first is not last collett 2023-03-08 04:12:52 +09:00
125c07173b fix ActionEffectType which is wrong since 5.2 and use proper effect packet for self buffs collett 2023-03-08 04:10:12 +09:00
78acb58d8f Update HP on tick effects Lucy 2023-03-07 20:03:43 +01:00
51b7740a6f Basic dot/hot ticks implemented Lucy 2023-03-07 20:00:32 +01:00
7ad9f9687e Fix hasStatusEffect to prevent duplicates Lucy 2023-03-07 19:59:11 +01:00
bfaec90e00 Apply status effects properly for self when having a target Lucy 2023-03-07 19:58:08 +01:00
b525495636 Add status entry for Maim Lucy 2023-03-07 19:57:14 +01:00
d640506962 minor fixes collett 2023-03-08 02:47:31 +09:00
b3098fec87 Don't clear tick effect Lucy 2023-02-21 20:11:17 +01:00
d18ee7871e ugly prototype of arenascript; Alice Ogeda 2023-03-07 11:24:47 -03:00
4bee448f4b Syntax error which snuck in fixed. Mordred 2023-03-07 15:09:56 +01:00
fb7be5053a Some more packet cleanup. Mordred 2023-03-07 15:08:28 +01:00
9f458ae27c

Merge pull request #914 from MapleHinata/Sapphire_Retail Mordred 2023-03-07 14:46:29 +01:00
ffcf4b087c Update excel data to 6.35 Maple 2023-03-07 09:32:08 -03:00
7d8b5472be Add enhanced logging to exd_common_gen Maple 2023-03-07 09:31:44 -03:00
71eb8dcf42 Fix building on gcc Maple 2023-03-07 09:31:25 -03:00
2862208cfe

Merge pull request #912 from ff14wed/Sapphire6.35 Mordred 2023-03-07 11:21:01 +01:00
28f3ab76de

Merge pull request #913 from Makar8000/nav-export-fix Mordred 2023-03-07 11:20:46 +01:00
3b80d7849c

Nav export fix for 6.x Makar 2023-03-07 03:52:44 -06:00
ca002dadd1 Renamed the Util::Player namespace to Util::Packet. More cleanups and refactorings. Mordred 2023-03-07 10:25:55 +01:00
fc722572c5 Update ServerZoneIpcTypes for 6.35 Flawed 2023-03-06 23:26:58 -08:00
b94e7f4b2f Fix windows build error Lucy 2023-03-06 23:57:06 +01:00
5386f1334f Add some example statuses to lut Lucy 2023-02-21 20:08:55 +01:00
c15ac9031a Apply/remove modifiers for statuseffects Lucy 2023-03-06 23:13:45 +01:00
dd20478a01 Add basic modifier impl for Chara Lucy 2023-03-06 23:06:59 +01:00
ed4104c83e Add more modifiers Lucy 2023-03-06 23:11:50 +01:00
0cd43df305 Add basic generic handler for applying statuseffects Lucy 2023-03-06 23:09:03 +01:00
65ad14a475 Rename buildEffects to make more sense Lucy 2023-03-06 23:08:01 +01:00
114bd28538 Add duration field to statuses Lucy 2023-03-06 23:05:21 +01:00
7f70248836 Check statuses to determine valid lut entry Lucy 2023-03-06 23:04:30 +01:00
aca46ac8ce

Merge pull request #911 from collett8192/Sapphire5.58_with_action_pr Mordred 2023-03-06 22:58:39 +01:00
819f2842b0

Merge pull request #910 from pinapelz/fix_linux_build Mordred 2023-03-06 22:34:30 +01:00
f00f930366 Sapphire 5.58 now with actions. collett 2023-03-07 05:12:18 +09:00
8591cb857a Remove extra qualification Pinapelz 2023-03-06 11:11:25 -08:00
5fdbc90487 Next big batch of packet cleanup Mordred 2023-03-06 13:27:56 +01:00
aead026960

Merge pull request #909 from hkAlice/achievos Mordred 2023-03-06 10:12:53 +01:00
f4ab4ab418 More cleanup of player packets. Mordred 2023-03-06 10:12:29 +01:00
78766f9700 myerge; Alice Ogeda 2023-03-05 20:46:58 -03:00
7538d2b4e3 achievement sql; Alice Ogeda 2023-03-05 20:44:42 -03:00
35f3ef8109 Moving player packet generation into a player util function Mordred 2023-03-05 23:27:35 +01:00
700989c68d

Merge pull request #908 from hkAlice/achievos Mordred 2023-03-05 21:32:53 +01:00
294f1aa498

Merge pull request #907 from Moydow/6.x_housing Mordred 2023-03-05 21:32:23 +01:00
9528b8177e add achv history support; Alice Ogeda 2023-03-05 16:05:25 -03:00
445597a639 add LandAvailability packet Moydow 2023-03-04 00:11:02 +00:00
789a9e7058 always face north on entering a house Moydow 2023-03-04 00:10:05 +00:00
9cc0b01b3b fix LandFlagsSlot Moydow 2023-03-04 00:09:44 +00:00