real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Support for grunts and cries of pain when units attack.

Browse Source 
This was SVN commit r1370.
This commit is contained in:
Acumen 2004-11-21 01:19:32 +00:00
parent dfec360d84
commit b99699cacc
4 changed files with 189 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
binaries/data/mods/official/entities/template_entity.xml
View File

@ -19,6 +19,9 @@
</Traits>
<Event On="Attack">
<![CDATA[
curr_hit = getGUIGlobal().newRandomSound("voice", "hit", this.traits.audio.path);
curr_hit.play();
// Attack logic.
dmg = new DamageType();
dmg.crush = this.actions.attack.damage * this.actions.attack.crush;
@ -31,6 +34,9 @@
<Event On="TakesDamage">
<![CDATA[
curr_pain = getGUIGlobal().newRandomSound("voice", "pain", this.traits.audio.path);
curr_pain.play();
// Apply armour and work out how much damage we actually take
crushDamage = evt.damage.crush - this.traits.armour.value * this.traits.armour.crush;
if( crushDamage < 0 ) crushDamage = 0;

3
binaries/data/mods/official/entities/units/template_unit.xml
View File

@ -14,6 +14,9 @@
type.unit.material="true"
type.unit.attack="true"
/>
<Audio
path="audio/voice/hellenes/soldier"
/>
<Health
curr="150"
hitpoints="150"

18
binaries/data/mods/official/gui/test/2_mainmenu.xml
View File

@ -13,15 +13,15 @@
<object type="empty" name="pregame_gui" size="0 0 100% 100%" z="1" hidden="false">
<action on="Load"><![CDATA[
// Play main 0 A.D. theme when the main menu starts.
curr_music = newRandomSound("music", "theme");
curr_music.loop();
curr_music.free(); // Close main theme when starting game session.
curr_session_playlist_1 = newRandomSound("music", "peace");
curr_session_playlist_1.play();
curr_session_playlist_1.free();
curr_session_playlist_2 = newRandomSound("music", "peace");
curr_session_playlist_2.play();
curr_session_playlist_2.free();
curr_music = newRandomSound("music", "theme");
curr_music.loop();
curr_music.free(); // Close main theme when starting game session.
curr_session_playlist_1 = newRandomSound("music", "peace");
curr_session_playlist_1.play();
curr_session_playlist_1.free();
curr_session_playlist_2 = newRandomSound("music", "peace");
curr_session_playlist_2.play();
curr_session_playlist_2.free();
]]></action>
<object type="image" name="pregame-mainmenu-background-image" sprite="pregame-mainmenu-background" size="0 0 100% 100%" z="100" hidden="false" />

172
binaries/data/mods/official/gui/test/functions_utility_music.js
View File

@ -13,7 +13,7 @@
// Close "s" and free it from memory (use in conjunction with loop()):
// s.free();
function newRandomSound(soundType, soundSubType)
function newRandomSound(soundType, soundSubType, soundPrePath)
{
switch (soundType)
{
@ -49,6 +49,176 @@ function newRandomSound(soundType, soundSubType)
break;
}
break;
case "voice":
randomSoundPath = soundPrePath + "/";
switch (soundSubType)
{
case "attack": // Unit given an attack order
// Get a random number within the sound's range.
// (Later we'll need to change this to an array selection of filenames.)
randomSound = getRandom(1, 6);
switch (randomSound)
{
case 1:
randomFileName = "Attack-Attackx.ogg"
break;
case 2:
randomFileName = "Attack-Chargex.ogg"
break;
case 3:
randomFileName = "Attack-Engagex.ogg"
break;
case 4:
randomFileName = "Attack-ForMyFamily.ogg"
break;
case 5:
randomFileName = "Attack-Warcry.ogg"
break;
case 6:
randomFileName = "Attack-ZeusSaviourandVictory.ogg"
break;
}
break;
case "command": // Unit given a generic order
// Get a random number within the sound's range.
// (Later we'll need to change this to an array selection of filenames.)
randomSound = getRandom(1, 8);
switch (randomSound)
{
case 1:
randomFileName = "Command-AsYouWish.ogg"
break;
case 2:
randomFileName = "Command-ByYourCommand.ogg"
break;
case 3:
randomFileName = "Command-ImComing.ogg"
break;
case 4:
randomFileName = "Command-IObey.ogg"
break;
case 5:
randomFileName = "Command-MyLiege.ogg"
break;
case 6:
randomFileName = "Command-OnMyWay.ogg"
break;
case 7:
randomFileName = "Command-WithMyHonour.ogg"
break;
case 8:
randomFileName = "Command-YesMyLord.ogg"
break;
}
break;
case "select": // Unit clicked by player
// Get a random number within the sound's range.
// (Later we'll need to change this to an array selection of filenames.)
randomSound = getRandom(1, 10);
switch (randomSound)
{
case 1:
randomFileName = "Select-AtYourService.ogg"
break;
case 2:
randomFileName = "Select-HowMayIServeYouq.ogg"
break;
case 3:
randomFileName = "Select-MyLiegeq.ogg"
break;
case 4:
randomFileName = "Select-MyLordq.ogg"
break;
case 5:
randomFileName = "Select-OrdersSireq.ogg"
break;
case 6:
randomFileName = "Select-Ready.ogg"
break;
case 7:
randomFileName = "Select-ReadySire.ogg"
break;
case 8:
randomFileName = "Select-Yesq.ogg"
break;
case 9:
randomFileName = "Select-YourOrdersq.ogg"
break;
case 10:
randomFileName = "Select-YourWishq.ogg"
break;
}
break;
case "hit": // Unit attacks with a grunt
// Get a random number within the sound's range.
// (Later we'll need to change this to an array selection of filenames.)
randomSound = getRandom(1, 6);
switch (randomSound)
{
case 1:
randomFileName = "Hit1.ogg"
break;
case 2:
randomFileName = "Hit2.ogg"
break;
case 3:
randomFileName = "Hit3.ogg"
break;
case 4:
randomFileName = "Hit4.ogg"
break;
case 5:
randomFileName = "Hit5.ogg"
break;
case 6:
randomFileName = "Hit6.ogg"
break;
}
break;
case "pain": // Unit is hurt, possibly death blow
// Get a random number within the sound's range.
// (Later we'll need to change this to an array selection of filenames.)
randomSound = getRandom(1, 9);
switch (randomSound)
{
case 1:
randomFileName = "Pain1.ogg"
break;
case 2:
randomFileName = "Pain2.ogg"
break;
case 3:
randomFileName = "Pain3.ogg"
break;
case 4:
randomFileName = "Pain4.ogg"
break;
case 5:
randomFileName = "Pain5.ogg"
break;
case 6:
randomFileName = "Pain6.ogg"
break;
case 7:
randomFileName = "Pain7.ogg"
break;
case 8:
randomFileName = "Pain8.ogg"
break;
case 9:
randomFileName = "Pain9.ogg"
break;
}
break;
default:
break;
}
break;
default:
break;
}