Menu
▾
▴
[crawl-ref-commits] SF.net SVN: crawl-ref: [1172] trunk/crawl-ref
|
From: <dsh...@us...> - 2007-04-01 18:48:28
|
Revision: 1172
http://svn.sourceforge.net/crawl-ref/?rev=1172&view=rev
Author: dshaligram
Date: 2007-04-01 11:48:12 -0700 (Sun, 01 Apr 2007)
Log Message:
-----------
Dialogue for Murray contributed by Jordan Lewis.
Modified Paths:
--------------
trunk/crawl-ref/CREDITS
trunk/crawl-ref/source/insult.cc
trunk/crawl-ref/source/insult.h
trunk/crawl-ref/source/mon-data.h
trunk/crawl-ref/source/monspeak.cc
trunk/crawl-ref/source/monspeak.h
trunk/crawl-ref/source/monstuff.cc
trunk/crawl-ref/source/monstuff.h
Modified: trunk/crawl-ref/CREDITS
===================================================================
--- trunk/crawl-ref/CREDITS 2007-04-01 17:22:27 UTC (rev 1171)
+++ trunk/crawl-ref/CREDITS 2007-04-01 18:48:12 UTC (rev 1172)
@@ -34,6 +34,7 @@
Jarmo Kielosto
Ryan Kusnery
Jukka Kuusisto
+Jordan Lewis
Icy Lich
Arien Malec
Shawn M Moore
Modified: trunk/crawl-ref/source/insult.cc
===================================================================
--- trunk/crawl-ref/source/insult.cc 2007-04-01 17:22:27 UTC (rev 1171)
+++ trunk/crawl-ref/source/insult.cc 2007-04-01 18:48:12 UTC (rev 1172)
@@ -38,7 +38,7 @@
str[0] = toupper( str[0] );
}
-void imp_taunt( struct monsters *mons )
+void imp_taunt( const monsters *mons )
{
char buff[80];
const char *mon_name = ptr_monam( mons, DESC_CAP_THE );
@@ -65,7 +65,7 @@
}
}
-void demon_taunt( struct monsters *mons )
+void demon_taunt( const monsters *mons )
{
static const char * sound_list[] =
{
Modified: trunk/crawl-ref/source/insult.h
===================================================================
--- trunk/crawl-ref/source/insult.h 2007-04-01 17:22:27 UTC (rev 1171)
+++ trunk/crawl-ref/source/insult.h 2007-04-01 18:48:12 UTC (rev 1172)
@@ -3,8 +3,8 @@
#include "externs.h"
-void imp_taunt( struct monsters *mons );
-void demon_taunt( struct monsters *mons );
+void imp_taunt( const monsters *mons );
+void demon_taunt( const monsters *mons );
const char * generic_insult(void);
const char * racial_insult(void);
Modified: trunk/crawl-ref/source/mon-data.h
===================================================================
--- trunk/crawl-ref/source/mon-data.h 2007-04-01 17:22:27 UTC (rev 1171)
+++ trunk/crawl-ref/source/mon-data.h 2007-04-01 18:48:12 UTC (rev 1172)
@@ -4393,7 +4393,7 @@
{
MONS_MURRAY, 'z', LIGHTRED, "Murray",
- M_SPELLCASTER | M_SEE_INVIS | M_EVIL | M_UNIQUE,
+ M_SPELLCASTER | M_SEE_INVIS | M_EVIL | M_SPEAKS | M_UNIQUE,
MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD,
0, 50, MONS_LICH, MONS_CURSE_SKULL, MH_UNDEAD, MAG_IMMUNE,
{ {AT_BITE, AF_PLAIN, 20}, {AT_BITE, AF_PLAIN, 20}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },
Modified: trunk/crawl-ref/source/monspeak.cc
===================================================================
--- trunk/crawl-ref/source/monspeak.cc 2007-04-01 17:22:27 UTC (rev 1171)
+++ trunk/crawl-ref/source/monspeak.cc 2007-04-01 18:48:12 UTC (rev 1172)
@@ -38,11 +38,117 @@
#include "stuff.h"
#include "view.h"
+struct mon_dialogue
+{
+ monster_type speaker;
+ const char **silenced;
+ const char **confused;
+ const char **confused_friend;
+ const char **fleeing;
+ const char **fleeing_friend;
+ const char **friendly;
+ const char **hostile; // Most common.
+};
+
+static const char *murray_silenced[] =
+{
+ "%s rolls in a circle.",
+ "%s rolls around.",
+ "%s spins like a top.",
+ "%s grins evilly.",
+ "%s seems to say something.",
+ "%s says something you can't hear. It was probably not a compliment.",
+ NULL
+};
+
+static const char *murray_hostile[] =
+{
+ "%s rolls in a circle.",
+ "%s rolls around.",
+ "%s spins like a top.",
+ "%s grins evilly.",
+ "%s laughs evilly.",
+ "%s cackles, \"I will rule the world!\"",
+ "%s shouts, \"Give me your head, so I can impale it on a pike!\"",
+ "%s's teeth chatter loudly.",
+ "%s yells, \"I'm a mighty demonic power!\"",
+ "%s asks, \"How could you choose the Orb over me, your best friend?\"",
+ "%s shouts, \"Let the forces of evil and voodoo overcome you!\"",
+ "%s screams, \"If I had legs, you would be dead twenty times over!\"",
+ "%s yells, \"My visage is famous all over the dungeon!\"",
+ "%s says, \"You're the second biggest fool I've ever met!\"",
+ NULL
+};
+
+static mon_dialogue vox_populi[] =
+{
+ { MONS_MURRAY, murray_silenced, NULL, NULL, NULL, NULL, NULL,
+ murray_hostile },
+};
+
+static const mon_dialogue *find_dialogue(const monsters *monster)
+{
+ for (unsigned i = 0; i < sizeof(vox_populi) / sizeof(*vox_populi); ++i)
+ if (vox_populi[i].speaker == monster->type)
+ return (&vox_populi[i]);
+ return (NULL);
+}
+
+static bool say_dialogue(const monsters *monster,
+ const char **dialogue)
+{
+ if (!dialogue)
+ return (false);
+
+ int nitems = 0;
+ for (const char **run = dialogue; *run; ++run, ++nitems)
+ ;
+
+ const char *chosen = nitems? dialogue[random2(nitems)] : NULL;
+
+ if (chosen && *chosen)
+ {
+ mprf(MSGCH_TALK, chosen, monster->name(DESC_CAP_THE).c_str());
+ return (true);
+ }
+
+ return (false);
+}
+
+static bool say_specific_dialogue(const monsters *monster,
+ const mon_dialogue *dialogue)
+{
+ if (silenced(monster->x, monster->y))
+ return (say_dialogue(monster, dialogue->silenced));
+
+ if (monster->has_ench(ENCH_CHARM))
+ return (false);
+
+ const bool friendly = (monster->attitude == ATT_FRIENDLY);
+
+ if (mons_is_confused(monster))
+ return (say_dialogue(
+ monster,
+ friendly? dialogue->confused_friend
+ : dialogue->confused));
+
+ if (monster->behaviour == BEH_FLEE)
+ return (say_dialogue(
+ monster,
+ friendly? dialogue->fleeing_friend
+ : dialogue->fleeing));
+
+ if (monster->attitude == ATT_FRIENDLY)
+ return (say_dialogue(monster, dialogue->friendly));
+
+ return (say_dialogue(monster, dialogue->hostile));
+}
+
// returns true if something is said
-bool mons_speaks(struct monsters *monster)
+bool mons_speaks(const monsters *monster)
{
int temp_rand; // probability determination
-
+
// This function is a little bit of a problem for the message channels
// since some of the messages it generates are "fake" warning to
// scare the player. In order to accomidate this intent, we're
@@ -57,6 +163,10 @@
return false;
// invisible monster tries to remain unnoticed
+ const mon_dialogue *dialogue = find_dialogue(monster);
+ if (dialogue)
+ return (say_specific_dialogue(monster, dialogue));
+
//mv: if it's also invisible, program never gets here
if (silenced(monster->x, monster->y))
{
@@ -82,7 +192,7 @@
(temp_rand == 4) ? " looks around." :
(temp_rand == 5) ? " appears indecisive." :
(temp_rand == 6) ? " ponders the situation."
- : " seems to says something.");
+ : " seems to say something.");
}
// disregard charmed critters.. they're not too expressive
else if (monster->attitude == ATT_FRIENDLY)
@@ -191,7 +301,7 @@
switch (random2(23)) // speaks for unfriendly confused monsters
{
case 0:
- strcat(info, " yells, \"Get them off of me!\"");
+ strcat(info, " yells, \"Get them off me!\"");
break;
case 1:
strcat(info, " screams, \"I will kill you anyway!\"");
Modified: trunk/crawl-ref/source/monspeak.h
===================================================================
--- trunk/crawl-ref/source/monspeak.h 2007-04-01 17:22:27 UTC (rev 1171)
+++ trunk/crawl-ref/source/monspeak.h 2007-04-01 18:48:12 UTC (rev 1172)
@@ -3,6 +3,6 @@
#include "externs.h"
-bool mons_speaks(struct monsters *monster);
+bool mons_speaks(const monsters *monster);
#endif
Modified: trunk/crawl-ref/source/monstuff.cc
===================================================================
--- trunk/crawl-ref/source/monstuff.cc 2007-04-01 17:22:27 UTC (rev 1171)
+++ trunk/crawl-ref/source/monstuff.cc 2007-04-01 18:48:12 UTC (rev 1172)
@@ -1834,7 +1834,7 @@
// distant or invisible to the player ... look elsewhere for a function
// permitting output of "It" messages for the invisible {dlb}
// Intentionally avoids info and str_pass now. -- bwr
-bool simple_monster_message(struct monsters *monster, const char *event,
+bool simple_monster_message(const monsters *monster, const char *event,
int channel, int param)
{
char buff[INFO_SIZE];
Modified: trunk/crawl-ref/source/monstuff.h
===================================================================
--- trunk/crawl-ref/source/monstuff.h 2007-04-01 17:22:27 UTC (rev 1171)
+++ trunk/crawl-ref/source/monstuff.h 2007-04-01 18:48:12 UTC (rev 1172)
@@ -87,7 +87,7 @@
* called from: beam - effects - fight - monstuff - mstuff2 - spells1 -
* spells2 - spells4
* *********************************************************************** */
-bool simple_monster_message(struct monsters *monster, const char *event,
+bool simple_monster_message(const monsters *monster, const char *event,
int channel = MSGCH_PLAIN, int param = 0);
std::string str_simple_monster_message(monsters *mons, const char *event);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
