- \n";
+ /* Only write the
- \n"
- ."
\n"; + $class = "undetermined"; + if ($a) { + if ($missing_prereqs) { + if (isset($missing_prereqs[$loadout['hullid']])) { + $class = "not-sittable"; + } else { + $class = "sittable"; + } + } else { + $class = "flyable"; + } + } + echo "
"; + echo " "; + } + + if($first === false) { + echo ""; $dps = $loadout['dps'] === null ? 'N/A' : \Osmium\Chrome\format($loadout['dps'], 2); $ehp = $loadout['ehp'] === null ? 'N/A' : \Osmium\Chrome\format($loadout['ehp'], 2, 'k'); $esp = $loadout['estimatedprice'] === null ? 'N/A' : \Osmium\Chrome\format($loadout['estimatedprice'], 2); @@ -366,12 +412,83 @@ function print_loadout_list(array $ids, $relative, $offset = 0, $nothing_message echo " "; + echo "" .$esp."ISK\n"; + echo ""; + echo "\n" + ." "; + + echo "\n"; + echo "$sn"; + echo ""; + + echo "
\n"; + print_viewpermission_sprites($loadout); + echo "\n"; + echo ""; echo "" .\Osmium\Chrome\escape($loadout['name'])."\n"; - echo " "; + + echo "\n"; + if ($a && $missing_prereqs) { + echo "
\n"; + echo ""; + if (isset($missing_prereqs[$loadout['hullid']])) { + list($unused, $hull_needed) = \Osmium\Skills\sum_sp($missing_prereqs[$loadout['hullid']], $fit['skillset']); + $h = \Osmium\Chrome\format($hull_needed); + echo "Hull in $h SP – "; + } + list($unused, $all_needed) = \Osmium\Skills\sum_sp($missing_unique, $fit['skillset']); + $a = \Osmium\Chrome\format($all_needed); + echo "Fit in $a SP"; + echo ""; + } + echo ""; + $tags = array_filter(explode(' ', $loadout['taglist']), function($tag) { return trim($tag) != ''; }); + if(count($tags) == 0) { + echo "(no tags)\n"; + } else { + echo "\n"; + } + echo " \n"; + + echo ""; + echo "".\Osmium\Chrome\format_character_name($loadout, $relative); + echo " (".\Osmium\Chrome\format_reputation($loadout['reputation']).")\n"; + + echo " "; + + echo "
".date('Y-m-d', $loadout['updatedate'])."
\n"; + echo ""; + $votes = (abs($loadout['votes']) == 1) ? 'vote' : 'votes'; + $upvotes = \Osmium\Chrome\format($loadout['upvotes'], -1); + $downvotes = \Osmium\Chrome\format($loadout['downvotes'], -1); + echo "+{$upvotes}/-{$downvotes} "; + echo "
\n"; + + $comments = ($loadout['comments'] == 1) ? 'comment' : 'comments'; + echo "" + .\Osmium\Chrome\format($loadout['comments'], -1)." {$comments}\n"; + echo " \n";
+ echo "
| Ideal | Ship | Name | Tags | Author | Social |
|---|---|---|---|---|---|
| $groupname | |||||
".$nothing_message."
\n"; + } +} + +function print_viewpermission_sprites($loadout) { $vp = $loadout['viewpermission']; $vpsize = 16; if($vp > 0) { @@ -418,44 +535,6 @@ function print_loadout_list(array $ids, $relative, $offset = 0, $nothing_message if((int)$loadout['visibility'] === \Osmium\Fit\VISIBILITY_PRIVATE) { echo \Osmium\Chrome\sprite($relative, "(hidden loadout)", 4, 13, 64, 64, $vpsize); } - - echo "\n"; - - echo "".\Osmium\Chrome\format_character_name($loadout, $relative); - echo " (".\Osmium\Chrome\format_reputation($loadout['reputation']).")\n"; - - echo " — ".date('Y-m-d', $loadout['updatedate'])."\n"; - - $votes = (abs($loadout['votes']) == 1) ? 'vote' : 'votes'; - $upvotes = \Osmium\Chrome\format($loadout['upvotes'], -1); - $downvotes = \Osmium\Chrome\format($loadout['downvotes'], -1); - echo "" - .\Osmium\Chrome\format($loadout['votes'], -1) - ." {$votes} (+{$upvotes}|-{$downvotes})\n"; - - $comments = ($loadout['comments'] == 1) ? 'comment' : 'comments'; - echo " — " - .\Osmium\Chrome\format($loadout['comments'], -1)." {$comments}\n"; - - $tags = array_filter(explode(' ', $loadout['taglist']), function($tag) { return trim($tag) != ''; }); - if(count($tags) == 0) { - echo "(no tags)\n"; - } else { - echo "\n"; - } - echo "\n"; - } - - if($first === false) { - echo "\n"; - } else { - echo "
".$nothing_message."
\n"; - } } function get_search_cond_from_advanced() { diff --git a/inc/skills.php b/inc/skills.php new file mode 100644 index 0000000..69f49c5 --- /dev/null +++ b/inc/skills.php @@ -0,0 +1,159 @@ + 277, /* RequiredSkill1 => RequiredSkill1Level */ + 183 => 278, /* etc… */ + 184 => 279, + 1285 => 1286, + 1289 => 1287, + 1290 => 1288, + ]; + + $vals = []; + + static $ctx = null; + if($ctx === null) dogma_init_context($ctx); + + /* XXX: this is hackish */ + dogma_init_context($ctx); + dogma_set_ship($ctx, $typeid); + foreach($rs as $rsattid => $rslattid) { + if(dogma_get_ship_attribute($ctx, $rsattid, $skill) === DOGMA_OK + && dogma_get_ship_attribute($ctx, $rslattid, $level) === DOGMA_OK) { + if($skill > 0 && $level > 0) { + $vals[$skill] = $level; + } + } + } + + \Osmium\State\put_cache_memory($key, $vals, 86400); + return $vals; +} + +function get_skill_rank($typeid) { + $typeid = (int)$typeid; + $key = 'NameCache_skill_rank_'.$typeid; + $cache = \Osmium\State\get_cache_memory($key); + + if($cache !== null) { + return $cache; + } + + static $ctx = null; + if($ctx === null) dogma_init_context($ctx); + + /* XXX */ + dogma_set_ship($ctx, $typeid); + + dogma_get_ship_attribute($ctx, \Osmium\Fit\ATT_SkillTimeConstant, $rank); + + \Osmium\State\put_cache_memory($key, $rank, 86400); + return $rank; +} + +/** + * Takes in an array of item/module type IDs; fills the $result array with entries like: + * input_type_id => array( + * skill_type_id => required_level, + * ... + * ) + */ +function get_skill_prerequisites_for_types(array $types, array &$result) { + foreach ($types as $typeid) { + if(!isset($result[$typeid])) { + $result[$typeid] = []; + } + + foreach(get_required_skills($typeid) as $stid => $slevel) { + if(!isset($result[$stid])) { + get_skill_prerequisites_for_types([ $stid ], $result); + } + + $result[$typeid][$stid] = $slevel; + } + } +} + +function uniquify_prerequisites(array $prereqs) { + $prereqs_unique = array(); + foreach($prereqs as $tid => $arr) { + foreach($arr as $stid => $level) { + if(isset($prereqs_unique[$stid])) { + $prereqs_unique[$stid] = max($prereqs_unique[$stid], $level); + } else { + $prereqs_unique[$stid] = $level; + } + } + } + return $prereqs_unique; +} + +function get_missing_prerequisites(array $prereqs, array $skillset) { + $missing = array(); + foreach($prereqs as $tid => $contents) { + foreach($prereqs[$tid] as $stid => $level) { + $current = isset($skillset['override'][$stid]) + ? $skillset['override'][$stid] : $skillset['default']; + + if($current < $level) { + if (!isset($missing[$tid])) { + $missing[$tid] = array(); + } + $missing[$tid][$stid] = $level; + break; + } + } + } + return $missing; +} + +function get_missing_prerequisites_unique(array $prereqs_unique, array $skillset) { + $missing_unique = array(); + foreach($prereqs_unique as $stid => $level) { + $current = isset($skillset['override'][$stid]) + ? $skillset['override'][$stid] : $skillset['default']; + + if($current < $level) { + $missing_unique[$stid] = $level; + } + } + return $missing_unique; +} + +function sp($level, $rank) { + if($level == 0) return 0; + return ceil(pow(2, 2.5 * ($level - 1.0)) * 250.0 * $rank); +} + +/** returns array($total_sp, $missing_sp) */ +function sum_sp(array $prereqs_unique, array $skillset) { + $total_sp = 0; + $missing_sp = 0; + foreach($prereqs_unique as $stid => $level) { + $current = isset($skillset['override'][$stid]) + ? $skillset['override'][$stid] : $skillset['default']; + + $rank = get_skill_rank($stid); + $needed = sp($level, $rank); + + $total_sp += $needed; + + if($current >= $level) { + continue; + } + + $missing_sp += $needed - sp($current, $rank); + } + return array($total_sp, $missing_sp); +} diff --git a/src/sass/search.scss b/src/sass/search.scss index a34f953..85553a1 100644 --- a/src/sass/search.scss +++ b/src/sass/search.scss @@ -61,89 +61,6 @@ div#search_full { } } -ol.loadout_sr { - margin: 0; - padding: 0; - list-style-type: none; - text-align: left; - - &> li { - display: inline-block; - position: relative; - width: 16em; - min-height: 7.25em; - vertical-align: top; - margin: 1em 3em 1em 7em; - padding: 0 0.5em; - text-align: left; - - border-left: 1px solid $subsection-border-color; - - &> a > img:first-child { - display: inline-block; - width: 4em; - height: 4em; - vertical-align: middle; - - overflow: hidden; - border-radius: 1em; - position: absolute; - left: -4.5em; - top: 0em; - } - - &> a.fitname { - display: block; - @include ellipsis; - } - - &> div.dps, &> div.ehp, &> div.esp { - position: absolute; - left: -4.75em; - width: 4.25em; - @include ellipsis; - text-align: right; - - &> span > strong:after { - content: " "; - } - - &.dps { - top: 4.25em; - } - - &.ehp { - top: 5.25em; - } - - &.esp { - top: 6.25em; - } - } - - &> div.sideicons { - position: absolute; - left: -5.25em; - top: 0.5em; - width: 16px; - } - - &> small, &> small > a { - color: $loadout-search-metadata-text-color; - text-decoration: none; - } - - &> em.notags { - display: block; - opacity: 0.5; - } - - &> ul.tags { - opacity: 0.8; - } - } -} - p.pagination { color: $pagination-meta-text-color; font-size: 0.8em; @@ -194,3 +111,73 @@ ol.pagination { } } } + +table.loadout_sr { + margin-left: auto; + margin-right: auto; + + th { + text-align: left; + padding-left: 6px; + } + + border-spacing: 0 5px; + td { + padding-left: 6px; + padding-right: 6px; + } + + tr.flyable { + background-color: $skills-flyable-bg-color; + } + + tr.sittable { + background-color: $skills-sittable-bg-color; + } + + tr.not-sittable { + background-color: $skills-not-sittable-bg-color; + } + + tr.undetermined { + background-color: $skills-undetermined-bg-color; + } + + div.dps, div.ehp, div.esp { + text-align: right; + + &> span > strong:after { + content: " "; + } + } + + td.ideal { + white-space: nowrap; + } + + td.hull a { + display: block; + position: relative; + border-radius: 1em; + overflow: hidden; + + &> img.hull-icon { + width: 4em; + height: 4em; + } + + &> .name { + position: absolute; + bottom: 0px; + left: 0px; + width: 100%; + padding: 0 0.5em; + box-sizing: border-box; + -moz-box-sizing: border-box; + text-align: center; + background: rgba(0, 0, 0, 0.4); + font-size: xx-small; + @include ellipsis; + } + } +} diff --git a/src/sass/themes/dark.scss b/src/sass/themes/dark.scss index 1ac6a8e..cc40559 100644 --- a/src/sass/themes/dark.scss +++ b/src/sass/themes/dark.scss @@ -219,6 +219,15 @@ $reputation-loss-text-color: hsl(0, 100%, 50%); $privilege-progress-bg-color: $subsection-bg-color; $privilege-progress-done-bg-color: $reputation-gain-text-color; +// +// Search +// + +$skills-flyable-bg-color: rgba(102, 255, 102, 0.2); +$skills-sittable-bg-color: rgba(255, 255, 102, 0.2); +$skills-not-sittable-bg-color: rgba(255, 102, 102, 0.2); +$skills-undetermined-bg-color: rgba(255, 255, 255, 0.1); + ///////////////////////////////////// -@import "../root.scss"; \ No newline at end of file +@import "../root.scss"; diff --git a/src/sass/themes/light.scss b/src/sass/themes/light.scss index 1ce8983..064e341 100644 --- a/src/sass/themes/light.scss +++ b/src/sass/themes/light.scss @@ -219,6 +219,15 @@ $reputation-loss-text-color: hsl(0, 100%, 50%); $privilege-progress-bg-color: $subsection-bg-color; $privilege-progress-done-bg-color: $reputation-gain-text-color; +// +// Search +// + +$skills-flyable-bg-color: rgba(102, 255, 102, 0.2); +$skills-sittable-bg-color: rgba(255, 255, 102, 0.2); +$skills-not-sittable-bg-color: rgba(255, 102, 102, 0.2); +$skills-undetermined-bg-color: rgba(0, 0, 0, 0.1); + ///////////////////////////////////// -@import "../root.scss"; \ No newline at end of file +@import "../root.scss";