[PlaneShift-svn] SF.net SVN: planeshift:[6201] www/webconsole-new

[<ravna-ps@us...>]

Revision: 6201
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6201&view=rev
Author:   ravna-ps
Date:     2010-09-16 16:59:50 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
Fixed various parts of the code that would have prevented any spawn rules from 

being edited.

Bumped WC supported DB version to 1253, which led to the following changes:
- Added instance_pos to action location editing.
- Added the option to change weapon_id on race_info (also made dropdowns for both 

weapons and armor).
- Added "removed_mesh" to the list/edit/create item screens.
- Added "min_spawn_spacing_dist" to Spawn Rules.
- Added "assigned_command" to the list/edit/create item screens.
- Added "spawnable" to the list/edit/create item screens.

Modified Paths:
--------------
    www/webconsole-new/DBVERSION.TXT
    www/webconsole-new/actionlocations/als.php
    www/webconsole-new/commonfunctions.php
    www/webconsole-new/items/createitem.php
    www/webconsole-new/items/edititem.php
    www/webconsole-new/npcs/listspawnrules.php
    www/webconsole-new/rules/raceinfo.php

Modified: www/webconsole-new/DBVERSION.TXT
===================================================================
--- www/webconsole-new/DBVERSION.TXT	2010-09-16 16:36:26 UTC (rev 6200)
+++ www/webconsole-new/DBVERSION.TXT	2010-09-16 16:59:50 UTC (rev 6201)
@@ -1 +1 @@
-DB VERSION: 1237
+DB VERSION: 1253

Modified: www/webconsole-new/actionlocations/als.php
===================================================================
--- www/webconsole-new/actionlocations/als.php	2010-09-16 16:36:26 UTC (rev 6200)
+++ www/webconsole-new/actionlocations/als.php	2010-09-16 16:59:50 UTC (rev 6201)
@@ -41,6 +41,7 @@
           echo '</select><br/>';
           echo 'Script: <textarea name="response" rows="4" cols="50">'.$row['response'].'</textarea><br/>';
           echo 'Active: '.$row['active_ind'] .' -- (Can Only be changed In-Game)<br/>';
+          echo 'Instance: <input type="text" name="pos_instance" value="'.$row['pos_instance'] .'" /> -- (Indicates from which istance this AL will be accessible. Default: 4294967295 means "all instances".)<br/>';
           echo '<input type="submit" name="submit" value="Update" />';
           if (checkaccess('als', 'delete')){
             echo '</form> -- <form action="./index.php?do=deleteal" method="post"><input type="hidden" name="id" value="'.$row['id'].'" /><input type="submit" name="delete" value="Delete AL" />';
@@ -79,7 +80,8 @@
       $triggertype = mysql_real_escape_string($_POST['radius']);
       $responsetype = mysql_real_escape_string($_POST['responsetype']);
       $response = mysql_real_escape_string($_POST['response']);
-      $query = "UPDATE action_locations SET master_id='$master_id', name='$name', meshname='$meshname', polygon='$polygon', radius='$radius', triggertype='$triggertype', responsetype='$responsetype', response='$response' WHERE id='$id'";
+      $pos_instance = mysql_real_escape_string($_POST['pos_instance']);
+      $query = "UPDATE action_locations SET master_id='$master_id', name='$name', meshname='$meshname', polygon='$polygon', radius='$radius', triggertype='$triggertype', responsetype='$responsetype', response='$response', pos_instance='$pos_instance' WHERE id='$id'";
       $result = mysql_query2($query);
       $_GET['sector'] = $_POST['sector'];
       echo '<p class="error">Update Successful</p>';

Modified: www/webconsole-new/commonfunctions.php
===================================================================
--- www/webconsole-new/commonfunctions.php	2010-09-16 16:36:26 UTC (rev 6200)
+++ www/webconsole-new/commonfunctions.php	2010-09-16 16:59:50 UTC (rev 6201)
@@ -184,7 +184,8 @@
   $typevals["patterns"] = "SELECT id, pattern_name FROM trade_patterns ORDER BY pattern_name";
   $typevals["mind_slot_items"] = "SELECT id, name FROM item_stats WHERE stat_type='B' AND valid_slots LIKE '%MIND%' ORDER BY name";
   $typevals["waypoints"] = "SELECT w.id, CONCAT(s.name, ' -- ', w.name, ' -- ', ' X: ', w.x, ' Y: ', w.y, ' Z: ', w.z) FROM sc_waypoints AS w LEFT JOIN sectors AS s ON w.loc_sector_id=s.id ORDER BY s.name, w.name";
-  $typevals["weapon"] = "SELECT s.id, CONCAT('[', s.armorvsweapon_type, '] ', s.name) FROM item_stats AS s, item_categories AS c WHERE c.name = 'Weapons' AND s.category_id=c.category_id and s.stat_type = 'B' ORDER BY s.armorvsweapon_type, s.name";  
+  $typevals["weapon"] = "SELECT s.id, CONCAT('[', s.armorvsweapon_type, '] ', s.name) FROM item_stats AS s, item_categories AS c WHERE c.name = 'Weapons' AND s.category_id=c.category_id AND s.stat_type = 'B' ORDER BY s.armorvsweapon_type, s.name";  
+  $typevals["armor"] = "SELECT s.id, CONCAT('[', s.armorvsweapon_type, '] ', s.name) FROM item_stats AS s, item_categories AS c WHERE c.name = 'Armor' AND s.category_id=c.category_id AND s.stat_type = 'B' ORDER BY s.armorvsweapon_type, s.name";  
   $typevals["factions"] = "SELECT faction_name, faction_name FROM factions";
   
   $query = $typevals[$type];
@@ -216,7 +217,8 @@
   $typevals["patterns"] = '"0"';
   $typevals["mind_slot_items"] = '"0"';
   $typevals["waypoints"] = '""';
-  $typevals["weapon"] = '"-1"';
+  $typevals["weapon"] = '"0"';
+  $typevals["armor"] = '"0"';
   $typevals["factions"] = '""';
   
   $nullval = $typevals[$type];

Modified: www/webconsole-new/items/createitem.php
===================================================================
--- www/webconsole-new/items/createitem.php	2010-09-16 16:36:26 UTC (rev 6200)
+++ www/webconsole-new/items/createitem.php	2010-09-16 16:59:50 UTC (rev 6201)
@@ -178,6 +178,11 @@
         $cstr_part_mesh = mysql_real_escape_string($_POST['cstr_part_mesh']);
         $cols = $cols . ', cstr_part_mesh';
         $values = $values . ", '$cstr_part_mesh'";
+      } 
+      if (isset($_POST['removed_mesh'])){
+        $removed_mesh = mysql_real_escape_string($_POST['removed_mesh']);
+        $cols = $cols . ', removed_mesh';
+        $values = $values . ", '$removed_mesh'";
       }
       if (isset($_POST['armorvsweapon_type'])){
         $armorvsweapon_type = mysql_real_escape_string($_POST['armorvsweapon_type']);
@@ -289,6 +294,16 @@
         $cols = $cols . ', weapon_range';
         $values = $values . ", '$weapon_range'";
       }
+      if (isset($_POST['assigned_command']) && trim($_POST['assigned_command']) != ""){
+        $assigned_command = mysql_real_escape_string($_POST['assigned_command']);
+        $cols = $cols . ', assigned_command';
+        $values = $values . ", '$assigned_command'";
+      }
+      if (isset($_POST['spawnable']) && trim($_POST['spawnable']) != ""){
+        $spawnable = mysql_real_escape_string($_POST['spawnable']);
+        $cols = $cols . ', spawnable';
+        $values = $values . ", '$spawnable'";
+      }
    // Finish preparing the query
       $query = $query . $cols . ')' . $values . ')';
       $result = mysql_query2($query);
@@ -340,6 +355,7 @@
       echo '<tr><td>cstr_gfx_texture</td><td><input type="text" name="cstr_gfx_texture"/></td></tr>';
       echo '<tr><td>cstr_part</td><td><input type="text" name="cstr_part"/></td></tr>';
       echo '<tr><td>cstr_part_mesh</td><td><input type="text" name="cstr_part_mesh"/></td></tr>';
+      echo '<tr><td>removed_mesh</td><td><input type="text" name="removed_mesh"/></td></tr>';
       echo '<tr><td>armorvsweapon_type</td><td><input type="text" name="armorvsweapon_type" /></td></tr>';
       $category_result = PrepSelect('category');
       echo '<tr><td>category_id</td><td>'.DrawSelectBox('category', $category_result, 'category_id', '').'</td></tr>';
@@ -366,6 +382,8 @@
       echo '</td></tr>';
       echo '<tr><td>max_charges</td><td><input type="text" name="max_charges" /></td></tr>';
       echo '<tr><td>weapon_range</td><td><input type="text" name="weapon_range" /></td></tr>';
+      echo '<tr><td>assigned_command</td><td><input type="text" name="assigned_command" /></td></tr>';
+      echo '<tr><td>spawnable</td><td><select name="spawnable"><option value="N">False</option><option value="Y" selected="true">True</option></select></td></tr>';
       echo '</table>';
       echo '<input type="submit" name="submit" value="Submit Changes" />';
       echo '</form>';

Modified: www/webconsole-new/items/edititem.php
===================================================================
--- www/webconsole-new/items/edititem.php	2010-09-16 16:36:26 UTC (rev 6200)
+++ www/webconsole-new/items/edititem.php	2010-09-16 16:59:50 UTC (rev 6201)
@@ -60,6 +60,7 @@
         echo '<tr><td>cstr_gfx_texture</td><td><input type="text" name="cstr_gfx_texture" value="'.$row['cstr_gfx_texture'].'"/></td></tr>';
         echo '<tr><td>cstr_part</td><td><input type="text" name="cstr_part" value="'.$row['cstr_part'].'"/></td></tr>';
         echo '<tr><td>cstr_part_mesh</td><td><input type="text" name="cstr_part_mesh" value="'.$row['cstr_part_mesh'].'"/></td></tr>';
+        echo '<tr><td>removed_mesh</td><td><input type="text" name="removed_mesh" value="'.$row['removed_mesh'].'"/></td></tr>';
         echo '<tr><td>armorvsweapon_type</td><td><input type="text" name="armorvsweapon_type" value="'.$row['armorvsweapon_type'].'" /></td></tr>';
         $category_result = PrepSelect('category');
         echo '<tr><td>category_id</td><td>'.DrawSelectBox('category', $category_result, 'category_id', $row['category_id']).'</td></tr>';
@@ -90,6 +91,17 @@
         echo '</td></tr>';
         echo '<tr><td>max_charges</td><td><input type="text" name="max_charges" value="'.$row['max_charges'].'" /></td></tr>';
         echo '<tr><td>weapon_range</td><td><input type="text" name="weapon_range" value="'.$row['weapon_range'].'" /></td></tr>';
+        echo '<tr><td>assigned_command</td><td><input type="text" name="assigned_command" value="'.$row['assigned_command'].'" /></td></tr>';
+        echo '<tr><td>spawnable</td><td>';
+        if ($row['spawnable'] == "Y")
+        {
+            echo '<select name="spawnable"><option value="N">False</option><option value="Y" selected="true">True</option></select>';
+        }
+        else
+        {
+            echo '<select name="spawnable"><option value="N" selected="true">False</option><option value="Y">True</option></select>';
+        }
+        echo '</td></tr>';
         echo '</table>';
         echo '<input type="submit" name="submit" value="Submit Changes" />';
         echo '</form>';
@@ -174,7 +186,9 @@
       $cstr_part = mysql_real_escape_string($_POST['cstr_part']);
       $query = $query . "cstr_part='$cstr_part', ";
       $cstr_part_mesh = mysql_real_escape_string($_POST['cstr_part_mesh']);
-      $query = $query . "cstr_part_mesh='$cstr_part_mesh', ";
+      $query = $query . "cstr_part_mesh='$cstr_part_mesh', ";  
+      $removed_mesh = mysql_real_escape_string($_POST['removed_mesh']);
+      $query = $query . "removed_mesh='$removed_mesh', ";
       $armorvsweapon_type = mysql_real_escape_string($_POST['armorvsweapon_type']);
       $query = $query . "armorvsweapon_type='$armorvsweapon_type', ";
       $category_id = mysql_real_escape_string($_POST['category_id']);
@@ -220,7 +234,11 @@
       $max_charges = mysql_real_escape_string($_POST['max_charges']);
       $query = $query . "max_charges='$max_charges', ";
       $weapon_range = mysql_real_escape_string($_POST['weapon_range']);
-      $query = $query . "weapon_range='$weapon_range' ";
+      $query = $query . "weapon_range='$weapon_range', ";
+      $assigned_command = mysql_real_escape_string($_POST['assigned_command']);
+      $query = $query . "assigned_command='$assigned_command', ";
+      $spawnable = mysql_real_escape_string($_POST['spawnable']);
+      $query = $query . "spawnable='$spawnable' ";
       $query = $query . "WHERE id=$id";
       $result = mysql_query2($query);
       if (isset($new_id))

Modified: www/webconsole-new/npcs/listspawnrules.php
===================================================================
--- www/webconsole-new/npcs/listspawnrules.php	2010-09-16 16:36:26 UTC (rev 6200)
+++ www/webconsole-new/npcs/listspawnrules.php	2010-09-16 16:59:50 UTC (rev 6201)
@@ -46,14 +46,15 @@
       if (checkaccess('npcs', 'edit')){
         echo '<form action="./index.php?do=editspawnrule" method="post"><input type="hidden" name="id" value="'.$row['id'].'"/><table>';
         echo '<tr><td>Min Spawn Time:</td><td><input type="text" name="min_spawn_time" value="'.$row['min_spawn_time'].'"/></td><td>Max Spawn Time:</td><td><input type="text" name="max_spawn_time" value="'.$row['max_spawn_time'].'"/></td></tr>';
-        echo '<tr><td>Substitute Spawn Odds:</td><td><input type="text" name="subsitute_spawn_odds" value="'.$row['substitute_spawn_odds'].'"/></td><td>Substitute NPC:</td><td><input type="text" name="substitute_player" value="'.$row['substitute_player'].'"/></td></tr>';
+        echo '<tr><td>Substitute Spawn Odds:</td><td><input type="text" name="substitute_spawn_odds" value="'.$row['substitute_spawn_odds'].'"/></td><td>Substitute NPC:</td><td><input type="text" name="substitute_player" value="'.$row['substitute_player'].'"/></td></tr>';
         echo '<tr><td>Fixed X:</td><td><input type="text" name="fixed_spawn_x" value="'.$row['fixed_spawn_x'].'"/></td><td>Fixed Y:</td><td><input type="text" name="fixed_spawn_y" value="'.$row['fixed_spawn_y'].'"/></td></tr>';
         echo '<tr><td>Fixed Z:</td><td><input type="text" name="fixed_spawn_z" value="'.$row['fixed_spawn_z'].'"/></td><td>Fixed Rot:</td><td><input type="text" name="fixed_spawn_rot" value="'.$row['fixed_spawn_rot'].'"/></td></tr>';
-        echo '<tr><td>Fixed sector:</td><td><input type="text" name="fixed_spawn_sector" value="'.$row['fixed_spawn_sector'].'"/></td><td>Fixed instance:</td><td><input type="text" name="fixed_spawn_intstance" value="'.$row['fixed_spawn_instance'].'"/></td></tr>';
+        echo '<tr><td>Fixed sector:</td><td><input type="text" name="fixed_spawn_sector" value="'.$row['fixed_spawn_sector'].'"/></td><td>Fixed instance:</td><td><input type="text" name="fixed_spawn_instance" value="'.$row['fixed_spawn_instance'].'"/></td></tr>';
         if (!isset($loot_result)){
           $loot_result = PrepSelect('loot');
         }
         echo '<tr><td>Loot Category ID:</td><td>'.DrawSelectbox('loot', $loot_result, 'loot_category_id', $row['loot_category_id'], TRUE).'</td><td>Dead Time</td><td><input type="text" name="dead_remain_time" value="'.$row['dead_remain_time'].'"/></td></tr>';
+        echo '<tr><td>Minimal Spawn Spacing Disatance: </td><td><input type="text" name="min_spawn_spacing_dist" value="'.$row['min_spawn_spacing_dist'].'" /></td><td></td><td></td></tr>';
         echo '</table><input type="submit" name="commit" value="Update Spawn Rule"/></form>';
       }else{
         echo '<table>';
@@ -63,6 +64,7 @@
         echo '<tr><td>Fixed Z:</td><td>'.$row['fixed_spawn_z'].'</td><td>Fixed Rot:</td><td>'.$row['fixed_spawn_rot'].'</td></tr>';
         echo '<tr><td>Fixed sector:</td><td>'.$row['fixed_spawn_sector'].'</td><td>Fixed instance:</td><td>'.$row['fixed_spawn_instance'].'</td></tr>';
         echo '<tr><td>Loot Category ID:</td><td>'.$row['loot_category_id'].'</td><td>Dead Time</td><td>'.$row['dead_remain_time'].'</td></tr>';
+        echo '<tr><td>Minimal Spawn Spacing Disatance: </td><td>'.$row['min_spawn_spacing_dist'].'</td><td></td><td></td></tr>';
         echo '</table>';
       }
       echo '<hr/>';
@@ -167,7 +169,8 @@
         $fixed_spawn_instance = mysql_real_escape_string($_POST['fixed_spawn_instance']);
         $loot_category_id = mysql_real_escape_string($_POST['loot_category_id']);
         $dead_remain_time = mysql_real_escape_string($_POST['dead_remain_time']);
-        $query = "UPDATE npc_spawn_rules SET min_spawn_time='$min_spawn_time', max_spawn_time='$max_spawn_time', substitute_spawn_odds='$substitute_spawn_odds', substitute_player='$substitute_player', fixed_spawn_x='$fixed_spawn_x', fixed_spawn_y='fixed_spawn_y', fixed_spawn_z='fixed_spawn_z', fixed_spawn_rot='$fixed_spawn_rot', fixed_spawn_sector='$fixed_spawn_sector', fixed_spawn_instance='$fixed_spawn_instance', loot_category_id='$loot_category_id', dead_remain_time='$dead_remain_time' WHERE id='$id'";
+        $min_spawn_spacing_dist = mysql_real_escape_string($_POST['min_spawn_spacing_dist']);
+        $query = "UPDATE npc_spawn_rules SET min_spawn_time='$min_spawn_time', max_spawn_time='$max_spawn_time', substitute_spawn_odds='$substitute_spawn_odds', substitute_player='$substitute_player', fixed_spawn_x='$fixed_spawn_x', fixed_spawn_y='$fixed_spawn_y', fixed_spawn_z='$fixed_spawn_z', fixed_spawn_rot='$fixed_spawn_rot', fixed_spawn_sector='$fixed_spawn_sector', fixed_spawn_instance='$fixed_spawn_instance', loot_category_id='$loot_category_id', dead_remain_time='$dead_remain_time', min_spawn_spacing_dist='$min_spawn_spacing_dist' WHERE id='$id'";
         $result = mysql_query2($query);
         echo '<p class="error">Update Successful</p>';
         listspawnrules();

Modified: www/webconsole-new/rules/raceinfo.php
===================================================================
--- www/webconsole-new/rules/raceinfo.php	2010-09-16 16:36:26 UTC (rev 6200)
+++ www/webconsole-new/rules/raceinfo.php	2010-09-16 16:59:50 UTC (rev 6201)
@@ -34,13 +34,14 @@
         $base_mental_regen_still = mysql_real_escape_string($_POST['base_mental_regen_still']);
         $base_mental_regen_walk = mysql_real_escape_string($_POST['base_mental_regen_walk']);
         $armor_id = mysql_real_escape_string($_POST['armor_id']);
+        $weapon_id = mysql_real_escape_string($_POST['weapon_id']);
         $helm = mysql_real_escape_string($_POST['helm']);
         $bracer = mysql_real_escape_string($_POST['bracer']);
         $belt = mysql_real_escape_string($_POST['belt']);
         $cloak = mysql_real_escape_string($_POST['cloak']);
         $speed_modifier = mysql_real_escape_string($_POST['speed_modifier']);
         $scale = mysql_real_escape_string($_POST['scale']);
-        $query = "UPDATE race_info SET name='$name', sex='$sex', size_x='$size_x', size_y='$size_y', size_z='$size_z', initial_cp='$initial_cp', start_str='$start_str', start_end='$start_end', start_agi='$start_agi', start_int='$start_int', start_will='$start_will', start_cha='$start_cha', base_physical_regen_still='$base_physical_regen_still', base_physical_regen_walk='$base_physical_regen_walk', base_mental_regen_still='$base_mental_regen_still', base_mental_regen_walk='$base_mental_regen_walk', armor_id='$armor_id', helm='$helm', bracer='$bracer', belt='$belt', cloak='$cloak', speed_modifier='$speed_modifier', scale='$scale' WHERE id='$id'";
+        $query = "UPDATE race_info SET name='$name', sex='$sex', size_x='$size_x', size_y='$size_y', size_z='$size_z', initial_cp='$initial_cp', start_str='$start_str', start_end='$start_end', start_agi='$start_agi', start_int='$start_int', start_will='$start_will', start_cha='$start_cha', base_physical_regen_still='$base_physical_regen_still', base_physical_regen_walk='$base_physical_regen_walk', base_mental_regen_still='$base_mental_regen_still', base_mental_regen_walk='$base_mental_regen_walk', armor_id='$armor_id', weapon_id='$weapon_id', helm='$helm', bracer='$bracer', belt='$belt', cloak='$cloak', speed_modifier='$speed_modifier', scale='$scale' WHERE id='$id'";
         $result = mysql_query2($query);
         echo '<p class="error">Update Successful</p>';
         unset($_POST);
@@ -113,7 +114,10 @@
         echo '<tr><td>Base Charisma:</td><td><input type="text" name="start_cha" value="'.$row['start_cha'].'"/></td></tr>';
         echo '<tr><td>Physical Rengeneration (Standing/Walking):</td><td><input type="text" name="base_physical_regen_still" value="'.$row['base_physical_regen_still'].'"/> / <input type="text" name="base_physical_regen_walk" value="'.$row['base_physical_regen_walk'].'" /></td></tr>';
         echo '<tr><td>Mental Regeneration (Standing/Walking):</td><td><input type="text" name="base_mental_regen_still" value="'.$row['base_mental_regen_still'].'"/> / <input type="text" name="base_mental_regen_walk" value="'.$row['base_mental_regen_walk'].'" /></td></tr>';
-        echo '<tr><td>Armor ID:</td><td><input type="text" name="armor_id" value="'.$row['armor_id'].'"/></td></tr>';
+        $armors = PrepSelect('armor');
+        $weapons = PrepSelect('weapon');
+        echo '<tr><td>Armor ID:</td><td>'.DrawSelectBox('armor', $armors, 'armor_id', $row['armor_id'], true).'</td></tr>';
+        echo '<tr><td>Weapon ID:</td><td>'.DrawSelectBox('weapon', $weapons, 'weapon_id', $row['weapon_id'], true).'</td></tr>';
         echo '<tr><td>Helm:</td><td><input type="text" name="helm" value="'.$row['helm'].'"/></td></tr>';
         echo '<tr><td>Bracer:</td><td><input type="text" name="bracer" value="'.$row['bracer'].'"/></td></tr>';
         echo '<tr><td>Belt:</td><td><input type="text" name="belt" value="'.$row['belt'].'"/></td></tr>';  
@@ -156,10 +160,10 @@
         $Spawns[$raceid][$i]['sector_id'] = $row['sector_id'];
         $Spawns[$raceid][$i]['sector_name'] = $row['name'];
       }
-      $query = "SELECT * FROM race_info ORDER BY name, sex";
+      $query = "SELECT ri.*, ist.name AS armor_name, ist.category_id AS armor_cat, iss.name AS weapon_name, iss.category_id AS weapon_cat FROM race_info AS ri LEFT JOIN item_stats AS ist ON ist.id=ri.armor_id LEFT JOIN item_stats AS iss ON iss.id=ri.weapon_id ORDER BY name, sex";
       $result = mysql_query2($query);
       echo '<table>';
-      echo '<tr><th>ID</th><th>Race</th><th>Sex</th><th>Size</th><th>CP\'s</th><th>Base STR</th><th>Base END</th><th>Base AGI</th><th>Base INT</th><th>Base WILL</th><th>Base CHA</th><th>Physical Regen (Standing/Walking)</th><th>Mental Regen (Standing/Walking)</th><th>armor_id</th><th>helm</th><th>bracer</th><th>belt</th><th>cloak</th><th>Speed Modifier</th><th>Scale</th><th>Spawn Points</th>';
+      echo '<tr><th>ID</th><th>Race</th><th>Sex</th><th>Size</th><th>CP\'s</th><th>Base STR</th><th>Base END</th><th>Base AGI</th><th>Base INT</th><th>Base WILL</th><th>Base CHA</th><th>Physical Regen (Standing/Walking)</th><th>Mental Regen (Standing/Walking)</th><th>armor_id</th><th>weapon_id</th><th>helm</th><th>bracer</th><th>belt</th><th>cloak</th><th>Speed Modifier</th><th>Scale</th><th>Spawn Points</th>';
       if (checkaccess('rules', 'edit')){
         echo '<th>Actions</th>';
       }
@@ -186,7 +190,8 @@
         echo '<td>'.$row['start_cha'].'</td>';
         echo '<td>'.$row['base_physical_regen_still'].' / '.$row['base_physical_regen_walk'].'</td>';
         echo '<td>'.$row['base_mental_regen_still'].' / '.$row['base_mental_regen_walk'].'</td>';
-        echo '<td>'.$row['armor_id'].'</td>';
+        echo '<td><a href="./index.php?do=listitems&amp;category='.$row['armor_cat'].'&amp;item='.$row['armor_id'].'">'.$row['armor_name'].'</a></td>';
+        echo '<td><a href="./index.php?do=listitems&amp;category='.$row['weapon_cat'].'&amp;item='.$row['weapon_id'].'">'.$row['weapon_name'].'</a></td>';
         echo '<td>'.$row['helm'].'</td>';
         echo '<td>'.$row['bracer'].'</td>';
         echo '<td>'.$row['belt'].'</td>'; 


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

[PlaneShift-svn] SF.net SVN: planeshift:[6200] trunk/src/server/workmanager.cpp

[<weltall2@us...>]

Revision: 6200
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6200&view=rev
Author:   weltall2
Date:     2010-09-16 16:36:26 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
silenced production message about natural resources as it works correctly.

Modified Paths:
--------------
    trunk/src/server/workmanager.cpp

Modified: trunk/src/server/workmanager.cpp
===================================================================
--- trunk/src/server/workmanager.cpp	2010-09-16 14:19:32 UTC (rev 6199)
+++ trunk/src/server/workmanager.cpp	2010-09-16 16:36:26 UTC (rev 6200)
@@ -709,7 +709,7 @@
     for(int i= 0; i < nearResources.GetSize(); i++)
     {
         NearNaturalResource & res = nearResources.Get(i);
-        printf("found res %d(%s): dist %f, probability %f, level %d\n", i, res.resource->reward_nickname.GetData(), res.dist, res.resource->probability, res.resource->skill_level);
+        Debug6(LOG_TRADE,0, "found res %d(%s): dist %f, probability %f, level %d\n", i, res.resource->reward_nickname.GetData(), res.dist, res.resource->probability, res.resource->skill_level);
     }
 
     return nearResources;


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

[PlaneShift-svn] SF.net SVN: planeshift:[6199] www/webconsole-new/npcs/npc_details.php

[<ravna-ps@us...>]

Revision: 6199
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6199&view=rev
Author:   ravna-ps
Date:     2010-09-16 14:19:32 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------

Made the delete button disappear for Players and Pets (can not be deleted by WC).

Modified Paths:
--------------
    www/webconsole-new/npcs/npc_details.php

Modified: www/webconsole-new/npcs/npc_details.php
===================================================================
--- www/webconsole-new/npcs/npc_details.php	2010-09-14 21:38:06 UTC (rev 6198)
+++ www/webconsole-new/npcs/npc_details.php	2010-09-16 14:19:32 UTC (rev 6199)
@@ -979,7 +979,18 @@
         //echo '<p class="bold">NPC: '.$id.' - '.$row['name'].' '.$row['lastname'].'</p>';
         echo '<form action="index.php?do=deletenpc&id='.$id.'" method="post" style="margin-bottom: 20px; margin-top: 20px;">';
         echo '<p class="bold" style="float: left; margin: 0pt 5px 0pt 0pt;">NPC: '.$id.' - '.$row['name'].' '.$row['lastname'].'</p>';
-        echo '<input type="submit" value="delete NPC"></form>';
+        if (checkaccess('npcs', 'delete'))
+        {
+            if ($row['character_type'] == 1 || $row['character_type'] == 3) 
+            {
+                echo '<input type="submit" value="delete NPC">';
+            }
+            else
+            {
+                echo '<br />';
+            }
+        }
+        echo '</form>';
         $uri_string = $uri_string.'&amp;npc_id='.$_GET['npc_id'];
       }
     }


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