diff --git a/assets-cg/converters.py b/assets-cg/converters.py
index d4b6a7c..28f1bd3 100644
--- a/assets-cg/converters.py
+++ b/assets-cg/converters.py
@@ -73,7 +73,7 @@ def convert_map(input, output, params, target):
 	#create a dictionnary {tile id:type}
 	for i in data_tileset["tiles"]:
 		id = i["id"]+1
-		type = i["type"]
+		type = i["class"]
 
 		value = tile_type.get(type) if type in tile_type else TILE_AIR
 		tile_value[id] = value
diff --git a/assets-cg/maps/1.tmx b/assets-cg/maps/1.tmx
index 9dc4f77..d7ff484 100644
--- a/assets-cg/maps/1.tmx
+++ b/assets-cg/maps/1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.5" orientation="orthogonal" renderorder="right-down" width="50" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="14" nextobjectid="71">
+<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" width="50" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="14" nextobjectid="77">
  <editorsettings>
   <export target="interior_1.json" format="json"/>
  </editorsettings>
@@ -45,21 +45,21 @@
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,29,0,0,0,0,0,0,0,0,0,0,
 0,0,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,29,349,350,351,0,0,0,0,0,0,0,323,324,325,0,0,58,0,0,0,0,0,0,0,0,0,0,
-0,0,349,350,351,0,0,0,0,0,0,0,0,22,23,0,0,0,0,0,0,0,0,58,378,379,380,0,0,0,0,0,0,0,352,353,354,0,0,0,323,324,325,0,0,0,0,0,0,0,
+0,0,349,350,351,0,0,0,0,0,0,0,0,22,23,346,0,0,0,0,0,0,0,58,378,379,380,0,0,0,0,0,0,0,352,353,354,0,0,0,323,324,325,0,0,0,0,0,0,0,
 0,0,378,379,380,0,0,0,0,0,0,0,0,51,52,0,0,0,0,0,0,0,0,0,0,0,294,294,0,0,0,0,0,0,381,382,383,0,0,0,352,353,354,0,0,0,0,0,0,0,
-0,0,0,0,0,0,326,327,328,329,0,0,0,0,0,0,323,324,325,0,0,0,0,0,0,0,294,294,294,0,0,0,0,0,0,0,0,0,0,0,381,382,383,294,294,0,0,0,0,0,
+0,0,0,0,346,0,326,327,328,329,0,0,0,0,0,0,323,324,325,0,0,0,0,0,0,0,294,294,294,0,0,0,0,0,0,0,0,0,0,0,381,382,383,294,294,0,0,0,0,0,
 0,0,0,0,0,0,355,356,357,358,245,0,0,0,0,0,352,353,354,0,0,0,0,0,0,0,0,294,294,294,0,0,0,0,0,0,0,0,0,0,0,0,0,294,294,294,0,0,0,0,
 0,0,0,0,0,0,384,385,386,387,274,28,24,25,0,0,381,382,383,0,0,0,0,0,0,0,0,0,0,294,294,0,12,13,0,0,0,0,0,0,0,0,294,294,294,294,294,0,0,0,
 0,0,0,0,0,0,413,414,415,416,303,57,53,54,0,334,335,336,337,248,249,250,251,0,0,0,31,323,324,325,0,0,41,42,0,0,0,0,0,0,294,294,295,295,294,294,294,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,363,364,365,366,309,0,0,280,0,0,0,39,352,353,354,0,0,0,0,0,0,0,0,0,294,294,295,295,294,294,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,392,393,394,395,0,0,0,280,24,25,0,0,381,382,383,0,0,0,0,0,0,0,0,0,294,294,295,295,0,323,324,325,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,323,324,325,421,422,423,424,249,250,249,309,53,54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,295,295,0,352,353,354,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,323,324,325,421,422,423,424,249,250,249,309,53,54,0,0,0,346,0,0,0,0,0,0,0,0,0,0,0,294,295,295,0,352,353,354,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,352,353,354,450,451,452,453,0,0,0,0,0,0,0,0,0,0,0,0,252,253,253,254,0,0,0,0,294,294,294,294,0,381,382,383,0,0,0,
 0,0,0,0,0,0,37,0,0,0,0,0,381,382,383,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,282,283,0,0,0,0,294,294,0,294,294,0,0,0,0,0,0,
 0,0,0,0,0,0,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,310,311,311,312,0,0,0,294,295,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,29,0,326,327,328,329,0,0,0,0,0,0,339,340,340,341,0,0,0,294,295,0,0,330,331,332,333,0,0,0,0,
 0,0,0,0,0,0,0,294,294,0,0,0,0,0,0,0,0,0,0,58,0,355,356,357,358,40,39,0,0,0,0,0,0,0,0,0,0,0,294,295,0,0,359,360,361,362,0,0,0,0,
-0,0,0,0,0,0,294,294,294,0,0,0,0,0,0,0,0,0,0,0,0,384,385,386,387,0,0,0,0,0,0,0,0,0,0,0,294,294,294,0,0,0,388,389,390,391,0,0,0,0,
+0,0,0,0,0,0,294,294,294,0,0,346,0,0,0,0,0,0,0,0,0,384,385,386,387,0,0,0,0,0,0,0,0,0,0,0,294,294,294,0,0,0,388,389,390,391,0,0,0,0,
 0,0,0,0,0,0,294,294,294,294,0,0,0,0,0,0,0,0,0,0,0,413,414,415,416,0,0,294,0,0,0,0,0,0,0,0,0,294,295,295,0,0,413,268,415,416,0,0,0,0,
 0,0,0,0,0,0,294,294,294,294,0,0,0,0,295,295,0,0,0,0,0,0,0,0,0,0,0,294,294,0,0,0,0,0,0,0,0,0,294,295,294,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,294,294,294,294,0,0,0,295,295,295,0,0,0,0,0,0,0,0,20,21,0,0,294,294,0,0,0,0,0,0,0,0,0,294,294,294,0,0,0,0,0,0,0,0,
@@ -113,32 +113,60 @@
   <object id="65" gid="267" x="256" y="368" width="16" height="16">
    <properties>
     <property name="name" value="Pancarte"/>
-    <property name="text" value="Ici le niveau est fixé et tu tombes que sur un monstre"/>
+    <property name="text" value="Ici le niveau est fixé et tu peux tomber sur un seul type de monstre"/>
    </properties>
   </object>
   <object id="66" gid="267" x="272" y="368" width="16" height="16">
    <properties>
     <property name="name" value="Pancarte"/>
-    <property name="text" value="Ici le niveau est fixé et tu tombes que sur un monstre"/>
+    <property name="text" value="Ici le niveau est fixé et tu peux tomber sur un seul type de monstre"/>
    </properties>
   </object>
   <object id="67" gid="267" x="384" y="336" width="16" height="16">
    <properties>
     <property name="name" value="Pancarte"/>
-    <property name="text" value="Le niveau est fixé mais tu tombes plus souvent sur un monstre"/>
+    <property name="text" value="Le niveau est fixé et tu tombes plus souvent sur un monstre"/>
    </properties>
   </object>
   <object id="68" gid="267" x="400" y="336" width="16" height="16">
    <properties>
     <property name="name" value="Pancarte"/>
-    <property name="text" value="Le niveau est fixé mais tu tombes plus souvent sur un monstre"/>
+    <property name="text" value="Le niveau est fixé et tu tombes plus souvent sur un monstre"/>
    </properties>
   </object>
   <object id="70" gid="267" x="304" y="256" width="16" height="16">
    <properties>
     <property name="exclusive" type="bool" value="false"/>
     <property name="name" value="Tituya"/>
-    <property name="text" value="Repose toi.;~pp:all"/>
+    <property name="text" value="Repose toi.;~pp:all;~hp:all"/>
+   </properties>
+  </object>
+  <object id="73" gid="267" x="176" y="272" width="16" height="16">
+   <properties>
+    <property name="exclusive" type="bool" value="false"/>
+    <property name="name" value="Information"/>
+    <property name="text" value="Regarde un peu la table du type Rédacteur !;~infotype:Rédacteur"/>
+   </properties>
+  </object>
+  <object id="74" gid="267" x="240" y="48" width="16" height="16">
+   <properties>
+    <property name="exclusive" type="bool" value="false"/>
+    <property name="name" value="Information"/>
+    <property name="text" value="Regarde un peu la table du type Modérateur !;~infotype:Modérateur"/>
+   </properties>
+  </object>
+  <object id="75" gid="267" x="448" y="176" width="16" height="16">
+   <properties>
+    <property name="exclusive" type="bool" value="false"/>
+    <property name="name" value="Information"/>
+    <property name="text" value="Regarde un peu la table du type Labélisateur !;~infotype:Labélisateur"/>
+   </properties>
+  </object>
+  <object id="76" gid="267" x="64" y="80" width="16" height="16">
+   <properties>
+    <property name="exclusive" type="bool" value="false"/>
+    <property name="name" value="Information"/>
+    <property name="text" value="Regarde un peu la table du type Administrateur !;~infotype:Administrateur"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/assets-cg/maps/tileset.tsx b/assets-cg/maps/tileset.tsx
index 821a990..b92ea0e 100644
--- a/assets-cg/maps/tileset.tsx
+++ b/assets-cg/maps/tileset.tsx
@@ -1,224 +1,225 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.8" tiledversion="1.8.5" name="tileset" tilewidth="16" tileheight="16" tilecount="464" columns="29">
+<tileset version="1.9" tiledversion="1.9.0" name="tileset" tilewidth="16" tileheight="16" tilecount="464" columns="29">
  <editorsettings>
   <export target="tileset.json" format="json"/>
  </editorsettings>
  <image source="../tileset.png" width="464" height="256"/>
- <tile id="15" type="solid"/>
- <tile id="16" type="solid"/>
- <tile id="17" type="solid"/>
- <tile id="18" type="solid"/>
- <tile id="19" type="solid"/>
- <tile id="20" type="solid"/>
- <tile id="21" type="solid"/>
- <tile id="22" type="solid"/>
- <tile id="23" type="solid"/>
- <tile id="24" type="solid"/>
- <tile id="25" type="solid"/>
- <tile id="44" type="solid"/>
- <tile id="45" type="solid"/>
- <tile id="46" type="solid"/>
- <tile id="47" type="solid"/>
- <tile id="48" type="talkable"/>
- <tile id="49" type="talkable"/>
- <tile id="52" type="solid"/>
- <tile id="53" type="solid"/>
- <tile id="54" type="solid"/>
- <tile id="56" type="talkable"/>
- <tile id="57" type="talkable"/>
- <tile id="78" type="solid"/>
- <tile id="79" type="solid"/>
- <tile id="80" type="solid"/>
- <tile id="81" type="solid"/>
- <tile id="82" type="solid"/>
- <tile id="83" type="solid"/>
- <tile id="107" type="solid"/>
- <tile id="109" type="solid"/>
- <tile id="110" type="solid"/>
- <tile id="112" type="solid"/>
- <tile id="136" type="solid"/>
- <tile id="137" type="solid"/>
- <tile id="138" type="solid"/>
- <tile id="139" type="solid"/>
- <tile id="140" type="solid"/>
- <tile id="141" type="solid"/>
- <tile id="165" type="solid"/>
- <tile id="167" type="solid"/>
- <tile id="168" type="solid"/>
- <tile id="169" type="solid"/>
- <tile id="170" type="solid"/>
- <tile id="194" type="solid"/>
- <tile id="196" type="solid"/>
- <tile id="197" type="solid"/>
- <tile id="199" type="solid"/>
- <tile id="200" type="bridge"/>
- <tile id="201" type="bridge"/>
- <tile id="202" type="bridge"/>
- <tile id="223" type="solid"/>
- <tile id="224" type="solid"/>
- <tile id="225" type="solid"/>
- <tile id="229" type="solid"/>
- <tile id="231" type="bridge"/>
- <tile id="232" type="solid"/>
- <tile id="233" type="solid"/>
- <tile id="234" type="solid"/>
- <tile id="235" type="solid"/>
- <tile id="236" type="solid"/>
- <tile id="237" type="teleporter"/>
- <tile id="238" type="teleporter"/>
- <tile id="239" type="solid"/>
- <tile id="240" type="solid"/>
- <tile id="241" type="solid"/>
- <tile id="242" type="solid"/>
- <tile id="243" type="solid"/>
- <tile id="244" type="solid"/>
- <tile id="245" type="solid"/>
- <tile id="246" type="solid"/>
- <tile id="247" type="solid"/>
- <tile id="248" type="solid"/>
- <tile id="249" type="solid"/>
- <tile id="250" type="solid"/>
- <tile id="251" type="solid"/>
- <tile id="252" type="solid"/>
- <tile id="253" type="solid"/>
- <tile id="254" type="solid"/>
- <tile id="255" type="bridge"/>
- <tile id="256" type="bridge"/>
- <tile id="257" type="solid"/>
- <tile id="258" type="ice"/>
- <tile id="259" type="ice"/>
- <tile id="260" type="ice"/>
- <tile id="261" type="solid"/>
- <tile id="262" type="solid"/>
- <tile id="263" type="solid"/>
- <tile id="264" type="solid"/>
- <tile id="265" type="solid"/>
- <tile id="266" type="text">
+ <tile id="15" class="solid"/>
+ <tile id="16" class="solid"/>
+ <tile id="17" class="solid"/>
+ <tile id="18" class="solid"/>
+ <tile id="19" class="solid"/>
+ <tile id="20" class="solid"/>
+ <tile id="21" class="solid"/>
+ <tile id="22" class="solid"/>
+ <tile id="23" class="solid"/>
+ <tile id="24" class="solid"/>
+ <tile id="25" class="solid"/>
+ <tile id="44" class="solid"/>
+ <tile id="45" class="solid"/>
+ <tile id="46" class="solid"/>
+ <tile id="47" class="solid"/>
+ <tile id="48" class="talkable"/>
+ <tile id="49" class="talkable"/>
+ <tile id="52" class="solid"/>
+ <tile id="53" class="solid"/>
+ <tile id="54" class="solid"/>
+ <tile id="56" class="talkable"/>
+ <tile id="57" class="talkable"/>
+ <tile id="78" class="solid"/>
+ <tile id="79" class="solid"/>
+ <tile id="80" class="solid"/>
+ <tile id="81" class="solid"/>
+ <tile id="82" class="solid"/>
+ <tile id="83" class="solid"/>
+ <tile id="107" class="solid"/>
+ <tile id="109" class="solid"/>
+ <tile id="110" class="solid"/>
+ <tile id="112" class="solid"/>
+ <tile id="136" class="solid"/>
+ <tile id="137" class="solid"/>
+ <tile id="138" class="solid"/>
+ <tile id="139" class="solid"/>
+ <tile id="140" class="solid"/>
+ <tile id="141" class="solid"/>
+ <tile id="165" class="solid"/>
+ <tile id="167" class="solid"/>
+ <tile id="168" class="solid"/>
+ <tile id="169" class="solid"/>
+ <tile id="170" class="solid"/>
+ <tile id="194" class="solid"/>
+ <tile id="196" class="solid"/>
+ <tile id="197" class="solid"/>
+ <tile id="199" class="solid"/>
+ <tile id="200" class="bridge"/>
+ <tile id="201" class="bridge"/>
+ <tile id="202" class="bridge"/>
+ <tile id="223" class="solid"/>
+ <tile id="224" class="solid"/>
+ <tile id="225" class="solid"/>
+ <tile id="229" class="solid"/>
+ <tile id="231" class="bridge"/>
+ <tile id="232" class="solid"/>
+ <tile id="233" class="solid"/>
+ <tile id="234" class="solid"/>
+ <tile id="235" class="solid"/>
+ <tile id="236" class="solid"/>
+ <tile id="237" class="teleporter"/>
+ <tile id="238" class="teleporter"/>
+ <tile id="239" class="solid"/>
+ <tile id="240" class="solid"/>
+ <tile id="241" class="solid"/>
+ <tile id="242" class="solid"/>
+ <tile id="243" class="solid"/>
+ <tile id="244" class="solid"/>
+ <tile id="245" class="solid"/>
+ <tile id="246" class="solid"/>
+ <tile id="247" class="solid"/>
+ <tile id="248" class="solid"/>
+ <tile id="249" class="solid"/>
+ <tile id="250" class="solid"/>
+ <tile id="251" class="solid"/>
+ <tile id="252" class="solid"/>
+ <tile id="253" class="solid"/>
+ <tile id="254" class="solid"/>
+ <tile id="255" class="bridge"/>
+ <tile id="256" class="bridge"/>
+ <tile id="257" class="solid"/>
+ <tile id="258" class="ice"/>
+ <tile id="259" class="ice"/>
+ <tile id="260" class="ice"/>
+ <tile id="261" class="solid"/>
+ <tile id="262" class="solid"/>
+ <tile id="263" class="solid"/>
+ <tile id="264" class="solid"/>
+ <tile id="265" class="solid"/>
+ <tile id="266" class="text">
   <properties>
    <property name="name" value=""/>
    <property name="text" value=""/>
   </properties>
  </tile>
- <tile id="267" type="teleporter"/>
- <tile id="268" type="solid"/>
- <tile id="269" type="solid"/>
- <tile id="270" type="solid"/>
- <tile id="271" type="solid"/>
- <tile id="272" type="solid"/>
- <tile id="273" type="solid"/>
- <tile id="274" type="solid"/>
- <tile id="275" type="solid"/>
- <tile id="276" type="solid"/>
- <tile id="277" type="solid"/>
- <tile id="278" type="solid"/>
- <tile id="279" type="solid"/>
- <tile id="280" type="bridge"/>
- <tile id="281" type="bridge"/>
- <tile id="282" type="bridge"/>
- <tile id="283" type="solid"/>
- <tile id="284" type="bridge"/>
- <tile id="285" type="bridge"/>
- <tile id="286" type="solid"/>
- <tile id="287" type="ice"/>
- <tile id="288" type="ice"/>
- <tile id="289" type="ice"/>
- <tile id="290" type="solid"/>
- <tile id="291" type="solid"/>
- <tile id="292" type="solid"/>
- <tile id="293" type="grass"/>
- <tile id="294" type="grass"/>
- <tile id="297" type="solid"/>
- <tile id="298" type="solid"/>
- <tile id="299" type="solid"/>
- <tile id="301" type="solid"/>
- <tile id="302" type="solid"/>
- <tile id="303" type="solid"/>
- <tile id="304" type="solid"/>
- <tile id="305" type="solid"/>
- <tile id="308" type="solid"/>
- <tile id="309" type="bridge"/>
- <tile id="310" type="bridge"/>
- <tile id="311" type="bridge"/>
- <tile id="312" type="solid"/>
- <tile id="313" type="bridge"/>
- <tile id="314" type="bridge"/>
- <tile id="315" type="solid"/>
- <tile id="316" type="ice"/>
- <tile id="317" type="ice"/>
- <tile id="318" type="ice"/>
- <tile id="319" type="solid"/>
- <tile id="320" type="solid"/>
- <tile id="321" type="solid"/>
- <tile id="322" type="solid"/>
- <tile id="323" type="solid"/>
- <tile id="324" type="solid"/>
- <tile id="325" type="solid"/>
- <tile id="326" type="solid"/>
- <tile id="327" type="solid"/>
- <tile id="328" type="solid"/>
- <tile id="329" type="solid"/>
- <tile id="330" type="solid"/>
- <tile id="331" type="solid"/>
- <tile id="332" type="solid"/>
- <tile id="333" type="solid"/>
- <tile id="334" type="solid"/>
- <tile id="335" type="solid"/>
- <tile id="336" type="solid"/>
- <tile id="338" type="solid"/>
- <tile id="339" type="solid"/>
- <tile id="340" type="solid"/>
- <tile id="341" type="solid"/>
- <tile id="342" type="bridge"/>
- <tile id="343" type="bridge"/>
- <tile id="344" type="solid"/>
- <tile id="348" type="solid"/>
- <tile id="349" type="solid"/>
- <tile id="350" type="solid"/>
- <tile id="351" type="solid"/>
- <tile id="352" type="solid"/>
- <tile id="353" type="solid"/>
- <tile id="354" type="solid"/>
- <tile id="355" type="solid"/>
- <tile id="356" type="solid"/>
- <tile id="357" type="solid"/>
- <tile id="358" type="solid"/>
- <tile id="359" type="solid"/>
- <tile id="360" type="solid"/>
- <tile id="361" type="solid"/>
- <tile id="362" type="solid"/>
- <tile id="363" type="solid"/>
- <tile id="364" type="solid"/>
- <tile id="365" type="solid"/>
- <tile id="377" type="solid"/>
- <tile id="378" type="solid"/>
- <tile id="379" type="solid"/>
- <tile id="380" type="solid"/>
- <tile id="381" type="solid"/>
- <tile id="382" type="solid"/>
- <tile id="383" type="solid"/>
- <tile id="384" type="solid"/>
- <tile id="385" type="solid"/>
- <tile id="386" type="solid"/>
- <tile id="387" type="solid"/>
- <tile id="388" type="solid"/>
- <tile id="389" type="solid"/>
- <tile id="390" type="solid"/>
- <tile id="391" type="solid"/>
- <tile id="392" type="solid"/>
- <tile id="393" type="solid"/>
- <tile id="394" type="solid"/>
- <tile id="412" type="solid"/>
- <tile id="413" type="door_in"/>
- <tile id="414" type="solid"/>
- <tile id="415" type="solid"/>
- <tile id="420" type="solid"/>
- <tile id="421" type="solid"/>
- <tile id="422" type="solid"/>
- <tile id="423" type="solid"/>
- <tile id="449" type="solid"/>
- <tile id="450" type="door_in"/>
- <tile id="451" type="solid"/>
- <tile id="452" type="solid"/>
+ <tile id="267" class="teleporter"/>
+ <tile id="268" class="solid"/>
+ <tile id="269" class="solid"/>
+ <tile id="270" class="solid"/>
+ <tile id="271" class="solid"/>
+ <tile id="272" class="solid"/>
+ <tile id="273" class="solid"/>
+ <tile id="274" class="solid"/>
+ <tile id="275" class="solid"/>
+ <tile id="276" class="solid"/>
+ <tile id="277" class="solid"/>
+ <tile id="278" class="solid"/>
+ <tile id="279" class="solid"/>
+ <tile id="280" class="bridge"/>
+ <tile id="281" class="bridge"/>
+ <tile id="282" class="bridge"/>
+ <tile id="283" class="solid"/>
+ <tile id="284" class="bridge"/>
+ <tile id="285" class="bridge"/>
+ <tile id="286" class="solid"/>
+ <tile id="287" class="ice"/>
+ <tile id="288" class="ice"/>
+ <tile id="289" class="ice"/>
+ <tile id="290" class="solid"/>
+ <tile id="291" class="solid"/>
+ <tile id="292" class="solid"/>
+ <tile id="293" class="grass"/>
+ <tile id="294" class="grass"/>
+ <tile id="297" class="solid"/>
+ <tile id="298" class="solid"/>
+ <tile id="299" class="solid"/>
+ <tile id="301" class="solid"/>
+ <tile id="302" class="solid"/>
+ <tile id="303" class="solid"/>
+ <tile id="304" class="solid"/>
+ <tile id="305" class="solid"/>
+ <tile id="308" class="solid"/>
+ <tile id="309" class="bridge"/>
+ <tile id="310" class="bridge"/>
+ <tile id="311" class="bridge"/>
+ <tile id="312" class="solid"/>
+ <tile id="313" class="bridge"/>
+ <tile id="314" class="bridge"/>
+ <tile id="315" class="solid"/>
+ <tile id="316" class="ice"/>
+ <tile id="317" class="ice"/>
+ <tile id="318" class="ice"/>
+ <tile id="319" class="solid"/>
+ <tile id="320" class="solid"/>
+ <tile id="321" class="solid"/>
+ <tile id="322" class="solid"/>
+ <tile id="323" class="solid"/>
+ <tile id="324" class="solid"/>
+ <tile id="325" class="solid"/>
+ <tile id="326" class="solid"/>
+ <tile id="327" class="solid"/>
+ <tile id="328" class="solid"/>
+ <tile id="329" class="solid"/>
+ <tile id="330" class="solid"/>
+ <tile id="331" class="solid"/>
+ <tile id="332" class="solid"/>
+ <tile id="333" class="solid"/>
+ <tile id="334" class="solid"/>
+ <tile id="335" class="solid"/>
+ <tile id="336" class="solid"/>
+ <tile id="338" class="solid"/>
+ <tile id="339" class="solid"/>
+ <tile id="340" class="solid"/>
+ <tile id="341" class="solid"/>
+ <tile id="342" class="bridge"/>
+ <tile id="343" class="bridge"/>
+ <tile id="344" class="solid"/>
+ <tile id="345" class="talkable"/>
+ <tile id="348" class="solid"/>
+ <tile id="349" class="solid"/>
+ <tile id="350" class="solid"/>
+ <tile id="351" class="solid"/>
+ <tile id="352" class="solid"/>
+ <tile id="353" class="solid"/>
+ <tile id="354" class="solid"/>
+ <tile id="355" class="solid"/>
+ <tile id="356" class="solid"/>
+ <tile id="357" class="solid"/>
+ <tile id="358" class="solid"/>
+ <tile id="359" class="solid"/>
+ <tile id="360" class="solid"/>
+ <tile id="361" class="solid"/>
+ <tile id="362" class="solid"/>
+ <tile id="363" class="solid"/>
+ <tile id="364" class="solid"/>
+ <tile id="365" class="solid"/>
+ <tile id="377" class="solid"/>
+ <tile id="378" class="solid"/>
+ <tile id="379" class="solid"/>
+ <tile id="380" class="solid"/>
+ <tile id="381" class="solid"/>
+ <tile id="382" class="solid"/>
+ <tile id="383" class="solid"/>
+ <tile id="384" class="solid"/>
+ <tile id="385" class="solid"/>
+ <tile id="386" class="solid"/>
+ <tile id="387" class="solid"/>
+ <tile id="388" class="solid"/>
+ <tile id="389" class="solid"/>
+ <tile id="390" class="solid"/>
+ <tile id="391" class="solid"/>
+ <tile id="392" class="solid"/>
+ <tile id="393" class="solid"/>
+ <tile id="394" class="solid"/>
+ <tile id="412" class="solid"/>
+ <tile id="413" class="door_in"/>
+ <tile id="414" class="solid"/>
+ <tile id="415" class="solid"/>
+ <tile id="420" class="solid"/>
+ <tile id="421" class="solid"/>
+ <tile id="422" class="solid"/>
+ <tile id="423" class="solid"/>
+ <tile id="449" class="solid"/>
+ <tile id="450" class="door_in"/>
+ <tile id="451" class="solid"/>
+ <tile id="452" class="solid"/>
  <wangsets>
   <wangset name="Herbe" type="corner" tile="-1">
    <wangcolor name="Herbe" color="#ff0000" tile="0" probability="1"/>
diff --git a/assets-cg/tileset.png b/assets-cg/tileset.png
index 1990f6f..4f65e31 100644
Binary files a/assets-cg/tileset.png and b/assets-cg/tileset.png differ
diff --git a/include/player.h b/include/player.h
index d797b71..89b0a58 100644
--- a/include/player.h
+++ b/include/player.h
@@ -66,4 +66,5 @@ bool check_eventzone(struct Player *player, int id);
 int get_nb_eventdialog(struct Player *player);
 bool check_eventdialog(struct Player *player, int id);
 void player_step_back(struct Player *player);
-bool has_pp_left(struct Player *player);
\ No newline at end of file
+bool has_pp_left(struct Player *player);
+void reset_hp(struct Player *player);
\ No newline at end of file
diff --git a/src/engine.c b/src/engine.c
index b6018a6..3f0bbbe 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -42,8 +42,8 @@ void engine_draw_map(struct Game const *game) {
 	const int y_offset = (game->camera.offset.y - DHEIGHT/2);
 	const int tileset_size = game->map->tileset_size;
 
-	for (int y = 1 ; y <= DHEIGHT / TILE_SIZE-1; y++) {
-		for (int x = 1 ; x <= DWIDTH / TILE_SIZE; x++) {
+	for (int y = 0 ; y <= DHEIGHT / TILE_SIZE; y++) {
+		for (int x = 0 ; x <= DWIDTH / TILE_SIZE; x++) {
 			for (int layer = 0 ; layer < game->map->nb_layers; layer++) {
 				unsigned int tile_id = 0;
 				//detect if the map is oob
@@ -137,11 +137,11 @@ void engine_action(struct Game *game, int action) {
 		add_move(game->player, get_move_id(3));*/
 		open_inventory(game, &game->player->inventory, "Consultation", true);
 	}
-	if(action == ACTION_F2) {
-		//add_item_to_inventory(game, &game->player->inventory, get_item_id(1));
-		// srand(game->player->pos.x * game->player->pos.y);
-		drawTypeEffects(getTypeFromId(rand_range(1,5)));
-	}
+	// if(action == ACTION_F2) {
+	// 	//add_item_to_inventory(game, &game->player->inventory, get_item_id(1));
+	// 	// srand(game->player->pos.x * game->player->pos.y);
+	// 	drawTypeEffects(getTypeFromId(rand_range(1,5)));
+	// }
 	if(action == ACTION_OPTN) {
 		draw_stats(game->player->stats);
 		draw_player_moves(game->player);
diff --git a/src/event.c b/src/event.c
index 286c9f7..29dad1d 100644
--- a/src/event.c
+++ b/src/event.c
@@ -29,12 +29,16 @@ bool handle_event(struct Game *game, char const *event)
         return true;
     }
     else if(!strncmp(event, "xp:", 3)) {
-    	event += 3;
-    	add_xp(game->player, atoi(event));
-    	return true;
+        event += 3;
+        add_xp(game->player, atoi(event));
+        return true;
+    }
+    else if(!strcmp(event, "hp:all")) {
+        reset_hp(game->player);
+        return true;
     }
     else if(!strncmp(event, "hp:", 3)) {
-    	event += 3;
+        event += 3;
         if(game->player->stats.pv != game->player->stats.max_pv) {
             game->player->stats.pv += atoi(event);
             if(game->player->stats.pv > game->player->stats.max_pv) game->player->stats.pv = game->player->stats.max_pv;
@@ -47,22 +51,31 @@ bool handle_event(struct Game *game, char const *event)
         return true;
     }
     else if(!strncmp(event, "pp:", 3)) {
-    	event += 3;
-    	return add_pp(game->player, atoi(event));
+        event += 3;
+        return add_pp(game->player, atoi(event));
     }
     else if(!strncmp(event, "type:", 5)) {
-    	event += 5;
+        event += 5;
         int len=strlen(event);
         char name[20];
         strncpy(name,event,len);
         name[len] = '\0';
-    	change_type(game->player, getTypeFromName(name));
-    	return true;
+        change_type(game->player, getTypeFromName(name));
+        return true;
     }
     else if(!strncmp(event, "move:", 5)) {
-    	event += 5;
-    	add_move(game->player, get_move_id(atoi(event)));
-    	return true;
+        event += 5;
+        add_move(game->player, get_move_id(atoi(event)));
+        return true;
+    }
+    else if(!strncmp(event, "infotype:", 9)) {
+        event += 9;
+        int len=strlen(event);
+        char name[20];
+        strncpy(name,event,len);
+        name[len] = '\0';
+        drawTypeEffects(getTypeFromName(name));
+        return true;
     }
     else if(!strcmp(event, "zone:begin")) {
         draw_dialog_text(game, "Bienvenue dans ce projet de RPG grandeur nature !;Voici une courte preview de ce qui est possible.");
diff --git a/src/player.c b/src/player.c
index 2e93c3c..35d1752 100644
--- a/src/player.c
+++ b/src/player.c
@@ -217,6 +217,13 @@ void reset_pp(struct Player *player) {
 	wait_for_input(KEY_SHIFT);
 }
 
+void reset_hp(struct Player *player) {
+	player->stats.pv = player->stats.max_pv;
+	draw_text(50, DHEIGHT-47, C_BLACK, "Vous regagnez l'ensemble de vos PVs");
+	dupdate();
+	wait_for_input(KEY_SHIFT);
+}
+
 void add_xp(struct Player *player, int xp) {
 	player->stats.xp += xp;
 
diff --git a/src/type.c b/src/type.c
index 73b4364..f97d6f6 100644
--- a/src/type.c
+++ b/src/type.c
@@ -61,6 +61,7 @@ void drawTypeEffects(struct Type type) {
 			if(i==2) dprint(70+100*i, 60+20*j, C_BLACK, "%s", getTypeFromId(type.null[j]).name);
 		}
 	}
+	drect(0, DHEIGHT-20, DWIDTH, DHEIGHT, type.color);
 	dupdate();
-	wait_for_input(KEY_SHIFT);
+	wait_for_input(KEY_EXIT);
 }
\ No newline at end of file