Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1135 Merge changes from Ryzom patch 1.10 (fix a crash with FES)

Browse source
This commit is contained in:
kervala 2010-10-28 16:37:59 +02:00
parent 86806d8b8e
commit 9c5af189f6
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset
View file

@ -299,7 +299,7 @@
</STRUCT> </STRUCT>
<STRUCT> <STRUCT>
<ATOM Name="name" Value="PvpClan"/> <ATOM Name="name" Value="PvpClan"/>
<ATOM Name="type" Value="uint8"/> <ATOM Name="type" Value="uint32"/>
<ATOM Name="persistant" Value="true"/> <ATOM Name="persistant" Value="true"/>
<ATOM Name="mirror" Value="true"/> <ATOM Name="mirror" Value="true"/>
<ATOM Name="weight" Value="1"/> <ATOM Name="weight" Value="1"/>

5
code/ryzom/server/data_shard/shop_category.cfg
View file

@ -99,6 +99,8 @@ ShopCategory = {
"TATOO_FEMALE", "TATOO_FEMALE",
"FOOD", "FOOD",
"SERVICE_STABLE", "SERVICE_STABLE",
"JOB_ELEMENT",
"END_ITEM_CATEGORY", "END_ITEM_CATEGORY",
@ -317,6 +319,9 @@ ShopNameAliases=
"COMMON_TOOL: Common : TOOL: STATIC_DYNAMIC_SHOP", "COMMON_TOOL: Common : TOOL: STATIC_DYNAMIC_SHOP",
"NEWBIELAND_TOOL : Common : TOOLS_NOOB: STATIC_DYNAMIC_SHOP", // NEW Newbieland "NEWBIELAND_TOOL : Common : TOOLS_NOOB: STATIC_DYNAMIC_SHOP", // NEW Newbieland
//job elements
"COMMON_JOB: Common : JOB_ELEMENT: STATIC_DYNAMIC_SHOP",
//jewel //jewel
"MATIS_JEWEL: Matis: JEWEL: DYNAMIC_SHOP", "MATIS_JEWEL: Matis: JEWEL: DYNAMIC_SHOP",
"TRYKER_JEWEL: Tryker: JEWEL: DYNAMIC_SHOP", "TRYKER_JEWEL: Tryker: JEWEL: DYNAMIC_SHOP",