[Planeshift-cvs] SF.net SVN: planeshift: [988] www

[<eri...@us...>]

Revision: 988
          http://planeshift.svn.sourceforge.net/planeshift/?rev=988&view=rev
Author:   eriroley
Date:     2008-02-24 19:30:58 -0800 (Sun, 24 Feb 2008)

Log Message:
-----------
WC - Modifications to display NPC description on the NPC list pages

Modified Paths:
--------------
    www/docs/history.txt
    www/webconsole/npcs/listnpcs.php
    www/webconsole-trunk/npcs/listnpcs.php

Modified: www/docs/history.txt
===================================================================
--- www/docs/history.txt	2008-02-24 21:09:19 UTC (rev 987)
+++ www/docs/history.txt	2008-02-25 03:30:58 UTC (rev 988)
@@ -1,4 +1,7 @@
 *** 2008-02-24 by Eriroley
+WC - Modifications to display NPC description on the NPC list pages
+
+*** 2008-02-24 by Eriroley
 WC - modifications to handeling of loot rules
 
 *** 2008-02-20 by Darcsabre

Modified: www/webconsole/npcs/listnpcs.php
===================================================================
--- www/webconsole/npcs/listnpcs.php	2008-02-24 21:09:19 UTC (rev 987)
+++ www/webconsole/npcs/listnpcs.php	2008-02-25 03:30:58 UTC (rev 988)
@@ -26,7 +26,7 @@
         echo "<b><A HREF=\"index.php?page=listnpcscombat\">Click here to switch to combat view</A></b>";
     }
 
-    $query = "select c.id, c.name, sec.name, c.loc_x, c.loc_y, c.loc_z, c.npc_spawn_rule, b.npctype,c.npc_addl_loot_category_id, b.region from characters as c LEFT JOIN sc_npc_definitions as b ON b.char_id=c.id, sectors as sec ";
+    $query = "select c.id, c.name, sec.name, c.loc_x, c.loc_y, c.loc_z, c.npc_spawn_rule, b.npctype,c.npc_addl_loot_category_id, b.region, c.description from characters as c LEFT JOIN sc_npc_definitions as b ON b.char_id=c.id, sectors as sec ";
     $query = $query . " where npc_master_id !=0 and character_type=1 and c.loc_sector_id=sec.id";
   
     $sector = $_GET['sector'];
@@ -44,7 +44,7 @@
     $result = mysql_query2($query);
 
     echo "  <TABLE BORDER=1>";
-    echo "  <TH> ID </TH> <TH> NAME</TH><TH> Spawn / Loot</TH><TH> SECTOR</TH> <TH> POSITION</TH><TH>BEHAVIOR</TH><TH>Personal Triggers</TH><TH>Region</TH><TH>NA</TH><TH> FUNCTIONS</TH><TH>CHECK</TH>";
+    echo "  <TH> ID </TH> <TH> NAME</TH><TH> DESCRIPTION</TH><TH> Spawn / Loot</TH><TH> SECTOR</TH> <TH> POSITION</TH><TH>BEHAVIOR</TH><TH>Personal Triggers</TH><TH>Region</TH><TH>NA</TH><TH> FUNCTIONS</TH><TH>CHECK</TH>";
 
     while ($line = mysql_fetch_array($result, MYSQL_NUM))
     {
@@ -61,7 +61,7 @@
         }
 
         echo "<TR><TD>$line[0] </TD><TD><A href='index.php?page=viewnpc&id=".$line[0]."'>".$line[1]."</a></TD>";
-    
+    	echo '<TD>'.$line[10].'</TD>';
         echo "<TD>".$spawn." ".$loot."</TD>";
     
         echo "<TD ALIGN=CENTER>".$line[2]."</TD><TD>".$line[3].",".$line[4].",".$line[5]."</TD>";

Modified: www/webconsole-trunk/npcs/listnpcs.php
===================================================================
--- www/webconsole-trunk/npcs/listnpcs.php	2008-02-24 21:09:19 UTC (rev 987)
+++ www/webconsole-trunk/npcs/listnpcs.php	2008-02-25 03:30:58 UTC (rev 988)
@@ -26,7 +26,7 @@
         echo "<b><A HREF=\"index.php?page=listnpcscombat\">Click here to switch to combat view</A></b>";
     }
 
-    $query = "select c.id, c.name, sec.name, c.loc_x, c.loc_y, c.loc_z, c.npc_spawn_rule, b.npctype,c.npc_addl_loot_category_id, b.region from characters as c LEFT JOIN sc_npc_definitions as b ON b.char_id=c.id, sectors as sec ";
+    $query = "select c.id, c.name, sec.name, c.loc_x, c.loc_y, c.loc_z, c.npc_spawn_rule, b.npctype,c.npc_addl_loot_category_id, b.region, c.description from characters as c LEFT JOIN sc_npc_definitions as b ON b.char_id=c.id, sectors as sec ";
     $query = $query . " where npc_master_id !=0 and character_type=1 and c.loc_sector_id=sec.id";
   
     $sector = $_GET['sector'];
@@ -44,7 +44,7 @@
     $result = mysql_query2($query);
 
     echo "  <TABLE BORDER=1>";
-    echo "  <TH> ID </TH> <TH> NAME</TH><TH> Spawn / Loot</TH><TH> SECTOR</TH> <TH> POSITION</TH><TH>BEHAVIOR</TH><TH>Personal Triggers</TH><TH>Region</TH><TH>NA</TH><TH> FUNCTIONS</TH><TH>CHECK</TH>";
+    echo "  <TH> ID </TH> <TH> NAME</TH><TH> DESCRIPTION</TH><TH> Spawn / Loot</TH><TH> SECTOR</TH> <TH> POSITION</TH><TH>BEHAVIOR</TH><TH>Personal Triggers</TH><TH>Region</TH><TH>NA</TH><TH> FUNCTIONS</TH><TH>CHECK</TH>";
 
     while ($line = mysql_fetch_array($result, MYSQL_NUM))
     {
@@ -61,7 +61,7 @@
         }
 
         echo "<TR><TD>$line[0] </TD><TD><A href='index.php?page=viewnpc&id=".$line[0]."'>".$line[1]."</a></TD>";
-    
+    	echo '<TD>'.$line[10].'</TD>';
         echo "<TD>".$spawn." ".$loot."</TD>";
     
         echo "<TD ALIGN=CENTER>".$line[2]."</TD><TD>".$line[3].",".$line[4].",".$line[5]."</TD>";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.