Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: aratama/magiaforge
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2024-12-30
Choose a base ref
...
head repository: aratama/magiaforge
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Loading
Showing with 29,436 additions and 8,833 deletions.
  1. +1 −1 .cargo/config.toml
  2. +4 −4 .github/workflows/release.yaml
  3. +1,612 −487 Cargo.lock
  4. +25 −7 Cargo.toml
  5. BIN assets/DotGothic16-Regular.ttf
  6. BIN assets/actor/bomb.aseprite
  7. BIN assets/actor/bookshelf.aseprite
  8. BIN assets/actor/chicken.aseprite
  9. BIN assets/actor/rock.aseprite
  10. BIN assets/actor/sandbag.aseprite
  11. BIN assets/actor/stone_lantern.aseprite
  12. BIN assets/actor/witch.aseprite
  13. BIN assets/audio/HP吸収魔法2_short.ogg
  14. BIN assets/audio/たき火.ogg
  15. BIN assets/audio/カーソル移動8.ogg
  16. BIN assets/audio/コルク栓を抜く1.ogg
  17. BIN assets/audio/シーン切り替え2.ogg
  18. BIN assets/audio/ジャンプの着地.ogg
  19. BIN assets/audio/ステータス上昇魔法2.ogg
  20. BIN assets/audio/ゾンビの食事.ogg
  21. BIN assets/audio/ドラゴンの羽ばたき.ogg
  22. BIN assets/audio/ドラゴンの鳴き声2.ogg
  23. BIN assets/audio/倒れる.ogg
  24. BIN assets/audio/剣の素振り2.ogg
  25. BIN assets/audio/構えを取る.ogg
  26. BIN assets/audio/水をバシャッとかける2.ogg
  27. BIN assets/audio/氷魔法で凍結.ogg
  28. BIN assets/audio/決定ボタンを押す31.ogg
  29. BIN assets/audio/決定ボタンを押す7.ogg
  30. BIN assets/audio/砂の上を走る.ogg
  31. BIN assets/audio/革靴で走る.ogg
  32. BIN assets/audio/風が吹く1.ogg
  33. BIN assets/bgm/battle-cinematic-trailer-royalty-free-music-210434.ogg
  34. BIN assets/bgm/battle-fight-music-dynamic-warrior-background-intro-theme-272176.ogg
  35. BIN assets/bgm/realm.ogg
  36. BIN assets/bgm/they_bgm.ogg
  37. BIN assets/bgm/海岸4.ogg
  38. BIN assets/bgm/発見.ogg
  39. BIN assets/chest/barrel.aseprite
  40. BIN assets/chest/barrel_bomb.aseprite
  41. BIN assets/chest/chest.aseprite
  42. BIN assets/chest/crate.aseprite
  43. BIN assets/chest/jar_blue.aseprite
  44. BIN assets/chest/jar_green.aseprite
  45. BIN assets/chest/jar_red.aseprite
  46. +300 −0 assets/dynamic.assets.ron
  47. BIN assets/{entity → enemy}/buer.aseprite
  48. BIN assets/enemy/eyeball.aseprite
  49. BIN assets/{entity → enemy}/eyeball_friend.aseprite
  50. BIN assets/{entity → enemy}/friend_slime.aseprite
  51. BIN assets/{entity → enemy}/huge_slime.aseprite
  52. BIN assets/{entity → enemy}/huge_slime_shadow.aseprite
  53. BIN assets/enemy/salamander.aseprite
  54. BIN assets/enemy/shadow.aseprite
  55. BIN assets/enemy/slime.aseprite
  56. BIN assets/enemy/spider.aseprite
  57. BIN assets/entity/bomb.aseprite
  58. BIN assets/entity/explosive_mashroom.aseprite
  59. BIN assets/entity/eyeball.aseprite
  60. BIN assets/entity/fire.aseprite
  61. BIN assets/entity/fireball.aseprite
  62. BIN assets/entity/freeze.aseprite
  63. BIN assets/entity/raven.aseprite
  64. BIN assets/entity/sandbug.aseprite
  65. BIN assets/entity/slash.aseprite
  66. BIN assets/entity/slime.aseprite
  67. BIN assets/entity/stone_lantern.aseprite
  68. BIN assets/entity/witch.aseprite
  69. BIN assets/font/NotoSansJP-Medium.ttf
  70. BIN assets/font/NotoSansKR-Medium.ttf
  71. BIN assets/font/NotoSansSC-Medium.ttf
  72. BIN assets/font/NotoSansTC-Medium.ttf
  73. BIN assets/image/atlas.aseprite
  74. BIN assets/image/ending.aseprite
  75. BIN assets/image/level.aseprite
  76. BIN assets/image/opening.aseprite
  77. +10,560 −0 assets/level.ldtk
  78. BIN assets/{entity → rabbit}/rabbit_black.aseprite
  79. BIN assets/{entity → rabbit}/rabbit_blue.aseprite
  80. BIN assets/{entity → rabbit}/rabbit_green.aseprite
  81. BIN assets/{entity → rabbit}/rabbit_red.aseprite
  82. BIN assets/{entity → rabbit}/rabbit_white.aseprite
  83. BIN assets/{entity → rabbit}/rabbit_yellow.aseprite
  84. +514 −0 assets/registry.actor.ron
  85. +248 −0 assets/registry.game.ron
  86. +1,414 −0 assets/registry.spell.ron
  87. +103 −0 assets/registry.tile.ron
  88. +471 −0 assets/script.js
  89. +5 −1 build.rs
  90. BIN misc/opening_sketch.aseprite
  91. BIN misc/screenshot.png
  92. BIN misc/screenshot_title.png
  93. BIN misc/water_tileset.aseprite
  94. +34 −57 readme.md
  95. +1,526 −0 src/actor.rs
  96. +58 −0 src/actor/bomb.rs
  97. +48 −0 src/actor/book_shelf.rs
  98. +246 −0 src/actor/chest.rs
  99. +90 −0 src/actor/chicken.rs
  100. +48 −0 src/actor/stone_lantern.rs
  101. +66 −0 src/actor/witch.rs
  102. +229 −146 src/asset.rs
  103. +59 −13 src/audio.rs
  104. +64 −43 src/camera.rs
  105. +484 −139 src/cast.rs
  106. +262 −0 src/collision.rs
  107. +9 −0 src/component.rs
  108. +29 −0 src/component/animated_slice.rs
  109. +86 −0 src/component/counter.rs
  110. +58 −0 src/component/entity_depth.rs
  111. +36 −0 src/component/falling.rs
  112. +29 −0 src/component/flip.rs
  113. +183 −0 src/component/metamorphosis.rs
  114. +85 −0 src/component/mine.rs
  115. +110 −0 src/component/point_light.rs
  116. +61 −0 src/component/vertical.rs
  117. +0 −34 src/config.rs
  118. +14 −54 src/constant.rs
  119. +0 −2 src/controller.rs
  120. +0 −55 src/controller/despawn_with_gold.rs
  121. +57 −22 src/controller/message_rabbit.rs
  122. +224 −146 src/controller/player.rs
  123. +128 −165 src/controller/remote.rs
  124. +7 −10 src/controller/servant.rs
  125. +0 −104 src/controller/shop_rabbit.rs
  126. +4 −7 src/controller/training_dummy.rs
  127. +19 −224 src/debug.rs
  128. +81 −0 src/debug_command.rs
  129. +0 −5 src/enemy.rs
  130. +0 −131 src/enemy/basic.rs
  131. +0 −80 src/enemy/buer.rs
  132. +0 −124 src/enemy/eyeball.rs
  133. +94 −299 src/enemy/huge_slime.rs
  134. +0 −110 src/enemy/sandbug.rs
  135. +0 −146 src/enemy/slime.rs
  136. +5 −105 src/entity.rs
  137. +0 −461 src/entity/actor.rs
  138. +3 −36 src/entity/bgm.rs
  139. +0 −130 src/entity/bomb.rs
  140. +0 −108 src/entity/book_shelf.rs
  141. +6 −3 src/entity/broken_magic_circle.rs
  142. +277 −149 src/entity/bullet.rs
  143. +46 −11 src/entity/bullet_particle.rs
  144. +0 −243 src/entity/chest.rs
  145. +0 −59 src/entity/counter.rs
  146. +59 −21 src/entity/damege.rs
  147. +77 −84 src/entity/dropped_item.rs
  148. +56 −29 src/entity/explosion.rs
  149. +249 −0 src/entity/fire.rs
  150. +35 −30 src/entity/gold.rs
  151. +143 −0 src/entity/grass.rs
  152. +110 −73 src/entity/impact.rs
  153. +0 −56 src/entity/life.rs
  154. +64 −0 src/entity/light.rs
  155. +90 −107 src/entity/magic_circle.rs
  156. +9 −4 src/entity/piece.rs
  157. +0 −137 src/entity/rabbit.rs
  158. +128 −162 src/entity/servant_seed.rs
  159. +31 −74 src/entity/shop.rs
  160. +127 −0 src/entity/slash.rs
  161. +0 −167 src/entity/stone_lantern.rs
  162. +109 −0 src/entity/web.rs
  163. +0 −350 src/entity/witch.rs
  164. +0 −91 src/equipment.rs
  165. +2 −1 src/footsteps.rs
  166. +117 −62 src/game.rs
  167. +74 −43 src/hud.rs
  168. +0 −36 src/hud/gameover.rs
  169. +51 −48 src/hud/life_bar.rs
  170. +6 −2 src/hud/overlay.rs
  171. +7 −2 src/hud/pointer.rs
  172. +83 −0 src/hud/tutorial.rs
  173. +7 −7 src/input.rs
  174. +34 −61 src/inventory.rs
  175. +0 −63 src/inventory_item.rs
  176. +212 −7 src/language.rs
  177. +2 −0 src/ldtk.rs
  178. +1,305 −0 src/ldtk/generated.rs
  179. +206 −0 src/ldtk/loader.rs
  180. +5 −3 src/level.rs
  181. +213 −140 src/level/appearance.rs
  182. +0 −5 src/level/biome.rs
  183. +141 −78 src/level/ceil.rs
  184. +380 −0 src/level/chunk.rs
  185. +46 −31 src/level/{wall.rs → collision.rs}
  186. +385 −272 src/level/entities.rs
  187. +38 −0 src/level/grid.rs
  188. +0 −337 src/level/map.rs
  189. +30 −0 src/level/readme.md
  190. +66 −0 src/level/spawn.rs
  191. +11 −10 src/level/tile.rs
  192. +248 −0 src/level/world.rs
  193. +10 −3 src/main.rs
  194. +190 −133 src/message.rs
  195. +1 −0 src/page.rs
  196. +12 −2 src/page/ending.rs
  197. +434 −317 src/page/in_game.rs
  198. +169 −74 src/page/main_menu.rs
  199. +12 −16 src/page/name_input.rs
  200. +452 −0 src/page/opening.rs
  201. +11 −7 src/page/warp.rs
  202. +63 −41 src/physics.rs
  203. +29 −104 src/player_state.rs
  204. +10 −0 src/random.rs
  205. +188 −0 src/registry.rs
  206. +189 −0 src/registry/actor.rs
  207. +24 −0 src/registry/game.rs
  208. +7 −0 src/registry/spell.rs
  209. +58 −0 src/registry/tile.rs
  210. +82 −0 src/save.rs
  211. +5 −0 src/script.rs
  212. +26 −0 src/script/api.md
  213. +115 −0 src/script/api.rs
  214. +276 −0 src/script/cmd.rs
  215. +241 −0 src/script/context.rs
  216. +59 −0 src/script/loader.rs
  217. +23 −0 src/script/value.rs
  218. +66 −76 src/se.rs
  219. +61 −2 src/set.rs
  220. +116 −413 src/spell.rs
  221. +17 −0 src/states.rs
  222. +448 −0 src/strategy.rs
  223. +0 −374 src/theater.rs
  224. +1 −1 src/ui.rs
  225. +78 −19 src/ui/bar.rs
  226. +29 −11 src/ui/boss_hitpoint_bar.rs
  227. +8 −24 src/ui/command_button.rs
  228. +0 −126 src/ui/equipment_list.rs
  229. +93 −124 src/ui/floating.rs
  230. +10 −7 src/ui/inventory.rs
  231. +18 −67 src/ui/item_panel.rs
  232. +5 −26 src/ui/label.rs
  233. +8 −22 src/ui/menu_button.rs
  234. +183 −0 src/ui/new_spell.rs
  235. +202 −86 src/ui/pause_menu.rs
  236. +14 −15 src/ui/player_list.rs
  237. +58 −61 src/ui/popup.rs
  238. +4 −22 src/ui/range.rs
  239. +117 −20 src/ui/speech_bubble.rs
  240. +12 −15 src/ui/spell_in_wand.rs
  241. +72 −50 src/ui/spell_list.rs
  242. +17 −13 src/ui/wand_editor.rs
  243. +9 −12 src/ui/wand_list.rs
  244. +26 −36 src/wand.rs
2 changes: 1 addition & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -8,5 +8,5 @@ rustflags = ["--cfg=web_sys_unstable_apis"]
# https://github.com/mozilla/sccache
# rustc-wrapper = "sccache.exe"

# [target.x86_64-pc-windows-msvc]
# [profile.dev.target.x86_64-pc-windows-msvc]
# rustflags = ["-C", "link-arg=-fuse-ld=lld"]
8 changes: 4 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ jobs:
run: cargo install --locked trunk

- name: Build
run: trunk build
run: trunk build --features save

- name: add CNAME
run: echo "magiaforge.app" > ./docs/CNAME
@@ -69,7 +69,7 @@ jobs:
Compress-Archive -Path windows/* -DestinationPath ${{ env.binary }}.zip
- name: Upload binaries to artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: ${{ env.binary }}.zip
name: windows
@@ -123,7 +123,7 @@ jobs:
hdiutil create -fs HFS+ -volname "${{ env.binary }}" -srcfolder ${{ env.binary }}.app ${{ env.binary }}-macOS-intel.dmg
- name: Upload binaries to artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: ${{ env.binary }}-macOS-intel.dmg
name: macOS-intel
@@ -173,7 +173,7 @@ jobs:
hdiutil create -fs HFS+ -volname "${{ env.binary }}-macOS-apple-silicon" -srcfolder ${{ env.binary }}.app ${{ env.binary }}-macOS-apple-silicon.dmg
- name: Upload binaries to artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: ${{ env.binary }}-macOS-apple-silicon.dmg
name: macOS-apple-silicon
Loading