Partial DocGen fix, Courtesy of Courageous
Component updates per OSI
This commit is contained in:
parent
cdda8cd854
commit
1f2ffdc2e8
8 changed files with 150 additions and 20 deletions
|
|
@ -26,3 +26,5 @@ Category Piece1 Piece2 Piece3 Piece4 Piece5 Piece6 Piece7 Piece8 FeatureMask Com
|
|||
21 0 0 11625 12708 11623 12710 0 0 128 Elvan Ornate Door
|
||||
22 0 0 11629 12714 11627 12712 0 0 128 Elvan Kia Wood Door 2
|
||||
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
|
||||
|
|
|
|||
|
|
@ -40,3 +40,5 @@ Category F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 F13 F14 F15 F16 FeatureMask Comm
|
|||
37 0 0 11215 11500 11501 11502 0 0 0 0 0 0 0 0 0 0 128 Parka Floor
|
||||
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
|
||||
|
|
@ -68,3 +68,5 @@ Category Style TID Piece1 Piece2 Piece3 Piece4 Piece5 Piece6 Piece7 Piece8 Featu
|
|||
18 0 1074417 11188 11179 11180 12060 11177 0 11187 11178 128 heartwood arch
|
||||
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
|
||||
|
|
|
|||
|
|
@ -27,6 +27,10 @@ Category Style TID North East South West NSCrosspiece EWCrosspiece NDent EDent S
|
|||
15 0 1063384 10458 10441 10457 10442 10440 10456 10445 10444 10446 10443 10448 10451 10449 10450 10447 0 64 Wooden Slats 1
|
||||
15 1 0 0 10452 10453 10454 10455 10473 10472 0 0 10459 10468 10469 10470 10474 10471 0 64 Wooden Slats 2
|
||||
16 0 1074420 11155 11138 11154 11139 11137 11153 11142 11141 11143 11140 11145 11148 11146 11147 11144 0 128 Elf Scaled Roof
|
||||
16 1 0 0 11149 11150 11151 11152 0 0 0 0 12065 12067 12066 12064 0 0 12063 128 Elf Scaled Roof
|
||||
16 1 0 11149 11150 11151 11152 12064 12065 12066 12067 0 0 12063 0 0 0 0 0 128 Elf Scaled Roof
|
||||
17 0 1074421 11174 11157 11173 11158 11156 11172 11161 11160 11159 11162 11164 11167 11165 11166 11163 0 128 Elvan Natural Roof
|
||||
17 1 0 0 11168 11169 11170 11171 0 0 0 0 12069 12071 12070 12068 0 0 12072 128 Elvan Natural Roof
|
||||
17 1 0 11168 11169 11170 11171 12068 12069 12070 12071 11175 11176 12072 0 0 0 0 0 128 Elvan Natural Roof
|
||||
18 0 1076718 13762 13759 13760 13761 13762 13763 13764 13765 13776 13777 13766 13767 13768 13769 13770 13771 512 Crystal Roof Tiles 1
|
||||
18 1 0 13772 13773 13774 13775 0 0 0 0 0 0 0 0 0 0 0 0 512 Crystal Roof Tiles 2
|
||||
19 0 1076719 13859 13860 13861 13862 13863 13864 13865 13875 13876 13866 13867 13868 13869 13870 13871 13872 512 Shadow Roof Tiles 1
|
||||
19 1 0 13873 13874 13877 0 0 0 0 0 0 0 0 0 0 0 0 0 512 Shadow Roof Tiles 2
|
||||
|
|
|
|||
|
|
@ -1,12 +1,23 @@
|
|||
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
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1415,3 +1415,73 @@ v 12059 1 1 1 1 1 1 1 1 1 1 1 0 0 0
|
|||
v 12060 1 1 1 1 1 1 1 1 1 1 1 0 0 0
|
||||
v 12061 1 1 1 1 1 1 1 1 1 1 1 0 0 0
|
||||
v 12062 1 1 1 1 1 1 1 1 1 1 1 0 0 0
|
||||
|
||||
\ 13790 1 1 0 0 1 1 1 1 1 1 0 0 1 0 Crystal Quarter
|
||||
\ 13792 1 1 0 0 0 1 0 1 0 1 0 0 1 0 Half
|
||||
\ 13795 1 1 0 0 1 1 1 1 1 1 1 0 1 0 Full
|
||||
\ 13796 1 1 0 0 1 1 1 1 1 1 1 0 1 0 Full
|
||||
\ 13798 1 1 0 0 1 1 1 1 1 1 1 0 1 0 Full Window
|
||||
./ 13789 1 1 0 1 0 1 0 1 0 0 0 1 0 0 Quarter
|
||||
./ 13791 1 1 0 1 0 1 0 1 0 0 0 1 0 0 Half
|
||||
./ 13793 1 1 1 1 1 1 1 1 0 0 1 1 0 0 Full
|
||||
./ 13794 1 1 1 1 1 1 1 1 0 0 1 1 0 0 Full
|
||||
./ 13797 1 1 1 1 1 1 1 1 0 0 1 1 0 0 Full Window
|
||||
v 13783 1 1 1 1 1 1 1 1 1 1 0 0 0 0 Quarter
|
||||
v 13784 1 1 0 1 0 1 0 1 0 1 0 0 0 0 Half
|
||||
v 13785 1 1 1 1 1 1 1 1 1 1 1 0 0 0 Full
|
||||
o 13786 1 1 0 0 1 1 1 1 0 0 0 1 1 1 Quarter
|
||||
o 13787 1 1 0 0 0 1 0 1 0 0 0 1 1 1 Half
|
||||
o 13788 1 1 0 0 1 1 1 1 0 0 1 1 1 1 Full
|
||||
\ 13947 0 1 0 0 0 0 0 0 0 0 0 0 1 0 Door
|
||||
\ 13949 0 1 0 0 0 0 0 0 0 0 0 0 1 0 Door
|
||||
\ 13951 0 1 0 0 0 0 0 0 0 0 0 0 1 0 Door
|
||||
\ 13953 0 1 0 0 0 0 0 0 0 0 0 0 1 0 Door
|
||||
./ 13955 0 1 0 0 0 0 0 0 0 0 0 1 0 0 Door
|
||||
./ 13957 0 1 0 0 0 0 0 0 0 0 0 1 0 0 Door
|
||||
./ 13959 0 1 0 0 0 0 0 0 0 0 0 1 0 0 Door
|
||||
./ 13961 0 1 0 0 0 0 0 0 0 0 0 1 0 0 Door
|
||||
o 13802 1 1 0 0 1 1 1 1 0 0 1 1 1 1 Pillar
|
||||
o 13803 1 1 0 0 1 1 1 1 0 0 1 1 1 1 Pillar
|
||||
o 13804 1 1 0 0 1 1 1 1 0 0 1 1 1 1 Pillar
|
||||
o 13814 1 1 0 0 1 1 1 1 0 0 1 1 1 1 Pillar
|
||||
o 13815 1 1 0 0 1 1 1 1 0 0 1 1 1 1 Pillar
|
||||
|
||||
\ 13879 1 1 0 0 1 1 1 1 1 1 0 0 1 0 Shadow Quarter
|
||||
\ 13881 1 1 0 0 0 1 0 1 0 1 0 0 1 0 Half
|
||||
\ 13883 1 1 0 0 1 1 1 1 1 1 1 0 1 0 Full
|
||||
\ 13897 1 1 0 0 1 1 1 1 1 1 1 0 1 0 Full
|
||||
\ 13895 1 1 0 0 1 1 1 1 1 1 1 0 1 0 Full
|
||||
\ 13885 1 1 0 0 1 1 1 1 1 1 1 0 1 0 Full Window
|
||||
\ 13887 1 1 0 0 1 1 1 1 1 1 1 0 1 0 Full Window
|
||||
./ 13878 1 1 0 1 0 1 0 1 0 0 0 1 0 0 Quarter
|
||||
./ 13880 1 1 0 1 0 1 0 1 0 0 0 1 0 0 Half
|
||||
./ 13882 1 1 1 1 1 1 1 1 0 0 1 1 0 0 Full
|
||||
./ 13898 1 1 1 1 1 1 1 1 0 0 1 1 0 0 Full
|
||||
./ 13896 1 1 1 1 1 1 1 1 0 0 1 1 0 0 Full
|
||||
./ 13884 1 1 1 1 1 1 1 1 0 0 1 1 0 0 Full Window
|
||||
./ 13886 1 1 1 1 1 1 1 1 0 0 1 1 0 0 Full Window
|
||||
v 13844 1 1 0 0 0 1 0 1 0 1 0 0 1 0 Quarter
|
||||
v 13845 1 1 0 1 0 1 0 1 0 1 0 0 0 0 Half
|
||||
v 13846 1 1 1 1 1 1 1 1 1 1 1 0 0 0 Full
|
||||
v 13843 1 1 1 1 1 1 1 1 1 1 1 0 0 0 Full
|
||||
o 13847 1 1 0 0 0 1 0 1 0 0 0 1 1 1 Quarter
|
||||
o 13848 1 1 0 0 0 1 0 1 0 0 0 1 1 1 Half
|
||||
o 13849 1 1 0 0 1 1 1 1 0 0 1 1 1 1 Full
|
||||
o 13842 1 1 0 0 1 1 1 1 0 0 1 1 1 1 Full
|
||||
\ 13963 0 1 0 0 0 0 0 0 0 0 0 0 1 0 Door
|
||||
\ 13965 0 1 0 0 0 0 0 0 0 0 0 0 1 0 Door
|
||||
\ 13967 0 1 0 0 0 0 0 0 0 0 0 0 1 0 Door
|
||||
\ 13969 0 1 0 0 0 0 0 0 0 0 0 0 1 0 Door
|
||||
./ 13971 0 1 0 0 0 0 0 0 0 0 0 1 0 0 Door
|
||||
./ 13973 0 1 0 0 0 0 0 0 0 0 0 1 0 0 Door
|
||||
./ 13975 0 1 0 0 0 0 0 0 0 0 0 1 0 0 Door
|
||||
./ 13977 0 1 0 0 0 0 0 0 0 0 0 1 0 0 Door
|
||||
o 13802 1 1 0 0 1 1 1 1 0 0 1 1 1 1 Pillar
|
||||
o 13803 1 1 0 0 1 1 1 1 0 0 1 1 1 1 Pillar
|
||||
o 13804 1 1 0 0 1 1 1 1 0 0 1 1 1 1 Pillar
|
||||
o 13814 1 1 0 0 1 1 1 1 0 0 1 1 1 1 Pillar
|
||||
o 13815 1 1 0 0 1 1 1 1 0 0 1 1 1 1 Pillar
|
||||
\ 13840 1 1 0 0 1 0 1 0 1 0 1 0 1 0 Arch
|
||||
\ 13841 1 1 0 0 1 1 1 1 1 1 1 0 1 0 Arch
|
||||
./ 13838 1 1 1 1 1 1 1 1 0 0 1 1 0 0 Arch
|
||||
./ 13839 1 1 1 0 1 0 1 0 0 0 1 1 0 0 Arch
|
||||
|
|
|
|||
|
|
@ -123,3 +123,10 @@ Category Style TID South1 South2 South3 Corner East1 East2 East3 Post WindowS Al
|
|||
29 1 0 11587 11587 11589 11589 11588 11588 11586 11586 0 0 0 0 0 0 128 Carved Wood 1
|
||||
29 2 0 11583 11583 11583 11545 11582 11582 11582 11548 0 0 0 0 0 0 128 Carved Wood 1
|
||||
29 3 0 11581 11581 11581 11544 11580 11580 11580 11547 0 0 0 0 0 0 128 Carved Wood 1
|
||||
30 0 1076720 13795 13796 13796 13785 13794 13794 13793 13788 13798 13798 13797 13797 0 0 512 Crystal Walls 1
|
||||
30 1 0 13792 13792 13792 13784 13791 13791 13791 13787 0 0 0 0 0 0 512 Crystal Walls 2
|
||||
30 2 0 13790 13790 13790 13783 13789 13789 13789 13786 0 0 0 0 0 0 512 Crystal Walls 3
|
||||
31 0 1076721 13883 13897 13895 13846 13896 13898 13882 13849 13885 13885 13884 13884 0 0 512 Shadow Walls 1
|
||||
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
|
||||
|
|
|
|||
|
|
@ -328,12 +328,44 @@ namespace Server.Commands
|
|||
}
|
||||
else
|
||||
{
|
||||
for( int i = 0; i < m_AliasLength; ++i )
|
||||
if( realType.IsGenericType )
|
||||
{
|
||||
if( m_Aliases[i, 0] == fullName )
|
||||
StringBuilder sb = new StringBuilder( "" );
|
||||
|
||||
bool firstpass = true;
|
||||
|
||||
foreach( Type paramType in realType.GetGenericArguments() )
|
||||
{
|
||||
aliased = m_Aliases[i, 1];
|
||||
break;
|
||||
if( !firstpass ) sb.Append( ',' ); else firstpass=false;
|
||||
|
||||
bool aliasFound = false;
|
||||
|
||||
for( int i = 0; i < m_AliasLength; ++i )
|
||||
{
|
||||
if( m_Aliases[i, 0] == fullName )
|
||||
{
|
||||
sb.Append( m_Aliases[i, 1] );
|
||||
aliasFound = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if( !aliasFound ) sb.Append( paramType.Name );
|
||||
}
|
||||
|
||||
aliased = sb.ToString();
|
||||
|
||||
aliased = realType.Name.Substring( 0, realType.Name.IndexOf( '`' ) ) + "<" + aliased + ">";
|
||||
}
|
||||
else
|
||||
{
|
||||
for( int i = 0; i < m_AliasLength; ++i )
|
||||
{
|
||||
if( m_Aliases[i, 0] == fullName )
|
||||
{
|
||||
aliased = m_Aliases[i, 1];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1434,7 +1466,7 @@ namespace Server.Commands
|
|||
lastIndex = index;
|
||||
|
||||
SpeechEntry entry = null;
|
||||
table.TryGetValue( index, out entry );
|
||||
table.TryGetValue( index, out entry );
|
||||
|
||||
if( entry == null )
|
||||
table[index] = entry = new SpeechEntry( index );
|
||||
|
|
@ -2189,7 +2221,7 @@ namespace Server.Commands
|
|||
++extendCount;
|
||||
|
||||
if( ifaceInfo == null )
|
||||
typeHtml.Write( iface.Name );
|
||||
typeHtml.Write( GetGenericTypeName( iface ) );
|
||||
else
|
||||
typeHtml.Write( "<a href=\"{0}\">{1}</a>", ifaceInfo.m_FileName, ifaceInfo.m_TypeName );
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue