Browse Source

wrote some dialogue tests

tags/v0.1.7^2
big bad waffle 6 years ago
parent
commit
154ccca251
6 changed files with 12 additions and 10 deletions
  1. +3
    -4
      src/server/components/dialogue.js
  2. +2
    -2
      src/server/components/trade.js
  3. +2
    -2
      src/server/items/generators/names.js
  4. +1
    -1
      src/server/items/generators/stats.js
  5. +3
    -0
      tests/server/mocks/generator.js
  6. +1
    -1
      tests/tests.js

+ 3
- 4
src/server/components/dialogue.js View File

@@ -22,9 +22,8 @@ define([

talk: function(msg) {
var target = msg.target;
var targetName = (msg.targetName || '').toLowerCase();

if ((target == null) && (!targetName))
if ((target == null) && (!msg.targetName))
return false;

if ((target != null) && (target.id == null)) {
@@ -32,8 +31,8 @@ define([
if (!target)
return false;
}
else if (targetName != null) {
target = this.obj.instance.objects.objects.find(o => ((o.name) && (o.name.toLowerCase() == targetName)));
else if (msg.targetName != null) {
target = this.obj.instance.objects.objects.find(o => ((o.name) && (o.name.toLowerCase() == msg.targetName.toLowerCase())));
if (!target)
return false;
}


+ 2
- 2
src/server/components/trade.js View File

@@ -1,6 +1,6 @@
define([
'items/generator',
'items/generators/stats'
'../items/generator',
'../items/generators/stats'
], function(
generator,
statGenerator


+ 2
- 2
src/server/items/generators/names.js View File

@@ -1,6 +1,6 @@
define([
'items/config/prefixes',
'items/config/suffixes'
'../config/prefixes',
'../config/suffixes'
], function(
prefixes,
suffixes


+ 1
- 1
src/server/items/generators/stats.js View File

@@ -1,5 +1,5 @@
define([
'items/generators/statsFishingRod'
'./statsFishingRod'
], function(
statsFishingRod
) {


+ 3
- 0
tests/server/mocks/generator.js View File

@@ -4,8 +4,11 @@ define([
) {
return {
nextId: 0,

player: function(blueprint) {
var result = {
id: this.nextId++,
fireEvent: function() {},
syncer: {},
instance: {


+ 1
- 1
tests/tests.js View File

@@ -3,7 +3,7 @@ define([
], function(
inventory
) {
var components = ['inventory', 'reputation'];
var components = ['inventory', 'reputation', 'dialogue'];

return {
stats: {


Loading…
Cancel
Save