Merge branch 'master' into eqstream

2026-05-16 22:58:34 +00:00 · 2017-02-06 21:46:34 -08:00
parent d5bd773a46 3d1bb6bd08
commit 0736ce43bd
57 changed files with 6422 additions and 2572 deletions
@@ -2495,6 +2495,7 @@ struct BookRequest_Struct {
 	uint8 window;	// where to display the text (0xFF means new window)
 	uint8 type;		//type: 0=scroll, 1=book, 2=item info.. prolly others.
 	uint32 invslot;	// Only used in Sof and later clients;
+	int16 subslot; // The subslot inside of a bag if it is inside one.
 	char txtfile[20];
 };

@@ -5154,6 +5154,7 @@ namespace RoF2

 		IN(type);
 		IN(invslot);
+		IN(subslot);
 		emu->window = (uint8)eq->window;
 		strn0cpy(emu->txtfile, eq->txtfile, sizeof(emu->txtfile));

@@ -2826,7 +2826,8 @@ struct BookText_Struct {
 struct BookRequest_Struct {
 /*0000*/	uint32 window;		// where to display the text (0xFFFFFFFF means new window).
 /*0004*/	uint16 invslot;		// Is the slot, but the RoF2 conversion causes it to fail.  Turned to 0 since it isnt required anyway.
-/*0008*/	uint32 unknown006;	// Seen FFFFFFFF
+/*0006*/	int16 subslot;		// Inventory sub-slot (0-x)
+/*0008*/	uint16 unknown006;	// Seen FFFF
 /*0010*/	uint16 unknown008;	// seen 0000
 /*0012*/	uint32 type;		// 0 = Scroll, 1 = Book, 2 = Item Info. Possibly others
 /*0016*/	uint32 unknown0012;
@@ -113,6 +113,741 @@

 #define PLAYER_RACE_ALL_MASK 65535

+#define RT_ABHORRENT 193
+#define RT_AIR_ELEMENTAL 210
+#define RT_AIR_ELEMENTAL_2 475
+#define RT_AIR_MEPHIT 291
+#define RT_AKHEVA 230
+#define RT_AKHEVA_2 722
+#define RT_ALARAN 695
+#define RT_ALARAN_GHOST 708
+#define RT_ALARAN_SENTRY_STONE 703
+#define RT_ALLIGATOR 91
+#define RT_ALLIGATOR_2 479
+#define RT_AMYGDALAN 99
+#define RT_AMYGDALAN_2 663
+#define RT_ANEUK 395
+#define RT_ANIMATED_ARMOR 323
+#define RT_ANIMATED_HAND 166
+#define RT_ANIMATED_STATUE 442
+#define RT_ANIMATED_STATUE_2 448
+#define RT_APEXUS 637
+#define RT_ARACHNID 326
+#define RT_ARCANIST_OF_HATE 352
+#define RT_ARMADILLO 87
+#define RT_ARMOR_RACK 535
+#define RT_AVIAK 13
+#define RT_AVIAK_2 558
+#define RT_AVIAK_PULL_ALONG 711
+#define RT_AYONAE_RO 498
+#define RT_BANNER 500
+#define RT_BANNER_2 553
+#define RT_BANNER_3 554
+#define RT_BANNER_4 555
+#define RT_BANNER_5 556
+#define RT_BANNER_6 557
+#define RT_BANNER_7 586
+#define RT_BANNER_10TH_ANNIVERSARY 628
+#define RT_BANSHEE 250
+#define RT_BANSHEE_2 487
+#define RT_BANSHEE_3 488
+#define RT_BARBARIAN 2
+#define RT_BARBARIAN_2 90
+#define RT_BARREL 377
+#define RT_BARREL_BARGE_SHIP 546
+#define RT_BASILISK 436
+#define RT_BAT 34
+#define RT_BAT_2 260
+#define RT_BAT_3 416
+#define RT_BAZU 409
+#define RT_BEAR 43
+#define RT_BEAR_2 305
+#define RT_BEAR_3 480
+#define RT_BEAR_MOUNT 655
+#define RT_BEAR_TRAP 503
+#define RT_BEETLE 22
+#define RT_BEETLE_2 559
+#define RT_BEETLE_3 716
+#define RT_BEGGAR 55
+#define RT_BELLIKOS 638
+#define RT_BERTOXXULOUS 152
+#define RT_BERTOXXULOUS_2 255
+#define RT_BIXIE 79
+#define RT_BIXIE_2 520
+#define RT_BLIMP_SHIP 693
+#define RT_BLIND_DREAMER 669
+#define RT_BLOOD_RAVEN 279
+#define RT_BOAT 141
+#define RT_BOAT_2 533
+#define RT_BOLVIRK 486
+#define RT_BONE_GOLEM 362
+#define RT_BONE_GOLEM_2 491
+#define RT_BONES 383
+#define RT_BOOK_DERVISH 660
+#define RT_BOT_PORTAL 329
+#define RT_BOULDER 585
+#define RT_BOX 376
+#define RT_BRAXI 688
+#define RT_BRAXI_MOUNT 676
+#define RT_BRELL 640
+#define RT_BRELLS_FIRST_CREATION 639
+#define RT_BRISTLEBANE 153
+#define RT_BROKEN_CLOCKWORK 274
+#define RT_BRONTOTHERIUM 169
+#define RT_BROWNIE 15
+#define RT_BROWNIE_2 568
+#define RT_BUBONIAN 268
+#define RT_BUBONIAN_UNDERLING 269
+#define RT_BURYNAI 144
+#define RT_BURYNAI_2 602
+#define RT_CAKE_10TH_ANNIVERSARY 629
+#define RT_CAMPFIRE 567
+#define RT_CARRIER_HAND 721
+#define RT_CAT 713
+#define RT_CAZIC_THULE 95
+#define RT_CAZIC_THULE_2 670
+#define RT_CENTAUR 16
+#define RT_CENTAUR_2 521
+#define RT_CHEST 378
+#define RT_CHEST_2 589
+#define RT_CHEST_3 590
+#define RT_CHIMERA 412
+#define RT_CHIMERA_2 582
+#define RT_CHOKIDAI 356
+#define RT_CLAM 115
+#define RT_CLIKNAR_MOUNT 652
+#define RT_CLIKNAR_QUEEN 642
+#define RT_CLIKNAR_SOLDIER 643
+#define RT_CLIKNAR_WORKER 644
+#define RT_CLOCKWORK_BEETLE 276
+#define RT_CLOCKWORK_BOAR 472
+#define RT_CLOCKWORK_BOMB 504
+#define RT_CLOCKWORK_BRAIN 249
+#define RT_CLOCKWORK_GNOME 88
+#define RT_CLOCKWORK_GOLEM 248
+#define RT_CLOCKWORK_GUARDIAN 572
+#define RT_COCKATRICE 96
+#define RT_COFFIN 382
+#define RT_COFFIN_2 592
+#define RT_COIN_PURSE 427
+#define RT_COLDAIN 183
+#define RT_COLDAIN_2 645
+#define RT_COLDAIN_3 646
+#define RT_CORAL 460
+#define RT_CORATHUS 459
+#define RT_CRAB 302
+#define RT_CRAGBEAST 390
+#define RT_CRAGSLITHER 597
+#define RT_CROCODILE 259
+#define RT_CRYSTAL 591
+#define RT_CRYSTAL_SHARD 425
+#define RT_CRYSTAL_SPHERE 616
+#define RT_CRYSTAL_SPIDER 327
+#define RT_CRYSTALSKIN_AMBULOID 641
+#define RT_CRYSTALSKIN_SESSILOID 647
+#define RT_DAISY_MAN 97
+#define RT_DARK_ELF 6
+#define RT_DARK_ELF_2 77
+#define RT_DARK_LORD 466
+#define RT_DEMI_LICH 45
+#define RT_DEMON_VULTURE 620
+#define RT_DERVISH 100
+#define RT_DERVISH_2 372
+#define RT_DERVISH_3 431
+#define RT_DERVISH_4 704
+#define RT_DERVISH_VER_5 726
+#define RT_DERVISH_VER_6 727
+#define RT_DEVOURER 159
+#define RT_DIRE_WOLF 171
+#define RT_DISCORD_SHIP 404
+#define RT_DISCORDLING 418
+#define RT_DISEASED_FIEND 253
+#define RT_DJINN 126
+#define RT_DRACHNID 57
+#define RT_DRACHNID_2 461
+#define RT_DRACHNID_COCOON 462
+#define RT_DRACOLICH 604
+#define RT_DRAGLOCK 132
+#define RT_DRAGON 49
+#define RT_DRAGON_2 122
+#define RT_DRAGON_3 165
+#define RT_DRAGON_4 184
+#define RT_DRAGON_5 192
+#define RT_DRAGON_6 195
+#define RT_DRAGON_7 196
+#define RT_DRAGON_8 198
+#define RT_DRAGON_9 304
+#define RT_DRAGON_10 435
+#define RT_DRAGON_11 437
+#define RT_DRAGON_12 438
+#define RT_DRAGON_13 452
+#define RT_DRAGON_14 530
+#define RT_DRAGON_15 531
+#define RT_DRAGON_16 569
+#define RT_DRAGON_BONES 423
+#define RT_DRAGON_EGG 445
+#define RT_DRAGON_STATUE 446
+#define RT_DRAGORN 413
+#define RT_DRAGORN_BOX 421
+#define RT_DRAKE 89
+#define RT_DRAKE_2 430
+#define RT_DRAKE_3 432
+#define RT_DRAKKIN 522
+#define RT_DRIXIE 113
+#define RT_DROGMORE 348
+#define RT_DROLVARG 133
+#define RT_DRYAD 243
+#define RT_DWARF 8
+#define RT_DWARF_2 94
+#define RT_DYNAMITE_KEG 505
+#define RT_DYNLETH 532
+#define RT_EARTH_ELEMENTAL 209
+#define RT_EARTH_ELEMENTAL_2 476
+#define RT_EARTH_MEPHIT 292
+#define RT_EEL 35
+#define RT_EFREETI 101
+#define RT_EFREETI_2 320
+#define RT_ELDDAR 489
+#define RT_ELEMENTAL 75
+#define RT_ELK_HEAD 714
+#define RT_ELVEN_BOAT 544
+#define RT_ELVEN_GHOST 587
+#define RT_ENCHANTED_ARMOR 175
+#define RT_EROLLISI 150
+#define RT_ERUDITE 3
+#define RT_ERUDITE_2 78
+#define RT_ERUDITE_3 678
+#define RT_EVAN_TEST 204
+#define RT_EVIL_EYE 21
+#define RT_EVIL_EYE_2 375
+#define RT_EVIL_EYE_3 469
+#define RT_EXOSKELETON 570
+#define RT_EXPLOSIVE_CART 692
+#define RT_EYE 108
+#define RT_FAIRY 25
+#define RT_FAIRY_2 473
+#define RT_FALLEN_KNIGHT 719
+#define RT_FAUN 182
+#define RT_FAY_DRAKE 154
+#define RT_FENNIN_RO 284
+#define RT_FERAN 410
+#define RT_FERAN_MOUNT 623
+#define RT_FIEND 300
+#define RT_FIRE_ELEMENTAL 212
+#define RT_FIRE_ELEMENTAL_2 477
+#define RT_FIRE_MEPHIT 293
+#define RT_FISH 24
+#define RT_FISH_2 148
+#define RT_FLAG 501
+#define RT_FLOATING_ISLAND 596
+#define RT_FLOATING_SKULL 512
+#define RT_FLOATING_TOWER 691
+#define RT_FLY 245
+#define RT_FLYING_CARPET 720
+#define RT_FOREST_GIANT 490
+#define RT_FROG 343
+#define RT_FROG_2 603
+#define RT_FROGLOK 26
+#define RT_FROGLOK_2 27
+#define RT_FROGLOK_3 330
+#define RT_FROGLOK_GHOST 371
+#define RT_FROGLOK_SKELETON 349
+#define RT_FUNGAL_FIEND 218
+#define RT_FUNGUS_PATCH 463
+#define RT_FUNGUSMAN 28
+#define RT_GALORIAN 228
+#define RT_GARGOYLE 29
+#define RT_GARGOYLE_2 464
+#define RT_GASBAG 30
+#define RT_GELATINOUS_CUBE 31
+#define RT_GELATINOUS_CUBE_2 712
+#define RT_GELIDRAN 417
+#define RT_GENARI 648
+#define RT_GEONID 178
+#define RT_GHOST 32
+#define RT_GHOST_2 117
+#define RT_GHOST_3 118
+#define RT_GHOST_4 334
+#define RT_GHOST_SHIP 114
+#define RT_GHOST_SHIP_2 552
+#define RT_GHOUL 33
+#define RT_GHOUL_2 571
+#define RT_GIANT 18
+#define RT_GIANT_2 140
+#define RT_GIANT_3 188
+#define RT_GIANT_4 189
+#define RT_GIANT_5 306
+#define RT_GIANT_6 307
+#define RT_GIANT_7 308
+#define RT_GIANT_8 309
+#define RT_GIANT_9 310
+#define RT_GIANT_10 311
+#define RT_GIANT_11 312
+#define RT_GIANT_12 453
+#define RT_GIANT_13 523
+#define RT_GIANT_CLOCKWORK 275
+#define RT_GIANT_RALLOSIAN_MATS 626
+#define RT_GIANT_SHADE 526
+#define RT_GIGYN 649
+#define RT_GINGERBREAD_MAN 666
+#define RT_GIRPLAN 419
+#define RT_GNOLL 39
+#define RT_GNOLL_2 524
+#define RT_GNOLL_3 617
+#define RT_GNOME 12
+#define RT_GNOMEWORK 457
+#define RT_GNOMISH_BALLOON 683
+#define RT_GNOMISH_BOAT 545
+#define RT_GNOMISH_HOVERING_TRANSPORT 685
+#define RT_GNOMISH_ROCKET_PACK 684
+#define RT_GOBLIN 40
+#define RT_GOBLIN_2 59
+#define RT_GOBLIN_3 137
+#define RT_GOBLIN_4 369
+#define RT_GOBLIN_5 433
+#define RT_GOD_LUCLIN_VER_2 728
+#define RT_GOD_LUCLIN_VER_3 729
+#define RT_GOD_LUCLIN_VER_4 731
+#define RT_GOD_OF_DISCORD 622
+#define RT_GOLEM 17
+#define RT_GOLEM_2 374
+#define RT_GOO 145
+#define RT_GOO_2 547
+#define RT_GOO_3 548
+#define RT_GOO_4 549
+#define RT_GORAL 687
+#define RT_GORAL_MOUNT 673
+#define RT_GORGON 121
+#define RT_GORILLA 41
+#define RT_GORILLA_2 560
+#define RT_GRANDFATHER_CLOCK 665
+#define RT_GREKEN_YOUNG 651
+#define RT_GREKEN_YOUNG_ADULT 650
+#define RT_GRENDLAEN 701
+#define RT_GRIEG_VENEFICUS 231
+#define RT_GRIFFIN 47
+#define RT_GRIFFIN_2 525
+#define RT_GRIMLING 202
+#define RT_GROUND_SHAKER 233
+#define RT_GUARD 44
+#define RT_GUARD_2 106
+#define RT_GUARD_3 112
+#define RT_GUARD_4 239
+#define RT_GUARD_OF_JUSTICE 251
+#define RT_GUARDIAN_CPU 593
+#define RT_HADAL 698
+#define RT_HAG 185
+#define RT_HALF_ELF 7
+#define RT_HALFLING 11
+#define RT_HALFLING_2 81
+#define RT_HARPY 111
+#define RT_HARPY_2 527
+#define RT_HIGH_ELF 5
+#define RT_HIPPOGRIFF 186
+#define RT_HOLGRESH 168
+#define RT_HOLGRESH_2 715
+#define RT_HONEY_POT 536
+#define RT_HORSE 216
+#define RT_HORSE_2 492
+#define RT_HORSE_3 518
+#define RT_HOVERING_PLATFORM 699
+#define RT_HRAQUIS 261
+#define RT_HUMAN 1
+#define RT_HUMAN_2 67
+#define RT_HUMAN_3 71
+#define RT_HUMAN_4 566
+#define RT_HUMAN_GHOST 588
+#define RT_HUVUL 400
+#define RT_HYDRA_CRYSTAL 615
+#define RT_HYDRA_MOUNT 631
+#define RT_HYDRA_NPC 632
+#define RT_HYNID 388
+#define RT_ICE_SPECTRE 174
+#define RT_IKAAV 394
+#define RT_IKSAR 128
+#define RT_IKSAR_2 139
+#define RT_IKSAR_GHOST 605
+#define RT_IKSAR_GOLEM 160
+#define RT_IKSAR_SKELETON 606
+#define RT_IKSAR_SPIRIT 147
+#define RT_IMP 46
+#define RT_INNORUUK 123
+#define RT_INSECT 370
+#define RT_INTERACTIVE_OBJECT 2250
+#define RT_INVISIBLE_MAN 127
+#define RT_INVISIBLE_MAN_2 681
+#define RT_INVISIBLE_MAN_3 690
+#define RT_INVISIBLE_MAN_OF_ZOMM 600
+#define RT_IXT 393
+#define RT_JOKESTER 384
+#define RT_JUM_JUM_BUCKET 537
+#define RT_JUNK_BEAST 273
+#define RT_KANGON 689
+#define RT_KANGON_MOUNT 677
+#define RT_KARANA 278
+#define RT_KEDGE 103
+#define RT_KEDGE_2 561
+#define RT_KERRAN 23
+#define RT_KERRAN_2 562
+#define RT_KIRIN 434
+#define RT_KIRIN_2 583
+#define RT_KNIGHT_OF_HATE 351
+#define RT_KNIGHT_OF_PESTILENCE 266
+#define RT_KOBOLD 48
+#define RT_KOBOLD_2 455
+#define RT_KRAKEN 315
+#define RT_KYV 396
+#define RT_LAUNCH 73
+#define RT_LAVA_ROCK 447
+#define RT_LAVA_SPIDER 450
+#define RT_LAVA_SPIDER_QUEEN 451
+#define RT_LEECH 104
+#define RT_LEPERTOLOTH 267
+#define RT_LIGHTCRAWLER 223
+#define RT_LIGHTNING_WARRIOR 407
+#define RT_LION 50
+#define RT_LIZARD_MAN 51
+#define RT_LUCLIN 724
+#define RT_LUGGALD 345
+#define RT_LUGGALD_2 346
+#define RT_LUGGALDS 347
+#define RT_MALARIAN 265
+#define RT_MAMMOTH 107
+#define RT_MAMMOTH_2 528
+#define RT_MAN_EATING_PLANT 162
+#define RT_MANSION 595
+#define RT_MANTICORE 172
+#define RT_MANTRAP 573
+#define RT_MARIONETTE 659
+#define RT_MASTRUQ 402
+#define RT_MATA_MURAM 406
+#define RT_MEDIUM_PLANT 541
+#define RT_MEPHIT 607
+#define RT_MERCHANT_SHIP 550
+#define RT_MERMAID 110
+#define RT_MIMIC 52
+#define RT_MINI_POM 252
+#define RT_MINOTAUR 53
+#define RT_MINOTAUR_2 420
+#define RT_MINOTAUR_3 470
+#define RT_MINOTAUR_4 574
+#define RT_MITHANIEL_MARR 296
+#define RT_MORELL_THULE 658
+#define RT_MOSQUITO 134
+#define RT_MOUTH_OF_INSANITY 281
+#define RT_MUDDITE 608
+#define RT_MUMMY 368
+#define RT_MURAMITE_ARMOR_PILE 424
+#define RT_MURKGLIDER 414
+#define RT_MURKGLIDER_EGG_SAC 429
+#define RT_MUTNA 401
+#define RT_NEKHON 614
+#define RT_NETHERBIAN 229
+#define RT_NIGHTMARE 287
+#define RT_NIGHTMARE_GARGOYLE 280
+#define RT_NIGHTMARE_GOBLIN 277
+#define RT_NIGHTMARE_MEPHIT 294
+#define RT_NIGHTMARE_UNICORN 517
+#define RT_NIGHTMARE_UNICORN_2 519
+#define RT_NIGHTMARE_WRAITH 264
+#define RT_NIHIL 385
+#define RT_NILBORIEN 317
+#define RT_NOC 397
+#define RT_NYMPH 242
+#define RT_OGRE 10
+#define RT_OGRE_2 93
+#define RT_OGRE_NPC_MALE 624
+#define RT_ORB 730
+#define RT_ORC 54
+#define RT_ORC_2 458
+#define RT_OTHMIR 190
+#define RT_OWLBEAR 206
+#define RT_PARASITIC_SCAVENGER 700
+#define RT_PEGASUS 125
+#define RT_PEGASUS_2 493
+#define RT_PEGASUS_3 732
+#define RT_PHOENIX 303
+#define RT_PIRANHA 74
+#define RT_PIRATE 335
+#define RT_PIRATE_2 336
+#define RT_PIRATE_3 337
+#define RT_PIRATE_4 338
+#define RT_PIRATE_5 339
+#define RT_PIRATE_6 340
+#define RT_PIRATE_7 341
+#define RT_PIRATE_8 342
+#define RT_PIRATE_SHIP 551
+#define RT_PIXIE 56
+#define RT_POISON_FROG 316
+#define RT_PORTAL 426
+#define RT_POWDER_KEG 636
+#define RT_PRESSURE_PLATE 506
+#define RT_PUFFER_SPORE 507
+#define RT_PUMA 76
+#define RT_PUMA_2 439
+#define RT_PUMA_3 584
+#define RT_PUSLING 270
+#define RT_PYRILEN 411
+#define RT_RA_TUK 398
+#define RT_RABBIT 668
+#define RT_RALLOS_ZEK 66
+#define RT_RALLOS_ZEK_2 288
+#define RT_RALLOS_ZEK_MINION 325
+#define RT_RAPTOR 163
+#define RT_RAPTOR_2 609
+#define RT_RAPTOR_MOUNT 680
+#define RT_RAT 36
+#define RT_RAT_2 415
+#define RT_RAT_MOUNT 656
+#define RT_RATMAN 156
+#define RT_RATMAN_2 718
+#define RT_REANIMATED_HAND 80
+#define RT_RECUSO 237
+#define RT_REGENERATION_POOL 705
+#define RT_RELIC_CASE 707
+#define RT_RHINO_BEETLE 207
+#define RT_RHINOCEROS 135
+#define RT_ROBOCOPTER_OF_ZOMM 601
+#define RT_ROCK_PILE 428
+#define RT_ROCKHOPPER 200
+#define RT_RONNIE_TEST 197
+#define RT_ROOT_TENTACLE 509
+#define RT_ROT_DOG_MOUNT 672
+#define RT_ROTDOG 662
+#define RT_ROTOCOPTER 577
+#define RT_ROWBOAT 502
+#define RT_ROYAL_GUARD 667
+#define RT_RUJARKIAN_ORC 361
+#define RT_RUJARKIAN_ORC_2 366
+#define RT_RUNED_ORB 422
+#define RT_RUNIC_SYMBOL 510
+#define RT_SABER_TOOTHED_CAT 119
+#define RT_SALTPETTER_BOMB 511
+#define RT_SAND_ELF 364
+#define RT_SANDMAN 664
+#define RT_SARNAK 131
+#define RT_SARNAK_2 610
+#define RT_SARNAK_GOLEM 164
+#define RT_SARNAK_SPIRIT 146
+#define RT_SARYRN 283
+#define RT_SATYR 529
+#define RT_SCALED_WOLF 481
+#define RT_SCARECROW 82
+#define RT_SCARECROW_2 575
+#define RT_SCARLET_CHEETAH 221
+#define RT_SCLERA_MOUNT 675
+#define RT_SCORPION 129
+#define RT_SCORPION_2 149
+#define RT_SCORPION_3 611
+#define RT_SCRYKIN 495
+#define RT_SEA_TURTLE 194
+#define RT_SEAHORSE 116
+#define RT_SELYRAH 686
+#define RT_SELYRAH_MOUNT 674
+#define RT_SERU 236
+#define RT_SERVANT_OF_SHADOW 723
+#define RT_SESSILOID_MOUNT 657
+#define RT_SHADE 224
+#define RT_SHADE_2 373
+#define RT_SHADE_3 576
+#define RT_SHADEL 205
+#define RT_SHAMBLING_MOUND 494
+#define RT_SHARK 61
+#define RT_SHIKNAR 199
+#define RT_SHILISKIN 467
+#define RT_SHIP 72
+#define RT_SHIP_IN_A_BOTTLE 702
+#define RT_SHISSAR 217
+#define RT_SHISSAR_2 563
+#define RT_SHRIEKER 227
+#define RT_SIREN 187
+#define RT_SIREN_2 564
+#define RT_SKELETAL_HORSE 282
+#define RT_SKELETON 60
+#define RT_SKELETON_2 367
+#define RT_SKELETON_3 484
+#define RT_SKUNK 83
+#define RT_SKYSTRIDER 709
+#define RT_SMALL_PLANT 540
+#define RT_SNAKE 37
+#define RT_SNAKE_2 468
+#define RT_SNAKE_ELEMENTAL 84
+#define RT_SNOW_DERVISH 170
+#define RT_SNOW_RABBIT 176
+#define RT_SOKOKAR 618
+#define RT_SOKOKAR_MOUNT 625
+#define RT_SOKOKAR_W_SADDLE 627
+#define RT_SOLUSEK_RO 58
+#define RT_SOLUSEK_RO_2 247
+#define RT_SOLUSEK_RO_GUARD 254
+#define RT_SONIC_WOLF 232
+#define RT_SOUL_DEVOURER 286
+#define RT_SPECTRE 85
+#define RT_SPECTRE_2 485
+#define RT_SPELL_PARTICLE_1 599
+#define RT_SPHINX 86
+#define RT_SPHINX_2 565
+#define RT_SPIDER 38
+#define RT_SPIDER_2 440
+#define RT_SPIDER_EGG_SACK 449
+#define RT_SPIDER_MOUNT 654
+#define RT_SPIDER_QUEEN 441
+#define RT_SPIKE_TRAP 513
+#define RT_SPIRIT_WOLF 483
+#define RT_SPORALI 456
+#define RT_STONE_JUG 539
+#define RT_STONE_PYLON 619
+#define RT_STONE_RING 508
+#define RT_STONE_WORKER 387
+#define RT_STONE_WORKER_2 405
+#define RT_STONEGRABBER 220
+#define RT_STONEMITE 391
+#define RT_STORMRIDER 272
+#define RT_SUCCUBUS 408
+#define RT_SUCCULENT 167
+#define RT_SULLON_ZEK 499
+#define RT_SUN_REVENANT 226
+#define RT_SUNFLOWER 225
+#define RT_SWINETOR 696
+#define RT_SWORDFISH 105
+#define RT_SYNARCANA 363
+#define RT_TABLE 380
+#define RT_TADPOLE 102
+#define RT_TAELOSIAN 403
+#define RT_TALL_PLANT 542
+#define RT_TALLON_ZEK 290
+#define RT_TANETH 399
+#define RT_TAREW_MARR 246
+#define RT_TEGI 215
+#define RT_TELEPORT_MAN 240
+#define RT_TELEPORTATION_STAND 706
+#define RT_TELMIRA 653
+#define RT_TENTACLE_TERROR 68
+#define RT_TENTACLE_TERROR_2 578
+#define RT_TERRIS_THULE 257
+#define RT_TEST_OBJECT 301
+#define RT_THE_RATHE 298
+#define RT_THE_TRIBUNAL 256
+#define RT_THOUGHT_HORROR 214
+#define RT_TIGER 63
+#define RT_TIN_SOLDIER 263
+#define RT_TOOLBOX 538
+#define RT_TOPIARY_LION 661
+#define RT_TOPIARY_LION_MOUNT 671
+#define RT_TORMENTOR 285
+#define RT_TOTEM 173
+#define RT_TOTEM_2 514
+#define RT_TRAKANON 19
+#define RT_TRANQUILION 262
+#define RT_TREANT 64
+#define RT_TREANT_2 244
+#define RT_TREANT_3 496
+#define RT_TRIBUNAL 151
+#define RT_TRIUMVIRATE 697
+#define RT_TROLL 9
+#define RT_TROLL_2 92
+#define RT_TROLL_3 331
+#define RT_TROLL_4 332
+#define RT_TROLL_5 333
+#define RT_TROLL_ZOMBIE 344
+#define RT_TRUSIK 386
+#define RT_TSETSIAN 612
+#define RT_TUMBLEWEED 694
+#define RT_TUNARE 62
+#define RT_TUREPTA 389
+#define RT_UKUN 392
+#define RT_ULTHORK 191
+#define RT_UNDEAD_CHOKIDAI 357
+#define RT_UNDEAD_FOOTMAN 324
+#define RT_UNDEAD_FROGLOK 350
+#define RT_UNDEAD_IKSAR 161
+#define RT_UNDEAD_KNIGHT 297
+#define RT_UNDEAD_SARNAK 155
+#define RT_UNDEAD_VEKSAR 358
+#define RT_UNDERBULK 201
+#define RT_UNICORN 124
+#define RT_UNKNOWN_RACE 0
+#define RT_UNKNOWN_RACE_2 142
+#define RT_UNKNOWN_RACE_3 143
+#define RT_UNKNOWN_RACE_4 179
+#define RT_UNKNOWN_RACE_5 180
+#define RT_UNKNOWN_RACE_6 443
+#define RT_UNKNOWN_RACE_7 444
+#define RT_VAH_SHIR 130
+#define RT_VAH_SHIR_2 238
+#define RT_VAH_SHIR_SKELETON 234
+#define RT_VALLON_ZEK 289
+#define RT_VALORIAN 318
+#define RT_VALORIAN_2 322
+#define RT_VAMPIRE 65
+#define RT_VAMPIRE_2 98
+#define RT_VAMPIRE_3 208
+#define RT_VAMPIRE_4 219
+#define RT_VAMPIRE_5 359
+#define RT_VAMPIRE_6 360
+#define RT_VAMPIRE_7 365
+#define RT_VAMPIRE_8 497
+#define RT_VASE 379
+#define RT_VEGEROG 258
+#define RT_VEKSAR 353
+#define RT_VEKSAR_2 354
+#define RT_VEKSAR_3 355
+#define RT_VENRIL_SATHIR 20
+#define RT_VINE_MAW 717
+#define RT_WAGON 621
+#define RT_WALRUS 177
+#define RT_WAR_BOAR 319
+#define RT_WAR_BOAR_2 321
+#define RT_WAR_WRAITH 313
+#define RT_WASP 109
+#define RT_WATER_ELEMENTAL 211
+#define RT_WATER_ELEMENTAL_2 478
+#define RT_WATER_MEPHIT 271
+#define RT_WATER_SPOUT 710
+#define RT_WEAPON_RACK 381
+#define RT_WEAPON_RACK_2 534
+#define RT_WEB 515
+#define RT_WEDDING_ALTAR 635
+#define RT_WEDDING_ARBOR 634
+#define RT_WEDDING_FLOWERS 633
+#define RT_WEREORC 579
+#define RT_WEREWOLF 14
+#define RT_WEREWOLF_2 241
+#define RT_WEREWOLF_3 454
+#define RT_WETFANG_MINNOW 213
+#define RT_WHIRLIGIG 682
+#define RT_WICKER_BASKET 516
+#define RT_WILL_O_WISP 69
+#define RT_WINE_CASK 543
+#define RT_WINE_CASK_2 630
+#define RT_WITHERAN 465
+#define RT_WITHERAN_2 474
+#define RT_WOLF 42
+#define RT_WOLF_2 120
+#define RT_WOLF_3 482
+#define RT_WOOD_ELF 4
+#define RT_WORG 580
+#define RT_WORG_2 594
+#define RT_WORM 203
+#define RT_WRETCH 235
+#define RT_WRULON 314
+#define RT_WRULON_2 598
+#define RT_WURM 158
+#define RT_WURM_2 613
+#define RT_WURM_MOUNT 679
+#define RT_WYVERN 157
+#define RT_WYVERN_2 581
+#define RT_XALGOZ 136
+#define RT_XARIC_THE_UNSPOKEN 725
+#define RT_XEGONY 299
+#define RT_YAKKAR 181
+#define RT_YETI 138
+#define RT_ZEBUXORUK 295
+#define RT_ZEBUXORUKS_CAGE 328
+#define RT_ZELNIAK 222
+#define RT_ZOMBIE 70
+#define RT_ZOMBIE_2 471
+

 const char* GetRaceIDName(uint16 race_id);
 const char* GetPlayerRaceName(uint32 player_race_value);
@@ -392,15 +392,13 @@ RULE_BOOL(Spells, NPCInnateProcOverride, true) //  NPC innate procs override the
 RULE_CATEGORY_END()

 RULE_CATEGORY(Combat)
-RULE_INT(Combat, MeleeBaseCritChance, 0) //The base crit chance for non warriors, NOTE: This will apply to NPCs as well
-RULE_INT(Combat, WarBerBaseCritChance, 3) //The base crit chance for warriors and berserkers, only applies to clients
-RULE_INT(Combat, BerserkBaseCritChance, 6) //The bonus base crit chance you get when you're berserk
+RULE_INT(Combat, PetBaseCritChance, 0) // Pet Base crit chance
 RULE_INT(Combat, NPCBashKickLevel, 6) //The level that npcs can KICK/BASH
 RULE_INT(Combat, NPCBashKickStunChance, 15) //Percent chance that a bash/kick will stun
-RULE_INT(Combat, RogueCritThrowingChance, 25) //Rogue throwing crit bonus
-RULE_INT(Combat, RogueDeadlyStrikeChance, 80) //Rogue chance throwing from behind crit becomes a deadly strike
-RULE_INT(Combat, RogueDeadlyStrikeMod, 2) //Deadly strike modifier to crit damage
-RULE_INT(Combat, ClientBaseCritChance, 0) //The base crit chance for all clients, this will stack with warrior's/zerker's crit chance.
+RULE_INT(Combat, MeleeCritDifficulty, 8900) // lower is easier
+RULE_INT(Combat, ArcheryCritDifficulty, 3400) // lower is easier
+RULE_INT(Combat, ThrowingCritDifficulty, 1100) // lower is easier
+RULE_BOOL(Combat, NPCCanCrit, false) // true allows non PC pet NPCs to crit
 RULE_BOOL(Combat, UseIntervalAC, true)
 RULE_INT(Combat, PetAttackMagicLevel, 30)
 RULE_BOOL(Combat, EnableFearPathing, true)
@@ -492,6 +490,7 @@ RULE_INT(Combat, NPCAssistCap, 5) // Maxiumium number of NPCs that will assist a
 RULE_INT(Combat, NPCAssistCapTimer, 6000) // Time in milliseconds a NPC will take to clear assist aggro cap space
 RULE_BOOL(Combat, UseRevampHandToHand, false) // use h2h revamped dmg/delays I believe this was implemented during SoF
 RULE_BOOL(Combat, ClassicMasterWu, false) // classic master wu uses a random special, modern doesn't
+RULE_INT(Combat, LevelToStopDamageCaps, 0) // 1 will effectively disable them, 20 should give basically same results as old incorrect system
 RULE_CATEGORY_END()

 RULE_CATEGORY(NPC)
@@ -1136,13 +1136,13 @@ const EQEmu::ItemData* SharedDatabase::IterateItems(uint32* id) {
 	return nullptr;
 }

-std::string SharedDatabase::GetBook(const char *txtfile)
+std::string SharedDatabase::GetBook(const char *txtfile, int16 *language)
 {
 	char txtfile2[20];
 	std::string txtout;
 	strcpy(txtfile2, txtfile);

-	std::string query = StringFormat("SELECT txtfile FROM books WHERE name = '%s'", txtfile2);
+	std::string query = StringFormat("SELECT txtfile, language FROM books WHERE name = '%s'", txtfile2);
 	auto results = QueryDatabase(query);
 	if (!results.Success()) {
 		txtout.assign(" ",1);
@@ -1157,6 +1157,7 @@ std::string SharedDatabase::GetBook(const char *txtfile)

    auto row = results.begin();
    txtout.assign(row[0],strlen(row[0]));
+    *language = static_cast<int16>(atoi(row[1]));

    return txtout;
 }
@@ -94,7 +94,7 @@ class SharedDatabase : public Database
 		bool	SetStartingItems(PlayerProfile_Struct* pp, EQEmu::InventoryProfile* inv, uint32 si_race, uint32 si_class, uint32 si_deity, uint32 si_current_zone, char* si_name, int admin);


-		std::string	GetBook(const char *txtfile);
+		std::string	GetBook(const char *txtfile, int16 *language);

 		/*
 		    Item Methods
@@ -124,6 +124,30 @@ bool EQEmu::skills::IsCastingSkill(SkillType skill)
 	}
 }

+int32 EQEmu::skills::GetBaseDamage(SkillType skill)
+{
+	switch (skill) {
+	case SkillBash:
+		return 2;
+	case SkillDragonPunch:
+		return 12;
+	case SkillEagleStrike:
+		return 7;
+	case SkillFlyingKick:
+		return 25;
+	case SkillKick:
+		return 3;
+	case SkillRoundKick:
+		return 5;
+	case SkillTigerClaw:
+		return 4;
+	case SkillFrenzy:
+		return 10;
+	default:
+		return 0;
+	}
+}
+
 const std::map<EQEmu::skills::SkillType, std::string>& EQEmu::skills::GetSkillTypeMap()
 {
 	/* VS2013 code
@@ -166,6 +166,7 @@ namespace EQEmu
 		float GetSkillMeleePushForce(SkillType skill);
 		bool IsBardInstrumentSkill(SkillType skill);
 		bool IsCastingSkill(SkillType skill);
+		int32 GetBaseDamage(SkillType skill);

 		extern const std::map<SkillType, std::string>& GetSkillTypeMap();

@@ -67,11 +67,59 @@ const int SpellTypes_Beneficial = SpellType_Heal|SpellType_Buff|SpellType_Escape

 #define SpellType_Any		0xFFFF

+// These should not be used to determine spell category..
+// They are a graphical affects (effects?) index only
+// TODO: import sai list
 enum SpellAffectIndex {
-	SAI_Calm			= 12, // Lull and Alliance Spells
-	SAI_Dispell_Sight	= 14, // Dispells and Spells like Bind Sight
-	SAI_Memory_Blur		= 27,
-	SAI_Calm_Song		= 43 // Lull and Alliance Songs
+	SAI_Summon_Mount_Unclass	= -1,
+	SAI_Direct_Damage			= 0,
+	SAI_Heal_Cure				= 1,
+	SAI_AC_Buff					= 2,
+	SAI_AE_Damage				= 3,
+	SAI_Summon					= 4,	// Summoned Pets and Items
+	SAI_Sight					= 5,
+	SAI_Mana_Regen_Resist_Song	= 6,
+	SAI_Stat_Buff				= 7,
+	SAI_Vanish					= 9,	// Invisibility and Gate/Port
+	SAI_Appearance				= 10,	// Illusion and Size
+	SAI_Enchanter_Pet			= 11,
+	SAI_Calm					= 12,	// Lull and Alliance Spells
+	SAI_Fear					= 13,
+	SAI_Dispell_Sight			= 14,	// Dispells and Spells like Bind Sight
+	SAI_Stun					= 15,
+	SAI_Haste_Runspeed			= 16,	// Haste and SoW
+	SAI_Combat_Slow				= 17,
+	SAI_Damage_Shield			= 18,
+	SAI_Cannibalize_Weapon_Proc	= 19,
+	SAI_Weaken					= 20,
+	SAI_Banish					= 21,
+	SAI_Blind_Poison			= 22,
+	SAI_Cold_DD					= 23,
+	SAI_Poison_Disease_DD		= 24,
+	SAI_Fire_DD					= 25,
+	SAI_Memory_Blur				= 27,
+	SAI_Gravity_Fling			= 28,
+	SAI_Suffocate				= 29,
+	SAI_Lifetap_Over_Time		= 30,
+	SAI_Fire_AE					= 31,
+	SAI_Cold_AE					= 33,
+	SAI_Poison_Disease_AE		= 34,
+	SAI_Teleport				= 40,
+	SAI_Direct_Damage_Song		= 41,
+	SAI_Combat_Buff_Song		= 42,
+	SAI_Calm_Song				= 43,	// Lull and Alliance Songs
+	SAI_Firework				= 45,
+	SAI_Firework_AE				= 46,
+	SAI_Weather_Rocket			= 47,
+	SAI_Convert_Vitals			= 50,
+	SAI_NPC_Special_60			= 60,
+	SAI_NPC_Special_61			= 61,
+	SAI_NPC_Special_62			= 62,
+	SAI_NPC_Special_63			= 63,
+	SAI_NPC_Special_70			= 70,
+	SAI_NPC_Special_71			= 71,
+	SAI_NPC_Special_80			= 80,
+	SAI_Trap_Lock				= 88
 };
 enum RESISTTYPE
 {
@@ -30,7 +30,7 @@
 	Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
 */

-#define CURRENT_BINARY_DATABASE_VERSION 9101
+#define CURRENT_BINARY_DATABASE_VERSION 9103
 #ifdef BOTS
 	#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9008
 #else