gitlord
/
isleward
espelhamento de https://gitlab.com/Isleward/isleward.git
1
0
Fork 0
Código Issues 0 Versões 203 Wiki Atividade
Ver código fonte

Merge branch 'v0.1.10' of gitlab.com:Isleward/isleward into v0.1.10

tags/v0.1.10^2
Big Bad Waffle 6 anos atrás
pai
4bb4231b4f f4e7b70bf1
commit
39ed0652cf
40 arquivos alterados com 11913 adições e 14032 exclusões
Visão dividida
Opções de diferenças
Mostrar estatísticas Baixar arquivo de patch Baixar arquivo de diferenças
  1. +1
    -1
      src/client/index.html
  2. +0
    -7
      src/client/ui/templates/characters/characters.js
  3. +31
    -6
      src/client/ui/templates/createCharacter/createCharacter.js
  4. +1
    -1
      src/client/ui/templates/createCharacter/styles.less
  5. +1
    -1
      src/client/ui/templates/online/template.html
  6. +3
    -3
      src/client/ui/templates/tooltips/styles.less
  7. +1
    -1
      src/server/components/player.js
  8. +1
    -1
      src/server/components/spellbook.js
  9. +117
    -123
      src/server/config/animations.js
  10. +13
    -13
      src/server/config/classes.js
  11. +2469
    -2807
      src/server/config/maps/cave/map.json
  12. +2499
    -2890
      src/server/config/maps/city/map.json
  13. +1057
    -1236
      src/server/config/maps/crystalCaves/map.json
  14. +1215
    -1429
      src/server/config/maps/estuary/map.json
  15. +0
    -0
      src/server/config/maps/fjolarok/chats.js
  16. +0
    -0
      src/server/config/maps/fjolarok/dialogues.js
  17. +0
    -0
      src/server/config/maps/fjolarok/events/fishingTournament.js
  18. +0
    -0
      src/server/config/maps/fjolarok/events/rodriguezHeist.js
  19. +3274
    -387
      src/server/config/maps/fjolarok/map.json
  20. +0
    -0
      src/server/config/maps/fjolarok/quests.js
  21. BIN
     
  22. +1
    -1
      src/server/config/maps/fjolarok/zone.js
  23. +1
    -1
      src/server/config/maps/mapList.js
  24. +1141
    -1334
      src/server/config/maps/sewer/map.json
  25. +0
    -3772
      src/server/config/maps/tutorial/map.json
  26. +72
    -0
      src/server/config/spirits.js
  27. +1
    -2
      src/server/mods/class-necromancer/index.js
  28. +7
    -8
      src/server/mods/event-halloween/index.js
  29. +0
    -0
      src/server/mods/event-halloween/maps/fjolarok/dialogues.js
  30. +0
    -0
      src/server/mods/event-halloween/maps/fjolarok/events/halloween.js
  31. +0
    -0
      src/server/mods/event-halloween/maps/fjolarok/events/halloweenBoss.js
  32. +0
    -0
      src/server/mods/event-halloween/maps/fjolarok/map.json
  33. +0
    -0
      src/server/mods/event-halloween/maps/fjolarok/quests.js
  34. +0
    -0
      src/server/mods/event-halloween/maps/fjolarok/zone.js
  35. +5
    -6
      src/server/mods/event-xmas/index.js
  36. +0
    -0
      src/server/mods/event-xmas/maps/fjolarok/dialogues.js
  37. +0
    -0
      src/server/mods/event-xmas/maps/fjolarok/events/xmas.js
  38. +0
    -0
      src/server/mods/event-xmas/maps/fjolarok/map.json
  39. +0
    -0
      src/server/mods/event-xmas/maps/fjolarok/zone.js
  40. +2
    -2
      src/server/world/atlas.js

+ 1
- 1
src/client/index.html Ver arquivo

@@ -1,7 +1,7 @@
<!doctype html>
<html>
<head>
<title>dev</title>
<title>isleward</title>
<script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
<script src="js/system/addons.js"></script>
<script src="plugins/require.js" data-main="js/app"></script>


+ 0
- 7
src/client/ui/templates/characters/characters.js Ver arquivo

@@ -20,13 +20,6 @@ define([
selected: null,
deleteCount: 0,

classSprites: {
warrior: [1, 1],
wizard: [2, 0],
thief: [6, 0],
cleric: [4, 0]
},

postRender: function () {
this.find('.btnPlay').on('click', this.onPlayClick.bind(this));
this.find('.btnNew').on('click', this.onNewClick.bind(this));


+ 31
- 6
src/client/ui/templates/createCharacter/createCharacter.js Ver arquivo

@@ -27,7 +27,11 @@ define([

uiFactory.build('tooltips');

this.find('.txtClass').on('click', this.changeClass.bind(this));
this.find('.txtClass')
.on('click', this.changeClass.bind(this))
.on('mousemove', this.onClassHover.bind(this))
.on('mouseleave', this.onClassUnhover.bind(this));

this.find('.txtCostume').on('click', this.changeCostume.bind(this));

this.find('.btnBack').on('click', this.back.bind(this));
@@ -59,8 +63,8 @@ define([

this.costume = -1;

this.class = 'wizard';
this.find('.txtClass').html('Wizard');
this.class = 'owl';
this.find('.txtClass').html('Owl');

this.changeCostume({
target: this.find('.txtCostume')
@@ -80,12 +84,10 @@ define([
events.emit('onShowTooltip', text, el[0], pos);
$('.uiTooltips .tooltip').addClass('bright');
},

onProphecyUnhover: function (e) {
var el = $(e.currentTarget);
events.emit('onHideTooltip', el[0]);
},

onProphecyClick: function (e) {
var el = $(e.currentTarget);
var pName = el.attr('prophecy');
@@ -140,9 +142,30 @@ define([
this.el.find('.message').html(result);
},

onClassHover: function (e) {
var el = $(e.currentTarget);

var pos = {
x: e.clientX + 25,
y: e.clientY
};

var text = ({
owl: `The wise Owl guides you; granting you the focus needed to cast spells. <br /><br />Upon level up, you gain 1 Intellect.`,
bear: `The towering Bear strenghtens you; lending force to your blows. <br /><br />Upon level up, you gain 1 Strength.`,
lynx: `The nimble Lynx hastens you; allowing your strikes to land true. <br /><br />Upon level up, you gain 1 Dexterity.`
})[this.class];

events.emit('onShowTooltip', text, el[0], pos, 200);
$('.uiTooltips .tooltip').addClass('bright');
},
onClassUnhover: function (e) {
var el = $(e.currentTarget);
events.emit('onHideTooltip', el[0]);
},
changeClass: function (e) {
var el = $(e.target);
var classes = ['wizard', 'warrior', 'thief'];
var classes = ['owl', 'bear', 'lynx'];
var nextIndex = (classes.indexOf(this.class) + 1) % classes.length;
this.costume = -1;

@@ -151,6 +174,8 @@ define([
el.html(newClass[0].toUpperCase() + newClass.substr(1));

this.class = newClass;

this.onClassHover(e);
},

changeCostume: function (e) {


+ 1
- 1
src/client/ui/templates/createCharacter/styles.less Ver arquivo

@@ -48,7 +48,7 @@

.txtClass {
&:before {
content: 'Class: ';
content: 'Spirit: ';
}
}



+ 1
- 1
src/client/ui/templates/online/template.html Ver arquivo

@@ -7,7 +7,7 @@
<div class="heading">
<div class="col">level</div>
<div class="col">name</div>
<div class="col">class</div>
<div class="col">spirit</div>
</div>
</div>
</div>


+ 3
- 3
src/client/ui/templates/tooltips/styles.less Ver arquivo

@@ -11,12 +11,12 @@
text-align: justify;

&.bright {
background-color: @blueC;
color: @white;
background-color: @grayB;
color: @black;
}

.hidden {
display: none;
}
}
}
}

+ 1
- 1
src/server/components/player.js Ver arquivo

@@ -33,7 +33,7 @@ define([
skinId: character.skinId,
name: character.name,
class: character.class,
zoneName: character.zoneName || 'tutorial',
zoneName: character.zoneName || 'fjolarok',
x: character.x,
y: character.y,
account: character.account,


+ 1
- 1
src/server/components/spellbook.js Ver arquivo

@@ -106,7 +106,7 @@ define([
else if (sheetName.indexOf('/') > -1)
animation = animations.mobs[sheetName];
else
animation = animations.classes[this.obj.class];
animation = animations.classes;

if ((animation) && (animation[this.obj.cell]) && (animation[this.obj.cell][animationName])) {
builtSpell.animation = extend(true, {}, animation[this.obj.cell][animationName]);


+ 117
- 123
src/server/config/animations.js Ver arquivo

@@ -8,138 +8,132 @@ define([
events.emit('onBeforeGetAnimations', this);
},
classes: {
wizard: {
'2': {
hitStaff: {
sheet: 'animChar',
row: 1,
col: 5,
frames: 3,
frameDelay: 4
},
raiseStaff: {
sheet: 'animChar',
row: 0,
col: 3,
frames: 5,
frameDelay: 3
}
'2': {
hitStaff: {
sheet: 'animChar',
row: 1,
col: 5,
frames: 3,
frameDelay: 4
},
raiseStaff: {
sheet: 'animChar',
row: 0,
col: 3,
frames: 5,
frameDelay: 3
}
},
'3': {
hitStaff: {
sheet: 'animChar',
row: 0,
col: 0,
frames: 3,
frameDelay: 4
},
raiseStaff: {
sheet: 'animChar',
row: 1,
col: 0,
frames: 5,
frameDelay: 3
}
},
'4': {
hitStaff: {
sheet: 'animChar',
row: 2,
col: 5,
frames: 3,
frameDelay: 5
},
'3': {
hitStaff: {
sheet: 'animChar',
row: 0,
col: 0,
frames: 3,
frameDelay: 4
},
raiseStaff: {
sheet: 'animChar',
row: 1,
col: 0,
frames: 5,
frameDelay: 3
}
raiseStaff: {
sheet: 'animChar',
row: 2,
col: 0,
frames: 5,
frameDelay: 4
}
},
'5': {
hitStaff: {
sheet: 'animChar',
row: 3,
col: 0,
frames: 3,
frameDelay: 5
},
raiseStaff: {
sheet: 'animChar',
row: 3,
col: 3,
frames: 5,
frameDelay: 4
}
},
'6': {
hitSword: {
sheet: 'animChar',
row: 5,
col: 5,
frames: 3,
frameDelay: 5
},
'4': {
hitStaff: {
sheet: 'animChar',
row: 2,
col: 5,
frames: 3,
frameDelay: 5
},
raiseStaff: {
sheet: 'animChar',
row: 2,
col: 0,
frames: 5,
frameDelay: 4
}
raiseHands: {
sheet: 'animChar',
row: 5,
col: 0,
frames: 5,
frameDelay: 5
}
},
'7': {
hitSword: {
sheet: 'animChar',
row: 4,
col: 0,
frames: 3,
frameDelay: 5
},
'5': {
hitStaff: {
sheet: 'animChar',
row: 3,
col: 0,
frames: 3,
frameDelay: 5
},
raiseStaff: {
sheet: 'animChar',
row: 3,
col: 3,
frames: 5,
frameDelay: 4
}
raiseHands: {
sheet: 'animChar',
row: 4,
col: 3,
frames: 5,
frameDelay: 6
}
},
thief: {
'6': {
hitSword: {
sheet: 'animChar',
row: 5,
col: 5,
frames: 3,
frameDelay: 5
},
raiseHands: {
sheet: 'animChar',
row: 5,
col: 0,
frames: 5,
frameDelay: 5
}
'9': {
hitSword: {
sheet: 'animChar',
row: 6,
col: 0,
frames: 3,
frameDelay: 5
},
'7': {
hitSword: {
sheet: 'animChar',
row: 4,
col: 0,
frames: 3,
frameDelay: 5
},
raiseHands: {
sheet: 'animChar',
row: 4,
col: 3,
frames: 5,
frameDelay: 6
}
raiseShield: {
sheet: 'animChar',
row: 7,
col: 0,
frames: 5,
frameDelay: 7
}
},
warrior: {
'9': {
hitSword: {
sheet: 'animChar',
row: 6,
col: 0,
frames: 3,
frameDelay: 5
},
raiseShield: {
sheet: 'animChar',
row: 7,
col: 0,
frames: 5,
frameDelay: 7
}
'10': {
hitSword: {
sheet: 'animChar',
row: 7,
col: 5,
frames: 3,
frameDelay: 5
},
'10': {
hitSword: {
sheet: 'animChar',
row: 7,
col: 5,
frames: 3,
frameDelay: 5
},
raiseShield: {
sheet: 'animChar',
row: 6,
col: 3,
frames: 5,
frameDelay: 7
}
raiseShield: {
sheet: 'animChar',
row: 6,
col: 3,
frames: 5,
frameDelay: 7
}
}
},


+ 13
- 13
src/server/config/classes.js Ver arquivo

@@ -4,28 +4,28 @@ define([
events
) {
var classes = {
list: ['warrior', 'wizard', 'thief'],
list: ['bear', 'owl', 'lynx'],
portraits: {
warrior: {
bear: {
x: 0,
y: 0
},
wizard: {
owl: {
x: 2,
y: 0
},
thief: {
lynx: {
x: 3,
y: 0
}
},
spells: {
wizard: ['magic missile', 'ice spear'],
warrior: ['slash', 'charge'],
thief: ['flurry', 'smokebomb']
owl: ['magic missile', 'ice spear'],
bear: ['slash', 'charge'],
lynx: ['flurry', 'smokebomb']
},
stats: {
wizard: {
owl: {
values: {
hpMax: 50
},
@@ -34,7 +34,7 @@ define([
int: 1
}
},
warrior: {
bear: {
values: {
hpMax: 80
},
@@ -43,7 +43,7 @@ define([
str: 1
}
},
thief: {
lynx: {
values: {
hpMax: 70
},
@@ -54,9 +54,9 @@ define([
}
},
weapons: {
wizard: 'Gnarled Staff',
thief: 'Dagger',
warrior: 'Sword'
owl: 'Gnarled Staff',
lynx: 'Dagger',
bear: 'Sword'
},

getSpritesheet: function (className) {


+ 2469
- 2807
src/server/config/maps/cave/map.json
Diferenças do arquivo suprimidas por serem muito extensas
Ver arquivo


+ 2499
- 2890
src/server/config/maps/city/map.json
Diferenças do arquivo suprimidas por serem muito extensas
Ver arquivo


+ 1057
- 1236
src/server/config/maps/crystalCaves/map.json
Diferenças do arquivo suprimidas por serem muito extensas
Ver arquivo


+ 1215
- 1429
src/server/config/maps/estuary/map.json
Diferenças do arquivo suprimidas por serem muito extensas
Ver arquivo


src/server/config/maps/tutorial/chats.js → src/server/config/maps/fjolarok/chats.js Ver arquivo


src/server/config/maps/tutorial/dialogues.js → src/server/config/maps/fjolarok/dialogues.js Ver arquivo


src/server/config/maps/tutorial/events/fishingTournament.js → src/server/config/maps/fjolarok/events/fishingTournament.js Ver arquivo


src/server/config/maps/tutorial/events/rodriguezHeist.js → src/server/config/maps/fjolarok/events/rodriguezHeist.js Ver arquivo


+ 3274
- 387
src/server/config/maps/fjolarok/map.json
Diferenças do arquivo suprimidas por serem muito extensas
Ver arquivo


src/server/config/maps/tutorial/quests.js → src/server/config/maps/fjolarok/quests.js Ver arquivo


BIN
Ver arquivo


src/server/config/maps/tutorial/zone.js → src/server/config/maps/fjolarok/zone.js Ver arquivo

@@ -1,5 +1,5 @@
module.exports = {
name: 'tutorial',
name: 'fjolarok',
level: [1, 10],
resources: {
Moonbell: {

+ 1
- 1
src/server/config/maps/mapList.js Ver arquivo

@@ -7,6 +7,6 @@ define([
'cave',
'estuary',
'sewer',
'tutorial'
'fjolarok'
];
});

+ 1141
- 1334
src/server/config/maps/sewer/map.json
Diferenças do arquivo suprimidas por serem muito extensas
Ver arquivo


+ 0
- 3772
src/server/config/maps/tutorial/map.json
Diferenças do arquivo suprimidas por serem muito extensas
Ver arquivo


+ 72
- 0
src/server/config/spirits.js Ver arquivo

@@ -0,0 +1,72 @@
define([
'../misc/events'
], function (
events
) {
var spirits = {
list: ['bear', 'owl', 'lynx'],
portraits: {
bear: {
x: 0,
y: 0
},
owl: {
x: 2,
y: 0
},
lynx: {
x: 3,
y: 0
}
},
spells: {
owl: ['magic missile', 'ice spear'],
bear: ['slash', 'charge'],
lynx: ['flurry', 'smokebomb']
},
stats: {
owl: {
values: {
hpMax: 50
},
vitScale: 10,
gainStats: {
int: 1
}
},
bear: {
values: {
hpMax: 80
},
vitScale: 10,
gainStats: {
str: 1
}
},
lynx: {
values: {
hpMax: 70
},
vitScale: 10,
gainStats: {
dex: 1
}
}
},
weapons: {
owl: 'Gnarled Staff',
lynx: 'Dagger',
bear: 'Sword'
},

getSpritesheet: function (className) {
return this.stats[className].spritesheet || 'characters';
},

init: function () {
events.emit('onBeforeGetClasses', classes);
}
};

return classes;
});

+ 1
- 2
src/server/mods/class-necromancer/index.js Ver arquivo

@@ -25,7 +25,7 @@ define([
},

onAfterGetZone: function (zone, config) {
if (zone != 'tutorial')
if (zone != 'fjolarok')
return;

var newRunes = [{
@@ -143,7 +143,6 @@ define([
skins['1.8'] = {
name: 'Necromancer 1',
sprite: [0, 0],
class: 'wizard',
spritesheet: `${this.folderName}/images/inGameSprite.png`
};
},


+ 7
- 8
src/server/mods/event-halloween/index.js Ver arquivo

@@ -12,7 +12,7 @@ define([
},

extraScripts: [
'maps/tutorial/events/halloween.js',
'maps/fjolarok/events/halloween.js',
'mtx/summonPumpkinSkeleton.js',
'spells/spellScatterPumpkinPieces.js'
],
@@ -22,7 +22,7 @@ define([
mapH: null,

init: function () {
this.mapFile = require.nodeRequire('../../../mods/event-halloween/maps/tutorial/map');
this.mapFile = require.nodeRequire('../../../mods/event-halloween/maps/fjolarok/map');
this.mapW = this.mapFile.width;
this.mapH = this.mapFile.height;

@@ -106,7 +106,6 @@ define([
skins['3.0'] = {
name: 'Pumpkin-Head Necromancer',
sprite: [0, 0],
class: 'wizard',
spritesheet: `${this.folderName}/images/skins.png`
};
},
@@ -186,7 +185,7 @@ define([
},

onAfterGetLayerObjects: function (info) {
if (info.map != 'tutorial')
if (info.map != 'fjolarok')
return;

var layer = this.mapFile.layers.find(l => (l.name == info.layer));
@@ -205,7 +204,7 @@ define([
},

onBeforeBuildLayerTile: function (info) {
if (info.map != 'tutorial')
if (info.map != 'fjolarok')
return;

var offset = this.mapOffset;
@@ -223,11 +222,11 @@ define([
},

onBeforeGetEventList: function (zone, list) {
if (zone != 'tutorial')
if (zone != 'fjolarok')
return;

list.push(this.relativeFolderName + '/maps/tutorial/events/halloween.js');
list.push(this.relativeFolderName + '/maps/tutorial/events/halloweenBoss.js');
list.push(this.relativeFolderName + '/maps/fjolarok/events/halloween.js');
list.push(this.relativeFolderName + '/maps/fjolarok/events/halloweenBoss.js');
},

onAfterGetZone: function (zone, config) {


src/server/mods/event-halloween/maps/tutorial/dialogues.js → src/server/mods/event-halloween/maps/fjolarok/dialogues.js Ver arquivo


src/server/mods/event-halloween/maps/tutorial/events/halloween.js → src/server/mods/event-halloween/maps/fjolarok/events/halloween.js Ver arquivo


src/server/mods/event-halloween/maps/tutorial/events/halloweenBoss.js → src/server/mods/event-halloween/maps/fjolarok/events/halloweenBoss.js Ver arquivo


src/server/mods/event-halloween/maps/tutorial/map.json → src/server/mods/event-halloween/maps/fjolarok/map.json Ver arquivo


src/server/mods/event-halloween/maps/tutorial/quests.js → src/server/mods/event-halloween/maps/fjolarok/quests.js Ver arquivo


src/server/mods/event-halloween/maps/tutorial/zone.js → src/server/mods/event-halloween/maps/fjolarok/zone.js Ver arquivo


+ 5
- 6
src/server/mods/event-xmas/index.js Ver arquivo

@@ -14,7 +14,7 @@ define([
},

init: function () {
this.mapFile = require.nodeRequire('../../../mods/event-xmas/maps/tutorial/map');
this.mapFile = require.nodeRequire('../../../mods/event-xmas/maps/fjolarok/map');
this.mapW = this.mapFile.width;
this.mapH = this.mapFile.height;

@@ -54,7 +54,6 @@ define([
skins['bearded wizard'] = {
name: 'Bearded Wizard',
sprite: [0, 0],
class: 'wizard',
spritesheet: `${this.folderName}/images/skins.png`
};
},
@@ -212,7 +211,7 @@ define([
},

onAfterGetLayerObjects: function (info) {
if (info.map != 'tutorial')
if (info.map != 'fjolarok')
return;

var layer = this.mapFile.layers.find(l => (l.name == info.layer));
@@ -231,7 +230,7 @@ define([
},

onBeforeBuildLayerTile: function (info) {
if (info.map != 'tutorial')
if (info.map != 'fjolarok')
return;

var offset = this.mapOffset;
@@ -327,10 +326,10 @@ define([
},

onBeforeGetEventList: function (zone, list) {
if (zone != 'tutorial')
if (zone != 'fjolarok')
return;

list.push(this.relativeFolderName + '/maps/tutorial/events/xmas.js');
list.push(this.relativeFolderName + '/maps/fjolarok/events/xmas.js');
},

onBeforeGetDialogue: function (zone, config) {


src/server/mods/event-xmas/maps/tutorial/dialogues.js → src/server/mods/event-xmas/maps/fjolarok/dialogues.js Ver arquivo


src/server/mods/event-xmas/maps/tutorial/events/xmas.js → src/server/mods/event-xmas/maps/fjolarok/events/xmas.js Ver arquivo


src/server/mods/event-xmas/maps/tutorial/map.json → src/server/mods/event-xmas/maps/fjolarok/map.json Ver arquivo


src/server/mods/event-xmas/maps/tutorial/zone.js → src/server/mods/event-xmas/maps/fjolarok/zone.js Ver arquivo


+ 2
- 2
src/server/world/atlas.js Ver arquivo

@@ -29,7 +29,7 @@ define([
instanceId = -1;

if (!thread) {
thread = this.getThreadFromName('tutorial');
thread = this.getThreadFromName('fjolarok');
obj.zoneName = thread.name;
}

@@ -193,7 +193,7 @@ define([
var thread = this.getThreadFromName(obj.zoneName);

if (!thread) {
thread = this.getThreadFromName('tutorial');
thread = this.getThreadFromName('fjolarok');
obj.zoneName = thread.name;
serverObj.zoneName = thread.name;
}


Escrever Pré-visualização
Carregando…
Cancelar
Salvar