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

Merge branch 'feature/0011_primitive_meunier' into 'lirria'

Browse source 
correction des missions du moulin

See merge request !30
This commit is contained in:
deed 2017-03-07 15:12:47 +01:00
commit c0b6370a2a
5 changed files with 363 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
primitives/newbieland/botobjects_newbieland.primitive
View file

@ -746,7 +746,7 @@
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimPoint">
<PT X="8996.070313" Y="-10701.690430" Z="0.000000"/>
<PT X="8996.070312" Y="-10701.690430" Z="0.000000"/>
<ANGLE VALUE="2.022400"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
@ -1018,7 +1018,7 @@
<CHILD TYPE="CPrimZone">
<PROPERTY TYPE="string">
<NAME>ai_activity</NAME>
<STRING>no_chang</STRING>
<STRING>no_change</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>class</NAME>
@ -1078,7 +1078,6 @@
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>equipment</NAME>
<STRING>USER_MODEL: selectable</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
@ -1243,7 +1242,7 @@
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimPoint">
<PT X="8764.803711" Y="-10672.581055" Z="0.000000"/>
<PT X="8766.178711" Y="-10672.203125" Z="0.000000"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>npc_bot</STRING>
@ -1287,8 +1286,12 @@
<STRING>#mission tags and pre-requisites</STRING>
<STRING>replayable</STRING>
<STRING>solo</STRING>
<STRING>auto_remove</STRING>
<STRING>player_replay_timer : 100</STRING>
<STRING>auto : qabb20170303a_PHR</STRING>
<STRING>mission_icon : generic_generic</STRING>
<STRING>need_validation</STRING>
<STRING>fail_if_inventory_is_full</STRING>
<STRING></STRING>
<STRING>#Variables declaration</STRING>
<STRING>decl : bot : giver</STRING>
@ -1301,8 +1304,8 @@
<STRING>mission_title : qabb20170303a_TITLE</STRING>
<STRING>mission_desc : qabb20170303a_DESC</STRING>
<STRING># step_4</STRING>
<STRING>set_obj_rp : qabb20170303a_OBJ1</STRING>
<STRING>give_item : mgedja 3 1 : giver</STRING>
<STRING>set_obj : qabb20170303a_OBJ1</STRING>
<STRING>give_item : mgedja 4 1 : giver</STRING>
<STRING>recv_item : mflour 1 1 : disp_bagflour</STRING>
<STRING></STRING>
</PROPERTY>

344
primitives/newbieland/disp_mission/qabb20170302a.primitive
View file

@ -92,6 +92,20 @@
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>linear_dyn_chat_continue</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>linear_dyn_chat_continue_1</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>phrase</NAME>
<STRING>qabb20170302a_PHR1</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
@ -113,6 +127,272 @@
<STRING>alias</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>step</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>step_2</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>actions</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>pre_actions</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>mission_objectives</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>objectives</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>forage</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>item/quantity/quality</NAME>
<STRING>mgedja 12 1</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>roleplay_objective</NAME>
<STRING>qabb20170302a_OBJ</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>add_compass</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>npc_to_add</NAME>
<STRING>$giver$</STRING>
</PROPERTY>
</CHILD>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>actions</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>post_actions</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>step</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>step_3</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>actions</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>pre_actions</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>mission_objectives</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>objectives</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>talk_to</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>talk_to $giver$</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>phrase</NAME>
<STRING>qabb20170302a_PHR2</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>actions</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>post_actions</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>step_if</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>condition_type</NAME>
<STRING>test_item_in_inv</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>Step_item_inv</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>test_parameters</NAME>
<STRING>mflour</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>result_yes</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>yes</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>jump_to</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>jump to linear_dyn_chat_continue_3</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>target</NAME>
<STRING>linear_dyn_chat_continue_3</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>result_no</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>no</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>jump_to</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>jump to linear_dyn_chat_continue_2</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>target</NAME>
<STRING>linear_dyn_chat_continue_2</STRING>
</PROPERTY>
</CHILD>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>linear_dyn_chat_continue</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>linear_dyn_chat_continue_2</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>phrase</NAME>
<STRING>qabb20170302a_PHR3</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>step</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>step_jump_test</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>actions</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>pre_actions</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>jump_to</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>jump to step_3</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>target</NAME>
<STRING>step_3</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>mission_objectives</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>objectives</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>actions</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>post_actions</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>linear_dyn_chat_continue</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>linear_dyn_chat_continue_3</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>phrase</NAME>
<STRING>qabb20170302a_PHR4</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
@ -141,52 +421,6 @@
<NAME>name</NAME>
<STRING>objectives</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>forage</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>item/quantity/quality</NAME>
<STRING>mgedja 5 1</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>roleplay_objective</NAME>
<STRING>qabb20170302a_OBJ</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>give_item</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>item/quantity/quality</NAME>
<STRING>mgedja 12 1</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>npc_name</NAME>
<STRING>disp_bagflour</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>roleplay_objective</NAME>
<STRING>qabb20170302a_OBJ1</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>recv_item</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>item/quantity/quality</NAME>
<STRING>mflour 3 1</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>npc_name</NAME>
<STRING>disp_bagflour</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
@ -196,9 +430,23 @@
<NAME>item/quantity/quality</NAME>
<STRING>mflour 3 1</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>give_item to $giver$</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>talk_to</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>talk_to $giver$</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>roleplay_objective</NAME>
<STRING>qabb20170302a_OBJ2</STRING>
<NAME>phrase</NAME>
<STRING>qabb20170302a_PHR5</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">

24
primitives/newbieland/disp_mission/qabb20170303a.primitive
View file

@ -16,10 +16,22 @@
<NAME>audience</NAME>
<STRING>solo</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>auto_remove_from_journal</NAME>
<STRING>true</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>automatic</NAME>
<STRING>true</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>mission_tree</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>fail_if_inventory_is_full</NAME>
<STRING>true</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>giver_primitive</NAME>
<STRING>botobjects_newbieland.primitive</STRING>
@ -44,6 +56,18 @@
<NAME>name</NAME>
<STRING>qabb20170303a</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>not_in_journal</NAME>
<STRING>true</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>phrase_auto_menu</NAME>
<STRING>qabb20170303a_PHR</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>player_replay_timer</NAME>
<STRING>100</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>replayable</NAME>
<STRING>true</STRING>

42
primitives/newbieland/urban_newbieland.primitive
View file

@ -1016,7 +1016,7 @@
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimPoint">
<PT X="8763.083984" Y="-10672.821289" Z="0.000000"/>
<PT X="8762.946289" Y="-10672.889648" Z="0.000000"/>
<ANGLE VALUE="3.180863"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
@ -1072,14 +1072,38 @@
<STRING>#script</STRING>
<STRING>mission_title : qabb20170302a_TITLE</STRING>
<STRING>mission_desc : qabb20170302a_DESC</STRING>
<STRING># linear_dyn_chat_continue_1</STRING>
<STRING>dyn_chat : giver : qabb20170302a_PHR1 : linear_dyn_chat_continue_1_resp ANSWER_OK</STRING>
<STRING>jump_point : linear_dyn_chat_continue_1_resp</STRING>
<STRING># step_2</STRING>
<STRING>set_obj_rp : qabb20170302a_OBJ</STRING>
<STRING>forage : mgedja 4 1</STRING>
<STRING>add_compass_npc : giver</STRING>
<STRING># step_3</STRING>
<STRING>jump_point : step_3</STRING>
<STRING>talk_to : giver : qabb20170302a_PHR2</STRING>
<STRING># Step_item_inv</STRING>
<STRING>if_item_in_inv : mflour : jump to linear_dyn_chat_continue_3</STRING>
<STRING># no: jump to linear_dyn_chat_continue_2</STRING>
<STRING>jump : linear_dyn_chat_continue_2</STRING>
<STRING>jump : Step_item_inv_endif</STRING>
<STRING># yes: jump to linear_dyn_chat_continue_3</STRING>
<STRING>jump_point : jump to linear_dyn_chat_continue_3</STRING>
<STRING>jump : linear_dyn_chat_continue_3</STRING>
<STRING>jump_point : Step_item_inv_endif</STRING>
<STRING># linear_dyn_chat_continue_2</STRING>
<STRING>jump_point : linear_dyn_chat_continue_2</STRING>
<STRING>dyn_chat : giver : qabb20170302a_PHR3 : linear_dyn_chat_continue_2_resp ANSWER_OK</STRING>
<STRING>jump_point : linear_dyn_chat_continue_2_resp</STRING>
<STRING># step_jump_test</STRING>
<STRING>jump : step_3</STRING>
<STRING># linear_dyn_chat_continue_3</STRING>
<STRING>jump_point : linear_dyn_chat_continue_3</STRING>
<STRING>dyn_chat : giver : qabb20170302a_PHR4 : linear_dyn_chat_continue_3_resp ANSWER_OK</STRING>
<STRING>jump_point : linear_dyn_chat_continue_3_resp</STRING>
<STRING># step_4</STRING>
<STRING>set_obj : qabb20170302a_OBJ</STRING>
<STRING>forage : mgedja 5 1</STRING>
<STRING>set_obj : qabb20170302a_OBJ1</STRING>
<STRING>give_item : mgedja 12 1 : disp_bagflour</STRING>
<STRING>recv_item : mflour 3 1 : disp_bagflour</STRING>
<STRING>set_obj : qabb20170302a_OBJ2</STRING>
<STRING>give_item : mflour 3 1 : giver</STRING>
<STRING>give_item : mflour 1 1 : giver</STRING>
<STRING>talk_to : giver : qabb20170302a_PHR5</STRING>
<STRING>recv_money : 1000</STRING>
<STRING></STRING>
</PROPERTY>
@ -1644,7 +1668,7 @@
<PT X="8838.248047" Y="-10637.232422" Z="0.000000"/>
<PT X="8815.148438" Y="-10668.859375" Z="0.000000"/>
<PT X="8812.402344" Y="-10741.995117" Z="0.000000"/>
<PT X="8825.601563" Y="-10814.310547" Z="0.000000"/>
<PT X="8825.601562" Y="-10814.310547" Z="0.000000"/>
<PT X="8822.853516" Y="-10894.063477" Z="0.000000"/>
<PT X="8814.603516" Y="-11046.956055" Z="0.000000"/>
<PT X="8810.755859" Y="-11181.699219" Z="0.000000"/>

2
primitives/primitives.cfg
View file

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