Merge branch 'feature/ajout_nest_pendo' into 'lirria'

Ajout des DS nid de pendo et des primitives

See merge request !11
This commit is contained in:
yannk 2017-01-09 21:18:09 +01:00
commit 70e2721aaf
24 changed files with 425 additions and 101 deletions

View file

@ -1,9 +1,9 @@
<?xml version="1.0"?>
<NEL_WORLD_EDITOR_PROJECT>
<VERSION>2</VERSION>
<DATA_DIRECTORY VALUE="L:\continents\newbieland"/>
<CONTEXT VALUE="default"/>
<DATABASE_ELEMENT FILENAME="F:\continents\newbieland\newbieland.land" TYPE="landscape">
<DATA_DIRECTORY VALUE="H:\khaganat\khanat-ressources\continents\newbieland"/>
<CONTEXT VALUE=""/>
<DATABASE_ELEMENT FILENAME="newbieland\newbieland.land" TYPE="landscape">
<PRIMITIVES VERSION="1">
<ROOT_PRIMITIVE TYPE="CPrimNode">
<ALIAS LAST_GENERATED="0"/>
@ -14,12 +14,6 @@
</ROOT_PRIMITIVE>
</PRIMITIVES>
</DATABASE_ELEMENT>
<DATABASE_ELEMENT FILENAME="L:\primitives\newbieland\urban_newbieland.primitive" TYPE="primitive"/>
<DATABASE_ELEMENT FILENAME="L:\primitives\newbieland\botobjects_newbieland.primitive" TYPE="primitive"/>
<DATABASE_ELEMENT FILENAME="L:\primitives\newbieland\deposit_ecotype_newbie.primitive" TYPE="primitive"/>
<DATABASE_ELEMENT FILENAME="L:\primitives\newbieland\deposit_newbieland.primitive" TYPE="primitive"/>
<DATABASE_ELEMENT FILENAME="L:\primitives\newbieland\guild_missions.primitive" TYPE="primitive"/>
<DATABASE_ELEMENT FILENAME="L:\primitives\newbieland\missions_newbieland.primitive" TYPE="primitive"/>
<DATABASE_ELEMENT FILENAME="L:\primitives\newbieland\fauna_newbieland.primitive" TYPE="primitive"/>
<DATABASE_ELEMENT FILENAME="L:\primitives\newbieland\region_newbieland.primitive" TYPE="primitive"/>
<DATABASE_ELEMENT FILENAME="../primitives\newbieland\botobjects_newbieland.primitive" TYPE="primitive"/>
<DATABASE_ELEMENT FILENAME="../primitives\newbieland\urban_newbieland.primitive" TYPE="primitive"/>
</NEL_WORLD_EDITOR_PROJECT>

View file

@ -0,0 +1,23 @@
<?xml version="1.0"?>
<FORM Version="0.0" State="modified">
<PARENT Filename="_parent_botobject.creature"/>
<STRUCT>
<STRUCT Name="Basics">
<STRUCT Name="Equipment">
<STRUCT Name="Body">
<ATOM Name="Item" Value="pendo_nest_01.shape"/>
</STRUCT>
</STRUCT>
</STRUCT>
<STRUCT Name="Collision">
<ATOM Name="CollisionRadius" Value="1"/>
<ATOM Name="Length" Value="0"/>
<ATOM Name="Width" Value="0"/>
<ATOM Name="Height" Value="0"/>
</STRUCT>
</STRUCT>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<STRUCT/>
</FORM>

View file

@ -0,0 +1,23 @@
<?xml version="1.0"?>
<FORM Version="0.0" State="modified">
<PARENT Filename="_parent_botobject.creature"/>
<STRUCT>
<STRUCT Name="Basics">
<STRUCT Name="Equipment">
<STRUCT Name="Body">
<ATOM Name="Item" Value="pendo_nest_02.shape"/>
</STRUCT>
</STRUCT>
</STRUCT>
<STRUCT Name="Collision">
<ATOM Name="CollisionRadius" Value="1"/>
<ATOM Name="Length" Value="0"/>
<ATOM Name="Width" Value="0"/>
<ATOM Name="Height" Value="0"/>
</STRUCT>
</STRUCT>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<STRUCT/>
</FORM>

View file

@ -0,0 +1,23 @@
<?xml version="1.0"?>
<FORM Version="0.0" State="modified">
<PARENT Filename="_parent_botobject.creature"/>
<STRUCT>
<STRUCT Name="Basics">
<STRUCT Name="Equipment">
<STRUCT Name="Body">
<ATOM Name="Item" Value="pendo_nest_03.shape"/>
</STRUCT>
</STRUCT>
</STRUCT>
<STRUCT Name="Collision">
<ATOM Name="CollisionRadius" Value="1"/>
<ATOM Name="Length" Value="0"/>
<ATOM Name="Width" Value="0"/>
<ATOM Name="Height" Value="0"/>
</STRUCT>
</STRUCT>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<STRUCT/>
</FORM>

View file

@ -0,0 +1,23 @@
<?xml version="1.0"?>
<FORM Version="0.0" State="modified">
<PARENT Filename="_parent_botobject.creature"/>
<STRUCT>
<STRUCT Name="Basics">
<STRUCT Name="Equipment">
<STRUCT Name="Body">
<ATOM Name="Item" Value="pendo_nest_04.shape"/>
</STRUCT>
</STRUCT>
</STRUCT>
<STRUCT Name="Collision">
<ATOM Name="CollisionRadius" Value="1"/>
<ATOM Name="Length" Value="0"/>
<ATOM Name="Width" Value="0"/>
<ATOM Name="Height" Value="0"/>
</STRUCT>
</STRUCT>
<STRUCT/>
<STRUCT/>
<STRUCT/>
<STRUCT/>
</FORM>

View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<PRIMITIVES VERSION="1">
<ROOT_PRIMITIVE TYPE="CPrimNode">
<ALIAS LAST_GENERATED="1024"/>
<ALIAS LAST_GENERATED="1041"/>
<CHILD TYPE="CPrimZone">
<PROPERTY TYPE="string">
<NAME>class</NAME>
@ -369,7 +369,7 @@
</CHILD>
</CHILD>
<CHILD TYPE="CPrimPoint">
<PT X="8919.109375" Y="-10608.517578" Z="0.000000"/>
<PT X="8930.383789" Y="-10608.242188" Z="0.000000"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_bot</STRING>
@ -460,7 +460,7 @@
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimPoint">
<PT X="8814.579102" Y="-10625.726563" Z="0.000000"/>
<PT X="8814.579102" Y="-10625.726562" Z="0.000000"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_bot</STRING>
@ -701,5 +701,329 @@
</CHILD>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimZone">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_manager</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>pendo_nest</STRING>
</PROPERTY>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1025"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>alias</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimZone">
<PROPERTY TYPE="string">
<NAME>ai_activity</NAME>
<STRING>no_chan</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_zone</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>pendo_nest</STRING>
</PROPERTY>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1026"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>alias</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_group</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>pendo_nest_delta</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_group_parameters</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>parameters</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1027"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>alias</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimPoint">
<PT X="8996.070312" Y="-10701.690430" Z="0.000000"/>
<ANGLE VALUE="2.022400"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_bot</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>pendo_nest_delta_01</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>sheet_client</NAME>
<STRING>pendo_nest_01</STRING>
</PROPERTY>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1028"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>alias</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimPoint">
<PT X="8998.069336" Y="-10702.774414" Z="0.000000"/>
<ANGLE VALUE="0.854121"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_bot</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>pendo_nest_delta_02</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>sheet_client</NAME>
<STRING>pendo_nest_02</STRING>
</PROPERTY>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1029"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>alias</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimPoint">
<PT X="8996.455078" Y="-10704.115234" Z="0.000000"/>
<ANGLE VALUE="-1.560979"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_bot</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>pendo_nest_delta_03</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>sheet_client</NAME>
<STRING>pendo_nest_03</STRING>
</PROPERTY>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1030"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>alias</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimPoint">
<PT X="8994.083984" Y="-10703.153320" Z="0.000000"/>
<ANGLE VALUE="-4.633850"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_bot</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>pendo_nest_delta_04</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>sheet_client</NAME>
<STRING>pendo_nest_04</STRING>
</PROPERTY>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1041"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>alias</STRING>
</PROPERTY>
</CHILD>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_group</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>pendo_nest_ashtarie</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_group_parameters</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>parameters</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1033"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>alias</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimPoint">
<PT X="8856.249023" Y="-10528.361328" Z="0.000000"/>
<ANGLE VALUE="1.384264"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_bot</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>pendo_nest_ashtarie_01</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>sheet_client</NAME>
<STRING>pendo_nest_01</STRING>
</PROPERTY>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1034"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>alias</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimPoint">
<PT X="8858.448242" Y="-10529.907227" Z="0.000000"/>
<ANGLE VALUE="1.030835"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_bot</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>pendo_nest_ashtarie_02</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>sheet_client</NAME>
<STRING>pendo_nest_02</STRING>
</PROPERTY>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1035"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>alias</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimPoint">
<PT X="8855.767578" Y="-10531.111328" Z="0.000000"/>
<ANGLE VALUE="-1.767146"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_bot</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>pendo_nest_ashtarie_03</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>sheet_client</NAME>
<STRING>pendo_nest_03</STRING>
</PROPERTY>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1036"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>alias</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimPoint">
<PT X="8854.359375" Y="-10529.839844" Z="0.000000"/>
<ANGLE VALUE="1.629701"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_bot</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>pendo_nest_ashtarie_04</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>sheet_client</NAME>
<STRING>pendo_nest_04</STRING>
</PROPERTY>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1037"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>alias</STRING>
</PROPERTY>
</CHILD>
</CHILD>
</CHILD>
</CHILD>
</CHILD>
</ROOT_PRIMITIVE>
</PRIMITIVES>

View file

@ -955,49 +955,6 @@
</CHILD>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_group_event_handler</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>event</NAME>
<STRING>start_of_state</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>disp_jimman_handler</STRING>
</PROPERTY>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1304"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>alias</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>action</NAME>
<STRING>code</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_event_handler_action</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>disp_jimman_action</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>parameters</NAME>
<STRING>()rename("Jimman$#(Intendant)");</STRING>
</PROPERTY>
</CHILD>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
@ -1061,49 +1018,6 @@
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_group_event_handler</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>event</NAME>
<STRING>start_of_state</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>disp_sipvandil_handler</STRING>
</PROPERTY>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1307"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>alias</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>action</NAME>
<STRING>code</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_event_handler_action</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>disp_sipvandil_action</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>parameters</NAME>
<STRING>()rename("Sipvandil$#(Cuisinier)");</STRING>
</PROPERTY>
</CHILD>
</CHILD>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimZone">