Added new dungeon - Githubissues

FukurouMakoto commented 3 years ago

Added a new dungeon, a castle that the player can access from 3-1. It has three rooms initially along with multiple floors. Second floor is still in progress. Let me know if everything is okay before I continue working on this. Fixes #103

ghost commented 3 years ago

I like it. You have a special skill of storytelling which I lack.

Add some emojis to the story! 😃 👍

ghost commented 3 years ago

One more important thing I noticed. Your PR has some merge conflicts. The reason is because there is already a floor named 7 in the normal-dungeon, and that was added by me in the latest PR #108. Maybe the reason you didn't notice it is because you did not make your fork up to date.

Maybe renaming the folder name might fix the issue, I think. @ming-tsai, any other ways to fix this?

FukurouMakoto commented 3 years ago

One more important thing I noticed. Your PR has some merge conflicts. The reason is because there is already a floor named 7 in the normal-dungeon, and that was added by me in the latest PR #108. Maybe the reason you didn't notice it is because you did not make your fork up to date.

Maybe renaming the folder name might fix the issue, I think. @ming-tsai, any other ways to fix this?

So THAT's what it is! I was wondering what was causing that! That's weird because I made sure to make a pull before I started working; I must've accidentally pulled from my fork instead of the main branch. I'll try renaming the files and seeing if that works!

ming-tsai commented 3 years ago

Yes @paulsonjpaul

ghost commented 3 years ago

One more important thing I noticed. Your PR has some merge conflicts. The reason is because there is already a floor named 7 in the normal-dungeon, and that was added by me in the latest PR #108. Maybe the reason you didn't notice it is because you did not make your fork up to date. Maybe renaming the folder name might fix the issue, I think. @ming-tsai, any other ways to fix this?

So THAT's what it is! I was wondering what was causing that! That's weird because I made sure to make a pull before I started working; I must've accidentally pulled from my fork instead of the main branch. I'll try renaming the files and seeing if that works!

If you want to make your fork up to date, this video will help: https://www.youtube.com/watch?v=deEYHVpE1c8&t=26s

FukurouMakoto commented 3 years ago

One more important thing I noticed. Your PR has some merge conflicts. The reason is because there is already a floor named 7 in the normal-dungeon, and that was added by me in the latest PR #108. Maybe the reason you didn't notice it is because you did not make your fork up to date. Maybe renaming the folder name might fix the issue, I think. @ming-tsai, any other ways to fix this?

So THAT's what it is! I was wondering what was causing that! That's weird because I made sure to make a pull before I started working; I must've accidentally pulled from my fork instead of the main branch. I'll try renaming the files and seeing if that works!

If you want to make your fork up to date, this video will help: https://www.youtube.com/watch?v=deEYHVpE1c8&t=26s

Thanks for the link; think I have everything properly synced now

ming-tsai commented 3 years ago

Hi @FukurouMakoto, are you merging correctly? Because some of your file has this

<======== head
...
=============

This normally is showing when you have merging conflict on the file and doesn't solve it, maybe you could move your part to another floor

FukurouMakoto commented 3 years ago

Hi @FukurouMakoto, are you merging correctly? Because some of your file has this
<======== head
...
=============
This normally is showing when you have merging conflict on the file and doesn't solve it, maybe you could move your part to another floor

To another floor as in rename the folders? I can do that if that's what you mean.

ming-tsai commented 3 years ago

Hi @FukurouMakoto, are you merging correctly? Because some of your file has this
<======== head
...
=============
This normally is showing when you have merging conflict on the file and doesn't solve it, maybe you could move your part to another floor
To another floor as in rename the folders? I can do that if that's what you mean.

Yes

FukurouMakoto commented 3 years ago

Hi @FukurouMakoto, are you merging correctly? Because some of your file has this
<======== head
...
=============
This normally is showing when you have merging conflict on the file and doesn't solve it, maybe you could move your part to another floor
To another floor as in rename the folders? I can do that if that's what you mean.
Yes

Okay done. Let me know if that worked.

ming-tsai commented 3 years ago

@FukurouMakoto the next floor is 8 please rename the folder 9 to 8

FukurouMakoto commented 3 years ago

@FukurouMakoto the next floor is 8 please rename the folder 9 to 8

To make sure, 8 was what the folder was named originally, and was causing the errors before as seen below:

Hi @FukurouMakoto, are you merging correctly? Because some of your file has this
<======== head
...
=============
This normally is showing when you have merging conflict on the file and doesn't solve it, maybe you could move your part to another floor
To another floor as in rename the folders? I can do that if that's what you mean.
Yes

What should I rename it to then?

ming-tsai commented 3 years ago

Ok, keep it on 9, but please delete folder .vscode

ghost commented 3 years ago

I think the .vscode file is created by VS Code Live Server Extension. It had happened to me also.

It is created when there is no index.html in the root folder and you want to preview an html file that's in a subfolder.