Add the emotion of jink and AOE.

Add EightDiagram's Audio.
heroxbd · Oct 13, 2011 · f5f767b · f5f767b
1 parent 083b72c
commit f5f767b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/audio/system/eight_diagram.ogg b/audio/system/eight_diagram.ogg
diff --git a/image/system/animation/jink.png → image/system/emotion/jink.png b/image/system/animation/jink.png → image/system/emotion/jink.png
diff --git a/src/package/standard-cards.cpp b/src/package/standard-cards.cpp
@@ -464,6 +464,7 @@ class EightDiagramSkill: public ArmorSkill{
                     jink->setSkillName(objectName());
                     room->provide(jink);
                     room->setEmotion(player, "good");
+                    room->broadcastInvoke("playAudio", objectName());
 
                     return true;
                 }else
@@ -554,7 +555,9 @@ SavageAssault::SavageAssault(Suit suit, int number)
 void SavageAssault::onEffect(const CardEffectStruct &effect) const{
     Room *room = effect.to->getRoom();
     const Card *slash = room->askForCard(effect.to, "slash", "savage-assault-slash:" + effect.from->objectName());
-    if(slash == NULL){
+    if(slash)
+        room->setEmotion(effect.to, "killer");
+    else{
         DamageStruct damage;
         damage.card = this;
         damage.damage = 1;
@@ -575,7 +578,9 @@ ArcheryAttack::ArcheryAttack(Card::Suit suit, int number)
 void ArcheryAttack::onEffect(const CardEffectStruct &effect) const{
     Room *room = effect.to->getRoom();
     const Card *jink = room->askForCard(effect.to, "jink", "archery-attack-jink:" + effect.from->objectName());
-    if(jink == NULL){
+    if(jink)
+        room->setEmotion(effect.to, "jink");
+    else{
         DamageStruct damage;
         damage.card = this;
         damage.damage = 1;

diff --git a/src/server/room.cpp b/src/server/room.cpp
@@ -359,8 +359,10 @@ void Room::slashResult(const SlashEffectStruct &effect, const Card *jink){
 
     if(jink == NULL)
         thread->trigger(SlashHit, effect.from, data);
-    else
+    else{
+        setEmotion(effect.to, "jink");
         thread->trigger(SlashMissed, effect.from, data);
+    }
 }
 
 void Room::attachSkillToPlayer(ServerPlayer *player, const QString &skill_name){