(news_ca): Change type of selector action to NSC_TYPEID.

(nat_ca): Split awkward selector level into selectors tech, research,
education and happiness.

diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c
index 26d5611ebe431bd07f61134d8dd256da7a03b9f8..288cf906570137dbcd8c703eaac567d2fb59714a 100644 (file)
--- a/src/lib/global/nsc.c
+++ b/src/lib/global/nsc.c
@@ -244,7 +244,7 @@ struct castr loan_ca[] = {
 
 struct castr news_ca[] = {
     {NSC_NATID, 0, 0, fldoff(nwsstr, nws_ano), "actor"},
-    {NSC_CHAR, 0, 0, fldoff(nwsstr, nws_vrb), "action"},
+    {NSC_TYPEID, 0, 0, fldoff(nwsstr, nws_vrb), "action"},
     {NSC_NATID, 0, 0, fldoff(nwsstr, nws_vno), "victim"},
     {NSC_CHAR, 0, 0, fldoff(nwsstr, nws_ntm), "times"},
     {NSC_TIME, 0, 0, fldoff(nwsstr, nws_when), "time"},
@@ -320,7 +320,10 @@ struct castr nat_ca[] = {
     {NSC_TIME, 0, 0, fldoff(natstr, nat_last_logout), "last_logout"},
     {NSC_TIME, 0, 0, fldoff(natstr, nat_newstim), "newstim"},
 #endif /* MAYBE_LATER */
-    {NSC_FLOAT, 0, 4, fldoff(natstr, nat_level[0]), "level"},
+    {NSC_FLOAT, 0, 0, fldoff(natstr, nat_level[NAT_TLEV]), "tech"},
+    {NSC_FLOAT, 0, 0, fldoff(natstr, nat_level[NAT_RLEV]), "research"},
+    {NSC_FLOAT, 0, 0, fldoff(natstr, nat_level[NAT_ELEV]), "education"},
+    {NSC_FLOAT, 0, 0, fldoff(natstr, nat_level[NAT_HLEV]), "happiness"},
 #if 0
     {NSC_SHORT, 0, MAXNOC, fldoff(natstr, nat_relate[0]),"relate"},
     {NSC_CHAR, 0, PRI_MAX+1, fldoff(natstr, nat_priorities[0]),"priorities"},