diff --git a/assets/axe_ranger-256.png b/assets/axe_ranger-256.png index e5387f3..a63718d 100644 Binary files a/assets/axe_ranger-256.png and b/assets/axe_ranger-256.png differ diff --git a/assets/config.json b/assets/config.json index ab53aec..60cb59c 100644 --- a/assets/config.json +++ b/assets/config.json @@ -54,7 +54,7 @@ "tunnel_with_rocks_stage": "assets/tunnel_with_rocks_stage.png" }, "worldgen": { - "enemy_probability": 80, + "enemy_probability": 30, "empty_room_probability": 10, "device_probability": 10 } diff --git a/assets/evil_eye-sprites.png b/assets/evil_eye-sprites.png index 4a38728..eb07d29 100644 Binary files a/assets/evil_eye-sprites.png and b/assets/evil_eye-sprites.png differ diff --git a/assets/undead_peasant-spritesheet.png b/assets/undead_peasant-spritesheet.png index 9da3fc6..bb82572 100644 Binary files a/assets/undead_peasant-spritesheet.png and b/assets/undead_peasant-spritesheet.png differ diff --git a/meson.build b/meson.build index f9ac005..26ac596 100644 --- a/meson.build +++ b/meson.build @@ -15,11 +15,6 @@ cc = meson.get_compiler('cpp') dependencies = [] if build_machine.system() == 'windows' - sfml_main = dependency('sfml_main') - opengl32 = cc.find_library('opengl32', required: true) - winmm = cc.find_library('winmm', required: true) - gdi32 = cc.find_library('gdi32', required: true) - add_global_link_arguments( '-static-libgcc', '-static-libstdc++', @@ -27,6 +22,11 @@ if build_machine.system() == 'windows' language: 'cpp', ) + sfml_main = dependency('sfml_main') + opengl32 = cc.find_library('opengl32', required: true) + winmm = cc.find_library('winmm', required: true) + gdi32 = cc.find_library('gdi32', required: true) + dependencies += [ opengl32, winmm, gdi32, sfml_main ] diff --git a/win_installer.ifp b/scripts/win_installer.ifp similarity index 93% rename from win_installer.ifp rename to scripts/win_installer.ifp index 67cb9fd..4357d98 100644 Binary files a/win_installer.ifp and b/scripts/win_installer.ifp differ