';
renderGroup(group.fields);
@@ -1353,6 +1356,8 @@ function saveItem() {
delete item.success_cap;
if (sBase || sPer || sCap) {
item.success = {base: sBase, per_level: sPer, cap: sCap};
+ } else {
+ delete item.success;
}
}
diff --git a/internal/admin/static/objecteditor.js b/internal/admin/static/objecteditor.js
index 3f2a875..5153458 100644
--- a/internal/admin/static/objecteditor.js
+++ b/internal/admin/static/objecteditor.js
@@ -2,6 +2,7 @@ var objectData = null;
var objectID = null;
var expandedCards = {};
var cardWidths = {};
+var toolTypes = null;
var SECTIONS = [
{
@@ -48,7 +49,7 @@ var SECTIONS = [
['deplete_timer', 'Deplete', 'number', '45', 'narrow', function(d) { return d.skill === 'woodcutting'; }],
['nest_chance', 'Nest 1/n', 'number', '256', 'narrow', function(d) { return d.skill === 'woodcutting'; }],
]},
- {label:'Tools', key:'tools', type:'tags'},
+ {label:'Tools', key:'tools', type:'tools_checkbox'},
],
subtables: [
{label:'Drops', key:'drops', fields:[
@@ -133,6 +134,7 @@ function initObjectEditor() {
editorType = 'objects';
editorFields = [];
loadList();
+ fetchToolTypes();
if (window.location.hash) loadObject(window.location.hash.substring(1));
}
@@ -266,6 +268,10 @@ function renderCard(sec, data) {
h += '
';
h += renderTags(sec, il, data);
h += '
';
+ } else if (il.type === 'tools_checkbox') {
+ h += '
';
+ h += renderToolsCheckbox(sec, il, data);
+ h += '
';
} else if (il.type === 'kv') {
h += '
';
h += renderKV(sec, il, data);
@@ -286,6 +292,8 @@ function renderCard(sec, data) {
noRow.forEach(function(il) {
if (il.type === 'tags') {
h += renderTags(sec, il, data);
+ } else if (il.type === 'tools_checkbox') {
+ h += renderToolsCheckbox(sec, il, data);
} else if (il.type === 'kv') {
h += renderKV(sec, il, data);
} else {
@@ -518,6 +526,35 @@ function renderKV(sec, il, data) {
return h;
}
+function renderToolsCheckbox(sec, il, data) {
+ var sectionRoot = data[cardPath(sec)] || {};
+ var arr = sectionRoot[il.key] || [];
+ var choices = toolTypes || [];
+ var h = '
';
+ h += '
' + esc(il.label) + ' ';
+ h += '
';
+ choices.forEach(function(t) {
+ var checked = arr.indexOf(t) >= 0 ? ' checked' : '';
+ h += '' + esc(t) + '
';
+ if (choices.length === 0) {
+ h += '
Loading tool types... ';
+ }
+ h += '
';
+ return h;
+}
+
+function fetchToolTypes() {
+ API.get('/api/tools').then(function(tools) {
+ toolTypes = tools || [];
+ renderCurrent();
+ }).catch(function() {
+ toolTypes = [];
+ renderCurrent();
+ });
+}
+
function toggleCard(id) {
expandedCards[id] = expandedCards[id] === false ? true : false;
renderCurrent();
@@ -742,6 +779,11 @@ function saveObject() {
sectionObj[il.key] = el.value.split(',').map(function(s) { return s.trim(); }).filter(function(s) { return s; });
hasValues = true;
}
+ } else if (il.type === 'tools_checkbox') {
+ var chks = document.querySelectorAll('.obj-tool-chk:checked');
+ var tools = [];
+ chks.forEach(function(c) { tools.push(c.getAttribute('data-tool')); });
+ if (tools.length > 0) { sectionObj[il.key] = tools; hasValues = true; }
} else if (il.type === 'kv') {
var kvEl = document.querySelector('.obj-kv-list[data-sec="' + sec.id + '"][data-key="' + il.key + '"]');
if (kvEl) {
diff --git a/internal/game/core_utils.go b/internal/game/core_utils.go
index 71d0acb..a07e789 100644
--- a/internal/game/core_utils.go
+++ b/internal/game/core_utils.go
@@ -144,7 +144,7 @@ func (g *Game) broadcastAction(sess *net.Session, format string, args ...interfa
func (g *Game) newInventorySlot(itemID string, qty int) *player.InventorySlot {
slot := &player.InventorySlot{ItemID: itemID, Quantity: qty}
if def, err := g.ItemStore.Load(itemID); err == nil && def.MaxQuality > 0 {
- slot.Quality = def.Quality
+ slot.Quality = def.MaxQuality
slot.MaxQuality = def.MaxQuality
}
return slot
diff --git a/internal/item/item.go b/internal/item/item.go
index 77f462a..93f736b 100644
--- a/internal/item/item.go
+++ b/internal/item/item.go
@@ -57,7 +57,7 @@ type DefenseBonuses struct {
type OtherBonuses struct {
Strength int `yaml:"strength,omitempty"`
- Ranged int `yaml:"ranged,omitempty"`
+ RangedStrength int `yaml:"ranged_strength,omitempty"`
Science int `yaml:"science,omitempty"`
Technology int `yaml:"technology,omitempty"`
}
@@ -91,7 +91,6 @@ type ItemDef struct {
Tool *ToolDef `yaml:"tool,omitempty"`
Requirements map[string]int `yaml:"requirements,omitempty"`
- Quality int `yaml:"quality"`
MaxQuality int `yaml:"max_quality"`
Craft CraftList `yaml:"craft,omitempty"`
@@ -207,7 +206,7 @@ func (d *ItemDef) Stats() ItemStats {
}
if d.Equipment.Other != nil {
s.StrengthBonus = d.Equipment.Other.Strength
- s.RangedStrength = d.Equipment.Other.Ranged
+ s.RangedStrength = d.Equipment.Other.RangedStrength
s.ScienceDamage = d.Equipment.Other.Science
s.TechnologyBonus = d.Equipment.Other.Technology
}
--
cgit v1.2.3