Merge pull request #65 from liam-middlebrook/event-death

Update EVENT_TYPE_DEAD broadcast spec

Author: liam-middlebrook

libnethack/src/topten.c

@@ -507,7 +507,7 @@ toptenlist_insert(struct toptenentry *ttlist, struct toptenentry *newtt)
 static void
 emit_dead_event(struct toptenentry *tt)
 {
-    char *argv[9];
+    char *argv[10];
     argv[0] = tt->name;
     argv[1] = tt->plrole;
     argv[2] = tt->plrace;
@@ -516,8 +516,9 @@ emit_dead_event(struct toptenentry *tt)
     asprintf(&argv[5], "%d", tt->deathlev);
     asprintf(&argv[6], "%d", tt->hp);
     asprintf(&argv[7], "%d", tt->maxhp);
-    argv[8] = tt->death;
-    event_trigger_async(EVENT_TYPE_DEAD, 9, argv);
+    argv[8] = tt->points;
+    argv[9] = tt->death;
+    event_trigger_async(EVENT_TYPE_DEAD, 10, argv);
     free(argv[5]);
     free(argv[6]);
     free(argv[7]);

scripts/nethack_events/bingehack-tweeter/bingehack-twitter.rb

@@ -7,12 +7,12 @@
 require 'net/ldap'
 require 'yaml'
 
-if ARGV.length != 9
-  $stderr.puts "Usage: #{$0} name role race gender align deathlev hp maxhp death"
+if ARGV.length != 10
+  $stderr.puts "Usage: #{$0} name role race gender align deathlev hp maxhp points death"
   exit(false)
 end
 
-name, role, race, gender, align, deathlev, hp, maxhp, death = *ARGV
+name, role, race, gender, align, deathlev, hp, maxhp, points, death = *ARGV
 
 $config = YAML.load_file('twitter-config.yml')
 
@@ -62,4 +62,4 @@ def get_twitter_username(name)
 
 client = Twitter::Client.new
 
-client.update("#{name}-#{role}-#{race}-#{gender}-#{align} #{death} on level #{deathlev} (HP: #{hp} [#{maxhp}])"[0,140])
+client.update("#{name}-#{role}-#{race}-#{gender}-#{align} #{death} on level #{deathlev} (HP: #{hp} [#{maxhp}]) Points: #{points}"[0,140])