Skip to content

Commit

Permalink
Merge pull request #6 from Yrahcaz7/v2.0-beta
Browse files Browse the repository at this point in the history
Upgrade to Version 2.0 (wipes save data)
  • Loading branch information
Yrahcaz7 authored Dec 8, 2024
2 parents f6ebb22 + 62fba5d commit 341ab9a
Show file tree
Hide file tree
Showing 260 changed files with 3,739 additions and 2,966 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/balancing_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ assignees: ''
---

**Which Card/Feature?**
A clear and concise description of which feature you want balanced.
A clear and concise description of which card (or other feature) you want balanced.

**Balancing Suggestions**
A clear and concise description of what should be changed.
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ Steps to reproduce the behavior, preferably in a numbered or bulleted list.
If applicable, add screenshots to help explain your problem.

**Context**
List your OS (and device if it is mobile.)
Provide your browser (and version number if it is not the most recent one.)
List your OS (and device if it is mobile).
Provide your browser (and version number if it is not the most recent one).

**Additional Notes**
Add any other things of importance here.
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Dungeon of Souls

> Copyright (C) 2022 Yrahcaz7
> Copyright (C) 2024 Yrahcaz7
>
> GNU General Public License (version 3)
>
Expand Down Expand Up @@ -28,7 +28,7 @@ Press tab to enter full screen, and escape to exit it.

There are also shortcut keys, like the E key, which ends your turn.

Others are 1, 2, and 3; which view your deck, void, and discard, respectively.
Others are 1; 2; and 3, which view your deck; discard; and void, respectively.

## How to play

Expand All @@ -48,8 +48,10 @@ Note: go to the '?' (top-right of the screen) in-game for more details.

## Credits

Inspired by ***Slay the Spire*** and ***Die in the Dungeon***.
Inspired by *Slay the Spire* and *Die in the Dungeon*.

Most player sprites are taken from or based off of the ones found [**here**](https://aamatniekss.itch.io/fantasy-knight-free-pixelart-animated-character) (made by Nauris Amatnieks).

All other art (and music) is entirely my original work.
The Act 2 background music, *Future Dungeon*, was made in collaboration with Brian Fitzhenry, Jr.

All other art and music is entirely my original work.
Binary file added images/artifact/0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added images/artifact/106.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/artifact/107.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added images/artifact/select/0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added images/artifact/select/106.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/artifact/select/107.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
Binary file modified images/aura_blade.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added images/background/hallway.ase
Binary file not shown.
Binary file added images/background/hallway.png
Binary file added images/background/panel.ase
Binary file not shown.
Binary file added images/background/panel.png
Binary file added images/background/panel_cover.png
Binary file modified images/background/temple.png
Binary file added images/background/tiles.png
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added images/card/common/1004.png
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added images/card/common/4000.png
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added images/card/rare/1003.png
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added images/card/rarity/rare.png
File renamed without changes
Binary file added images/card/refine.png
File renamed without changes
File renamed without changes
Binary file removed images/cards/common/aura_blade.png
Diff not rendered.
Binary file removed images/cards/common/gold_slash.png
Diff not rendered.
Binary file removed images/cards/rare/bladestorm.png
Diff not rendered.
Binary file removed images/cards/rarity/rare.png
Diff not rendered.
Binary file removed images/clock/hour_hand.png
Diff not rendered.
Binary file removed images/clock/hour_hand_90deg.ase
Binary file not shown.
Binary file removed images/clock/hour_hand_full.ase
Binary file not shown.
Binary file removed images/clock/min_hand.png
Diff not rendered.
Binary file removed images/clock/min_hand_90deg.ase
Binary file not shown.
Binary file removed images/clock/min_hand_full.ase
Binary file not shown.
Binary file added images/cover/bottom_left.png
Binary file added images/cover/bottom_right.png
Binary file added images/cover/corner.png
Binary file added images/cover/top_left.png
Binary file added images/cover/top_left_big.png
Binary file added images/cover/top_right.png
File renamed without changes.
File renamed without changes
Binary file removed images/enemies/fragment/attack.ase
Binary file not shown.
Binary file removed images/enemies/fragment/attack.png
Diff not rendered.
Binary file removed images/enemies/fragment/idle.ase
Binary file not shown.
Binary file removed images/enemies/fragment/idle.png
Diff not rendered.
Binary file removed images/enemies/fragment/open.ase
Binary file not shown.
Binary file removed images/enemies/fragment/open.png
Diff not rendered.
Binary file removed images/enemies/fragment/roll.ase
Binary file not shown.
Binary file removed images/enemies/fragment/roll.png
Diff not rendered.
Binary file added images/enemy/fragment/attack.ase
Binary file not shown.
Binary file added images/enemy/fragment/attack.png
Binary file added images/enemy/fragment/idle.ase
Binary file not shown.
Binary file added images/enemy/fragment/idle.png
Binary file added images/enemy/fragment/open.ase
Binary file not shown.
Binary file added images/enemy/fragment/open.png
Binary file added images/enemy/fragment/roll.ase
Binary file not shown.
Binary file added images/enemy/fragment/roll.png
Binary file added images/enemy/sentry/big.ase
Binary file not shown.
Binary file added images/enemy/sentry/big.png
Binary file added images/enemy/sentry/big_attack.ase
Binary file not shown.
Binary file added images/enemy/sentry/big_attack.png
Binary file added images/enemy/sentry/big_defend.ase
Binary file not shown.
Binary file added images/enemy/sentry/big_defend.png
Binary file added images/enemy/sentry/prime.ase
Binary file not shown.
Binary file added images/enemy/sentry/prime.png
Binary file added images/enemy/sentry/prime_attack.ase
Binary file not shown.
Binary file added images/enemy/sentry/prime_attack.png
Binary file added images/enemy/sentry/prime_defend.ase
Binary file not shown.
Binary file added images/enemy/sentry/prime_defend.png
Binary file added images/enemy/sentry/small.ase
Binary file not shown.
Binary file added images/enemy/sentry/small.png
Binary file added images/enemy/sentry/small_attack.ase
Binary file not shown.
Binary file added images/enemy/sentry/small_attack.png
Binary file added images/enemy/sentry/small_defend.ase
Binary file not shown.
Binary file added images/enemy/sentry/small_defend.png
Binary file added images/enemy/sentry/to_prime.ase
Binary file not shown.
Binary file added images/enemy/sentry/to_prime.png
Binary file added images/enemy/singularity/attack.ase
Binary file not shown.
Binary file added images/enemy/singularity/attack.png
Binary file added images/enemy/singularity/attack_overlay.ase
Binary file not shown.
Binary file added images/enemy/singularity/attack_overlay.png
Binary file added images/enemy/singularity/defend.png
Binary file added images/enemy/singularity/experimental orbs/paths.png
Binary file not shown.
Binary file not shown.
Binary file added images/enemy/singularity/idle.png
Binary file added images/enemy/singularity/orbs.ase
Binary file not shown.
Binary file added images/enemy/singularity/orbs.png
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added images/extra/looker.png
Binary file renamed images/extras/options.png → images/extra/options.png
File renamed without changes
Binary file removed images/extras/looker.png
Diff not rendered.
Binary file added images/icon/1700.png
Binary file renamed images/icons/burn.png → images/icon/1701.png
File renamed without changes
File renamed without changes
Binary file renamed images/icons/weakness.png → images/icon/1704.png
Binary file added images/icon/1704_back.png
Binary file added images/icon/1705.png
Binary file added images/icon/1706.png
Binary file added images/icon/1707.png
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added images/icon/1903.png
Binary file added images/icon/1904.png
Binary file added images/icon/1905.png
Binary file added images/icon/1906.png
Binary file removed images/icons/aura_blade.png
Diff not rendered.
Binary file modified images/intent/attack/0.png
Binary file modified images/intent/attack/1.png
Binary file modified images/intent/attack/10.png
Binary file modified images/intent/attack/2.png
Binary file modified images/intent/attack/3.png
Binary file modified images/intent/attack/4.png
Binary file modified images/intent/attack/5.png
Binary file modified images/intent/attack/6.png
Binary file modified images/intent/attack/7.png
Binary file modified images/intent/attack/8.png
Binary file modified images/intent/attack/9.png
Binary file modified images/intent/defend/10.png
Binary file added images/intent/ritual.png
Binary file added images/intent/summon.png
Binary file modified images/map/bottom.png
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added images/map/node/select/orb.png
Binary file added images/map/node/select/orb_blue.png
File renamed without changes
File renamed without changes
Binary file added images/map/node/select/treasure_open.png
File renamed without changes
File renamed without changes
File renamed without changes
Binary file modified images/map/scribbles.png
Binary file modified images/map/select_first.png
Binary file modified images/map/top.png
Binary file modified images/player/crouch_shield.png
Binary file modified images/player/crouch_shield_reinforced.png
File renamed without changes
Binary file added images/reward/item.png
Binary file removed images/rewards/item.png
Diff not rendered.
File renamed without changes
Binary file modified images/select/card_rare.png
Binary file modified images/select/card_rare_unplayable.png
Binary file modified images/select/item_border.png
Binary file modified images/select/options.png
Binary file added images/select/options_yellow.png
Binary file modified images/select/popup.png
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file modified images/title.png
6 changes: 4 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Dungeon of Souls
Copyright (C) 2022 Yrahcaz7
Copyright (C) 2024 Yrahcaz7
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -21,16 +21,18 @@
<head>
<title>Dungeon of Souls</title>
<link rel="stylesheet" type="text/css" href="main.css">
<script src="js/data.js"></script>
<script src="js/characters.js"></script>
<script src="js/functions.js"></script>
<script src="js/enums.js"></script>
<script src="js/events.js"></script>
<script src="js/map.js"></script>
<script src="js/images.js"></script>
<script src="js/graphics.js"></script>
<script src="js/artifacts.js"></script>
<script src="js/cards.js"></script>
<script src="js/enemies.js"></script>
<script src="js/data.js"></script>
<script src="js/actions.js"></script>
<script src="js/game.js"></script>
<script src="js/save.js"></script>
<script src="js/technical.js"></script>
Expand Down
Loading

0 comments on commit 341ab9a

Please sign in to comment.