Compare commits

...
Sign in to create a new pull request.

6 commits

Author SHA1 Message Date
Jesusalva Jesusalva
69619b431b Deleted witch mas 2022-10-15 01:14:03 +00:00
Jesusalva Jesusalva
88adf8212a Merge branch 'master' into 'github/fork/Ledmitz/punch_sfx'
# Conflicts:
#   items/racesprite/item-106_Undead.xml
2022-10-15 01:12:58 +00:00
Jesusalva Jesusalva
f48f96839c Update witch mas ─ wtf is this file 2022-10-15 01:11:34 +00:00
Ledmitz
e4d7102a6e Removed gender from sound tag to avoid build errors from travis.ci, though gender should be allowed since players have a sex. 2020-09-28 04:59:59 +00:00
Ledmitz
5e3d75c391 Fixed comment error in troll XML. 2020-09-28 04:51:08 +00:00
Ledmitz
06775b3050 Altered racesprite punch sounds and altered paths.xml accordingly. 2020-09-28 04:42:23 +00:00
7 changed files with 26 additions and 2 deletions

View file

@ -10,9 +10,13 @@
<sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite gender="male">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite gender="other">model/neutral.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sound event="hit">punch.ogg</sound>
<sound event="strike">weapons/miss1.ogg</sound>
</item>
<item id="-99100" type="racesprite" name="Placeholder">
<sprite gender="unisex">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sound event="hit">weapons/punch.ogg</sound>
<sound event="strike">weapons/miss1.ogg</sound>
</item>
</items>

View file

@ -10,9 +10,13 @@
<sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite gender="male">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite gender="other">model/neutral.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sound event="hit">punch.ogg</sound>
<sound event="strike">weapons/miss1.ogg</sound>
</item>
<item id="-99101" type="racesprite" name="Talpan">
<sprite gender="unisex">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sound event="hit">weapons/punch.ogg</sound>
<sound event="strike">weapons/miss1.ogg</sound>
</item>
</items>

View file

@ -10,9 +10,13 @@
<sprite gender="female">model/female.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
<sprite gender="male">model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
<sprite gender="other">model/neutral.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
<sound event="hit">punch.ogg</sound>
<sound event="strike">weapons/miss1.ogg</sound>
</item>
<item id="-99102" type="racesprite" name="Tritan">
<sprite gender="unisex">model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
<sprite gender="female">model/female.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
<sound event="hit">weapons/punch.ogg</sound>
<sound event="strike">weapons/miss1.ogg</sound>
</item>
</items>

View file

@ -10,9 +10,13 @@
<sprite gender="female">model/female.xml|#5d3841,ba5f48,e48b6d,edb6a2;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite gender="male">model/male.xml|#5d3841,ba5f48,e48b6d,edb6a2;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite gender="other">model/neutral.xml|#5d3841,ba5f48,e48b6d,edb6a2;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sound event="hit">punch.ogg</sound>
<sound event="strike">weapons/miss1.ogg</sound>
</item>
<item id="-99103" type="racesprite" name="Ifriton">
<sprite gender="unisex">model/male.xml|#5d3841,ba5f48,e48b6d,edb6a2;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite gender="female">model/female.xml|#5d3841,ba5f48,e48b6d,edb6a2;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sound event="hit">weapons/punch.ogg</sound>
<sound event="strike">weapons/miss1.ogg</sound>
</item>
</items>

View file

@ -10,9 +10,13 @@
<sprite gender="female">model/female.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite gender="male">model/male.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite gender="other">model/neutral.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sound event="hit">punch.ogg</sound>
<sound event="strike">weapons/miss1.ogg</sound>
</item>
<item id="-99104" type="racesprite" name="Gispaan">
<sprite gender="unisex">model/male.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite gender="female">model/female.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sound event="hit">weapons/punch.ogg</sound>
<sound event="strike">weapons/miss1.ogg</sound>
</item>
</items>

View file

@ -10,9 +10,13 @@
<sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite gender="male">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite gender="other">model/neutral.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sound event="hit">punch.ogg</sound>
<sound event="strike">weapons/miss1.ogg</sound>
</item>
<item id="-99105" type="racesprite" name="Sparron">
<sprite gender="unisex">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sound event="hit">weapons/punch.ogg</sound>
<sound event="strike">weapons/miss1.ogg</sound>
</item>
</items>

View file

@ -44,8 +44,8 @@ Also, don't forget to add the '/' path separator at the end of folder values.
<option name="sfx" value="sfx/"/>
<!-- option name="newQuestSfx" value="system/levelup.ogg"/ -->
<!-- option name="completeQuestSfx" value="system/levelup.ogg"/ -->
<option name="attackSfxFile" value="weapons/knives/knife-hit1.ogg"/>
<option name="missSfxFile" value="fist-swish.ogg"/>
<!-- option name="attackSfxFile" value=""/ -->
<!-- option name="missSfxFile" value=""/ -->
<option name="music" value="music/"/>
<option name="wallpapers" value="graphics/images/"/>
<option name="wallpaperFile" value="login_wallpaper.png"/>