diff --git a/assets/enemies.json b/assets/enemies.json index 10f8c6b..26d8b72 100644 --- a/assets/enemies.json +++ b/assets/enemies.json @@ -6,7 +6,7 @@ "foreground": "enemies/fg:player", "background": "color:transparent" }, - {"_type": "Combat", "hp": 200, "max_hp": 200, "ap": 0, "max_ap": 12, "ap_delta": 6, "damage": 10, "dead": false}, + {"_type": "Combat", "hp": 200, "max_hp": 200, "ap": 0, "max_ap": 12, "ap_delta": 6, "damage": 50, "dead": false}, {"_type": "Motion", "dx": 0, "dy": 0, "random": false}, {"_type": "Collision", "has": true}, {"_type": "EnemyConfig", "ai_script": "Host::actions", "ai_start_name": "Host::initial_state", "ai_goal_name": "Host::final_state"}, diff --git a/assets/items/broken_locket.png b/assets/items/broken_locket.png index eb219d5..b576032 100644 Binary files a/assets/items/broken_locket.png and b/assets/items/broken_locket.png differ diff --git a/assets/items/broken_pen_knife.png b/assets/items/broken_pen_knife.png index 566c3e5..22c75df 100644 Binary files a/assets/items/broken_pen_knife.png and b/assets/items/broken_pen_knife.png differ diff --git a/assets/items/broken_yoyo.png b/assets/items/broken_yoyo.png index 96cbe25..9451a06 100644 Binary files a/assets/items/broken_yoyo.png and b/assets/items/broken_yoyo.png differ diff --git a/assets/items/chess_pawn.png b/assets/items/chess_pawn.png index d10508e..f2213f5 100644 Binary files a/assets/items/chess_pawn.png and b/assets/items/chess_pawn.png differ diff --git a/assets/items/cinqueda.png b/assets/items/cinqueda.png index 5c25dfb..b54eee6 100644 Binary files a/assets/items/cinqueda.png and b/assets/items/cinqueda.png differ diff --git a/assets/items/dirty_kerchief.png b/assets/items/dirty_kerchief.png index c867e6c..fec9235 100644 Binary files a/assets/items/dirty_kerchief.png and b/assets/items/dirty_kerchief.png differ diff --git a/assets/items/dubious_combination.png b/assets/items/dubious_combination.png index 481b6dc..f3c7a83 100644 Binary files a/assets/items/dubious_combination.png and b/assets/items/dubious_combination.png differ diff --git a/assets/items/healing_potion_small.png b/assets/items/healing_potion_small.png index 568547e..e79946a 100644 Binary files a/assets/items/healing_potion_small.png and b/assets/items/healing_potion_small.png differ diff --git a/assets/items/leather_pouch.png b/assets/items/leather_pouch.png index befb97d..057e9bf 100644 Binary files a/assets/items/leather_pouch.png and b/assets/items/leather_pouch.png differ diff --git a/assets/items/mushroom.png b/assets/items/mushroom.png index 323f909..9bfaebe 100644 Binary files a/assets/items/mushroom.png and b/assets/items/mushroom.png differ diff --git a/assets/items/pocket_watch.png b/assets/items/pocket_watch.png index 1d1c2f2..9386248 100644 Binary files a/assets/items/pocket_watch.png and b/assets/items/pocket_watch.png differ diff --git a/assets/items/rusty_nails.png b/assets/items/rusty_nails.png index 3025d99..5c0f69d 100644 Binary files a/assets/items/rusty_nails.png and b/assets/items/rusty_nails.png differ diff --git a/assets/items/severed_finger.png b/assets/items/severed_finger.png index 1075d39..65644ff 100644 Binary files a/assets/items/severed_finger.png and b/assets/items/severed_finger.png differ diff --git a/assets/items/stone_doll_cursed.png b/assets/items/stone_doll_cursed.png index c64b3f4..5852b20 100644 Binary files a/assets/items/stone_doll_cursed.png and b/assets/items/stone_doll_cursed.png differ diff --git a/assets/items/torch_crappy.png b/assets/items/torch_crappy.png index 3c80ada..9d3be6b 100644 Binary files a/assets/items/torch_crappy.png and b/assets/items/torch_crappy.png differ diff --git a/assets/items/torch_horizontal_floor.png b/assets/items/torch_horizontal_floor.png index 606167d..ee09194 100644 Binary files a/assets/items/torch_horizontal_floor.png and b/assets/items/torch_horizontal_floor.png differ diff --git a/assets/items/wood_barrel_small.png b/assets/items/wood_barrel_small.png index 3bbb04a..f4c4760 100644 Binary files a/assets/items/wood_barrel_small.png and b/assets/items/wood_barrel_small.png differ diff --git a/assets/textures/ceiling_black.png b/assets/textures/ceiling_black.png index 444bc64..6dab8cb 100644 Binary files a/assets/textures/ceiling_black.png and b/assets/textures/ceiling_black.png differ diff --git a/assets/textures/ceiling_blue_light.png b/assets/textures/ceiling_blue_light.png index da6fc96..4a3f6c0 100644 Binary files a/assets/textures/ceiling_blue_light.png and b/assets/textures/ceiling_blue_light.png differ diff --git a/assets/textures/door_plain.png b/assets/textures/door_plain.png deleted file mode 100644 index 62a717b..0000000 Binary files a/assets/textures/door_plain.png and /dev/null differ diff --git a/assets/textures/floor_gray_stone.png b/assets/textures/floor_gray_stone.png index 89f7bee..27ee024 100644 Binary files a/assets/textures/floor_gray_stone.png and b/assets/textures/floor_gray_stone.png differ diff --git a/assets/textures/glowing_moss_wall.png b/assets/textures/glowing_moss_wall.png index e8c6e6c..1838adb 100644 Binary files a/assets/textures/glowing_moss_wall.png and b/assets/textures/glowing_moss_wall.png differ diff --git a/assets/textures/gray_stone_floor_light.png b/assets/textures/gray_stone_floor_light.png index b4f686f..932999b 100644 Binary files a/assets/textures/gray_stone_floor_light.png and b/assets/textures/gray_stone_floor_light.png differ diff --git a/assets/textures/lava_floor.png b/assets/textures/lava_floor.png index d539e91..9416f11 100644 Binary files a/assets/textures/lava_floor.png and b/assets/textures/lava_floor.png differ diff --git a/assets/textures/wall_plain.png b/assets/textures/wall_plain.png index ad7ed11..09a9085 100644 Binary files a/assets/textures/wall_plain.png and b/assets/textures/wall_plain.png differ diff --git a/assets/textures/wood_wall.png b/assets/textures/wood_wall.png index 6b9f578..e5ebe5a 100644 Binary files a/assets/textures/wood_wall.png and b/assets/textures/wood_wall.png differ diff --git a/assets/tiles.json b/assets/tiles.json index 5a443c4..edd2100 100644 --- a/assets/tiles.json +++ b/assets/tiles.json @@ -67,7 +67,7 @@ "id": 8 }, "door_plain": { - "texture": "assets/textures/door_plain.png", + "texture": "assets/doors/door_plain.png", "display": 1087, "light": 0, "foreground": "tiles/fg:wall_plain", diff --git a/jankifier.json b/jankifier.json index 4fd7e5f..daddacd 100644 --- a/jankifier.json +++ b/jankifier.json @@ -1,6 +1,6 @@ { "Base": { - "PixelWidth": 16, + "PixelWidth": 8, "ColorDepth": 16, "DitherType": 2, "Width": 256, @@ -24,6 +24,13 @@ "Width": 256, "Height": 256 }, + "doors/.*.png": { + "PixelWidth": 8, + "ColorDepth": 16, + "DitherType": 2, + "Width": 256, + "Height": 256 + }, "hands/.*.png": { "PixelWidth": 6, "ColorDepth": 16, diff --git a/src/algos/pathing.cpp b/src/algos/pathing.cpp index 6429e1f..c67c9b4 100644 --- a/src/algos/pathing.cpp +++ b/src/algos/pathing.cpp @@ -77,12 +77,17 @@ PathingResult Pathing::find_path(Point &out, int direction, bool diag) // get the current dijkstra number int cur = $paths[out.y][out.x]; int target = cur; + // BUG: can I shortcut if target == 0 now? + bool found = false; + // a lambda makes it easy to capture what we have to change auto next_step = [&](size_t x, size_t y) -> bool { target = $paths[y][x]; // don't go through walls + // BUG: should actually do a collision check + // BUG: can I shortcut if target == 0 now? if(target == WALL_PATH_LIMIT) return false; int weight = cur - target; @@ -104,6 +109,7 @@ PathingResult Pathing::find_path(Point &out, int direction, bool diag) if(diag) { + // BUG: maybe a special alternative to box that doesn't do the central cell? for(matrix::box it{$paths, out.x, out.y, 1}; it.next();) { bool should_stop = next_step(it.x, it.y); if(should_stop) break;