Skip to content

Commit

Permalink
add inside map
Browse files Browse the repository at this point in the history
  • Loading branch information
@cgack
cgack committed Jul 28, 2012
1 parent 5e230a2 commit 402863d
Show file tree
Hide file tree
Showing 11 changed files with 306 additions and 24 deletions.
7 changes: 7 additions & 0 deletions area0.tmx
View file
Expand Up @@ -84,6 +84,13 @@
<property name="to" value="area_east"/>
</properties>
</object>
<object name="me.LevelEntity" x="1212" y="703" width="41" height="26">
<properties>
<property name="duration" value="250"/>
<property name="fade" value="#000000"/>
<property name="to" value="inside"/>
</properties>
</object>
</objectgroup>
<objectgroup name="EnemyEntities" width="90" height="60">
<object name="EnemyEntity" x="2334" y="528" width="503" height="1124">
Expand Down
9 changes: 8 additions & 1 deletion area0_e.tmx
View file
Expand Up @@ -77,13 +77,20 @@
<property name="spritewidth" value="64"/>
</properties>
</object>
<object name="me.LevelEntity" x="2845" y="318" width="42" height="824">
<object name="me.LevelEntity" x="2855" y="-9" width="28" height="1777">
<properties>
<property name="duration" value="250"/>
<property name="fade" value="#000000"/>
<property name="to" value="area_east"/>
</properties>
</object>
<object name="me.LevelEntity" x="1207" y="700" width="46" height="35">
<properties>
<property name="duration" value="250"/>
<property name="fade" value="#000000"/>
<property name="to" value="inside"/>
</properties>
</object>
</objectgroup>
<objectgroup name="EnemyEntities" width="90" height="60">
<object name="EnemyEntity" x="2334" y="528" width="503" height="1124">
Expand Down
161 changes: 161 additions & 0 deletions area0_farm.tmx
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion area_east.tmx
View file
Expand Up @@ -51,7 +51,7 @@
<property name="spritewidth" value="64"/>
</properties>
</object>
<object name="me.LevelEntity" x="21" y="70" width="82" height="1819">
<object name="me.LevelEntity" x="0" y="1" width="33" height="1919">
<properties>
<property name="duration" value="250"/>
<property name="fade" value="#000000"/>
Expand Down
Binary file added assets/barrel.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cabinets.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/country.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cup.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/inside.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
66 changes: 66 additions & 0 deletions inside.tmx
View file

Large diffs are not rendered by default.

85 changes: 63 additions & 22 deletions main.js
View file
@@ -1,26 +1,34 @@
// game resources
var g_resources = [
{ name: "lava", type: "image", src: "assets/lava.png" },
{ name: "lavarock", type: "image", src: "assets/lavarock.png" },
{ name: "grass", type: "image", src: "assets/grass.png" },
{ name: "fence", type: "image", src: "assets/fence.png" },
{ name: "dirt2", type: "image", src: "assets/dirt2.png" },
{ name: "area0", type: "tmx", src: "area0.tmx" },
{ name: "area0_e", type: "tmx", src: "area0_e.tmx" },
{ name: "area_east", type: "tmx", src: "area_east.tmx"},
{ name: "gray_mage", type: "image", src: "assets/gray_mage.png" },
{ name: "forest_mage", type: "image", src: "assets/forest_mage.png" },
{ name: "dark_mage_elder", type: "image", src: "assets/dark_mage_elder.png"},
{ name: "malesoldierzombie", type: "image", src: "assets/malesoldierzombie.png" },
{ name: "house", type: "image", src: "assets/house.png" },
{ name: "magic_firelion_sheet", type: "image", src: "assets/magic/magic_firelion_sheet.png" },
{ name: "32x32_font", type: "image", src: "assets/32x32_font.png" },
{ name: "metatiles32x32", type: "image", src: "assets/metatiles32x32.png" },
{ name: "tileset01", type: "image", src: "assets/tileset01.png" },
{ name: "water", type: "image", src: "assets/water.png" },
{ name: "waterfall", type: "image", src: "assets/waterfall.png" },
{ name: "watergrass", type: "image", src: "assets/watergrass.png" },
{ name:"lpc_home_cup", type: "image", src: "assets/lpc_home_cup.png" }
{ name: "lava", type: "image", src: "assets/lava.png" },
{ name: "lavarock", type: "image", src: "assets/lavarock.png" },
{ name: "grass", type: "image", src: "assets/grass.png" },
{ name: "fence", type: "image", src: "assets/fence.png" },
{ name: "dirt2", type: "image", src: "assets/dirt2.png" },
{ name: "area0", type: "tmx", src: "area0.tmx" },
{ name: "area0_e", type: "tmx", src: "area0_e.tmx" },
{ name: "area_east", type: "tmx", src: "area_east.tmx"},
{ name: "inside", type: "tmx", src: "inside.tmx" },
{ name: "area0_farm", type: "tmx", src: "area0_farm.tmx"},
{ name: "gray_mage", type: "image", src: "assets/gray_mage.png" },
{ name: "forest_mage", type: "image", src: "assets/forest_mage.png" },
{ name: "dark_mage_elder", type: "image", src: "assets/dark_mage_elder.png"},
{ name: "malesoldierzombie", type: "image", src: "assets/malesoldierzombie.png" },
{ name: "house", type: "image", src: "assets/house.png" },
{ name: "magic_firelion_sheet", type: "image", src: "assets/magic/magic_firelion_sheet.png" },
{ name: "32x32_font", type: "image", src: "assets/32x32_font.png" },
{ name: "metatiles32x32", type: "image", src: "assets/metatiles32x32.png" },
{ name: "tileset01", type: "image", src: "assets/tileset01.png" },
{ name: "water", type: "image", src: "assets/water.png" },
{ name: "waterfall", type: "image", src: "assets/waterfall.png" },
{ name: "watergrass", type: "image", src: "assets/watergrass.png" },
{ name:"lpc_home_cup", type: "image", src: "assets/lpc_home_cup.png" },
{ name: "inside", type:"image", src: "assets/inside.png"},
{ name: "royal_mage", type: "image", src: "assets/royal_mage.png"},
{ name: "barrel", type: "image", src: "assets/barrel.png"},
{ name: "cabinets", type: "image", src:"assets/cabinets.png" },
{ name: "country", type: "image", src: "assets/country.png" }

];

var jsApp = {
Expand Down Expand Up @@ -75,6 +83,7 @@ var jsApp = {
me.entityPool.add("mainPlayer", PlayerEntity);
me.entityPool.add("friendlyForestMage", FriendEntity);
me.entityPool.add("friendFireMage", FireMage);
me.entityPool.add("friendRoyalMage", RoyalMage);
me.entityPool.add("EnemyEntity", EnemyEntity);
me.entityPool.add("MagicEntity", MagicEntity);

Expand Down Expand Up @@ -377,7 +386,6 @@ var MagicEntity = me.ObjectEntity.extend({

var FireMage = me.ObjectEntity.extend({
init: function(x, y, settings) {
//settings.image = "forest_mage";
settings.spritewidth = 64;
settings.spriteheight = 64;

Expand Down Expand Up @@ -408,6 +416,39 @@ var FireMage = me.ObjectEntity.extend({
}
});

var RoyalMage = me.ObjectEntity.extend({
init: function(x, y, settings) {
settings.spritewidth = 64;
settings.spriteheight = 64;

this.parent(x, y, settings);

this.updateColRect(8,48,10,54);

this.gravity = 0;
this.setVelocity(0,0);
this.collidable = true;

this.addAnimation("stand-s", [18]);

this.type = me.game.FRIEND_OBJECT;
},
onCollision: function(res, obj) {
if (obj.type === me.game.PLAYER_MAIN) {
me.game.MESSAGE_IS_SHOWING = true;
me.game.HUD.updateItemValue("message", "To save the world you'll need to find the cup." );
me.game.STATES["cupKnowledge"] = "true";
}

},
update: function() {
this.setCurrentAnimation("stand-s");

return true;
}
});


var FriendEntity = me.ObjectEntity.extend({
init: function(x, y, settings) {
//settings.image = "forest_mage";
Expand Down

0 comments on commit 402863d

Please sign in to comment.