From 125e83be3b46929e0fa6a5bfc8b56b9d2151401e Mon Sep 17 00:00:00 2001 From: deed Date: Sat, 3 Dec 2016 20:09:53 +0100 Subject: [PATCH] corrction des sacs + primitives + clapclap --- .../parent_creature_prototype/_sagassmonte.creature | 4 +++- .../anim/anim_set/clapclap/clapclap.animset_mode | 11 +---------- leveldesign/game_element/sitem/inventory/bag.sitem | 9 +++------ primitives/newbieland/urban_newbieland.primitive | 8 ++++---- 4 files changed, 11 insertions(+), 21 deletions(-) diff --git a/leveldesign/game_elem/creature/fauna/parent_creature_prototype/_sagassmonte.creature b/leveldesign/game_elem/creature/fauna/parent_creature_prototype/_sagassmonte.creature index f3c398b..60f4ca4 100644 --- a/leveldesign/game_elem/creature/fauna/parent_creature_prototype/_sagassmonte.creature +++ b/leveldesign/game_elem/creature/fauna/parent_creature_prototype/_sagassmonte.creature @@ -61,7 +61,9 @@ - + + + diff --git a/leveldesign/game_element/anim/anim_set/clapclap/clapclap.animset_mode b/leveldesign/game_element/anim/anim_set/clapclap/clapclap.animset_mode index 8efcde9..482236e 100644 --- a/leveldesign/game_element/anim/anim_set/clapclap/clapclap.animset_mode +++ b/leveldesign/game_element/anim/anim_set/clapclap/clapclap.animset_mode @@ -13,14 +13,5 @@ - Fri Jan 15 20:46:08 2016 (g) .swim.__ = true -Sat Jan 16 02:47:21 2016 (g) .alert.__ = false -Sat Jan 16 02:47:21 2016 (g) .combat.__ = false -Sat Jan 16 02:47:21 2016 (g) .death.__ = false -Sat Jan 16 02:47:21 2016 (g) .default.__ = false -Sat Jan 16 02:47:21 2016 (g) .eat.__ = false -Sat Jan 16 02:47:21 2016 (g) .hungry.__ = false -Sat Jan 16 02:47:21 2016 (g) .rest.__ = false -Sat Jan 16 02:47:21 2016 (g) .swim_death.__ = true -Thu Mar 31 22:48:01 2016 (g) .swim_death.__ = true + diff --git a/leveldesign/game_element/sitem/inventory/bag.sitem b/leveldesign/game_element/sitem/inventory/bag.sitem index 3371f47..bc2f3bf 100644 --- a/leveldesign/game_element/sitem/inventory/bag.sitem +++ b/leveldesign/game_element/sitem/inventory/bag.sitem @@ -6,12 +6,9 @@ - - - - - - + + + diff --git a/primitives/newbieland/urban_newbieland.primitive b/primitives/newbieland/urban_newbieland.primitive index b79a41a..6dc8364 100644 --- a/primitives/newbieland/urban_newbieland.primitive +++ b/primitives/newbieland/urban_newbieland.primitive @@ -9,7 +9,7 @@ name - starting_camp + starting_camp @@ -696,7 +696,7 @@ forage : mgedja 20 5 set_obj_rp : qabb20160603a_OBJ1 give_item : mgedja 20 5 : disp_sipvandil - recv_item : fireworks_a 3 1 : disp_sipvandil + recv_item : object_fireworks_a 3 1 : disp_sipvandil # chat_end dyn_chat : disp_sipvandil : TEXT_qabb20160603a_1 : chat_end_resp ANSWER_OK jump_point : chat_end_resp @@ -789,7 +789,7 @@ # ANSWER2 jump_point : ANSWER2 give_item : mflour 1 1; mgourd_full 5 1 : disp_sipvandil - recv_item : fireworks_b 3 1 : disp_sipvandil + recv_item : object_fireworks_b 3 1 : disp_sipvandil @@ -848,7 +848,7 @@ set_obj_rp : qabb20160607a_OBJ3 dyn_chat : disp_sipvandil : TEXT_qabb20160607a_2 : chat_end_resp ANSWER_OK jump_point : chat_end_resp - recv_item : fireworks_c 3 1 : disp_sipvandil + recv_item : object_fireworks_c 3 1 : disp_sipvandil