Skip to content

Commit 51f2558

Browse files
XoduzXoduz
authored
Merge pull request #546 from DragonSlayer62/Publish-123-Equipment
Publish 123 Weapons and Armors
2 parents 93e8a1c + 09230cc commit 51f2558

3 files changed

Lines changed: 80 additions & 4 deletions

File tree

‎data/js/server/data/material_types.js‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ const itemTileIDList = [
3636
//New ToL Weapons
3737
0xaea4, 0xaea5, 0xaeb3, 0xaeb4, 0xaec2, 0xaec3, 0xaed1, 0xaed2,
3838

39+
// Publish 123 Weapons
40+
0xB4BF, 0xB4C0, 0xB4C1, 0xB4C2, 0xB4C3, 0xB4C4, 0xB4C5, 0xB4C6, 0xB4C7, 0xB4C8, 0xB4C9,
41+
0xB4CA, 0xB4CB, 0xB4CC, 0xB4CD, 0xB4CE, 0xB4D4, 0xB4D5, 0xB4D6, 0xB4D7, 0xB4DA, 0xB4DB,
42+
0xB4DC, 0xB4DD, 0xB4DE, 0xB4DF, 0xB4E0, 0xB4E1,
43+
3944
// Armor
4045
0x13bb, 0x13be, 0x13bf, 0x13c0, 0x13c3, 0x13c4, 0x13eb, 0x13ec, 0x13ed, 0x13ee, 0x13ef,
4146
0x13f0, 0x13f1, 0x13f2, 0x1408, 0x1409, 0x140a, 0x140b, 0x140c, 0x140d, 0x140e, 0x140f,
@@ -54,6 +59,9 @@ const itemTileIDList = [
5459
0xaebf, 0xaec0, 0xaec6, 0xaec7, 0xaec8, 0xaec9, 0xaeca, 0xaecb, 0xaecc, 0xaecd,
5560
0xaece, 0xaecf, 0xaed5, 0xaed6, 0xaed7, 0xaed8, 0xaed9, 0xaeda, 0xaedb,
5661

62+
// Publish 123 Armors
63+
0xB4E2, 0xB4E3,
64+
5765
// Shields
5866
0x1b72, 0x1b73, 0x1b74, 0x1b75, 0x1b76, 0x1b77, 0x1b7b, 0x2b01, 0x4201, 0x4202, 0x4203,
5967
0x4204, 0x4206, 0x4208, 0x4209, 0x420a, 0xa649, 0xa64a, 0xa831, 0xa832, 0x7818, 0x7817,
@@ -132,6 +140,9 @@ const itemTileIDList = [
132140
0xa700, 0xa701, 0xa702, 0xa703, 0xb2b7, 0xb2b8, 0xb2b9, 0xb2ba, 0xb298, 0xb299, 0xb29a, 0xb29b, 0xb29c, 0xb29d, 0xaea3,
133141
0xaeb2, 0xaec1, 0xaed0, 0xb1de,
134142

143+
// Publish 123 Clothing
144+
0xB40A,
145+
135146
// Armor
136147
0x2794, 0x2797, 0x2798, 0x405f, 0x4060, 0x4061, 0x4062, 0x4063, 0x4064, 0x4065, 0x4066
137148
]],
@@ -166,17 +177,18 @@ const itemTileIDList = [
166177
]]
167178
];
168179

180+
/** @type { ( itemToCheck: Item | null, idToCheck?: number ) => string | number | boolean } */
169181
function GetItemMaterialType( itemToCheck, idToCheck )
170182
{
171183
var itemTileID = 0;
184+
172185
if( ValidateObject( itemToCheck ))
173186
{
174187
// Return custom material from item tag, if it exists
175188
if( itemToCheck.GetTag( "materialType" ))
176189
{
177190
return itemToCheck.GetTag( "materialType" );
178191
}
179-
180192
// Otherwise return material based on item's ID
181193
itemTileID = itemToCheck.id;
182194
}
@@ -232,6 +244,7 @@ const resourceTileIDList = [
232244
]]*/
233245
];
234246

247+
/** @type { ( idToCheck: number ) => string } */
235248
function GetResourceType( idToCheck )
236249
{
237250
for( var i = 0; i < resourceTileIDList.length; i++ )
@@ -250,13 +263,14 @@ function GetResourceType( idToCheck )
250263
const mapTileIDList = [
251264
];
252265

266+
/** @type { ( mapTileID: number ) => string } */
253267
function GetGroundMaterialType( mapTileID )
254268
{
255-
for( var i = 0; i < mapTileIDListList.length; i++ )
269+
for( var i = 0; i < mapTileIDList.length; i++ )
256270
{
257271
for( var j = 0; j < mapTileIDListList[i].length; j++ )
258272
{
259-
if( mapTileIDListList[i][j].indexOf( mapTileID ) > -1 )
273+
if( mapTileIDList[i][j].indexOf( mapTileID ) > -1 )
260274
{
261275
return mapTileIDListList[i][0];
262276
}

‎data/js/server/data/weapontypes.js‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
// "WRESTLING"
4747
// "THROWING"
4848

49+
/** @type { ( mChar: Character | null, itemID: number | null ) => string } */
4950
function GetWeaponType( mChar, itemID )
5051
{
5152
var weaponType;
@@ -97,6 +98,8 @@ function GetWeaponType( mChar, itemID )
9798
case 0x48C7: //gargish bone harvester - SA
9899
case 0xA28B: // Bladed Whip - tol
99100
case 0xA293: // Bladed Whip - tol
101+
case 0xB4CD: //Gargish Bokuto Publish 123
102+
case 0xB4CE: //Gargish Bokuto Publish 123
100103
weaponType = "DEF_SWORDS"; break;
101104
// Default Swords
102105
case 0x13F6: //butcher knife
@@ -158,6 +161,10 @@ function GetWeaponType( mChar, itemID )
158161
case 0x27F3: //bokuto - SE
159162
case 0x2D32: //rune blade - ML
160163
case 0x2D26: //rune blade - ML
164+
case 0x0908: //gargish talwar - SA
165+
case 0x4075: //gargish talwar - SA
166+
case 0xB4BF: //Tachi Publish 123
167+
case 0xB4C0: //Tachi Publish 123
161168
weaponType = "TWOHND_LG_SWORDS"; break;
162169
// Bardiche
163170
case 0x0F4D: //bardiche
@@ -206,6 +213,8 @@ function GetWeaponType( mChar, itemID )
206213
case 0x48B1: //gargish battleaxe - SA
207214
case 0x48B2: //gargish axe - SA
208215
case 0x48B3: //gargish axe - SA
216+
case 0xB4DE: //Skull_Axe Publish 123
217+
case 0xB4DF: //Skull_Axe Publish 123
209218
weaponType = "TWOHND_AXES"; break;
210219
// Default Maces
211220
case 0x0DF2: // Wand
@@ -249,6 +258,12 @@ function GetWeaponType( mChar, itemID )
249258
case 0xAEB3: //Water Paladin Hammer - ToL
250259
case 0xAEC2: //Earth Paladin Hammer - ToL
251260
case 0xAED1: //Fire Paladin Hammer - ToL
261+
case 0xB4C1: //Escrima Publish 123
262+
case 0xB4C2: //Escrima Publish 123
263+
case 0xB4CB: //Gargish Otsuchi Publish 123
264+
case 0xB4CC: //Gargish Otsuchi Publish 123
265+
case 0xB4DA: //Skull_Mace Publish 123
266+
case 0xB4DB: //Skull_Mace Publish 123
252267
weaponType = "DEF_MACES"; break;
253268
// Large Maces
254269
case 0x1438: //war hammer
@@ -267,6 +282,10 @@ function GetWeaponType( mChar, itemID )
267282
case 0x48C1: //gargish war hammer - SA
268283
case 0x48CC: //gargish tessen - SA
269284
case 0x48CD: //gargish tessen - SA
285+
case 0xA7C3: //candycane staff
286+
case 0xA7C4: //candycane staff
287+
case 0xB4C3: //Bo Staff Publish 123
288+
case 0xB4C4: //Bo Staff Publish 123
270289
weaponType = "LG_MACES"; break;
271290
// Staffs - treated differently in some cases than other maces
272291
case 0x13F4: //crook
@@ -311,6 +330,8 @@ function GetWeaponType( mChar, itemID )
311330
case 0x27F0: //yumi - SE
312331
case 0x2D1F: //magical shortbow - ML
313332
case 0x2D2B: //magical shortbow - ML
333+
case 0xB4DC: //Skull_Crossbow Publish 123
334+
case 0xB4DD: //Skull_Crossbow Publish 123
314335
weaponType = "BOWS"; break;
315336
// Crossbows
316337
case 0x0F4F: //crossbow
@@ -353,6 +374,12 @@ function GetWeaponType( mChar, itemID )
353374
case 0xAEB4: //Water Paladin fork - ToL
354375
case 0xAEC3: //Earth Paladin fork - ToL
355376
case 0xAED2: //Fire Paladin fork - ToL
377+
case 0xB4C7: //Tanto Publish 123
378+
case 0xB4C8: //Tanto Publish 123
379+
case 0xB4C9: //Gargish Tanto Publish 123
380+
case 0xB4CA: //Gargish Tanto Publish 123
381+
case 0xB4D4: //Skull_Blade Publish 123
382+
case 0xB4D5: //Skull_Blade Publish 123
356383
weaponType = "DEF_FENCING"; break;
357384
// Stabbing Fencing Weapons
358385
case 0x0E87: //pitchfork
@@ -382,6 +409,10 @@ function GetWeaponType( mChar, itemID )
382409
case 0x48C9: //gargish pike - SA
383410
case 0x48CA: //gargish lance - SA
384411
case 0x48CB: //gargish lance - SA
412+
case 0xB4C5: //Yari Publish 123
413+
case 0xB4C6: //Yari Publish 123
414+
case 0xB4D6: //Skull_Spear Publish 123
415+
case 0xB4D7: //Skull_Spear Publish 123
385416
weaponType = "TWOHND_FENCING"; break;
386417
case 0x27AF: //sai - SE
387418
case 0x27FA: //sai - SE
@@ -406,14 +437,17 @@ function GetWeaponType( mChar, itemID )
406437
case 0x406C: //gargish cyclone - SA
407438
case 0x090A: //gargish soul glaive - SA
408439
case 0x406B: //gargish soul glaive - SA
409-
weapontype = "THROWN"; break;
440+
case 0xB4E0: //Skull_Glaive_G Publish 123
441+
case 0xB4E1: //Skull_Glaive_G Publish 123
442+
weaponType = "THROWN"; break;
410443
default: // Wrestling
411444
weaponType = "WRESTLING"; break;
412445
}
413446

414447
return weaponType;
415448
}
416449

450+
/** @type { ( weaponType: string ) => string } */
417451
function GetCombatSkill( weaponType )
418452
{
419453
var combatSkill;

‎source/combat.cpp‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,8 @@ UI08 CHandleCombat::GetWeaponType( CItem *i )
727727
case 0x48BB: //gargish katana - SA
728728
case 0xA28B: //bladed whip - ToL
729729
case 0xA293: //bladed whip - ToL
730+
case 0xB4CD: //Gargish Bokuto Publish 123
731+
case 0xB4CE: //Gargish Bokuto Publish 123
730732
return SLASH_SWORDS;
731733
// One-Handed Lg. Swords
732734
case 0x0F5E: //broadsword
@@ -768,6 +770,8 @@ UI08 CHandleCombat::GetWeaponType( CItem *i )
768770
case 0x2D32: //rune blade - ML
769771
case 0x0908: //gargish talwar - SA
770772
case 0x4075: //gargish talwar - SA
773+
case 0xB4BF: //Tachi Publish 123
774+
case 0xB4C0: //Tachi Publish 123
771775
return TWOHND_LG_SWORDS;
772776
// Bardiche
773777
case 0x0F4D: //bardiche
@@ -816,6 +820,8 @@ UI08 CHandleCombat::GetWeaponType( CItem *i )
816820
case 0x48B1: //gargish battleaxe - SA
817821
case 0x48B2: //gargish axe - SA
818822
case 0x48B3: //gargish axe - SA
823+
case 0xB4DE: //Skull_Axe Publish 123
824+
case 0xB4DF: //Skull_Axe Publish 123
819825
return TWOHND_AXES;
820826
// Default Maces
821827
case 0x0DF2: // Wand
@@ -861,6 +867,12 @@ UI08 CHandleCombat::GetWeaponType( CItem *i )
861867
case 0xAEB3: //Water Paladin Hammer - ToL
862868
case 0xAEC2: //Earth Paladin Hammer - ToL
863869
case 0xAED1: //Fire Paladin Hammer - ToL
870+
case 0xB4C1: //Escrima Publish 123
871+
case 0xB4C2: //Escrima Publish 123
872+
case 0xB4CB: //Gargish Otsuchi Publish 123
873+
case 0xB4CC: //Gargish Otsuchi Publish 123
874+
case 0xB4DA: //Skull_Mace Publish 123
875+
case 0xB4DB: //Skull_Mace Publish 123
864876
return DEF_MACES;
865877
// Large Maces
866878
case 0x13F4: //crook
@@ -908,6 +920,8 @@ UI08 CHandleCombat::GetWeaponType( CItem *i )
908920
case 0xA348: //gargoyle skull staff east
909921
case 0xA7C3: //candycane staff
910922
case 0xA7C4: //candycane staff
923+
case 0xB4C3: //Bo Staff Publish 123
924+
case 0xB4C4: //Bo Staff Publish 123
911925
return LG_MACES;
912926
// Bows
913927
case 0x13B1: //bow
@@ -929,6 +943,8 @@ UI08 CHandleCombat::GetWeaponType( CItem *i )
929943
case 0x13FD: //heavy crossbow
930944
case 0x26C3: //repeating crossbow - AoS
931945
case 0x26CD: //repeating crossbow - AoS
946+
case 0xB4DC: //Skull_Crossbow Publish 123
947+
case 0xB4DD: //Skull_Crossbow Publish 123
932948
return XBOWS;
933949
case 0x27AA: //fukiya - SE - Blowgun, uses Dart ammo (0x2806 or 0x2804)
934950
case 0x27F5: //fukiya - SE - Blowgun, uses Dart ammo (0x2806 or 0x2804)
@@ -963,6 +979,12 @@ UI08 CHandleCombat::GetWeaponType( CItem *i )
963979
case 0xAEB4: //Water Paladin fork - ToL
964980
case 0xAEC3: //Earth Paladin fork - ToL
965981
case 0xAED2: //Fire Paladin fork - ToL
982+
case 0xB4C7: //Tanto Publish 123
983+
case 0xB4C8: //Tanto Publish 123
984+
case 0xB4C9: //Gargish Tanto Publish 123
985+
case 0xB4CA: //Gargish Tanto Publish 123
986+
case 0xB4D4: //Skull_Blade Publish 123
987+
case 0xB4D5: //Skull_Blade Publish 123
966988
return DEF_FENCING;
967989
// Stabbing Fencing Weapons
968990
case 0x0E87: //pitchfork
@@ -988,6 +1010,10 @@ UI08 CHandleCombat::GetWeaponType( CItem *i )
9881010
case 0x48C9: //gargish pike - SA
9891011
case 0x48CA: //gargish lance - SA
9901012
case 0x48CB: //gargish lance - SA
1013+
case 0xB4C5: //Yari Publish 123
1014+
case 0xB4C6: //Yari Publish 123
1015+
case 0xB4D6: //Skull_Spear Publish 123
1016+
case 0xB4D7: //Skull_Spear Publish 123
9911017
return TWOHND_FENCING;
9921018
case 0x27AF: //sai - SE
9931019
case 0x27FA: //sai - SE
@@ -1012,6 +1038,8 @@ UI08 CHandleCombat::GetWeaponType( CItem *i )
10121038
case 0x406C: //gargish cyclone - SA
10131039
case 0x090A: //gargish soul glaive - SA
10141040
case 0x406B: //gargish soul glaive - SA
1041+
case 0xB4E0: //Skull_Glaive_G Publish 123
1042+
case 0xB4E1: //Skull_Glaive_G Publish 123
10151043
return THROWN;
10161044
default: // Wrestling
10171045
return WRESTLING;

0 commit comments

Comments
 (0)