From 4f8de6df0a661874c671531486bba02e32e63949 Mon Sep 17 00:00:00 2001 From: deed Date: Wed, 7 Sep 2016 17:34:18 +0200 Subject: [PATCH] correction du monte et effacement de double --- .../fauna/bestiary/forest/arma_mount.creature | 2 +- .../ecosystem/forest/_armamonte_for.creature | 2 +- .../_arma_mount.creature | 4 +- .../anim/anim_set/entities.animset_list | 4 +- .../pet/clapclap/clapclap.animset_mode | 26 --- .../clapclap/clapclap_alert__.animation_set | 11 - .../clapclap/clapclap_combat__.animation_set | 11 - .../clapclap/clapclap_death__.animation_set | 11 - .../clapclap/clapclap_default__.animation_set | 206 ------------------ .../pet/clapclap/clapclap_eat__.animation_set | 11 - .../clapclap/clapclap_hungry__.animation_set | 11 - .../clapclap/clapclap_rest__.animation_set | 184 ---------------- .../clapclap/clapclap_swim__.animation_set | 206 ------------------ .../sagass_mount/sagass_selle.animset_mode | 11 - .../sagass_selle_combat__.animation_set | 180 --------------- .../sagass_selle_death__.animation_set | 17 -- .../sagass_selle_default__.animation_set | 114 ---------- ...sagass_selle_mount_default__.animation_set | 159 -------------- .../sagass_selle_mount_swim__.animation_set | 161 -------------- .../sagass_selle_rest__.animation_set | 27 --- .../sagass_selle_swim__.animation_set | 169 -------------- .../newbieland/urban_newbieland.primitive | 123 ++++++++++- 22 files changed, 126 insertions(+), 1524 deletions(-) delete mode 100644 leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap.animset_mode delete mode 100644 leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_alert__.animation_set delete mode 100644 leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_combat__.animation_set delete mode 100644 leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_death__.animation_set delete mode 100644 leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_default__.animation_set delete mode 100644 leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_eat__.animation_set delete mode 100644 leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_hungry__.animation_set delete mode 100644 leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_rest__.animation_set delete mode 100644 leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_swim__.animation_set delete mode 100644 leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle.animset_mode delete mode 100644 leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_combat__.animation_set delete mode 100644 leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_death__.animation_set delete mode 100644 leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_default__.animation_set delete mode 100644 leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_mount_default__.animation_set delete mode 100644 leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_mount_swim__.animation_set delete mode 100644 leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_rest__.animation_set delete mode 100644 leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_swim__.animation_set diff --git a/leveldesign/game_elem/creature/fauna/bestiary/forest/arma_mount.creature b/leveldesign/game_elem/creature/fauna/bestiary/forest/arma_mount.creature index a3b1363..edf2834 100644 --- a/leveldesign/game_elem/creature/fauna/bestiary/forest/arma_mount.creature +++ b/leveldesign/game_elem/creature/fauna/bestiary/forest/arma_mount.creature @@ -1,6 +1,6 @@
- + diff --git a/leveldesign/game_elem/creature/fauna/ecosystem/forest/_armamonte_for.creature b/leveldesign/game_elem/creature/fauna/ecosystem/forest/_armamonte_for.creature index 10b99b5..6273ac8 100644 --- a/leveldesign/game_elem/creature/fauna/ecosystem/forest/_armamonte_for.creature +++ b/leveldesign/game_elem/creature/fauna/ecosystem/forest/_armamonte_for.creature @@ -1,6 +1,6 @@ - + diff --git a/leveldesign/game_elem/creature/fauna/parent_creature_prototype/_arma_mount.creature b/leveldesign/game_elem/creature/fauna/parent_creature_prototype/_arma_mount.creature index 02801fa..9a2e30d 100644 --- a/leveldesign/game_elem/creature/fauna/parent_creature_prototype/_arma_mount.creature +++ b/leveldesign/game_elem/creature/fauna/parent_creature_prototype/_arma_mount.creature @@ -5,7 +5,7 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/leveldesign/game_element/anim/anim_set/entities.animset_list b/leveldesign/game_element/anim/anim_set/entities.animset_list index 9f4bcde..6e25627 100644 --- a/leveldesign/game_element/anim/anim_set/entities.animset_list +++ b/leveldesign/game_element/anim/anim_set/entities.animset_list @@ -6,8 +6,8 @@ - - + + diff --git a/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap.animset_mode b/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap.animset_mode deleted file mode 100644 index 8efcde9..0000000 --- a/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap.animset_mode +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - 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/anim/anim_set/pet/clapclap/clapclap_alert__.animation_set b/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_alert__.animation_set deleted file mode 100644 index 6db5529..0000000 --- a/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_alert__.animation_set +++ /dev/null @@ -1,11 +0,0 @@ - -
- - - - - - - - - diff --git a/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_combat__.animation_set b/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_combat__.animation_set deleted file mode 100644 index 6db5529..0000000 --- a/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_combat__.animation_set +++ /dev/null @@ -1,11 +0,0 @@ - -
- - - - - - - - - diff --git a/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_death__.animation_set b/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_death__.animation_set deleted file mode 100644 index 6db5529..0000000 --- a/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_death__.animation_set +++ /dev/null @@ -1,11 +0,0 @@ - -
- - - - - - - - - diff --git a/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_default__.animation_set b/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_default__.animation_set deleted file mode 100644 index bd408e4..0000000 --- a/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_default__.animation_set +++ /dev/null @@ -1,206 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_eat__.animation_set b/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_eat__.animation_set deleted file mode 100644 index 6db5529..0000000 --- a/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_eat__.animation_set +++ /dev/null @@ -1,11 +0,0 @@ - -
- - - - - - - - - diff --git a/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_hungry__.animation_set b/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_hungry__.animation_set deleted file mode 100644 index 52eacf6..0000000 --- a/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_hungry__.animation_set +++ /dev/null @@ -1,11 +0,0 @@ - -
- - - - - - - - - diff --git a/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_rest__.animation_set b/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_rest__.animation_set deleted file mode 100644 index 59c01ac..0000000 --- a/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_rest__.animation_set +++ /dev/null @@ -1,184 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_swim__.animation_set b/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_swim__.animation_set deleted file mode 100644 index 1bb92fd..0000000 --- a/leveldesign/game_element/anim/anim_set/pet/clapclap/clapclap_swim__.animation_set +++ /dev/null @@ -1,206 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle.animset_mode b/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle.animset_mode deleted file mode 100644 index 4f0e499..0000000 --- a/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle.animset_mode +++ /dev/null @@ -1,11 +0,0 @@ - -
- - - - - - - - - diff --git a/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_combat__.animation_set b/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_combat__.animation_set deleted file mode 100644 index d81d8fe..0000000 --- a/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_combat__.animation_set +++ /dev/null @@ -1,180 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_death__.animation_set b/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_death__.animation_set deleted file mode 100644 index 4b9faae..0000000 --- a/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_death__.animation_set +++ /dev/null @@ -1,17 +0,0 @@ - -
- - - - - - - - - - - - - - - diff --git a/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_default__.animation_set b/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_default__.animation_set deleted file mode 100644 index 1cc2c62..0000000 --- a/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_default__.animation_set +++ /dev/null @@ -1,114 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_mount_default__.animation_set b/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_mount_default__.animation_set deleted file mode 100644 index 0c9a793..0000000 --- a/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_mount_default__.animation_set +++ /dev/null @@ -1,159 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_mount_swim__.animation_set b/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_mount_swim__.animation_set deleted file mode 100644 index b65d05a..0000000 --- a/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_mount_swim__.animation_set +++ /dev/null @@ -1,161 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_rest__.animation_set b/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_rest__.animation_set deleted file mode 100644 index ea97c87..0000000 --- a/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_rest__.animation_set +++ /dev/null @@ -1,27 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_swim__.animation_set b/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_swim__.animation_set deleted file mode 100644 index ec60b2f..0000000 --- a/leveldesign/game_element/anim/anim_set/pet/sagass_mount/sagass_selle_swim__.animation_set +++ /dev/null @@ -1,169 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/primitives/newbieland/urban_newbieland.primitive b/primitives/newbieland/urban_newbieland.primitive index 0abc0d0..b79a41a 100644 --- a/primitives/newbieland/urban_newbieland.primitive +++ b/primitives/newbieland/urban_newbieland.primitive @@ -1,7 +1,7 @@ - + class @@ -603,7 +603,7 @@ name - disp_cook + disp_jimman_group @@ -864,6 +864,80 @@ + + + class + npc_group_event_handler + + + event + start_of_state + + + name + disp_jimman_handler + + + + + class + alias + + + name + alias + + + + + action + code + + + class + npc_event_handler_action + + + name + disp_jimman_action + + + parameters + ()rename("Jimman$#(Intendant)"); + + + + + + + class + npc_group + + + name + disp_sipvandil_group + + + + class + npc_group_parameters + + + name + parameters + + + + + + class + alias + + + name + alias + + @@ -885,7 +959,7 @@ welcome_ra - + class alias @@ -896,6 +970,49 @@ + + + class + npc_group_event_handler + + + event + start_of_state + + + name + disp_sipvandil_handler + + + + + class + alias + + + name + alias + + + + + action + code + + + class + npc_event_handler_action + + + name + disp_sipvandil_action + + + parameters + ()rename("Sipvandil$#(Cuisinier)"); + + +