Merge branch 'develop'

FantasyBrawl_Project/Game/buffmanager.xml

@@ -5,7 +5,9 @@
   <effect id="1" name="shield" type="BUFF" duration_type="TEMPORARY" method="ADD" att_to_change="HEALTH" bonus="10" duration_value="10"></effect>
 
   <effect id ="2" name="war_cry" type="BUFF" duration_type="TEMPORARY" method="ADD" att_to_change="STRENGTH" bonus="50" duration_value="10"></effect>
+
+  <effect id ="3" name="hurt" type="DEBUFF" duration_type="PERMANENT" method="ADD" att_to_change="HEALTH" bonus="20" duration_value="0"></effect>
 
-  <effect id ="3" name="storm" type="DEBUFF" duration_type="PERMANENT" method="ADD" att_to_change="HEALTH" bonus="0" duration_value ="0" />
+  <effect id ="4" name="storm" type="DEBUFF" duration_type="PERMANENT" method="ADD" att_to_change="HEALTH" bonus="0" duration_value ="0" />
 
 </buff_manager>

FantasyBrawl_Project/Game/config.xml

@@ -24,12 +24,58 @@
 
   <map>
     <folder>maps/</folder>
-    <colliders red="423" green="422" blue="421"/>
+    <colliders red="423" green="422" blue="424"/>
 
   </map>
 
+  <audio>
+    <music>
+      <folder>audio/music/</folder>
+      <song name="01_Intro.ogg"/>
+      <song name="02_Main_Menu_1.ogg"/>
+      <song name="03_Main_Menu_2.ogg"/>
+      <song name="04_Champion_Selection.ogg"/>
+      <song name="05_Gallery.ogg"/>
+      <song name="06_Options.ogg"/>
+      <song name="07_Loading_Screen_1.ogg"/>
+      <song name="08_Loading_Screen_2.ogg"/>
+      <song name="09_Loading_Screen_3.ogg"/>
+      <song name="10_Loading_Screen_4.ogg"/>
+      <song name="11_Map_1.ogg"/>
+      <song name="12_Map_2_1.ogg"/>
+      <song name="13_Map_2_2.ogg"/>
+      <song name="14_Map_3.ogg"/>
+      <song name="15_Map_4.ogg"/>
+      <song name="16_Leader_Board.ogg"/>
+    </music>
+    <fx>
+      <folder>audio/fx/</folder>
+      <sound cursor="01_Cursor.wav" confirm="02_Confirm.wav" cancel="03_Cancel.wav"
+             scroll="04_Scroll.wav" cursor2="05_Cursor_2.wav" confirmchamp="06_Confirm_Champion.wav"
+             cancelchamp="07_Cancel_Champion.wav" countdown="08_Countdown.wav"
+             brawlstart="09_Brawl_Start.wav" traktbasic="10_Trakt_Basic.wav"
+             traktspecial="11_Trakt_Special.wav" traktdeath="12_Trakt_Death.wav"
+             wendolinbasic="13_Wendolin_Basic.wav" wendolinspecial="14_Wendolin_Special.wav"
+             wendolindeath="15_Wendolin_Death.wav" simonbasic="16_Simon_Basic.wav"
+             simonspecial="17_Simon_Special.wav" simondeath="18_Simon_Death.wav"
+             meliadoulbasic="19_Meliadoul_Basic.wav" meliadoulspecial="20_Meliadoul_Special.wav"
+             meliadouldeath="21_Meliadoul_Death.wav" specialavailable="22_Special_Available.wav"
+             hit1="23_Hit_1.wav" hit2="24_Hit_2.wav" hit3="25_Hit_3.wav"
+             shieldhit1="26_Shield_Hit_1.wav" shieldhit2="27_Shield_Hit_2.wav"
+             powerup1="28_Power_Up_Appearing_1.wav" powerup2="29_Power_Up_Appearing_2.wav"
+             powerup3="30_Power_Up_Appearing_3.wav" poweruppick="31_Power_Up_Pick.wav"
+             powerupactivation="32_Power_Up_Activation.wav" stormcount="33_Storm_Close_count.wav"
+             stormclose="34_Storm_Close.wav" pause="35_Pause.wav" roundend="36_Round_End.wav"
+             matchend="37_Match_End.wav"/>
+    </fx>
+  </audio>
+
   <scene>
     <map_name path="Map2x_automap.tmx"/>
+    <initialposP1 x="200" y="150"/>
+    <initialposP2 x="3300" y="200"/>
+    <initialposP3 x="250" y="3450"/>
+    <initialposP4 x="3400" y="3350"/>
   </scene>
 
   <gui>
@@ -48,6 +94,7 @@
       <texture3>textures/Wendolin Red Sprite 3x.png</texture3>
       <texture4>textures/Wendolin Red Sprite 3x.png</texture4>
       <collider x="0" y="0" width="70" height="30"/>
+      <shield>textures/Shield_Red_2x.png</shield>
 
       <AnimationRangeRight range_start="-22.5f" range_end="22.5f" />
       <AnimationRangeLeft range_start="157.5f" range_end="180.0f" />