diff --git a/primitives/newbieland/botobjects_newbieland.primitive b/primitives/newbieland/botobjects_newbieland.primitive
index f5f1704..58037ca 100644
--- a/primitives/newbieland/botobjects_newbieland.primitive
+++ b/primitives/newbieland/botobjects_newbieland.primitive
@@ -746,7 +746,7 @@
-
+
class
@@ -1018,7 +1018,7 @@
ai_activity
- no_chang
+ no_change
class
@@ -1078,7 +1078,6 @@
equipment
- USER_MODEL: selectable
name
@@ -1243,7 +1242,7 @@
-
+
class
npc_bot
@@ -1287,8 +1286,12 @@
#mission tags and pre-requisites
replayable
solo
+ auto_remove
+ player_replay_timer : 100
+ auto : qabb20170303a_PHR
mission_icon : generic_generic
need_validation
+ fail_if_inventory_is_full
#Variables declaration
decl : bot : giver
@@ -1301,8 +1304,8 @@
mission_title : qabb20170303a_TITLE
mission_desc : qabb20170303a_DESC
# step_4
- set_obj_rp : qabb20170303a_OBJ1
- give_item : mgedja 3 1 : giver
+ set_obj : qabb20170303a_OBJ1
+ give_item : mgedja 4 1 : giver
recv_item : mflour 1 1 : disp_bagflour
diff --git a/primitives/newbieland/disp_mission/qabb20170302a.primitive b/primitives/newbieland/disp_mission/qabb20170302a.primitive
index e608d5c..0e941ff 100644
--- a/primitives/newbieland/disp_mission/qabb20170302a.primitive
+++ b/primitives/newbieland/disp_mission/qabb20170302a.primitive
@@ -92,6 +92,20 @@
+
+
+ class
+ linear_dyn_chat_continue
+
+
+ name
+ linear_dyn_chat_continue_1
+
+
+ phrase
+ qabb20170302a_PHR1
+
+
class
@@ -113,6 +127,272 @@
alias
+
+
+ class
+ step
+
+
+ name
+ step_2
+
+
+
+ class
+ actions
+
+
+ name
+ pre_actions
+
+
+
+
+ class
+ mission_objectives
+
+
+ name
+ objectives
+
+
+
+ class
+ forage
+
+
+ item/quantity/quality
+ mgedja 12 1
+
+
+ roleplay_objective
+ qabb20170302a_OBJ
+
+
+
+ class
+ add_compass
+
+
+ npc_to_add
+ $giver$
+
+
+
+
+
+
+ class
+ actions
+
+
+ name
+ post_actions
+
+
+
+
+
+ class
+ step
+
+
+ name
+ step_3
+
+
+
+ class
+ actions
+
+
+ name
+ pre_actions
+
+
+
+
+ class
+ mission_objectives
+
+
+ name
+ objectives
+
+
+
+ class
+ talk_to
+
+
+ name
+ talk_to $giver$
+
+
+ phrase
+ qabb20170302a_PHR2
+
+
+
+
+
+ class
+ actions
+
+
+ name
+ post_actions
+
+
+
+
+
+ class
+ step_if
+
+
+ condition_type
+ test_item_in_inv
+
+
+ name
+ Step_item_inv
+
+
+ test_parameters
+ mflour
+
+
+
+ class
+ result_yes
+
+
+ name
+ yes
+
+
+
+ class
+ jump_to
+
+
+ name
+ jump to linear_dyn_chat_continue_3
+
+
+ target
+ linear_dyn_chat_continue_3
+
+
+
+
+
+ class
+ result_no
+
+
+ name
+ no
+
+
+
+ class
+ jump_to
+
+
+ name
+ jump to linear_dyn_chat_continue_2
+
+
+ target
+ linear_dyn_chat_continue_2
+
+
+
+
+
+
+ class
+ linear_dyn_chat_continue
+
+
+ name
+ linear_dyn_chat_continue_2
+
+
+ phrase
+ qabb20170302a_PHR3
+
+
+
+
+ class
+ step
+
+
+ name
+ step_jump_test
+
+
+
+ class
+ actions
+
+
+ name
+ pre_actions
+
+
+
+ class
+ jump_to
+
+
+ name
+ jump to step_3
+
+
+ target
+ step_3
+
+
+
+
+
+ class
+ mission_objectives
+
+
+ name
+ objectives
+
+
+
+
+ class
+ actions
+
+
+ name
+ post_actions
+
+
+
+
+
+ class
+ linear_dyn_chat_continue
+
+
+ name
+ linear_dyn_chat_continue_3
+
+
+ phrase
+ qabb20170302a_PHR4
+
+
class
@@ -141,52 +421,6 @@
name
objectives
-
-
- class
- forage
-
-
- item/quantity/quality
- mgedja 5 1
-
-
- roleplay_objective
- qabb20170302a_OBJ
-
-
-
-
- class
- give_item
-
-
- item/quantity/quality
- mgedja 12 1
-
-
- npc_name
- disp_bagflour
-
-
- roleplay_objective
- qabb20170302a_OBJ1
-
-
-
- class
- recv_item
-
-
- item/quantity/quality
- mflour 3 1
-
-
- npc_name
- disp_bagflour
-
-
-
class
@@ -196,9 +430,23 @@
item/quantity/quality
mflour 3 1
+
+ name
+ give_item to $giver$
+
+
+
+
+ class
+ talk_to
+
+
+ name
+ talk_to $giver$
+
- roleplay_objective
- qabb20170302a_OBJ2
+ phrase
+ qabb20170302a_PHR5
diff --git a/primitives/newbieland/disp_mission/qabb20170303a.primitive b/primitives/newbieland/disp_mission/qabb20170303a.primitive
index 6f2097e..4e8aa27 100644
--- a/primitives/newbieland/disp_mission/qabb20170303a.primitive
+++ b/primitives/newbieland/disp_mission/qabb20170303a.primitive
@@ -16,10 +16,22 @@
audience
solo
+
+ auto_remove_from_journal
+ true
+
+
+ automatic
+ true
+
class
mission_tree
+
+ fail_if_inventory_is_full
+ true
+
giver_primitive
botobjects_newbieland.primitive
@@ -44,6 +56,18 @@
name
qabb20170303a
+
+ not_in_journal
+ true
+
+
+ phrase_auto_menu
+ qabb20170303a_PHR
+
+
+ player_replay_timer
+ 100
+
replayable
true
diff --git a/primitives/newbieland/urban_newbieland.primitive b/primitives/newbieland/urban_newbieland.primitive
index 9835b50..e0dda44 100644
--- a/primitives/newbieland/urban_newbieland.primitive
+++ b/primitives/newbieland/urban_newbieland.primitive
@@ -1016,7 +1016,7 @@
-
+
class
@@ -1072,14 +1072,38 @@
#script
mission_title : qabb20170302a_TITLE
mission_desc : qabb20170302a_DESC
+ # linear_dyn_chat_continue_1
+ dyn_chat : giver : qabb20170302a_PHR1 : linear_dyn_chat_continue_1_resp ANSWER_OK
+ jump_point : linear_dyn_chat_continue_1_resp
+ # step_2
+ set_obj_rp : qabb20170302a_OBJ
+ forage : mgedja 4 1
+ add_compass_npc : giver
+ # step_3
+ jump_point : step_3
+ talk_to : giver : qabb20170302a_PHR2
+ # Step_item_inv
+ if_item_in_inv : mflour : jump to linear_dyn_chat_continue_3
+ # no: jump to linear_dyn_chat_continue_2
+ jump : linear_dyn_chat_continue_2
+ jump : Step_item_inv_endif
+ # yes: jump to linear_dyn_chat_continue_3
+ jump_point : jump to linear_dyn_chat_continue_3
+ jump : linear_dyn_chat_continue_3
+ jump_point : Step_item_inv_endif
+ # linear_dyn_chat_continue_2
+ jump_point : linear_dyn_chat_continue_2
+ dyn_chat : giver : qabb20170302a_PHR3 : linear_dyn_chat_continue_2_resp ANSWER_OK
+ jump_point : linear_dyn_chat_continue_2_resp
+ # step_jump_test
+ jump : step_3
+ # linear_dyn_chat_continue_3
+ jump_point : linear_dyn_chat_continue_3
+ dyn_chat : giver : qabb20170302a_PHR4 : linear_dyn_chat_continue_3_resp ANSWER_OK
+ jump_point : linear_dyn_chat_continue_3_resp
# step_4
- set_obj : qabb20170302a_OBJ
- forage : mgedja 5 1
- set_obj : qabb20170302a_OBJ1
- give_item : mgedja 12 1 : disp_bagflour
- recv_item : mflour 3 1 : disp_bagflour
- set_obj : qabb20170302a_OBJ2
- give_item : mflour 3 1 : giver
+ give_item : mflour 1 1 : giver
+ talk_to : giver : qabb20170302a_PHR5
recv_money : 1000
@@ -1644,7 +1668,7 @@
-
+
diff --git a/primitives/primitives.cfg b/primitives/primitives.cfg
index d731618..8cd086f 100644
--- a/primitives/primitives.cfg
+++ b/primitives/primitives.cfg
@@ -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",