resources/script/jquery.min.js
scripts/crafting/list.php
scripts/crafting/recipe.php
template/templates/crafting/details.tpl
template/templates/crafting/list.tpl
@@ -2,7 +2,7 @@
# SetEnv RELEASE_MODE DEV
RewriteEngine On
-RewriteBase /kittokittokitto
+RewriteBase /kitto
# These are the real folders.
RewriteRule ^resources/(.*)$ resources/$1 [L]
@@ -18,6 +18,7 @@ RewriteRule ^notice/([0-9]+) index.php?page_slug=notice&state=jump¬ification_
# Pagination for /items/ - /items is still handled by the catch-all, etc.
RewriteRule ^items/([0-9]+) index.php?page_slug=items&page=$1 [NC,L]
RewriteRule ^news/([0-9]+) index.php?page_slug=news&page=$1 [NC,L]
+RewriteRule ^crafting/([0-9]+) index.php?page_slug=crafting&page=$1 [NC,L]
# Messages - first pagination. Then we have two URLs mapped to our write-new
# slug - /write-new-message/ and /write-message-reply/. -new accepts a user ID,
@@ -37,5 +38,8 @@ RewriteRule ^edit-thread/([0-9]+)(/([0-9]+))? index.php?page_slug=edit-thread&th
# Search page rules.
RewriteRule ^search/([a-z0-9]+)(((/([^/]+))(/(exact|contains)?)(/([0-9])+)?))? index.php?page_slug=search&state=search&search=$1&term=$5&page=$9&precision=$7 [NC,L]
+# Craft things.
+RewriteRule ^craft/([0-9]+) index.php?page_slug=craft&id=$1 [NC,L]
+
# Gotta catch 'em all! Don't put any rules below this one.
RewriteRule ^([A-Z0-9-]+)(/(.*))?$ index.php?page_slug=$1 [QSA,NC,L]
.htaccess
@@ -52,6 +52,16 @@ class ItemType extends ActiveTable
),
);
+ public function hasMaterials()
+ {
+ if($this->getItemClassId() == 4)
+ {
+ return true;
+ }
+
+ return false;
+ } // end hasMaterials
+
/**
* Return the full URL to the item's image.
*
includes/classes/item/item_type.class.php
@@ -74,6 +74,67 @@ class Recipe_Item extends Item
),
);
+ /**
+ * An efficient bill of materials vs inventory check.
+ *
+ * This will return how many batches the user can produce.
+ *
+ * @return integer
+ **/
+ public function canCraft()
+ {
+ switch($this->db->phptype)
+ {
+ case 'mysqli':
+ case 'mysql':
+ {
+ $sql = '
+ SELECT
+ FLOOR(IFNULL(user_item.quantity,0) / item_recipe_material.material_quantity) AS batch_size
+ FROM item_type
+ INNER JOIN item_recipe_material ON (item_type.item_type_id = item_recipe_material.recipe_item_type_id)
+ LEFT JOIN user_item ON (
+ item_recipe_material.material_item_type_id = user_item.item_type_id
+ AND ? = user_item.user_id
+ )
+ WHERE item_type.item_type_id = ?
+ ORDER BY batch_size
+ LIMIT 1
+ ';
+
+ break;
+ } // end mysql
+
+ default:
+ {
+ throw new ArgumentError('RDBMS unsupported.');
+
+ break;
+ } // end default
+ } // end db engine switch
+
+ $batch_size = $this->db->getOne($sql,array($this->getUserId(),$this->getItemTypeId()));
+ if(PEAR::isError($batch_size))
+ {
+ throw new SQLError($batch_size->getDebugInfo(),$batch_size->userinfo,10);
+ }
+
+ return $batch_size;
+ } // end canCraft
+
+ public function grabProduct()
+ {
+ $item = new ItemType($this->db);
+ $item = $item->findOneByItemTypeId($this->getRecipeCreatedItemTypeId());
+
+ if($item == null)
+ {
+ throw new ArgumentError('Could not find product item - recipe buildout invalid!');
+ }
+
+ return $item;
+ } // end grabProduct
+
public function listAttributes()
{
$TYPES = array(0 => 'Select one...');
includes/classes/item/recipe_item.class.php
@@ -366,12 +366,20 @@ class User extends ActiveTable
($start !== null && $end !== null) == false
)
{
- throw ArgumentError('Must specify either no arguments or both arguments.');
+ throw new ArgumentError('Must specify either no arguments or both arguments.');
} // end problem w/ args.
- $PROPER_INVENTORY = array();
- $inventory = $this->grab('inventory','ORDER BY user_item_id',false,$start,$end);
+ $inventory = new Item($this->db);
+ $inventory = $inventory->findBy(array(
+ 'user_id' => $this->getUserId(),
+ array(
+ 'table' => 'item_class',
+ 'column' => 'normal_inventory_display',
+ 'value' => 'Y',
+ ),
+ ),'ORDER BY item_type.item_name',false,$start,$end);
+ $PROPER_INVENTORY = array();
foreach($inventory as $item)
{
$PROPER_INVENTORY[] = Item::factory($item->getUserItemId(),$this->db);
@@ -383,10 +391,54 @@ class User extends ActiveTable
public function grabInventorySize()
{
$result = new Item($this->db);
- $result = $result->findByUserId($this->getUserId(),null,true);
+ $result = $result->findBy(array(
+ 'user_id' => $this->getUserId(),
+ array(
+ 'table' => 'item_class',
+ 'column' => 'normal_inventory_display',
+ 'value' => 'Y',
+ ),
+ ),null,true);
return $result;
} // end grabInventorySize
+
+ public function grabRecipes($start=null,$end=null)
+ {
+ if(($start === null && $end === null) == false &&
+ ($start !== null && $end !== null) == false
+ )
+ {
+ throw new ArgumentError('Must specify either no arguments or both arguments.');
+ } // end problem w/ args.
+
+ $inventory = new Recipe_Item($this->db);
+ $inventory = $inventory->findBy(array(
+ 'user_id' => $this->getUserId(),
+ array(
+ 'table' => 'item_class',
+ 'column' => 'item_class_id',
+ 'value' => 4,
+ ),
+ ),'ORDER BY item_type.item_name',false,$start,$end);
+
+ return $inventory;
+ } // end grabRecipies
+
+ public function grabRecipeSize()
+ {
+ $result = new Recipe_Item($this->db);
+ $result = $result->findBy(array(
+ 'user_id' => $this->getUserId(),
+ array(
+ 'table' => 'item_class',
+ 'column' => 'item_class_id',
+ 'value' => 4,
+ ),
+ ),null,true);
+
+ return $result;
+ } // end grabRecipieSize
/**
* Add some money to the user.
includes/classes/user/user.class.php
@@ -374,3 +374,17 @@ h3 {
display: inline;
padding-left: 1em;
}
+
+.page-subnav {
+ text-align: center;
+ font-size: 1.2em;
+}
+
+.recipe-desc {
+ vertical-align: top;
+}
+.recipe-name {
+ font-weight: bold;
+ margin: 0;
+ padding: 0;
+}
resources/styles/style.css
@@ -5,7 +5,7 @@
<script type='text/javascript'>
<!--
$(document).ready(function(){
- var data = '/item-search-ajax';
+ var data = '{/literal}{$display_settings.public_dir}{literal}/item-search-ajax';
$("#{/literal}{$id}{literal}").autocomplete(data,{
max: 10,
mustMatch: true,
template/templates/_widgets/item_search.tpl
@@ -1,3 +1,5 @@
+<p class='page-subnav'>Inventory | {kkkurl link_text='Crafting' slug='crafting'}</p>
+
{if $notice != ''}<div id='item-notice' class='{$fat} notice-box'>{$notice}</div>{/if}
{section name=item_index loop=$inventory}
{assign var='item' value=$inventory[item_index]}
template/templates/items/list.tpl
@@ -15,6 +15,9 @@
<script type='text/javascript' src='{$display_settings.public_dir}/resources/script/fat.js'></script>
<script type='text/javascript' src='{$display_settings.public_dir}/resources/script/yasashii.js'></script>
+ <script type='text/javascript' src='{$display_settings.public_dir}/resources/script/jquery.min.js'></script>
+ <script type='text/javascript' src='{$display_settings.public_dir}/resources/script/autocomplete/jquery.autocomplete.min.js'></script>
+ <link href="{$display_settings.public_dir}/resources/script/autocomplete/jquery.autocomplete.css" rel="stylesheet" type="text/css" />
{foreach from=$spry.js item=js_file}
<script type="text/javascript" src="{$display_settings.public_dir}/resources/script/spry/widgets/{$js_file}"></script>
template/templates/layout/deep/header.tpl
91c93b411fb7917b36d5b13249850804c0a8bdcb
Nicholas 'OwlManAtt' Evans
owlmanatt@gmail.com
http://github.com/OwlManAtt/kittokittokitto/commit/6249d0a62ffa40b42489c45cb3ac72dfd776c442
6249d0a62ffa40b42489c45cb3ac72dfd776c442
2009-07-13T14:51:01-07:00
2009-07-13T14:43:23-07:00
Finished integrating crafting system.
432cc46c77e5b391268bddb60049ada6e1fbbd9c
Nicholas 'OwlManAtt' Evans
owlmanatt@gmail.com