gitlord
/
isleward
mirror da https://gitlab.com/Isleward/isleward.git
1
0
Forka 0
Codice Problemi 0 Rilasci 203 Wiki Attività
Sfoglia il codice sorgente

fixes #533

tags/v0.1.10^2
Big Bad Waffle 6 anni fa
parent
b5bbb60ba2
commit
d61ee5dbeb
31 ha cambiato i file con 11674 aggiunte e 13874 eliminazioni
Visualizzazione separata
Opzioni Diff
Mostra statistiche Scarica il file Patch Scarica il file Diff
  1. +1
    -1
      src/client/index.html
  2. +1
    -1
      src/server/components/player.js
  3. +2469
    -2807
      src/server/config/maps/cave/map.json
  4. +2499
    -2890
      src/server/config/maps/city/map.json
  5. +1057
    -1236
      src/server/config/maps/crystalCaves/map.json
  6. +1215
    -1429
      src/server/config/maps/estuary/map.json
  7. +0
    -0
      src/server/config/maps/fjolarok/chats.js
  8. +0
    -0
      src/server/config/maps/fjolarok/dialogues.js
  9. +0
    -0
      src/server/config/maps/fjolarok/events/fishingTournament.js
  10. +0
    -0
      src/server/config/maps/fjolarok/events/rodriguezHeist.js
  11. +3274
    -387
      src/server/config/maps/fjolarok/map.json
  12. +0
    -0
      src/server/config/maps/fjolarok/quests.js
  13. BIN
     
  14. +1
    -1
      src/server/config/maps/fjolarok/zone.js
  15. +1
    -1
      src/server/config/maps/mapList.js
  16. +1141
    -1334
      src/server/config/maps/sewer/map.json
  17. +0
    -3772
      src/server/config/maps/tutorial/map.json
  18. +1
    -1
      src/server/mods/class-necromancer/index.js
  19. +7
    -7
      src/server/mods/event-halloween/index.js
  20. +0
    -0
      src/server/mods/event-halloween/maps/fjolarok/dialogues.js
  21. +0
    -0
      src/server/mods/event-halloween/maps/fjolarok/events/halloween.js
  22. +0
    -0
      src/server/mods/event-halloween/maps/fjolarok/events/halloweenBoss.js
  23. +0
    -0
      src/server/mods/event-halloween/maps/fjolarok/map.json
  24. +0
    -0
      src/server/mods/event-halloween/maps/fjolarok/quests.js
  25. +0
    -0
      src/server/mods/event-halloween/maps/fjolarok/zone.js
  26. +5
    -5
      src/server/mods/event-xmas/index.js
  27. +0
    -0
      src/server/mods/event-xmas/maps/fjolarok/dialogues.js
  28. +0
    -0
      src/server/mods/event-xmas/maps/fjolarok/events/xmas.js
  29. +0
    -0
      src/server/mods/event-xmas/maps/fjolarok/map.json
  30. +0
    -0
      src/server/mods/event-xmas/maps/fjolarok/zone.js
  31. +2
    -2
      src/server/world/atlas.js

+ 1
- 1
src/client/index.html Vedi File

@@ -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>


+ 1
- 1
src/server/components/player.js Vedi File

@@ -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,


+ 2469
- 2807
src/server/config/maps/cave/map.json
File diff soppresso perché troppo grande
Vedi File


+ 2499
- 2890
src/server/config/maps/city/map.json
File diff soppresso perché troppo grande
Vedi File


+ 1057
- 1236
src/server/config/maps/crystalCaves/map.json
File diff soppresso perché troppo grande
Vedi File


+ 1215
- 1429
src/server/config/maps/estuary/map.json
File diff soppresso perché troppo grande
Vedi File


src/server/config/maps/tutorial/chats.js → src/server/config/maps/fjolarok/chats.js Vedi File


src/server/config/maps/tutorial/dialogues.js → src/server/config/maps/fjolarok/dialogues.js Vedi File


src/server/config/maps/tutorial/events/fishingTournament.js → src/server/config/maps/fjolarok/events/fishingTournament.js Vedi File


src/server/config/maps/tutorial/events/rodriguezHeist.js → src/server/config/maps/fjolarok/events/rodriguezHeist.js Vedi File


+ 3274
- 387
src/server/config/maps/fjolarok/map.json
File diff soppresso perché troppo grande
Vedi File


src/server/config/maps/tutorial/quests.js → src/server/config/maps/fjolarok/quests.js Vedi File


BIN
Vedi File


src/server/config/maps/tutorial/zone.js → src/server/config/maps/fjolarok/zone.js Vedi File

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

+ 1
- 1
src/server/config/maps/mapList.js Vedi File

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

+ 1141
- 1334
src/server/config/maps/sewer/map.json
File diff soppresso perché troppo grande
Vedi File


+ 0
- 3772
src/server/config/maps/tutorial/map.json
File diff soppresso perché troppo grande
Vedi File


+ 1
- 1
src/server/mods/class-necromancer/index.js Vedi File

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

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

var newRunes = [{


+ 7
- 7
src/server/mods/event-halloween/index.js Vedi File

@@ -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;

@@ -185,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));
@@ -204,7 +204,7 @@ define([
},

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

var offset = this.mapOffset;
@@ -222,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 Vedi File


src/server/mods/event-halloween/maps/tutorial/events/halloween.js → src/server/mods/event-halloween/maps/fjolarok/events/halloween.js Vedi File


src/server/mods/event-halloween/maps/tutorial/events/halloweenBoss.js → src/server/mods/event-halloween/maps/fjolarok/events/halloweenBoss.js Vedi File


src/server/mods/event-halloween/maps/tutorial/map.json → src/server/mods/event-halloween/maps/fjolarok/map.json Vedi File


src/server/mods/event-halloween/maps/tutorial/quests.js → src/server/mods/event-halloween/maps/fjolarok/quests.js Vedi File


src/server/mods/event-halloween/maps/tutorial/zone.js → src/server/mods/event-halloween/maps/fjolarok/zone.js Vedi File


+ 5
- 5
src/server/mods/event-xmas/index.js Vedi File

@@ -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;

@@ -211,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));
@@ -230,7 +230,7 @@ define([
},

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

var offset = this.mapOffset;
@@ -326,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 Vedi File


src/server/mods/event-xmas/maps/tutorial/events/xmas.js → src/server/mods/event-xmas/maps/fjolarok/events/xmas.js Vedi File


src/server/mods/event-xmas/maps/tutorial/map.json → src/server/mods/event-xmas/maps/fjolarok/map.json Vedi File


src/server/mods/event-xmas/maps/tutorial/zone.js → src/server/mods/event-xmas/maps/fjolarok/zone.js Vedi File


+ 2
- 2
src/server/world/atlas.js Vedi File

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

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

@@ -198,7 +198,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;
}


Scrivi Anteprima
Caricamento…
Annulla
Salva