diff --git a/assets/config.json b/assets/config.json index bd93845..a49a751 100644 --- a/assets/config.json +++ b/assets/config.json @@ -309,6 +309,16 @@ {"path": "assets/rituals/stone_doll_cursed-128.png", "frame_width": 128, "frame_height": 128 + }, + "dubious_combination-64": + {"path": "assets/rituals/dubious_combination-64.png", + "frame_width": 64, + "frame_height": 64 + }, + "dubious_combination-128": + {"path": "assets/rituals/dubious_combination-128.png", + "frame_width": 128, + "frame_height": 128 } }, "worldgen": { diff --git a/assets/rituals.json b/assets/rituals.json index fcfe060..6b34963 100644 --- a/assets/rituals.json +++ b/assets/rituals.json @@ -197,6 +197,6 @@ } }, "starting_junk": [ - "dirty_kerchief", "pocket_watch", "chess_pawn", "mushroom", "severed_finger", "rusty_nails" + "pocket_watch", "mushroom", "rusty_nails" ] } diff --git a/assets/rituals/dubious_combination-128.png b/assets/rituals/dubious_combination-128.png new file mode 100644 index 0000000..7a752b4 Binary files /dev/null and b/assets/rituals/dubious_combination-128.png differ diff --git a/assets/rituals/dubious_combination-64.png b/assets/rituals/dubious_combination-64.png new file mode 100644 index 0000000..6068cc6 Binary files /dev/null and b/assets/rituals/dubious_combination-64.png differ diff --git a/assets/sounds/fireball_01.ogg b/assets/sounds/fireball_01.ogg index 5346559..d819833 100644 Binary files a/assets/sounds/fireball_01.ogg and b/assets/sounds/fireball_01.ogg differ diff --git a/ritual_ui.cpp b/ritual_ui.cpp index 699a07a..a98442c 100644 --- a/ritual_ui.cpp +++ b/ritual_ui.cpp @@ -54,12 +54,6 @@ namespace gui { [&](auto, auto){ event(Event::TOGGLE); } }); - auto combine = $gui.entity("combine"); - $gui.set(combine, {}); - $gui.set