Skip to content

Commit

Permalink
fixing merge issue for winter level - veera kalakota
Browse files Browse the repository at this point in the history
  • Loading branch information
@VeeraKalakota
VeeraKalakota committed Feb 12, 2025
1 parent 277e382 commit e1ea8f6
Showing 1 changed file with 8 additions and 32 deletions.
40 changes: 8 additions & 32 deletions assets/js/platformer/GameSetterWinter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@ const assets = {
sandblock: {src:"/images/platformer/platforms/sandblock.png"},
snowyfloor: { src: "/images/platformer/platforms/grass.png" },
snowywood: { src: "/images/platformer/platforms/snowywood.png" },
boxmiddle: { src: "/images/platformer/platforms/block-left.png"},
boxendleft: {src: "images/platformer/platforms/block-left.png"},
boxendright: {src: "images/platformer/platforms/block-left.png"},
boxback: {src: "images/platformer/platforms/block-left.png"},
boxmiddle_rotated: {src: "images/platformer/platforms/block-left.png"},
boxendleft_rotated: {src: "/images/platformer/platforms/block-left.png"},
boxendright_rotated: {src: "images/platformer/platforms/block-left.png"},
boxmiddle: { src: "/images/platformer/platforms/boxmiddle.png"},
boxendleft: {src: "/images/platformer/platforms/boxendleft.png"},
boxendright: {src: "/images/platformer/platforms/boxendright.png"},
boxback: {src: "/images/platformer/platforms/boxback.png"},
boxmiddle_rotated: {src: "/images/platformer/platforms/boxmiddle_rotated.png"},
boxendleft_rotated: {src: "/images/platformer/platforms/boxendleft_rotated.png"},
boxendright_rotated: {src: "/images/platformer/platforms/boxendright_rotated.png"},
alien: { src: "/images/platformer/platforms/alien.png" },
bricks: { src: "/images/platformer/platforms/brick_wall.png" },
lava: { src: "/images/platformer/platforms/lava.jpg" },
Expand Down Expand Up @@ -479,30 +479,6 @@ const assets = {
{ name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.36, yPercentage: 0.63},
{ name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.565, yPercentage: 0.42},
{ name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.72, yPercentage: 0.58},
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle, xPercentage: 0.2, yPercentage: 0.82 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle, xPercentage: 0.2368, yPercentage: 0.82 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle, xPercentage: 0.2736, yPercentage: 0.82 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle, xPercentage: 0.3104, yPercentage: 0.82 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright, xPercentage: 0.3472, yPercentage: 0.82 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendleft, xPercentage: 0.384, yPercentage: 0.715 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright, xPercentage: 0.4208, yPercentage: 0.715 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendleft_rotated, xPercentage: 0.5090, yPercentage: 0.56 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle_rotated, xPercentage: 0.5090, yPercentage: 0.48 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle_rotated, xPercentage: 0.5090, yPercentage: 0.40 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright_rotated, xPercentage: 0.5090, yPercentage: 0.32 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright, xPercentage: 0.655, yPercentage: 0.68 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendleft, xPercentage: 0.62, yPercentage: 0.68 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright, xPercentage: 0.72, yPercentage: 0.76 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendleft, xPercentage: 0.69, yPercentage: 0.76 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendleft_rotated, xPercentage: 0.755, yPercentage: 1 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle_rotated, xPercentage: 0.755, yPercentage: 0.92 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright_rotated, xPercentage: 0.755, yPercentage: 0.84 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright_rotated, xPercentage: 0.625, yPercentage: 0.92 },
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendleft_rotated, xPercentage: 0.625, yPercentage: 1 },
{ name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.4, yPercentage: 0.5},
{ name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.63, yPercentage: 0.58},
{ name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.21, yPercentage: 0.6},
{ name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.32, yPercentage: 0.6},
{ name: 'owl', id: 'owl', class: Owl, data: assets.enemies.Owl, xPercentage: 0.3, minPosition: 0.05 },
{ name: 'owl', id: 'owl', class: Owl, data: assets.enemies.Owl, xPercentage: 0.8, minPosition: 0.05 },
{ name: 'caveman', id: 'snowman', class: Snowman, data: assets.enemies.Snowman, xPercentage: 0.2, minPosition: 0.1, difficulties: ["normal", "hard", "impossible"] },
Expand All @@ -519,4 +495,4 @@ const assets = {
objects: objects
};

export default GameSetterWinter;
export default GameSetterWinter;

0 comments on commit e1ea8f6

Please # to comment.