Bug 736355: Add coder character

pol · Mar 21, 2012 · d26f8d3 · d26f8d3
1 parent 28cae24
commit d26f8d3
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 6 deletions.
diff --git a/client/img/1/coder.png b/client/img/1/coder.png
diff --git a/client/img/2/coder.png b/client/img/2/coder.png
diff --git a/client/img/3/coder.png b/client/img/3/coder.png
diff --git a/client/js/entityfactory.js b/client/js/entityfactory.js
@@ -159,6 +159,10 @@ define(['mobs', 'items', 'npcs', 'warrior', 'chest'], function(Mobs, Items, NPCs
     EntityFactory.builders[Types.Entities.VILLAGER] = function(id) {
         return new NPCs.Villager(id);
     };
+
+    EntityFactory.builders[Types.Entities.CODER] = function(id) {
+        return new NPCs.Coder(id);
+    };
 
     EntityFactory.builders[Types.Entities.AGENT] = function(id) {
         return new NPCs.Agent(id);

diff --git a/client/js/game.js b/client/js/game.js
@@ -64,7 +64,7 @@ function(InfoManager, BubbleManager, Renderer, Map, Animation, Sprite, AnimatedT
 
             // sprites
             this.spriteNames = ["hand", "sword", "loot", "target", "talk", "sparks", "shadow16", "rat", "skeleton", "skeleton2", "spectre", "boss", "deathknight", 
-                                "ogre", "crab", "snake", "eye", "bat", "goblin", "wizard", "guard", "king", "villagegirl", "villager", "agent", "rick", "scientist", "nyan", "priest", 
+                                "ogre", "crab", "snake", "eye", "bat", "goblin", "wizard", "guard", "king", "villagegirl", "villager", "coder", "agent", "rick", "scientist", "nyan", "priest", 
                                 "sorcerer", "octocat", "beachnpc", "forestnpc", "desertnpc", "lavanpc", "clotharmor", "leatherarmor", "mailarmor", 
                                 "platearmor", "redarmor", "goldenarmor", "firefox", "death", "sword1", "axe", "chest",
                                 "sword2", "redsword", "bluesword", "goldensword", "item-sword2", "item-axe", "item-redsword", "item-bluesword", "item-goldensword", "item-leatherarmor", "item-mailarmor", 

diff --git a/client/js/npc.js b/client/js/npc.js
@@ -130,8 +130,14 @@ define(['character'], function(Character) {
 
         "octocat": [
             "Welcome to BrowserQuest!",
-            "Want to see the code?",
-            'Check out <a target="_blank" href="http://github.com/mozilla/BrowserQuest">the repository on Github</a>'
+            "Want to see the source code?",
+            'Check out <a target="_blank" href="http://github.com/mozilla/BrowserQuest">the repository on GitHub</a>'
+        ],
+
+        "coder": [
+            "Welcome to BrowserQuest!",
+            "Want to see the source code?",
+            'Check out <a target="_blank" href="http://github.com/mozilla/BrowserQuest">the repository on GitHub</a>'
         ],
 
         "beachnpc": [

diff --git a/client/js/npcs.js b/client/js/npcs.js
@@ -38,6 +38,12 @@ define(['npc'], function(Npc) {
                 this._super(id, Types.Entities.VILLAGER, 1);
             }
         }),
+
+        Coder: Npc.extend({
+            init: function(id) {
+                this._super(id, Types.Entities.CODER, 1);
+            }
+        }),
 
         Scientist: Npc.extend({
             init: function(id) {

diff --git a/client/js/sprites.js b/client/js/sprites.js
@@ -8,6 +8,7 @@ define(['text!../sprites/agent.json',
         'text!../sprites/boss.json',
         'text!../sprites/chest.json',
         'text!../sprites/clotharmor.json',
+        'text!../sprites/coder.json',
         'text!../sprites/crab.json',
         'text!../sprites/death.json',
         'text!../sprites/deathknight.json',

diff --git a/client/maps/world_client.js b/client/maps/world_client.js
diff --git a/client/maps/world_client.json b/client/maps/world_client.json
diff --git a/client/sprites/coder.json b/client/sprites/coder.json
@@ -0,0 +1 @@
+{	"id": "coder",	"width": 24,	"height": 24,	"animations": {		"idle_down": {			"length": 2,			"row": 0		}	},	"offset_x": -4,	"offset_y": -7}

diff --git a/server/maps/world_server.json b/server/maps/world_server.json
diff --git a/shared/js/gametypes.js b/shared/js/gametypes.js
@@ -82,6 +82,7 @@ Types = {
         FORESTNPC: 52,
         DESERTNPC: 53,
         LAVANPC: 54,
+        CODER: 55,
 
         // Weapons
         SWORD1: 60,
@@ -143,6 +144,7 @@ var kinds = {
     guard: [Types.Entities.GUARD, "npc"],
     villagegirl: [Types.Entities.VILLAGEGIRL, "npc"],
     villager: [Types.Entities.VILLAGER, "npc"],
+    coder: [Types.Entities.CODER, "npc"],
     scientist: [Types.Entities.SCIENTIST, "npc"],
     priest: [Types.Entities.PRIEST, "npc"],
     king: [Types.Entities.KING, "npc"],