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..8c2bb94 100644
--- a/leveldesign/game_element/anim/anim_set/clapclap/clapclap.animset_mode
+++ b/leveldesign/game_element/anim/anim_set/clapclap/clapclap.animset_mode
@@ -1,26 +1,10 @@
-<?xml version="1.0"?>
-<FORM Revision="$Revision: 1.1 $" State="modified">
-  <PARENT Filename="_pet.animset_mode"/>
-  <STRUCT>
-    <STRUCT Name="swim">
-      <ATOM Name="__" Value="true"/>
-    </STRUCT>
-    <STRUCT Name="swim_death">
-      <ATOM Name="__" Value="true"/>
-    </STRUCT>
-  </STRUCT>
-  <STRUCT/>
-  <STRUCT/>
-  <STRUCT/>
-  <STRUCT/>
-  <LOG>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</LOG>
-</FORM>
+<?xml version="1.0"?>
+<FORM Revision="$Revision: 1.1 $" State="modified">
+  <PARENT Filename="_creatures.animset_mode"/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG></LOG>
+</FORM>
diff --git a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_alert__.animation_set b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_alert__.animation_set
index 6db5529..8bf5fc8 100644
--- a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_alert__.animation_set
+++ b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_alert__.animation_set
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <FORM Revision="$Revision: 1.1 $" State="modified">
-  <PARENT Filename="clapclap_swim__.animation_set"/>
+  <PARENT Filename="clapclap_default__.animation_set"/>
   <STRUCT>
   </STRUCT>
   <STRUCT/>
diff --git a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_combat__.animation_set b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_combat__.animation_set
index 6db5529..501ed33 100644
--- a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_combat__.animation_set
+++ b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_combat__.animation_set
@@ -1,11 +1,123 @@
 <?xml version="1.0"?>
-<FORM Revision="$Revision: 1.1 $" State="modified">
-  <PARENT Filename="clapclap_swim__.animation_set"/>
+<FORM Revision="$Revision: 1.2 $" State="modified">
+  <PARENT Filename="_combat.animation_set"/>
   <STRUCT>
+    <STRUCT Name="idle">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_idle.anim"/>
+        </STRUCT>
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_intimidation.anim"/>
+        </STRUCT>
+      </ARRAY>
+      <ATOM Name="LodCharacterAnimation" Value="TR_MO_Clapclap_idle.anim"/>
+    </STRUCT>
+    <STRUCT Name="walk">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_nage.anim"/>
+        </STRUCT>
+      </ARRAY>
+      <ATOM Name="LodCharacterAnimation" Value="TR_MO_Clapclap_nage.anim"/>
+    </STRUCT>
+    <STRUCT Name="run">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_nage.anim"/>
+        </STRUCT>
+      </ARRAY>
+      <ATOM Name="LodCharacterAnimation" Value="TR_MO_Clapclap_nage.anim"/>
+    </STRUCT>
+    <STRUCT Name="turn_left">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_tournegauche.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="turn_right">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_tournedroite.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="turn_left_to_walk">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_tournegauche.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="turn_right_to_walk">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_tournedroite.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="turn_left_to_backward">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_tournegauche.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="turn_right_to_backward">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_tournedroite.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="impact">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_impact.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="stun_begin">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_stun_init.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="stun_loop">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_stun_loop.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="stun_end">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_stun_end.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="attack1">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_attaque_1.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="death_mode">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_mort.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
   </STRUCT>
   <STRUCT/>
   <STRUCT/>
   <STRUCT/>
   <STRUCT/>
+  <COMMENTS></COMMENTS>
   <LOG></LOG>
 </FORM>
diff --git a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_death__.animation_set b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_death__.animation_set
index 6db5529..eed9981 100644
--- a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_death__.animation_set
+++ b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_death__.animation_set
@@ -1,7 +1,15 @@
 <?xml version="1.0"?>
 <FORM Revision="$Revision: 1.1 $" State="modified">
-  <PARENT Filename="clapclap_swim__.animation_set"/>
+  <PARENT Filename="_death__.animation_set"/>
   <STRUCT>
+    <STRUCT Name="idle">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_mort_cycle.anim"/>
+        </STRUCT>
+      </ARRAY>
+      <ATOM Name="LodCharacterAnimation" Value="TR_MO_Clapclap_mort_cycle.anim"/>
+    </STRUCT>
   </STRUCT>
   <STRUCT/>
   <STRUCT/>
diff --git a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_default__.animation_set b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_default__.animation_set
index bd408e4..07a0242 100644
--- a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_default__.animation_set
+++ b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_default__.animation_set
@@ -1,206 +1,113 @@
-<?xml version="1.0"?>
-<FORM Revision="$Revision: 1.1 $" State="modified">
-  <STRUCT>
-    <STRUCT Name="idle">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_baille.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_idle.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_occupation.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_senti_danger.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_intimidation.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_attaque_1.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_attaque_2.anim"/>
-        </STRUCT>
-      </ARRAY>
-      <ATOM Name="LodCharacterAnimation" Value="tr_mo_clapclap_idle.anim"/>
-    </STRUCT>
-    <STRUCT Name="walk">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_nage.anim"/>
-          <ATOM Name="next1" Value="-1"/>
-          <ATOM Name="next1 weight" Value="1"/>
-          <ATOM Name="next2" Value="-1"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_sortirdelo.anim"/>
-          <ATOM Name="next1" Value="-1"/>
-          <ATOM Name="next1 weight" Value="1"/>
-          <ATOM Name="next2" Value="-1"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_nage.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_nage.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_nage.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_nage.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_nage.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_nage.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_nage.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="backward">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_recule.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_left">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_gauche.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_straffe_gauche.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournegauche.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_right">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_droit.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournedroite.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_left_to_walk">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_gauche.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournegauche.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_right_to_walk">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_droit.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournedroite.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_left_to_backward">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_gauche.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournegauche.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_right_to_backward">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_droit.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournedroite.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="strafe_right">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_straffe_droit.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="impact">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_impact.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="stun_begin">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_stun_init.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="stun_loop">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_stun_loop.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="stun_end">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_stun_end.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="attack1">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_attaque_1.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_attaque_2.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="attack2">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_attaque_1.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_attaque_2.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="death_mode">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_mort.anim"/>
-        </STRUCT>
-      </ARRAY>
-      <ATOM Name="LodCharacterAnimation" Value="tr_mo_clapclap_mort.anim"/>
-    </STRUCT>
-  </STRUCT>
-  <STRUCT/>
-  <STRUCT/>
-  <STRUCT/>
-  <STRUCT/>
-  <LOG></LOG>
-</FORM>
+<?xml version="1.0"?>
+<FORM Revision="$Revision: 1.2 $" State="modified">
+  <PARENT Filename="_default.animation_set"/>
+  <STRUCT>
+    <STRUCT Name="idle">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_idle.anim"/>
+        </STRUCT>
+      </ARRAY>
+      <ATOM Name="LodCharacterAnimation" Value="TR_MO_Clapclap_idle.anim"/>
+    </STRUCT>
+    <STRUCT Name="walk">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_nage.anim"/>
+        </STRUCT>
+      </ARRAY>
+      <ATOM Name="LodCharacterAnimation" Value="TR_MO_Clapclap_nage.anim"/>
+    </STRUCT>
+    <STRUCT Name="run">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_nage.anim"/>
+        </STRUCT>
+      </ARRAY>
+      <ATOM Name="LodCharacterAnimation" Value="TR_MO_Clapclap_nage.anim"/>
+    </STRUCT>
+    <STRUCT Name="turn_left">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_tournegauche.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="turn_right">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_tournedroite.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="turn_left_to_walk">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_tournegauche.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="turn_right_to_walk">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_tournedroite.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="turn_left_to_backward">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_tournegauche.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="turn_right_to_backward">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_tournedroite.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="impact">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_impact.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="stun_begin">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_stun_init.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="stun_loop">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_stun_loop.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="stun_end">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_stun_end.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+    <STRUCT Name="death_mode">
+      <ARRAY Name="animations">
+        <STRUCT>
+          <ATOM Name="filename" Value="TR_MO_Clapclap_mort.anim"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <COMMENTS></COMMENTS>
+  <LOG></LOG>
+</FORM>
diff --git a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_eat__.animation_set b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_eat__.animation_set
index 6db5529..8bf5fc8 100644
--- a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_eat__.animation_set
+++ b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_eat__.animation_set
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <FORM Revision="$Revision: 1.1 $" State="modified">
-  <PARENT Filename="clapclap_swim__.animation_set"/>
+  <PARENT Filename="clapclap_default__.animation_set"/>
   <STRUCT>
   </STRUCT>
   <STRUCT/>
diff --git a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_hungry__.animation_set b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_hungry__.animation_set
index 52eacf6..93c8787 100644
--- a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_hungry__.animation_set
+++ b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_hungry__.animation_set
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <FORM Revision="$Revision: 1.1 $" State="modified">
-  <PARENT Filename="clapclap_swim__.animation_set"/>
+  <PARENT Filename="clapclap_default__.animation_set"/>
   <STRUCT>
   </STRUCT>
   <STRUCT/>
diff --git a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_rest__.animation_set b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_rest__.animation_set
index 59c01ac..8bf5fc8 100644
--- a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_rest__.animation_set
+++ b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_rest__.animation_set
@@ -1,180 +1,7 @@
 <?xml version="1.0"?>
 <FORM Revision="$Revision: 1.1 $" State="modified">
+  <PARENT Filename="clapclap_default__.animation_set"/>
   <STRUCT>
-    <STRUCT Name="idle">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_baille.anim"/>
-		  <ATOM Name="next1" Value="1"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_idle.anim"/>
-		  <ATOM Name="next1" Value="0"/>
-          <ATOM Name="next1 weight" Value="2"/>
-          <ATOM Name="next2" Value="1"/>
-          <ATOM Name="next2 weight" Value="5"/>
-          <ATOM Name="next3" Value="2"/>
-          <ATOM Name="next4" Value="3"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_senti_danger.anim"/>
-		  <ATOM Name="next1" Value="1"/>
-          <ATOM Name="next1 weight" Value="5"/>
-          <ATOM Name="next2" Value="4"/>
-          <ATOM Name="next3" Value="3"/>
-          <ATOM Name="next3 weight" Value="3"/>
-        </STRUCT>
-      </ARRAY>
-      <ATOM Name="LodCharacterAnimation" Value="tr_mo_clapclap_idle.anim"/>
-    </STRUCT>
-    <STRUCT Name="walk">
-        <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_nage.anim"/>
-          <ATOM Name="next1" Value="0"/>
-          <ATOM Name="next1 weight" Value="10"/>
-          <ATOM Name="next2" Value="1"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_sortirdelo.anim"/>
-          <ATOM Name="next1" Value="0"/>
-          <ATOM Name="next1 weight" Value="10"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="backward">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_recule.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_left">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_gauche.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_straffe_gauche.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournegauche.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_right">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_droit.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournedroite.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_left_to_walk">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_gauche.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournegauche.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_right_to_walk">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_droit.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournedroite.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_left_to_backward">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_gauche.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournegauche.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_right_to_backward">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_droit.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournedroite.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="strafe_right">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_straffe_droit.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="impact">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_impact.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="stun_begin">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_stun_init.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="stun_loop">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_stun_loop.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="stun_end">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_stun_end.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="attack1">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_attaque_1.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_attaque_2.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="attack2">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_attaque_1.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_attaque_2.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="death_mode">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_mort.anim"/>
-        </STRUCT>
-      </ARRAY>
-      <ATOM Name="LodCharacterAnimation" Value="tr_mo_clapclap_mort.anim"/>
-    </STRUCT>
   </STRUCT>
   <STRUCT/>
   <STRUCT/>
diff --git a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_swim__.animation_set b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_swim__.animation_set
index 1bb92fd..93c8787 100644
--- a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_swim__.animation_set
+++ b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_swim__.animation_set
@@ -1,202 +1,7 @@
 <?xml version="1.0"?>
 <FORM Revision="$Revision: 1.1 $" State="modified">
+  <PARENT Filename="clapclap_default__.animation_set"/>
   <STRUCT>
-    <STRUCT Name="idle">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_baille.anim"/>
-		  <ATOM Name="next1" Value="1"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_idle.anim"/>
-		            <ATOM Name="next1" Value="0"/>
-          <ATOM Name="next1 weight" Value="2"/>
-          <ATOM Name="next2" Value="1"/>
-          <ATOM Name="next2 weight" Value="5"/>
-          <ATOM Name="next3" Value="2"/>
-          <ATOM Name="next4" Value="3"/>
-          <ATOM Name="next4 weight" Value="2"/>
-          <ATOM Name="next5" Value="4"/>
-
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_occupation.anim"/>
-		            <ATOM Name="next1" Value="1"/>
-          <ATOM Name="next1 weight" Value="7"/>
-          <ATOM Name="next2" Value="3"/>
-          <ATOM Name="next2 weight" Value="3"/>
-
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_senti_danger.anim"/>
-		            <ATOM Name="next1" Value="1"/>
-          <ATOM Name="next1 weight" Value="5"/>
-          <ATOM Name="next2" Value="4"/>
-          <ATOM Name="next3" Value="3"/>
-          <ATOM Name="next3 weight" Value="3"/>
-          <ATOM Name="next4" Value="4"/>
-          <ATOM Name="next4 weight" Value="0"/>
-          <ATOM Name="next5" Value="3"/>
-
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_intimidation.anim"/>
-            <ATOM Name="next1" Value="1"/>
-          <ATOM Name="next1 weight" Value="7"/>
-          <ATOM Name="next2" Value="3"/>
-          <ATOM Name="next2 weight" Value="3"/>
-        </STRUCT>
-      </ARRAY>
-      <ATOM Name="LodCharacterAnimation" Value="tr_mo_clapclap_idle.anim"/>
-    </STRUCT>
-    <STRUCT Name="walk">
-        <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_nage.anim"/>
-          <ATOM Name="next1" Value="0"/>
-          <ATOM Name="next1 weight" Value="10"/>
-          <ATOM Name="next2" Value="1"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_sortirdelo.anim"/>
-          <ATOM Name="next1" Value="0"/>
-          <ATOM Name="next1 weight" Value="10"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="backward">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_recule.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_left">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_gauche.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_straffe_gauche.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournegauche.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_right">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_droit.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournedroite.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_left_to_walk">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_gauche.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournegauche.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_right_to_walk">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_droit.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournedroite.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_left_to_backward">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_gauche.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournegauche.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="turn_right_to_backward">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_demitour_droit.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_tournedroite.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="strafe_right">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_straffe_droit.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="impact">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_impact.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="stun_begin">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_stun_init.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="stun_loop">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_stun_loop.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="stun_end">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_stun_end.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="attack1">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_attaque_1.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_attaque_2.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="attack2">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_attaque_1.anim"/>
-        </STRUCT>
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_attaque_2.anim"/>
-        </STRUCT>
-      </ARRAY>
-    </STRUCT>
-    <STRUCT Name="death_mode">
-      <ARRAY Name="animations">
-        <STRUCT>
-          <ATOM Name="filename" Value="tr_mo_clapclap_mort.anim"/>
-        </STRUCT>
-      </ARRAY>
-      <ATOM Name="LodCharacterAnimation" Value="tr_mo_clapclap_mort.anim"/>
-    </STRUCT>
   </STRUCT>
   <STRUCT/>
   <STRUCT/>
diff --git a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_swim_death__.animation_set b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_swim_death__.animation_set
index 6db5529..f325366 100644
--- a/leveldesign/game_element/anim/anim_set/clapclap/clapclap_swim_death__.animation_set
+++ b/leveldesign/game_element/anim/anim_set/clapclap/clapclap_swim_death__.animation_set
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <FORM Revision="$Revision: 1.1 $" State="modified">
-  <PARENT Filename="clapclap_swim__.animation_set"/>
+  <PARENT Filename="clapclap_death__.animation_set"/>
   <STRUCT>
   </STRUCT>
   <STRUCT/>