Khaganat-NeL/khanat-ressources-NeL
2
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/0006_changement_primitive_npc' into 'lirria'

Browse source 
Changement des nouvelles DS de NPC

See merge request !23
This commit is contained in:
deed 2017-02-16 17:13:02 +01:00
commit 7bdaf1f871
3 changed files with 11 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
primitives/newbieland/fauna_lirria.primitive
View file

@ -171,7 +171,7 @@
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>count</NAME> <NAME>count</NAME>
<STRING>150</STRING> <STRING>100</STRING>
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>creature_code</NAME> <NAME>creature_code</NAME>

37
primitives/newbieland/urban_newbieland.primitive
View file

@ -86,9 +86,6 @@
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string_array"> <PROPERTY TYPE="string_array">
<NAME>equipment</NAME> <NAME>equipment</NAME>
<STRING>VPA:0042060000103206</STRING>
<STRING>VPB:00000020F0000000</STRING>
<STRING>VPC:0021DDE4074DA8D4</STRING>
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>name</NAME> <NAME>name</NAME>
@ -96,7 +93,7 @@
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>sheet_client</NAME> <NAME>sheet_client</NAME>
<STRING>welcome_ra</STRING> <STRING>disp_welcome_ra</STRING>
</PROPERTY> </PROPERTY>
<CHILD TYPE="CPrimAlias"> <CHILD TYPE="CPrimAlias">
<ALIAS VALUE="158"/> <ALIAS VALUE="158"/>
@ -493,8 +490,7 @@
<ANGLE VALUE="6.037747"/> <ANGLE VALUE="6.037747"/>
<PROPERTY TYPE="string_array"> <PROPERTY TYPE="string_array">
<NAME>chat_parameters</NAME> <NAME>chat_parameters</NAME>
<STRING>shop : Matis:Fyros:HAIRDRESSING_FEMALE:HAIRDRESSING_MALE:TATOO_MALE:TATOO_FEMALE</STRING> <STRING>shop : Matis:Fyros:HAIRDRESSING_FEMALE:TATOO_FEMALE</STRING>
<STRING>shop : NEWBIELAND_LARMOR_ALL</STRING>
<STRING>item : pendo_toy1.sitem 1</STRING> <STRING>item : pendo_toy1.sitem 1</STRING>
<STRING>item : pendo_toy2.sitem 1</STRING> <STRING>item : pendo_toy2.sitem 1</STRING>
<STRING>item : pendo_toy3.sitem 1</STRING> <STRING>item : pendo_toy3.sitem 1</STRING>
@ -526,9 +522,6 @@
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string_array"> <PROPERTY TYPE="string_array">
<NAME>equipment</NAME> <NAME>equipment</NAME>
<STRING>VPA:212C120000901209</STRING>
<STRING>VPB:000000C0BC090000</STRING>
<STRING>VPC:000000381396B8AD</STRING>
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>name</NAME> <NAME>name</NAME>
@ -536,7 +529,7 @@
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>sheet_client</NAME> <NAME>sheet_client</NAME>
<STRING>welcome_ra_f</STRING> <STRING>nbland_marchand_larmor</STRING>
</PROPERTY> </PROPERTY>
<CHILD TYPE="CPrimAlias"> <CHILD TYPE="CPrimAlias">
<ALIAS VALUE="146"/> <ALIAS VALUE="146"/>
@ -563,9 +556,6 @@
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string_array"> <PROPERTY TYPE="string_array">
<NAME>equipment</NAME> <NAME>equipment</NAME>
<STRING>VPA:A08C14000010D21B</STRING>
<STRING>VPB:000000C0CC0A0000</STRING>
<STRING>VPC:001625F805C2E9B4</STRING>
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>name</NAME> <NAME>name</NAME>
@ -573,7 +563,7 @@
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>sheet_client</NAME> <NAME>sheet_client</NAME>
<STRING>dispensary_tcara_f</STRING> <STRING>nbland_marchand_pet</STRING>
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>vertical_pos</NAME> <NAME>vertical_pos</NAME>
@ -634,9 +624,6 @@
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string_array"> <PROPERTY TYPE="string_array">
<NAME>equipment</NAME> <NAME>equipment</NAME>
<STRING>VPA:802C12000010D21B</STRING>
<STRING>VPB:C0BC090000</STRING>
<STRING>VPC:19695C3A52589A</STRING>
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>name</NAME> <NAME>name</NAME>
@ -644,7 +631,7 @@
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>sheet_client</NAME> <NAME>sheet_client</NAME>
<STRING>welcome_ra</STRING> <STRING>disp_jimman</STRING>
</PROPERTY> </PROPERTY>
<CHILD TYPE="CPrimAlias"> <CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1284"/> <ALIAS VALUE="1284"/>
@ -990,9 +977,6 @@
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string_array"> <PROPERTY TYPE="string_array">
<NAME>equipment</NAME> <NAME>equipment</NAME>
<STRING>VPA:723C12000010D21B</STRING>
<STRING>VPB:C0BC090000</STRING>
<STRING>VPC:19695C3A52589A</STRING>
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>name</NAME> <NAME>name</NAME>
@ -1000,7 +984,7 @@
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>sheet_client</NAME> <NAME>sheet_client</NAME>
<STRING>welcome_ra</STRING> <STRING>disp_sipvandil</STRING>
</PROPERTY> </PROPERTY>
<CHILD TYPE="CPrimAlias"> <CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1306"/> <ALIAS VALUE="1306"/>
@ -1172,7 +1156,7 @@
<PROPERTY TYPE="string_array"> <PROPERTY TYPE="string_array">
<NAME>chat_parameters</NAME> <NAME>chat_parameters</NAME>
<STRING>menu: MENU_WHOAMI FREDI_SINGER</STRING> <STRING>menu: MENU_WHOAMI FREDI_SINGER</STRING>
<STRING>shop : Matis:Fyros:HAIRDRESSING_FEMALE:HAIRDRESSING_MALE:TATOO_MALE:TATOO_FEMALE</STRING> <STRING>shop : Matis:Fyros:HAIRDRESSING_MALE:TATOO_MALE</STRING>
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>class</NAME> <NAME>class</NAME>
@ -1180,9 +1164,6 @@
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string_array"> <PROPERTY TYPE="string_array">
<NAME>equipment</NAME> <NAME>equipment</NAME>
<STRING>VPA:A13C12000010D21A</STRING>
<STRING>VPB:000000C0BC090000</STRING>
<STRING>VPC:00127A38007A689A</STRING>
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>name</NAME> <NAME>name</NAME>
@ -1190,7 +1171,7 @@
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>sheet_client</NAME> <NAME>sheet_client</NAME>
<STRING>welcome_ra</STRING> <STRING>nbland_esthetics</STRING>
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>vertical_pos</NAME> <NAME>vertical_pos</NAME>
@ -1720,7 +1701,7 @@
</PROPERTY> </PROPERTY>
<PROPERTY TYPE="string"> <PROPERTY TYPE="string">
<NAME>sheet_client</NAME> <NAME>sheet_client</NAME>
<STRING>welcome_ra</STRING> <STRING>disp_itenerant_1</STRING>
</PROPERTY> </PROPERTY>
<CHILD TYPE="CPrimAlias"> <CHILD TYPE="CPrimAlias">
<ALIAS VALUE="393"/> <ALIAS VALUE="393"/>

2
primitives/primitives.cfg
View file

@ -20,7 +20,7 @@ PrimitiveFiles = {
"FILE fisherman.primitive", "FILE fisherman.primitive",
"FILE fauna_lirria.primitive", "FILE fauna_lirria.primitive",
"FILE village1_lirria.primitive", "FILE village1_lirria.primitive",
"FILE event_anniv_egg.primitive", // "FILE event_anniv_egg.primitive",
"MAPEND", "MAPEND",
"MAPEND", "MAPEND",