Task schema updates from EQEmu/Server#2449

ProjectEQ · Oct 18, 2022 · 4cc7f80 · 4cc7f80
1 parent 4f230c2
commit 4cc7f80
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 296 deletions.
diff --git a/index.php b/index.php
@@ -1,7 +1,7 @@
 <?php
 
-$current_revision = "16 October 2022";
-$current_db_version = 9207;
+$current_revision = "18 October 2022";
+$current_db_version = 9208;
 
 require_once("config.php");
 require_once("lib/logging.php");

diff --git a/lib/tasks.php b/lib/tasks.php
diff --git a/templates/tasks/activity.add.tmpl.php b/templates/tasks/activity.add.tmpl.php
@@ -64,19 +64,11 @@
 <?endforeach;?>
                 </select>
               </td>
-              <td align="left" width="25%">Goal Count:<br><input type="text" name="goalcount" size="7" value="0"></td>
-              <td align="left" width="25%">&nbsp;</td>
-              <td align="left" width="25%">&nbsp;</td>
-            </tr>
-            <tr>
-              <td align="left" width="25%">NPC ID:<br><input type="text" name="npc_id" size="10" value="0"></td>
-              <td align="left" width="25%">NPC Goal ID:<br><input type="text" name="npc_goal_id" size="10" value="0"></td>
-              <td align="left" width="50%" colspan="2">NPC Match List:<br><input type="text" name="npc_match_list" size="50" value=""></td>
+              <td align="left" width="75%">NPC Match List:<br><input type="text" name="npc_match_list" size="80" value=""></td>
             </tr>
             <tr>
-              <td align="left" width="25%">Item ID:<br><input type="text" name="item_id" size="10" value="0"></td>
-              <td align="left" width="25%">Item Goal ID:<br><input type="text" name="item_goal_id" size="10" value="0"></td>
-              <td align="left" width="50%" colspan="2">Item ID List:<br><input type="text" name="item_id_list" size="50" value=""></td>
+              <td align="left" width="25%">Goal Count:<br><input type="text" name="goalcount" size="7" value="0"></td>
+              <td align="left" width="75%">Item ID List:<br><input type="text" name="item_id_list" size="80" value=""></td>
             </tr>
           </table>
         </fieldset><br>

diff --git a/templates/tasks/activity.edit.tmpl.php b/templates/tasks/activity.edit.tmpl.php
@@ -59,19 +59,11 @@
 <?endforeach;?>
                 </select>
               </td>
-              <td align="left" width="25%">Goal Count:<br><input type="text" name="goalcount" size="7" value="<?=$goalcount?>"></td>
-              <td align="left" width="25%">&nbsp;</td>
-              <td align="left" width="25%">&nbsp;</td>
-            </tr>
-            <tr>
-              <td align="left" width="25%">NPC ID:<br><input type="text" name="npc_id" size="10" value="<?=$npc_id?>"></td>
-              <td align="left" width="25%">NPC Goal ID:<br><input type="text" name="npc_goal_id" size="10" value="<?=$npc_goal_id?>"></td>
-              <td align="left" width="50%" colspan="2">NPC Match List:<br><input type="text" name="npc_match_list" size="50" value="<?echo htmlentities($npc_match_list);?>"></td>
+              <td align="left" width="75%">NPC Match List:<br><input type="text" name="npc_match_list" size="80" value="<?echo htmlentities($npc_match_list);?>"></td>
             </tr>
             <tr>
-              <td align="left" width="25%">Item ID:<br><input type="text" name="item_id" size="10" value="<?=$item_id?>"></td>
-              <td align="left" width="25%">Item Goal ID:<br><input type="text" name="item_goal_id" size="10" value="<?=$item_goal_id?>"></td>
-              <td align="left" width="50%" colspan="2">Item ID List:<br><input type="text" name="item_id_list" size="50" value="<?echo htmlentities($item_id_list);?>"></td>
+              <td align="left" width="25%">Goal Count:<br><input type="text" name="goalcount" size="7" value="<?=$goalcount?>"></td>
+              <td align="left" width="75%">Item ID List:<br><input type="text" name="item_id_list" size="80" value="<?echo htmlentities($item_id_list);?>"></td>
             </tr>
           </table>
         </fieldset><br>

diff --git a/templates/tasks/tasks.add.tmpl.php b/templates/tasks/tasks.add.tmpl.php
@@ -27,8 +27,8 @@
                 </select>
               </td>
               <td align="left" width="20%">Duration:<br><input type="text" name="duration" size="7" value="0"></td>
-              <td align="left" width="20%">Min Level:<br><input type="text" name="minlevel" size="7" value="0"></td>
-              <td align="left" width="20%">Max Level:<br><input type="text" name="maxlevel" size="7" value="0"></td>
+              <td align="left" width="20%">Min Level:<br><input type="text" name="min_level" size="7" value="0"></td>
+              <td align="left" width="20%">Max Level:<br><input type="text" name="max_level" size="7" value="0"></td>
               <td align="left" width="20%">
                 Repeatable:<br>
                 <select name="repeatable">
@@ -61,20 +61,20 @@
           <legend><strong><font size="4">Completion</font></strong></legend>
           <table width="100%" border="0" cellpadding="3" cellspacing="0">
             <tr>
-              <td align="left" width="50%" colspan="2">Reward Text:<br><input type="text" name="reward" size="45" value=""></td> 
+              <td align="left" width="50%" colspan="2">Reward Text:<br><input type="text" name="reward_text" size="45" value=""></td> 
               <td align="left" width="50%" colspan="2">
                 Reward Method:<br>
-                <select name="rewardmethod" style="width: 180px;">
+                <select name="reward_method" style="width: 180px;">
 <?foreach($rewardmethods as $key=>$value):?>
-                  <option value="<?=$key?>"<?echo (isset($rewardmethod) && $key == $rewardmethod)? " selected" : "";?>><?=$key?>: <?=$value?></option>
+                  <option value="<?=$key?>"<?echo (isset($reward_method) && $key == $reward_method)? " selected" : "";?>><?=$key?>: <?=$value?></option>
 <?endforeach;?>
                 </select>
               </td>
             </tr>
             <tr>
-              <td align="left" width="25%">Reward ID:<br><input type="text" name="rewardid" size="7" value="0"></td>
-              <td align="left" width="25%">Reward XP:<br><input type="text" name="xpreward" size="7" value="0"></td>
-              <td align="left" width="25%">Reward Cash:<br><input type="text" name="cashreward" size="7" value="0"></td>
+              <td align="left" width="25%">Reward ID List: (|=delimiter)<br><input type="text" name="reward_id_list" size="20" value="0"></td>
+              <td align="left" width="25%">Reward XP:<br><input type="text" name="exp_reward" size="7" value="0"></td>
+              <td align="left" width="25%">Reward Cash:<br><input type="text" name="cash_reward" size="7" value="0"></td>
               <td align="left" width="25%">Reward Faction:<br><input type="text" name="faction_reward" size="7" value="0"></td>
             </tr>
             <tr>

diff --git a/templates/tasks/tasks.edit.tmpl.php b/templates/tasks/tasks.edit.tmpl.php
@@ -27,8 +27,8 @@
                 </select>
               </td>
               <td align="left" width="20%">Duration:<br><input type="text" name="duration" size="7" value="<?=$duration?>"></td>
-              <td align="left" width="20%">Min Level:<br><input type="text" name="minlevel" size="7" value="<?=$minlevel?>"></td>
-              <td align="left" width="20%">Max Level:<br><input type="text" name="maxlevel" size="7" value="<?=$maxlevel?>"></td>
+              <td align="left" width="20%">Min Level:<br><input type="text" name="min_level" size="7" value="<?=$min_level?>"></td>
+              <td align="left" width="20%">Max Level:<br><input type="text" name="max_level" size="7" value="<?=$max_level?>"></td>
               <td align="left" width="20%">
                 Repeatable:<br>
                 <select name="repeatable">
@@ -61,20 +61,20 @@
           <legend><strong><font size="4">Completion</font></strong></legend>
           <table width="100%" border="0" cellpadding="3" cellspacing="0">
             <tr>
-              <td align="left" width="50%" colspan="2">Reward Text:<br><input type="text" name="reward" size="45" value="<?echo htmlentities($reward);?>"></td> 
+              <td align="left" width="50%" colspan="2">Reward Text:<br><input type="text" name="reward_text" size="45" value="<?echo htmlentities($reward);?>"></td> 
               <td align="left" width="50%" colspan="2">
                 Reward Method:<br>
-                <select name="rewardmethod" style="width: 180px;">
+                <select name="reward_method" style="width: 180px;">
 <?foreach ($rewardmethods as $key=>$value):?>
-                  <option value="<?=$key?>"<?echo ($key == $rewardmethod) ? " selected" : "";?>><?=$key?>: <?=$value?></option>
+                  <option value="<?=$key?>"<?echo ($key == $reward_method) ? " selected" : "";?>><?=$key?>: <?=$value?></option>
 <?endforeach;?>
                 </select>
               </td>
             </tr>
             <tr>
-              <td align="left" width="25%">Reward ID:<br><input type="text" name="rewardid" size="7" value="<?=$rewardid?>"></td>
-              <td align="left" width="25%">Reward XP:<br><input type="text" name="xpreward" size="7" value="<?=$xpreward?>"></td>
-              <td align="left" width="25%">Reward Cash:<br><input type="text" name="cashreward" size="7" value="<?=$cashreward?>"></td>
+              <td align="left" width="25%">Reward ID List: (|=delimiter)<br><input type="text" name="reward_id_list" size="20" value="<?=$reward_id_list?>"></td>
+              <td align="left" width="25%">Reward EXP:<br><input type="text" name="exp_reward" size="7" value="<?=$exp_reward?>"></td>
+              <td align="left" width="25%">Reward Cash:<br><input type="text" name="cash_reward" size="7" value="<?=$cash_reward?>"></td>
               <td align="left" width="25%">Reward Faction:<br><input type="text" name="faction_reward" size="7" value="<?=$faction_reward?>"></td>
             </tr>
             <tr>

diff --git a/templates/tasks/tasks.tmpl.php b/templates/tasks/tasks.tmpl.php
@@ -21,8 +21,8 @@
                 <tr>
                   <td align="left" width="20%">Duration Code: <?=$duration_codes[$duration_code]?></td>
                   <td align="left" width="20%">Duration: <?=$duration?></td>
-                  <td align="left" width="20%">Min Level: <?=$minlevel?></td>
-                  <td align="left" width="20%">Max Level:  <?=$maxlevel?></td>              
+                  <td align="left" width="20%">Min Level: <?=$min_level?></td>
+                  <td align="left" width="20%">Max Level:  <?=$max_level?></td>              
                   <td align="left" width="20%">Repeatable: <?=$yesno[$repeatable]?></td>
                 </tr>
                 <tr>
@@ -46,28 +46,14 @@
               <legend><strong>Completion</font></strong></legend>
               <table width="100%" border="0" cellpadding="3" cellspacing="0">
                 <tr>
-                  <td align="left" width="50%" colspan="2">Reward Text: "<?=$reward?>"</td>
-                  <td align="left" width="25%">Reward Method: <?=$rewardmethods[$rewardmethod]?></td>
+                  <td align="left" width="50%" colspan="2">Reward Text: "<?=$reward_text?>"</td>
+                  <td align="left" width="25%">Reward Method: <?=$rewardmethods[$reward_method]?></td>
                   <td align="left" width="25%">Reward Faction: <?=$faction_reward?></td>
                 </tr>
                 <tr>
-                  <td align="left" width="25%">
-                    Reward:
-<?if(($rewardmethod == 0 || $rewardmethod == 2) && $rewardid > 1000):?>
-                    <a href="index.php?editor=items&tskid=<?=$id?>&id=<?=$rewardid?>&action=2"><?echo $rewardid . " - " . get_item_name($rewardid)?></a> <span>[<a href="https://lucy.allakhazam.com/item.html?id=<?=$rewardid?>" target="_blank">Lucy</a>]</span>
-<?endif;?> 
-<?if($rewardmethod == 2 && $rewardid < 1001):?>
-                    <?=$rewardid?>
-<?endif;?> 
-<?if($rewardmethod == 1 && $rewardid > 0 && $rewardid < 1001):?>
-                    <a href="index.php?editor=tasks&tskid=<?=$id?>&lid=<?=$rewardid?>&action=11"><?=$rewardid?></a>
-<?endif;?> 
-<?if($rewardmethod == 1 && $rewardid == 0):?>
-                    <a href="index.php?editor=tasks&tskid=<?=$id?>&action=12"><?=$rewardid?></a>
-<?endif;?>
-                  </td>
-                  <td align="left" width="25%">Reward Cash: <?=$cashreward?></td>
-                  <td align="left" width="25%">Reward XP: <?=$xpreward?></td>
+                  <td align="left" width="25%">Reward ID List: <?=$reward_id_list?></td>
+                  <td align="left" width="25%">Reward Cash: <?=$cash_reward?></td>
+                  <td align="left" width="25%">Reward EXP: <?=$exp_reward?></td>
                   <td align="left" width="25%">Faction Amount: <?=$faction_amount?></td>
                 </tr>
                 <tr>