warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

massive branch sync part 2

Browse source
This commit is contained in:
mark 2010-04-25 06:11:21 +00:00
parent b3e8ec0a08
commit f6fcf02fe9
14 changed files with 526 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Data/Components/doors.txt
View file

@ -28,3 +28,12 @@ Category Piece1 Piece2 Piece3 Piece4 Piece5 Piece6 Piece7 Piece8 FeatureMask Com
23 0 0 12260 12700 12258 12702 0 0 128 Elvan Moon Door
24 13951 13953 13947 13949 13955 13957 13959 13961 512 Crystal Door
25 13967 13969 13963 13965 13971 13973 13975 13977 512 Shadow Door
26 0 0 16539 16541 16543 16545 0 0 65536 Gargish Carved Green Door
27 0 0 16652 16654 16656 16658 0 0 65536 Gargish Brown Door
28 0 0 16834 16836 16838 16840 0 0 65536 Sun Door
29 0 0 16847 16849 16851 16853 0 0 65536 Gargish Grey Door
30 17262 17264 17266 17268 17270 17272 17274 17276 65536 Gargish Set Door
31 0 0 18141 18143 18145 18147 0 0 65536 Ruined Door
32 0 0 19746 19748 19750 19752 0 0 65536 Gargish Blue Door
33 20680 20682 20688 20690 20684 20686 20692 20694 65536 Gargish Red Doors
34 0 0 20802 20804 20806 20808 0 0 65536 Gargish Prison Door

15
Data/Components/floors.txt
View file

@ -41,4 +41,17 @@ Category F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 F13 F14 F15 F16 FeatureMask Comm
38 0 0 11576 11577 11578 11579 0 0 0 0 0 0 0 0 0 0 128 Wormwood Floor
39 0 0 11723 11724 11725 11726 0 0 0 0 0 0 0 0 0 0 128 Deca Floor
40 0 0 13746 13747 13748 13749 13750 13751 13752 13753 13754 13755 13756 13757 0 0 512 Crystal Floor
41 0 0 0 13850 13851 13852 13853 13854 13855 13856 13857 13858 0 0 0 0 512 Shadow Floor
41 0 0 0 13850 13851 13852 13853 13854 13855 13856 13857 13858 0 0 0 0 512 Shadow Floor
42 17196 17197 17192 17193 17194 17195 17206 17207 17208 17209 17210 17211 0 0 0 0 65536 Gargish Floor 1
43 17198 17199 17200 17201 17202 17203 17204 17205 0 0 0 0 0 0 0 0 65536 Gargish Floor 2
44 19946 19947 19948 19949 19950 19951 19952 19953 19954 19942 19943 19945 19755 19756 19757 19758 65536 Gargish Striped
45 20345 20340 20341 20342 20343 20336 20337 20338 20339 20332 20333 20334 20335 20329 20330 20331 65536 Gargish Blue Stripe
46 20706 20707 20708 20702 20703 20704 20705 20711 20712 20713 20714 20715 20716 20717 20718 20709 65536 Gargish Red
47 20723 20719 20720 20721 20722 20724 20725 20726 20727 0 0 0 0 0 0 0 65536 Gargish Dark
48 16815 16816 16817 16818 16821 16822 16823 16824 16825 16826 16827 16828 0 0 0 0 65536 Gargish Green
49 16884 16872 16873 16874 16875 16876 16877 16878 16879 16880 16881 16882 16883 16885 16886 16887 65536 Gargish Stone
50 16864 16860 16861 16862 16863 16865 16866 16867 16868 0 0 0 0 0 0 0 65536 Gargish Motif
51 16778 16774 16775 16776 16777 16779 16780 16781 16782 0 0 0 0 0 0 0 65536 Gargish Sun
52 16523 16524 16525 16526 16527 16528 16529 16530 16531 16532 16533 16534 16535 16536 16537 16538 65536 Gargish Green Stone
53 16514 16510 16511 16512 16513 16515 16516 16517 16518 16519 16520 16521 16522 0 0 0 65536 Gargish Green Stone 2
54 18124 18125 18126 18127 18326 18327 18328 18329 0 0 0 0 0 0 0 0 65536 Gargish Ruins

21
Data/Components/misc.txt
View file

@ -69,4 +69,23 @@ Category Style TID Piece1 Piece2 Piece3 Piece4 Piece5 Piece6 Piece7 Piece8 Featu
19 0 1074418 11214 11205 11206 12061 11203 0 11213 11204 128 kiawood arch
20 0 1074419 11575 11542 11543 12062 11540 0 11574 11541 128 tanglewood arch
21 0 1076716 0 13802 13803 13804 13814 13815 0 0 512 Miscellaneous Crystal Pieces
22 0 1076717 0 13838 13839 13840 13841 13842 0 0 512 Miscellaneous Shadow Pieces
22 0 1076717 0 13838 13839 13840 13841 13983 13842 0 512 Miscellaneous Shadow Pieces
23 0 1112089 17166 17167 17363 17364 17170 17171 17367 17368 65536 Gargish Battlement 1
23 1 0 17168 17169 17365 17366 17162 17163 17345 17346 65536 Gargish Battlement 2
23 2 0 17160 17161 17359 17360 17164 17165 17218 17219 65536 Gargish Battlement 3
23 3 0 17232 17233 17371 17372 17234 17235 0 0 65536 Gargish Battlement 4
24 0 1112089 17188 17185 17186 17187 17189 17172 17173 17174 65536 Gargish Battlement 5
25 0 1112090 17212 17213 17214 17215 17216 17217 17177 0 65536 Dark Red Stone Arches
26 0 1060074 17319 17318 17369 17370 17321 17322 17325 17326 65536 Miscellaneous Roof Pieces 1
26 1 0 17340 17342 17343 17341 17338 17339 17337 17336 65536 Miscellaneous Roof Pieces 2
26 2 0 17320 17323 17324 17327 17221 17220 17222 17223 65536 Miscellaneous Roof Pieces 3
27 0 1112091 17278 17282 17286 17290 17294 17298 17302 17306 65536 Gargish Fountain 1
27 1 0 17310 17314 0 0 0 0 0 0 65536 Gargish Fountain 2
28 0 1112092 16800 16801 16803 16804 16809 16810 16811 16812 65536 Green Marble Arches
29 0 1112093 16754 16755 16752 16753 16756 16750 16751 0 65536 Blue Marble Arches
30 0 1112094 16714 16715 16716 16717 16727 16726 16728 16729 65536 Two-Tone Stone Archways
30 1 0 0 0 0 16746 16747 0 0 0 65536 Two-Tone Stone Archways 2
31 0 1112095 16672 16671 16673 16674 16667 16668 16669 16670 65536 Gold Stone Battlement
32 0 1112096 20771 20772 20773 20774 20728 20729 20731 20732 65536 Gargish Marble Arches
33 0 1112097 18401 18402 18403 18407 18408 18409 0 0 65536 Gargish Ruined Arches
34 0 1112098 18600 18601 18602 18603 18604 18605 0 0 65536 Gargish Stone Heads

16
Data/Components/stairs.txt
View file

@ -1,23 +1,17 @@
int int int int int int int int int int int int int int int string
Category Block North East South West Squared1 Squared2 Rounded1 Rounded2 MultiNorth MultiEast MultiSouth MultiWest FeatureMask Comment
0 1848 1849 1852 1851 1850 1856 1854 1862 1861 7600 7601 7602 7603 0 Dark Wood
1 1955 1956 1959 1958 1957 1963 1961 0 0 7604 7605 7606 7607 0 Grey Stone
2 1928 1929 1932 1931 1930 1936 1934 1939 1938 7608 7609 7610 7611 0 Weathered Stone
3 1825 1826 1829 1828 1827 1833 1831 1836 1835 7612 7613 7614 7615 0 Light Wood
4 1822 1823 1865 1847 1846 1869 1867 0 0 7616 7617 7618 7619 0 Granite
5 1801 1802 1805 1804 1803 1809 1807 1812 1811 7620 7621 7622 7623 0 Tan Marble
6 1006 1007 1010 1009 1008 1014 1012 1017 1016 7624 7625 7626 7627 0 Sandstone
7 1900 1901 1904 1903 1902 1908 1906 1911 1910 7628 7629 7630 7631 0 Sandstone Brick
8 1872 1873 1876 1875 1874 1880 1878 1883 1882 7632 7633 7634 7635 0 Light Stone
9 1978 1979 0 0 1980 0 0 0 1991 7636 0 0 7639 0 Red
10 13778 13780 13781 13782 13779 0 0 0 0 7640 7641 7642 7643 512 Crystal
11 13833 13835 13836 13837 13834 0 0 0 0 7644 7645 7646 7647 512 Shadow
12 17175 17248 17249 17247 17246 17261 17260 17257 17256 7648 7649 7650 7651 65536 Gargish 1
13 17175 17244 17253 17243 17250 0 0 0 0 7652 7653 7654 7655 65536 Gargish 2
14 17176 17252 17245 17251 17242 0 0 0 0 7656 7657 7658 7659 65536 Gargish 3

640
Data/Components/suppinfo.txt
View file

File diff suppressed because it is too large Load diff

32
Data/Components/walls.txt
View file

@ -130,3 +130,35 @@ Category Style TID South1 South2 South3 Corner East1 East2 East3 Post WindowS Al
31 1 0 13881 13881 13881 13845 13880 13880 13880 13848 0 0 0 0 0 0 512 Shadow Walls 2
31 2 0 13879 13879 13879 13844 13878 13878 13878 13847 0 0 0 0 0 0 512 Shadow Walls 3
31 3 0 0 0 0 13843 0 0 0 0 0 0 0 0 0 0 512 Shadow Walls 3
32 0 1112080 17229 17228 17226 17190 17227 17224 17225 17191 0 0 0 0 0 0 65536 Gargish Wall Set 1
32 1 0 17354 17355 17358 17356 17357 0 0 0 0 0 0 0 0 0 65536 Gargish Wall Set 1
33 0 1112080 17230 17231 17178 17180 17232 17233 17183 17181 0 0 0 0 0 0 65536 Gargish Wall Set 2
33 1 0 17182 17179 0 0 0 0 0 0 0 0 0 0 0 0 65536 Gargish Wall Set 2
34 0 1112080 17240 17237 17239 17238 17241 17236 0 0 0 0 0 0 0 0 65536 Gargish Windows 3
35 0 1112082 16790 16791 16805 16785 16784 16786 16787 16796 16788 16789 0 0 0 0 65536 Gargish Green Marble 1
35 1 0 16797 16799 16806 16807 16808 16792 16793 16794 0 0 0 0 0 0 65536 Gargish Green Marble 2
35 2 0 16795 16798 0 0 0 0 0 0 0 0 0 0 0 0 65536 Gargish Green Marble 3
36 0 1112083 16720 16721 16724 16725 16730 16722 16723 16733 16736 16737 0 0 0 0 65536 Gargish Two-Tone Stone Walls
36 1 0 16731 16738 16739 16734 16718 16719 16732 16735 0 0 0 0 0 0 65536 Gargish Two-tone Stone Half Walls
36 2 0 16742 16743 16744 16745 0 0 0 0 0 0 0 0 0 0 65536 Gargish Two-tone Stone Half Walls
37 0 1112084 16664 16665 16666 16675 16660 16661 16662 16663 0 0 0 0 0 0 65536 Gargish Gold Stone Walls 1
37 1 0 16676 16677 16678 16679 0 0 0 0 0 0 0 0 0 0 65536 Gargish Gold Stone Walls 2
38 0 1112086 20787 20786 20800 20781 20795 20796 20782 20783 20799 20801 20754 20735 0 0 65536 Gargish Red Marble Walls 1
38 1 0 20734 20738 20753 20757 20736 20737 20755 20756 0 0 0 0 0 0 65536 Gargish Red Marble Walls 2
38 2 0 20741 20742 20743 20744 20745 20746 20739 20758 0 0 0 0 0 0 65536 Gargish Red Marble Walls 3
38 3 0 0 20733 20747 20748 20749 20750 20752 0 0 0 0 0 0 0 65536 Gargish Red Marble Walls 4
38 4 0 20760 20761 20762 20763 20764 20765 20766 20767 0 0 0 0 0 0 65536 Gargish Red Marble Walls 5
38 5 0 20768 20769 0 0 0 0 0 0 0 0 0 0 0 0 65536 Gargish Red Marble Walls 6
39 0 1112085 20751 20759 20778 20775 20794 20797 20798 20784 0 0 0 0 0 0 65536 Gargish Marble Walls 1
39 1 0 20785 20698 20699 20700 20701 20791 20792 20793 0 0 0 0 0 0 65536 Gargish Marble Walls 2
39 2 0 20788 20789 20790 20780 20779 0 0 0 0 0 0 0 0 0 65536 Gargish Marble Tiles 2
40 0 1112087 18139 18138 18136 18140 18304 18305 18306 18307 0 0 0 0 0 0 65536 Gargish Ruined Walls 1
40 1 0 18308 18310 18313 18314 18315 18316 18317 18318 0 0 0 0 0 0 65536 Gargish Ruined Walls 2
40 2 0 18309 18311 18312 18302 18303 18201 18202 18204 0 0 0 0 0 0 65536 Gargish Ruined Walls 3
40 3 0 18205 18206 18207 18208 0 18129 18130 18131 0 0 0 0 0 0 65536 Gargish Ruined Walls 4
40 4 0 18132 18133 18134 18135 18110 18111 18112 18113 0 0 0 0 0 0 65536 Gargish Ruined Walls 4
40 5 0 18114 18115 18116 18117 18118 18122 18123 18120 0 0 0 0 0 0 65536 Gargish Ruined Walls 4
41 0 1112088 16761 16760 16759 16756 16763 16762 16765 16766 16757 16758 0 0 0 0 65536 Gargish Blue Marble Walls
41 1 0 16764 16767 16768 16769 16770 16771 16772 16773 0 0 0 0 0 0 65536 Gargish Blue Marble Half Walls
41 2 0 16751 16750 16748 16749 0 0 0 0 0 0 0 0 0 0 65536 Gargish Blue Marble Half Walls 2
42 0 1112080 17184 17349 17350 17347 17348 17351 17352 17353 0 0 0 0 0 0 65536 Gargish Wall Set 3

1
Scripts/Mobiles/Vendors/SBInfo/SBAnimalTrainer.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using Server.Items;

1
Scripts/Mobiles/Vendors/SBInfo/SBBanker.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using Server.Items;

1
Scripts/Mobiles/Vendors/SBInfo/SBBarkeeper.cs
View file

@ -20,7 +20,6 @@ namespace Server.Mobiles
{
public InternalBuyInfo()
{
Add( new BeverageBuyInfo( typeof( BeverageBottle ), BeverageType.Ale, 7, 20, 0x99F, 0 ) );
Add( new BeverageBuyInfo( typeof( BeverageBottle ), BeverageType.Wine, 7, 20, 0x9C7, 0 ) );
Add( new BeverageBuyInfo( typeof( BeverageBottle ), BeverageType.Liquor, 7, 20, 0x99B, 0 ) );

4
Scripts/Mobiles/Vendors/SBInfo/SBButcher.cs
View file

@ -19,7 +19,7 @@ namespace Server.Mobiles
public class InternalBuyInfo : List<GenericBuyInfo>
{
public InternalBuyInfo()
{
{
Add( new GenericBuyInfo( typeof( Bacon ), 7, 20, 0x979, 0 ) );
Add( new GenericBuyInfo( typeof( Ham ), 26, 20, 0x9C9, 0 ) );
Add( new GenericBuyInfo( typeof( Sausage ), 18, 20, 0x9C0, 0 ) );
@ -28,7 +28,7 @@ namespace Server.Mobiles
Add( new GenericBuyInfo( typeof( RawLambLeg ), 9, 20, 0x1609, 0 ) );
Add( new GenericBuyInfo( typeof( RawRibs ), 16, 20, 0x9F1, 0 ) );
Add( new GenericBuyInfo( typeof( ButcherKnife ), 13, 20, 0x13F6, 0 ) );
Add( new GenericBuyInfo( typeof( Cleaver ), 13, 20, 0xEC3, 0 ) );
Add( new GenericBuyInfo( typeof( Cleaver ), 13, 20, 0xEC3, 0 ) );
Add( new GenericBuyInfo( typeof( SkinningKnife ), 13, 20, 0xEC4, 0 ) );

1
Scripts/Mobiles/Vendors/SBInfo/SBTavernKeeper.cs
View file

@ -20,7 +20,6 @@ namespace Server.Mobiles
{
public InternalBuyInfo()
{
Add( new BeverageBuyInfo( typeof( BeverageBottle ), BeverageType.Ale, 7, 20, 0x99F, 0 ) );
Add( new BeverageBuyInfo( typeof( BeverageBottle ), BeverageType.Wine, 7, 20, 0x9C7, 0 ) );
Add( new BeverageBuyInfo( typeof( BeverageBottle ), BeverageType.Liquor, 7, 20, 0x99B, 0 ) );

1
Scripts/Mobiles/Vendors/SBInfo/SBVeterinarian.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using Server.Items;

19
Scripts/Multis/ComponentVerification.cs
View file

@ -6,8 +6,8 @@ namespace Server.Multis
{
public class ComponentVerification
{
private byte[] m_ItemTable;
private byte[] m_MultiTable;
private int[] m_ItemTable;
private int[] m_MultiTable;
public bool IsItemValid( int itemID )
{
@ -25,8 +25,11 @@ namespace Server.Multis
return CheckValidity( m_MultiTable[multiID] );
}
public bool CheckValidity( byte val )
public bool CheckValidity( int val )
{
if ( val == -1 )
return false;
return ( val == 0 || (ExpansionInfo.CurrentExpansion.CustomHousingFlag & val) != 0 );
}
@ -46,12 +49,12 @@ namespace Server.Multis
LoadMultis( "Data/Components/stairs.txt", "MultiNorth", "MultiEast", "MultiSouth", "MultiWest" );
}
private byte[] CreateTable( int length )
private int[] CreateTable( int length )
{
byte[] table = new byte[length];
int[] table = new int[length];
for ( int i = 0; i < table.Length; ++i )
table[i] = 0xFF;
table[i] = -1;
return table;
}
@ -66,7 +69,7 @@ namespace Server.Multis
LoadSpreadsheet( m_MultiTable, path, multiColumns );
}
private void LoadSpreadsheet( byte[] table, string path, params string[] tileColumns )
private void LoadSpreadsheet( int[] table, string path, params string[] tileColumns )
{
Spreadsheet ss = new Spreadsheet( path );
@ -81,7 +84,7 @@ namespace Server.Multis
{
DataRecord record = ss.Records[i];
byte fid = (byte) record.GetInt32( featureCID );
int fid = record.GetInt32( featureCID );
for ( int j = 0; j < tileCIDs.Length; ++j )
{

6
Server/Network/PacketHandlers.cs
View file

@ -2211,8 +2211,7 @@ namespace Server.Network
m_AuthIDWindow.Remove( authID );
state.Version = ap.Version;
}
else if ( m_ClientVerification ) {
} else if ( m_ClientVerification ) {
Console.WriteLine( "Login: {0}: Invalid client detected, disconnecting", state );
state.Dispose();
return;
@ -2243,8 +2242,7 @@ namespace Server.Network
state.CityInfo = e.CityInfo;
state.CompressionEnabled = true;
if ( Core.AOS )
state.Send( SupportedFeatures.Instantiate( state ) );
state.Send( SupportedFeatures.Instantiate( state ) );
state.Send( new CharacterList( state.Account, state.CityInfo ) );
}