Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria'

ajout de pnj dans les primitives et correction des missions See merge request !39
2017-07-06 23:57:14 +02:00 · 2017-07-06 23:57:14 +02:00 · b4ddcf96b3
commit b4ddcf96b3
parent 8db7ba5840 d2ffe85ba7
73 changed files with 886 additions and 321 deletions
--- a/leveldesign/game_elem/creature/npc/bestiary/creature/newbieland/disp_smemui.creature
+++ b/leveldesign/game_elem/creature/npc/bestiary/creature/newbieland/disp_smemui.creature
@ -9,7 +9,7 @@
          <ATOM Name="Color" Value="0"/>
        </STRUCT>
        <STRUCT Name="Face">
-          <ATOM Name="Item" Value="fy_visage.item"/>
+          <ATOM Name="Item" Value="ma_visage.item"/>
          <ATOM Name="Texture" Value="Jungle/High Quality/Old"/>
          <ATOM Name="Color" Value="Beige"/>
        </STRUCT>
--- a/leveldesign/game_elem/creature/npc/bestiary/creature/newbieland/disp_taejmetri.creature
+++ b/leveldesign/game_elem/creature/npc/bestiary/creature/newbieland/disp_taejmetri.creature
--- a/primitives/newbieland/urban_newbieland.primitive
+++ b/primitives/newbieland/urban_newbieland.primitive
--- a/translation/history/bodypart_words_wk_595EADA0.txt
+++ b/translation/history/bodypart_words_wk_595EADA0.txt
--- a/translation/history/bodypart_words_wk_595EADD3.txt
+++ b/translation/history/bodypart_words_wk_595EADD3.txt
--- a/translation/history/bodypart_words_wk_595EADFD.txt
+++ b/translation/history/bodypart_words_wk_595EADFD.txt
--- a/translation/history/bot_names_595EAE18.txt
+++ b/translation/history/bot_names_595EAE18.txt
--- a/translation/history/bot_names_diff_595EADE5.txt
+++ b/translation/history/bot_names_diff_595EADE5.txt
--- a/translation/history/career_words_wk_595EADA0.txt
+++ b/translation/history/career_words_wk_595EADA0.txt
--- a/translation/history/career_words_wk_595EADD3.txt
+++ b/translation/history/career_words_wk_595EADD3.txt
--- a/translation/history/career_words_wk_595EADFD.txt
+++ b/translation/history/career_words_wk_595EADFD.txt
--- a/translation/history/characteristic_words_wk_595EADA0.txt
+++ b/translation/history/characteristic_words_wk_595EADA0.txt
--- a/translation/history/characteristic_words_wk_595EADD3.txt
+++ b/translation/history/characteristic_words_wk_595EADD3.txt
--- a/translation/history/characteristic_words_wk_595EADFD.txt
+++ b/translation/history/characteristic_words_wk_595EADFD.txt
--- a/translation/history/classificationtype_words_wk_595EADA0.txt
+++ b/translation/history/classificationtype_words_wk_595EADA0.txt
--- a/translation/history/classificationtype_words_wk_595EADD3.txt
+++ b/translation/history/classificationtype_words_wk_595EADD3.txt
--- a/translation/history/classificationtype_words_wk_595EADFD.txt
+++ b/translation/history/classificationtype_words_wk_595EADFD.txt
--- a/translation/history/creature_words_wk_595EADA0.txt
+++ b/translation/history/creature_words_wk_595EADA0.txt
--- a/translation/history/creature_words_wk_595EADD3.txt
+++ b/translation/history/creature_words_wk_595EADD3.txt
--- a/translation/history/creature_words_wk_595EADFD.txt
+++ b/translation/history/creature_words_wk_595EADFD.txt
--- a/translation/history/damagetype_words_wk_595EADA0.txt
+++ b/translation/history/damagetype_words_wk_595EADA0.txt
--- a/translation/history/damagetype_words_wk_595EADD3.txt
+++ b/translation/history/damagetype_words_wk_595EADD3.txt
--- a/translation/history/damagetype_words_wk_595EADFD.txt
+++ b/translation/history/damagetype_words_wk_595EADFD.txt
--- a/translation/history/ecosystem_words_wk_595EADA0.txt
+++ b/translation/history/ecosystem_words_wk_595EADA0.txt
--- a/translation/history/ecosystem_words_wk_595EADD3.txt
+++ b/translation/history/ecosystem_words_wk_595EADD3.txt
--- a/translation/history/ecosystem_words_wk_595EADFD.txt
+++ b/translation/history/ecosystem_words_wk_595EADFD.txt
--- a/translation/history/faction_words_wk_595EADA0.txt
+++ b/translation/history/faction_words_wk_595EADA0.txt
--- a/translation/history/faction_words_wk_595EADD3.txt
+++ b/translation/history/faction_words_wk_595EADD3.txt
--- a/translation/history/faction_words_wk_595EADFD.txt
+++ b/translation/history/faction_words_wk_595EADFD.txt
--- a/translation/history/item_words_wk_595EADA0.txt
+++ b/translation/history/item_words_wk_595EADA0.txt
--- a/translation/history/item_words_wk_595EADD3.txt
+++ b/translation/history/item_words_wk_595EADD3.txt
--- a/translation/history/item_words_wk_595EADFD.txt
+++ b/translation/history/item_words_wk_595EADFD.txt
--- a/translation/history/job_words_wk_595EADA0.txt
+++ b/translation/history/job_words_wk_595EADA0.txt
--- a/translation/history/job_words_wk_595EADD3.txt
+++ b/translation/history/job_words_wk_595EADD3.txt
--- a/translation/history/job_words_wk_595EADFD.txt
+++ b/translation/history/job_words_wk_595EADFD.txt
--- a/translation/history/outpost_words_wk_595EADA0.txt
+++ b/translation/history/outpost_words_wk_595EADA0.txt
--- a/translation/history/outpost_words_wk_595EADD3.txt
+++ b/translation/history/outpost_words_wk_595EADD3.txt
--- a/translation/history/outpost_words_wk_595EADFD.txt
+++ b/translation/history/outpost_words_wk_595EADFD.txt
--- a/translation/history/place_words_wk_595EADA0.txt
+++ b/translation/history/place_words_wk_595EADA0.txt
--- a/translation/history/place_words_wk_595EADD3.txt
+++ b/translation/history/place_words_wk_595EADD3.txt
--- a/translation/history/place_words_wk_595EADFD.txt
+++ b/translation/history/place_words_wk_595EADFD.txt
--- a/translation/history/powertype_words_wk_595EADA0.txt
+++ b/translation/history/powertype_words_wk_595EADA0.txt
--- a/translation/history/powertype_words_wk_595EADD3.txt
+++ b/translation/history/powertype_words_wk_595EADD3.txt
--- a/translation/history/powertype_words_wk_595EADFD.txt
+++ b/translation/history/powertype_words_wk_595EADFD.txt
--- a/translation/history/race_words_wk_595EADA0.txt
+++ b/translation/history/race_words_wk_595EADA0.txt
--- a/translation/history/race_words_wk_595EADD3.txt
+++ b/translation/history/race_words_wk_595EADD3.txt
--- a/translation/history/race_words_wk_595EADFD.txt
+++ b/translation/history/race_words_wk_595EADFD.txt
--- a/translation/history/sbrick_words_wk_595EADA0.txt
+++ b/translation/history/sbrick_words_wk_595EADA0.txt
--- a/translation/history/sbrick_words_wk_595EADD3.txt
+++ b/translation/history/sbrick_words_wk_595EADD3.txt
--- a/translation/history/sbrick_words_wk_595EADFD.txt
+++ b/translation/history/sbrick_words_wk_595EADFD.txt
--- a/translation/history/score_words_wk_595EADA0.txt
+++ b/translation/history/score_words_wk_595EADA0.txt
--- a/translation/history/score_words_wk_595EADD3.txt
+++ b/translation/history/score_words_wk_595EADD3.txt
--- a/translation/history/score_words_wk_595EADFD.txt
+++ b/translation/history/score_words_wk_595EADFD.txt
--- a/translation/history/skill_words_wk_595EADA0.txt
+++ b/translation/history/skill_words_wk_595EADA0.txt
--- a/translation/history/skill_words_wk_595EADD3.txt
+++ b/translation/history/skill_words_wk_595EADD3.txt
--- a/translation/history/skill_words_wk_595EADFD.txt
+++ b/translation/history/skill_words_wk_595EADFD.txt
--- a/translation/history/sphrase_words_wk_595EADA0.txt
+++ b/translation/history/sphrase_words_wk_595EADA0.txt
--- a/translation/history/sphrase_words_wk_595EADD3.txt
+++ b/translation/history/sphrase_words_wk_595EADD3.txt
--- a/translation/history/sphrase_words_wk_595EADFD.txt
+++ b/translation/history/sphrase_words_wk_595EADFD.txt
--- a/translation/history/title_words_en_595EADD3.txt
+++ b/translation/history/title_words_en_595EADD3.txt
--- a/translation/history/title_words_en_diff_595EADA2.txt
+++ b/translation/history/title_words_en_diff_595EADA2.txt
--- a/translation/history/title_words_fr_595EADD3.txt
+++ b/translation/history/title_words_fr_595EADD3.txt
--- a/translation/history/title_words_fr_diff_595EADA2.txt
+++ b/translation/history/title_words_fr_diff_595EADA2.txt
--- a/translation/history/title_words_wk_595EADA0.txt
+++ b/translation/history/title_words_wk_595EADA0.txt
--- a/translation/history/title_words_wk_595EADD3.txt
+++ b/translation/history/title_words_wk_595EADD3.txt
--- a/translation/history/title_words_wk_595EADFD.txt
+++ b/translation/history/title_words_wk_595EADFD.txt
--- a/translation/history/title_words_wk_diff_595EAD82.txt
+++ b/translation/history/title_words_wk_diff_595EAD82.txt
--- a/translation/translated/bot_names.txt
+++ b/translation/translated/bot_names.txt
--- a/translation/translated/title_words_en.txt
+++ b/translation/translated/title_words_en.txt
--- a/translation/translated/title_words_fr.txt
+++ b/translation/translated/title_words_fr.txt
--- a/translation/translated/title_words_wk.txt
+++ b/translation/translated/title_words_wk.txt
--- a/translation/work/bot_names.txt
+++ b/translation/work/bot_names.txt
--- a/translation/work/title_words_wk.txt
+++ b/translation/work/title_words_wk.txt