.gitignore

@@ -27,5 +27,4 @@ backup
 *.dll
 *.world
 coverage
-coverage/*
 .venv

.vimrc_proj

@@ -1 +1 @@
-set makeprg=make\ -f\ ../Makefile\ build
+set makeprg=meson\ compile\ -C\ .

Makefile

@@ -1,5 +1,3 @@
-ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
-
 all: build test
 
 reset:
@@ -10,19 +8,10 @@ else
 endif
 
 %.cpp : %.rl
-	ragel -I $(ROOT_DIR) -G1 -o $@ $<
+	ragel -o $@ $<
-
-%.dot: %.rl
-	ragel -Vp -I $(ROOT_DIR) -o $@ $<
-
-%.png: %.dot
-	dot -Tpng $< -o $@
 
-build:
+build: lel_parser.cpp
-	meson compile -j 10 -C $(ROOT_DIR)/builddir
+	meson compile -j 10 -C builddir
-
-asset_build: build
-	./builddir/icongen
 
 release_build:
 	meson --wipe builddir -Db_ndebug=true --buildtype release
@@ -36,8 +25,8 @@ tracy_build:
 	meson setup --wipe builddir --buildtype debugoptimized -Dtracy_enable=true -Dtracy:on_demand=true
 	meson compile -j 10 -C builddir
 
-test: asset_build build
+test: build
-	./builddir/runtests "[map-sprite]"
+	./builddir/runtests
 
 run: build test
 ifeq '$(OS)' 'Windows_NT'
@@ -60,7 +49,7 @@ clean:
 	meson compile --clean -C builddir
 
 debug_test: build
-	gdb --nx -x .gdbinit --ex run --args builddir/runtests -e "[map-sprite]"
+	gdb --nx -x .gdbinit --ex run --args builddir/runtests -e
 
 win_installer:
 	powershell 'start "C:\Program Files (x86)\solicus\InstallForge\bin\ifbuilderenvx86.exe" scripts\win_installer.ifp'

amt/raycaster.cpp

@@ -68,6 +68,7 @@ void Raycaster::position_camera(float player_x, float player_y) {
 
 void Raycaster::draw_pixel_buffer() {
   view_texture.update(pixels.to_raw_buf(), {(unsigned int)$width, (unsigned int)$height}, {0, 0});
+  // BUG: can I do this once and just update it?
   $window.draw(view_sprite);
 }
 

assets/config.json

@@ -22,197 +22,293 @@
     "ui_hover": "assets/sounds/ui_hover.ogg",
     "punch_cartoony": "assets/sounds/punch_cartoony.ogg",
     "electric_shock_01": "assets/sounds/electric_shock_01.ogg",
-    "fireball_01": "assets/sounds/fireball_01.ogg",
+    "fireball_01": "assets/sounds/fireball_01.ogg"
-    "hp_status_80": "assets/sounds/hp_status_80.ogg",
-    "hp_status_60": "assets/sounds/hp_status_60.ogg",
-    "hp_status_30": "assets/sounds/hp_status_30.ogg",
-    "hp_status_10": "assets/sounds/hp_status_10.ogg",
-    "hp_status_00": "assets/sounds/hp_status_00.ogg"
   },
   "sprites": {
     "gold_savior":
-    {"path": "assets/sprites/gold_savior.png",
+    {"path": "assets/gold_savior-256.png",
       "frame_width": 256,
       "frame_height": 256
     },
     "armored_knight":
-    {"path": "assets/sprites/armored_knight_1.png",
+    {"path": "assets/armored_knight_1-256.png",
       "frame_width": 256,
       "frame_height": 256
     },
-    "axe_ranger":
+    "sword":
-    {"path": "assets/sprites/axe_ranger.png",
+    {"path": "assets/cinqueda_1-256.png",
       "frame_width": 256,
       "frame_height": 256
     },
-    "hairy_spider":
+    "rat_with_sword":
-    {"path": "assets/sprites/hairy_spider.png",
+    {"path": "assets/rat_with_sword-256.png",
       "frame_width": 256,
       "frame_height": 256
     },
-    "rat_with_sword":
+    "rat_king":
-    {"path": "assets/sprites/rat_with_sword.png",
+    {"path": "assets/rat_king-256.png",
       "frame_width": 256,
       "frame_height": 256
     },
     "rat_king_boss":
-    {"path": "assets/bossfights/rat_king_2_frame_animation.png",
+    {"path": "assets/rat_king_2_frame_animation.png",
       "frame_width": 720,
       "frame_height": 720
     },
     "barrel_small":
-    {"path": "assets/items/wood_barrel_small.png",
+    {"path": "assets/wood_barrel_small-256.png",
       "frame_width": 256,
       "frame_height": 256
     },
     "torch_pillar":
-    {"path": "assets/sprites/torch_pillar.png",
+    {"path": "assets/torch_pillar-256.png",
       "frame_width": 256,
       "frame_height": 256
     },
     "torch_crappy":
-    {"path": "assets/items/torch_crappy.png",
+    {"path": "assets/torch_crappy-256.png",
       "frame_width": 256,
       "frame_height": 256
     },
     "torch_horizontal_floor":
-    {"path": "assets/items/torch_horizontal_floor.png",
+    {"path": "assets/torch_horizontal_floor-256.png",
+      "frame_width": 256,
+      "frame_height": 256
+    },
+    "evil_eye":
+    {"path": "assets/evil_eye-sprites.png",
       "frame_width": 256,
       "frame_height": 256
     },
     "peasant_girl":
-    {"path": "assets/sprites/peasant_girl_2.png",
+    {"path": "assets/undead_peasant-256.png",
       "frame_width": 256,
       "frame_height": 256
     },
     "grave_stone":
-    {"path": "assets/sprites/grave_stone.png",
+    {"path": "assets/grave_stone-256.png",
+      "frame_width": 256,
+      "frame_height": 256
+    },
+    "floor":
+    {"path": "assets/floor_tile_test-256.png",
+      "frame_width": 256,
+      "frame_height": 256
+    },
+    "ceiling":
+    {"path": "assets/ceiling_test-256.png",
       "frame_width": 256,
       "frame_height": 256
     },
     "healing_potion_small":
-    {"path": "assets/items/healing_potion_small.png",
+    {"path": "assets/healing_potion_small-256.png",
       "frame_width": 256,
       "frame_height": 256
     },
     "well_down":
-    {"path": "assets/sprites/well_down.png",
+    {"path": "assets/well_down-256.png",
       "frame_width": 256,
       "frame_height": 256
     },
     "rope_vines_up":
-    {"path": "assets/sprites/rope_vines_up.png",
+    {"path": "assets/rope_vines_up-256.png",
       "frame_width": 256,
       "frame_height": 256
     },
     "tripwire_trap":
-    {"path": "assets/sprites/tripwire_trap.png",
+    {"path": "assets/tripwire_trap-256.png",
+      "frame_width": 256,
+      "frame_height": 256
+    },
+    "cinqueda":
+    {"path": "assets/cinqueda_1-256.png",
+      "frame_width": 256,
+      "frame_height": 256
+    },
+    "blood_splatter":
+    {"path": "assets/blood_splatter-256.png",
       "frame_width": 256,
       "frame_height": 256
     },
+    "axe_ranger":
+    {"path": "assets/axe_ranger-256.png",
+      "frame_width": 256,
+      "frame_height": 256
+    },
+    "hairy_spider":
+    {"path": "assets/hairy_spider-256.png",
+      "frame_width": 256,
+      "frame_height": 256
+    },
+    "down_the_well":
+    {"path": "assets/down_the_well.jpg",
+      "frame_width": 900,
+      "frame_height": 600
+    },
     "boss_fight_background":
-    {"path": "assets/bossfights/rat_king_boss_fight_background.jpg",
+    {"path": "assets/rat_king_boss_fight_background.jpg",
       "frame_width": 1080,
       "frame_height": 720
     },
     "devils_fingers_background":
-    {"path": "assets/bossfights/devils_fingers_background.jpg",
+    {"path": "assets/devils_fingers_background.jpg",
       "frame_width": 1080,
       "frame_height": 720
     },
     "devils_fingers_sprite":
-    {"path": "assets/bossfights/devils_fingers_sprite.png",
+    {"path": "assets/devils_fingers_sprite.png",
       "frame_width": 720,
       "frame_height": 720
     },
     "devils_fingers_stage":
-    {"path": "assets/bossfights/devils_fingers_stage.png",
+    {"path": "assets/devils_fingers_stage.png",
       "frame_width": 1080,
       "frame_height": 720
     },
     "tunnel_with_rocks":
-    {"path": "assets/bossfights/tunnel_with_rocks.png",
+    {"path": "assets/tunnel_with_rocks.png",
       "frame_width": 1080,
       "frame_height": 720
     },
     "tunnel_with_rocks_stage":
-    {"path": "assets/bossfights/tunnel_with_rocks_stage.png",
+    {"path": "assets/tunnel_with_rocks_stage.png",
       "frame_width": 1080,
       "frame_height": 720
     },
     "ritual_crafting_area":
-    {"path": "assets/ui/ritual_crafting_area.png",
+    {"path": "assets/ritual_crafting_area.png",
+      "frame_width": 380,
+      "frame_height": 720
+    },
+    "the_ritual_circle":
+    {"path": "assets/the_ritual_circle.png",
+      "frame_width": 380,
+      "frame_height": 380
+    },
+    "paper_ui_background":
+    {"path": "assets/paper_ui_background.png",
       "frame_width": 380,
       "frame_height": 720
     },
     "full_screen_paper":
-    {"path": "assets/ui/full_screen_paper.png",
+    {"path": "assets/full_screen_paper.png",
       "frame_width": 1280,
       "frame_height": 720
     },
-    "broken_locket":
+    "broken_locket-64":
-    {"path": "assets/items/broken_locket.png",
+    {"path": "assets/rituals/broken_locket-64.png",
-      "frame_width": 256,
+      "frame_width": 64,
-      "frame_height": 256
+      "frame_height": 64
-    },
+    },
-    "broken_pen_knife":
+    "broken_locket-128":
-    {"path": "assets/items/broken_pen_knife.png",
+    {"path": "assets/rituals/broken_locket-128.png",
-      "frame_width": 256,
+      "frame_width": 128,
-      "frame_height": 256
+      "frame_height": 128
-    },
+    },
-    "broken_yoyo":
+    "broken_pen_knife-64":
-    {"path": "assets/items/broken_yoyo.png",
+    {"path": "assets/rituals/broken_pen_knife-64.png",
-      "frame_width": 256,
+      "frame_width": 64,
-      "frame_height": 256
+      "frame_height": 64
-    },
+    },
-    "chess_pawn":
+    "broken_pen_knife-128":
-    {"path": "assets/items/chess_pawn.png",
+    {"path": "assets/rituals/broken_pen_knife-128.png",
-      "frame_width": 256,
+      "frame_width": 128,
-      "frame_height": 256
+      "frame_height": 128
-    },
+    },
-    "dirty_kerchief":
+    "broken_yoyo-64":
-    {"path": "assets/items/dirty_kerchief.png",
+    {"path": "assets/rituals/broken_yoyo-64.png",
-      "frame_width": 256,
+      "frame_width": 64,
-      "frame_height": 256
+      "frame_height": 64
-    },
+    },
-    "leather_pouch":
+    "broken_yoyo-128":
-    {"path": "assets/items/leather_pouch.png",
+    {"path": "assets/rituals/broken_yoyo-128.png",
-      "frame_width": 256,
+      "frame_width": 128,
-      "frame_height": 256
+      "frame_height": 128
-    },
+    },
-    "mushroom":
+    "chess_pawn-64":
-    {"path": "assets/items/mushroom.png",
+    {"path": "assets/rituals/chess_pawn-64.png",
-      "frame_width": 256,
+      "frame_width": 64,
-      "frame_height": 256
+      "frame_height": 64
-    },
+    },
-    "pocket_watch":
+    "chess_pawn-128":
-    {"path": "assets/items/pocket_watch.png",
+    {"path": "assets/rituals/chess_pawn-128.png",
-      "frame_width": 256,
+      "frame_width": 128,
-      "frame_height": 256
+      "frame_height": 128
-    },
+    },
-    "rusty_nails":
+    "dirty_kerchief-64":
-    {"path": "assets/items/rusty_nails.png",
+    {"path": "assets/rituals/dirty_kerchief-64.png",
-      "frame_width": 256,
+      "frame_width": 64,
-      "frame_height": 256
+      "frame_height": 64
-    },
+    },
-    "severed_finger":
+    "dirty_kerchief-128":
-    {"path": "assets/items/severed_finger.png",
+    {"path": "assets/rituals/dirty_kerchief-128.png",
-      "frame_width": 256,
+      "frame_width": 128,
-      "frame_height": 256
+      "frame_height": 128
-    },
+    },
-    "stone_doll_cursed":
+    "leather_pouch-64":
-    {"path": "assets/items/stone_doll_cursed.png",
+    {"path": "assets/rituals/leather_pouch-64.png",
-      "frame_width": 256,
+      "frame_width": 64,
-      "frame_height": 256
+      "frame_height": 64
-    },
+    },
-    "dubious_combination":
+    "leather_pouch-128":
-    {"path": "assets/items/dubious_combination.png",
+    {"path": "assets/rituals/leather_pouch-128.png",
-      "frame_width": 256,
+      "frame_width": 128,
-      "frame_height": 256
+      "frame_height": 128
+    },
+    "mushroom-64":
+    {"path": "assets/rituals/mushroom-64.png",
+      "frame_width": 64,
+      "frame_height": 64
+    },
+    "mushroom-128":
+    {"path": "assets/rituals/mushroom-128.png",
+      "frame_width": 128,
+      "frame_height": 128
+    },
+    "pocket_watch-64":
+    {"path": "assets/rituals/pocket_watch-64.png",
+      "frame_width": 64,
+      "frame_height": 64
+    },
+    "pocket_watch-128":
+    {"path": "assets/rituals/pocket_watch-128.png",
+      "frame_width": 128,
+      "frame_height": 128
+    },
+    "rusty_nails-64":
+    {"path": "assets/rituals/rusty_nails-64.png",
+      "frame_width": 64,
+      "frame_height": 64
+    },
+    "rusty_nails-128":
+    {"path": "assets/rituals/rusty_nails-128.png",
+      "frame_width": 128,
+      "frame_height": 128
+    },
+    "severed_finger-64":
+    {"path": "assets/rituals/severed_finger-64.png",
+      "frame_width": 64,
+      "frame_height": 64
+    },
+    "severed_finger-128":
+    {"path": "assets/rituals/severed_finger-128.png",
+      "frame_width": 128,
+      "frame_height": 128
+    },
+    "stone_doll_cursed-64":
+    {"path": "assets/rituals/stone_doll_cursed-64.png",
+      "frame_width": 64,
+      "frame_height": 64
+    },
+    "stone_doll_cursed-128":
+    {"path": "assets/rituals/stone_doll_cursed-128.png",
+      "frame_width": 128,
+      "frame_height": 128
     }
   },
   "worldgen": {
     "enemy_probability": 50,
+    "empty_room_probability": 1,
     "device_probability": 10
   },
   "graphics": {
@@ -228,25 +324,9 @@
     "W": 8592,
     "NW": 8598
   },
-  "theme": {
+  "test_rituals": [
-    "black": [0, 0, 0, 255],
+      { "has_spikes": true, "active": true },
-    "dark_dark": [10, 10, 10, 255],
+      { "has_magick": true, "active": true },
-    "dark_mid": [30, 30, 30, 255],
+      { "has_magick": true, "shiny_bauble": true, "active": true }
-    "dark_light": [60, 60, 60, 255],
+  ]
-    "mid": [100, 100, 100, 255],
-    "light_dark": [150, 150, 150, 255],
-    "light_mid": [200, 200, 200, 255],
-    "light_light": [230, 230, 230, 255],
-    "white": [255, 255, 255, 255],
-    "padding": 3,
-    "border_px": 1,
-    "text_size": 20,
-    "label_size": 20,
-    "fill_color": "dark_mid",
-    "text_color": "light_light",
-    "bg_color": "mid",
-    "border_color": "dark_dark",
-    "bg_color_dark": "black",
-    "font_file_name": "assets/text.otf"
-  }
 }

assets/devices.json

@@ -12,8 +12,8 @@
         "background": [24, 205, 189]
       },
       {"_type": "Device",
-        "config": {},
+        "config": {"test": true},
-        "events": ["STAIRS_DOWN"]},
+        "events": ["Events::GUI::STAIRS_DOWN"]},
       {"_type": "Sprite", "name": "well_down", "width": 256, "height": 256, "scale": 1.0}
     ]
   },
@@ -29,8 +29,8 @@
         "background": [24, 205, 189]
       },
       {"_type": "Device",
-        "config": {},
+        "config": {"test": true},
-        "events": ["STAIRS_UP"]},
+        "events": ["Events::GUI::STAIRS_UP"]},
       {"_type": "Sprite", "name": "rope_vines_up", "width": 256, "height": 256, "scale": 1.0}
     ]
   },
@@ -40,40 +40,14 @@
     "description": "Watch where you're going.",
     "inventory_count": 0,
     "components": [
-      {"_type": "Tile", "display": 95,
+      {"_type": "Tile", "display": 6855,
         "foreground": [24, 205, 189],
         "background": [24, 205, 189]
       },
-      {"_type": "Device", "config": {}, "events": ["TRAP"]},
+      {"_type": "Device",
+        "config": {"test": true},
+        "events": ["Events::GUI::TRAP"]},
       {"_type": "Sprite", "name": "tripwire_trap", "width": 256, "height": 256, "scale": 1.0}
     ]
-  },
-  "BARREL_SMALL": {
-    "id": "BARREL_SMALL",
-    "name": "Small Barrel",
-    "description": "A small rotten barrel that may hold things.",
-    "components": [
-      {"_type": "Tile", "display": 85,
-        "foreground": [150, 100, 189],
-        "background": [150, 100, 189]
-      },
-      {"_type": "Device", "config": {}, "events": ["LOOT_CONTAINER"]},
-      {"_type": "Sprite", "name": "barrel_small", "width": 256, "height": 256, "scale": 1.0},
-      {"_type": "Sound", "attack": "pickup", "death": "blank"}
-    ]
-  },
-  "GRAVE_STONE": {
-    "id": "GRAVE_STONE",
-    "name": "Grave Stone",
-    "description": "Something died here. Was this your doing?",
-    "components": [
-      {"_type": "Tile", "display": 8687,
-        "foreground": [32, 123, 164],
-        "background": [24, 205, 189]
-      },
-      {"_type": "Device", "config": {}, "events": ["LOOT_CONTAINER"]},
-      {"_type": "Sprite", "name": "grave_stone", "width": 256, "height": 256, "scale": 1.0},
-      {"_type": "Sound", "attack": "pickup", "death": "blank"}
-    ]
   }
 }

assets/enemies.json

@@ -2,35 +2,20 @@
   "PLAYER_TILE": {
     "placement": "fixed",
     "components": [
-      {"_type": "Tile", "display": 41981,
+      {"_type": "Tile", "display": 42603,
         "foreground": [255, 200, 125],
-        "background": [0,0,0]
+        "background": [30, 20, 75]
       },
       {"_type": "Combat", "hp": 200, "max_hp": 200, "damage": 10, "dead": false},
       {"_type": "Motion", "dx": 0, "dy": 0, "random": false},
-      {"_type": "LightSource", "strength": 35, "radius": 2.0}
+      {"_type": "LightSource", "strength": 45, "radius": 2.0}
-    ]
-  },
-  "GOLD_SAVIOR": {
-    "components": [
-      {"_type": "Tile", "display": 42586,
-        "foreground": [131, 213, 238],
-        "background": [0,0,0]
-      },
-      {"_type": "Combat", "hp": 20, "max_hp": 20, "damage": 1, "dead": false},
-      {"_type": "Motion", "dx": 0, "dy": 0, "random": false},
-      {"_type": "EnemyConfig", "ai_script": "Enemy::actions", "ai_start_name": "Enemy::initial_state", "ai_goal_name": "Enemy::final_state"},
-      {"_type": "Personality", "hearing_distance": 5, "tough": false},
-      {"_type": "Animation", "easing": 1, "ease_rate": 0.2,  "scale": 0.1, "simple": true, "frames": 10, "speed": 0.3, "stationary": false},
-      {"_type": "Sprite", "name": "gold_savior", "width": 256, "height": 256, "width": 256, "height": 256, "scale": 1.0},
-      {"_type": "Sound", "attack": "Sword_Hit_2", "death": "Humanoid_Death_1"}
     ]
   },
   "KNIGHT": {
     "components": [
       {"_type": "Tile", "display": 2189,
         "foreground": [131, 213, 238],
-        "background": [0,0,0]
+        "background": [30, 20, 75]
       },
       {"_type": "Combat", "hp": 20, "max_hp": 20, "damage": 1, "dead": false},
       {"_type": "Motion", "dx": 0, "dy": 0, "random": false},
@@ -45,14 +30,14 @@
     "components": [
       {"_type": "Tile", "display": 1898,
         "foreground": [156, 172, 197],
-        "background": [0,0,0]
+        "background": [30, 20, 75]
       },
       {"_type": "Combat", "hp": 40, "max_hp": 40, "damage": 10, "dead": false},
       {"_type": "Motion", "dx": 0, "dy": 0, "random": true},
       {"_type": "EnemyConfig", "ai_script": "Enemy::actions", "ai_start_name": "Enemy::initial_state", "ai_goal_name": "Enemy::final_state"},
       {"_type": "Personality", "hearing_distance": 5, "tough": true},
       {"_type": "Sprite", "name": "axe_ranger", "width": 256, "height": 256, "scale": 1.0},
-      {"_type": "Animation", "easing": 3, "ease_rate": 0.5,  "scale": 0.1, "simple": true, "frames": 1, "speed": 0.6, "stationary": false},
+      {"_type": "Animation", "easing": 3, "ease_rate": 0.5,  "scale": 0.1, "simple": false, "frames": 2, "speed": 0.6, "stationary": false},
       {"_type": "Sound", "attack": "Sword_Hit_2", "death": "Ranger_1"}
     ]
   },
@@ -60,7 +45,7 @@
     "components": [
       {"_type": "Tile", "display": 2220,
         "foreground": [205, 164, 246],
-        "background": [0,0,0]
+        "background": [30, 20, 75]
       },
       {"_type": "Combat", "hp": 50, "max_hp": 50, "damage": 2, "dead": false},
       {"_type": "Motion", "dx": 0, "dy": 0, "random": false},
@@ -75,7 +60,7 @@
     "components": [
       {"_type": "Tile", "display": 1218,
         "foreground": [205, 164, 246],
-        "background": [0,0,0]
+        "background": [30, 20, 75]
       },
       {"_type": "Combat", "hp": 20, "max_hp": 20, "damage": 20, "dead": false},
       {"_type": "Motion", "dx": 0, "dy": 0, "random": false},

assets/items.json

@@ -8,12 +8,57 @@
       {"_type": "LightSource", "strength": 50, "radius": 2.5},
       {"_type": "Tile", "display": 3848,
         "foreground": [24, 120, 189],
-        "background": [0,0,0]
+        "background": [230,120, 120]
       },
       {"_type": "Sprite", "name": "torch_horizontal_floor", "width": 256, "height": 256, "scale": 1.0},
       {"_type": "Sound", "attack": "pickup", "death": "blank"}
     ]
   },
+  "SWORD_RUSTY": {
+    "id": "SWORD_RUSTY",
+    "name": "Rusty Junk Sword",
+    "description": "A sword left to rot in a deep hole where it acquired a patina of dirt and tetanus. You aren't sure if it's more deadly for you to hold it or for the people you stab with it.",
+    "inventory_count": 1,
+    "components": [
+      {"_type": "Weapon", "damage": 15},
+      {"_type": "Tile", "display": 7735,
+        "foreground": [24, 120, 189],
+        "background": [24, 120, 189]
+      },
+      {"_type": "Sprite", "name": "cinqueda", "width": 256, "height": 256, "scale": 1.0},
+      {"_type": "Sound", "attack": "pickup", "death": "blank"}
+    ]
+  },
+  "BARREL_SMALL": {
+    "id": "BARREL_SMALL",
+    "name": "Small Barrel",
+    "description": "A small rotten barrel that may hold things.",
+    "components": [
+      {"_type": "Tile", "display": 43754,
+        "foreground": [150, 100, 189],
+        "background": [150, 100, 189]
+      },
+      {"_type": "Loot", "amount": 10},
+      {"_type": "Sprite", "name": "barrel_small", "width": 256, "height": 256, "scale": 1.0},
+      {"_type": "Sound", "attack": "pickup", "death": "blank"}
+    ],
+    "inventory_count": 1
+  },
+  "TORCH_PILLAR": {
+    "id": "TORCH_PILLAR",
+    "name": "Light Hanging from Ceiling",
+    "description": "Light Hanging from Ceiling",
+    "inventory_count": 0,
+    "components": [
+      {"_type": "Tile", "display": 1918,
+        "foreground": [24, 205, 210],
+        "background": [24, 205, 210]
+      },
+      {"_type": "LightSource", "strength": 50, "radius": 2.8},
+      {"_type": "Sprite", "name": "torch_pillar", "width": 256, "height": 256, "scale": 1.0},
+      {"_type": "Sound", "attack": "pickup", "death": "blank"}
+    ]
+  },
   "POTION_HEALING_SMALL": {
     "id": "POTION_HEALING_SMALL",
     "name": "Small Healing Potion",
@@ -22,11 +67,26 @@
     "components": [
       {"_type": "Tile", "display": 1003,
         "foreground": [255, 205, 189],
-        "background": [0,0,0]
+        "background": [255, 205, 189]
       },
       {"_type": "Curative", "hp": 20},
       {"_type": "Sprite", "name": "healing_potion_small", "width": 256, "height": 256, "scale": 1.0},
       {"_type": "Sound", "attack": "pickup", "death": "blank"}
     ]
+  },
+  "GRAVE_STONE": {
+    "id": "GRAVE_STONE",
+    "name": "Grave Stone",
+    "description": "Something died here. Was this your doing?",
+    "inventory_count": 1,
+    "components": [
+      {"_type": "Tile", "display": 8687,
+        "foreground": [32, 123, 164],
+        "background": [24, 205, 189]
+      },
+      {"_type": "Loot", "amount": 10},
+      {"_type": "Sprite", "name": "grave_stone", "width": 256, "height": 256, "scale": 1.0},
+      {"_type": "Sound", "attack": "pickup", "death": "blank"}
+    ]
   }
 }

assets/map_tiles.json

@@ -1,128 +0,0 @@
-[
-    {
-        "centered": false,
-        "display": 35,
-        "x": 0,
-        "y": 0
-    },
-    {
-        "centered": false,
-        "display": 8284,
-        "x": 32,
-        "y": 0
-    },
-    {
-        "centered": false,
-        "display": 11590,
-        "x": 64,
-        "y": 0
-    },
-    {
-        "centered": false,
-        "display": 10899,
-        "x": 96,
-        "y": 0
-    },
-    {
-        "centered": false,
-        "display": 9256,
-        "x": 128,
-        "y": 0
-    },
-    {
-        "centered": false,
-        "display": 9608,
-        "x": 160,
-        "y": 0
-    },
-    {
-        "centered": false,
-        "display": 10747,
-        "x": 192,
-        "y": 0
-    },
-    {
-        "centered": false,
-        "display": 8285,
-        "x": 224,
-        "y": 0
-    },
-    {
-        "centered": true,
-        "display": 1003,
-        "x": 256,
-        "y": 0
-    },
-    {
-        "centered": true,
-        "display": 3848,
-        "x": 288,
-        "y": 0
-    },
-    {
-        "centered": true,
-        "display": 85,
-        "x": 0,
-        "y": 32
-    },
-    {
-        "centered": true,
-        "display": 8687,
-        "x": 32,
-        "y": 32
-    },
-    {
-        "centered": true,
-        "display": 10949,
-        "x": 64,
-        "y": 32
-    },
-    {
-        "centered": true,
-        "display": 8793,
-        "x": 96,
-        "y": 32
-    },
-    {
-        "centered": true,
-        "display": 95,
-        "x": 128,
-        "y": 32
-    },
-    {
-        "centered": true,
-        "display": 1898,
-        "x": 160,
-        "y": 32
-    },
-    {
-        "centered": true,
-        "display": 42586,
-        "x": 192,
-        "y": 32
-    },
-    {
-        "centered": true,
-        "display": 2189,
-        "x": 224,
-        "y": 32
-    },
-    {
-        "centered": true,
-        "display": 41981,
-        "x": 256,
-        "y": 32
-    },
-    {
-        "centered": true,
-        "display": 2220,
-        "x": 288,
-        "y": 32
-    },
-    {
-        "centered": true,
-        "display": 1218,
-        "x": 0,
-        "y": 64
-    }
-]

assets/rituals.json

@@ -169,34 +169,5 @@
       "damage": 16,
       "probability": 1.0
     }
-  },
+  }
-  "junk": {
-    "chess_pawn": {
-      "name": "chess_pawn",
-      "provides": ["cursed_item"]
-    },
-   "dirty_kerchief": {
-      "name": "dirty_kerchief",
-      "provides": ["has_magick"]
-    },
-   "mushroom": {
-      "name": "mushroom",
-      "provides": ["has_magick"]
-    },
-    "pocket_watch": {
-      "name": "pocket_watch",
-      "provides": ["shiny_bauble"]
-    },
-    "rusty_nails": {
-      "name": "rusty_nails",
-      "provides": ["has_spikes"]
-    },
-    "severed_finger": {
-      "name": "severed_finger",
-      "provides": ["cursed_item"]
-    }
-  },
-  "starting_junk": [
-     "pocket_watch", "mushroom", "rusty_nails"
-  ]
 }

assets/shaders/flame_trash.frag

@@ -1,10 +1,8 @@
-#version 120
 uniform vec2 u_resolution;
 uniform float u_time;
 uniform sampler2D source;
 uniform float u_mouse;
 uniform float value = 0.2;
-uniform int octaves=8;
 
 float random (in vec2 st) {
     return fract(sin(dot(st.xy,
@@ -28,7 +26,7 @@ float noise(in vec2 st) {
     (d - b) * u.x * u.y;
 }
 
-float fbm(in vec2 st) {
+float fbm(in vec2 st, int octaves=8) {
   float v = 0.0;
   float a = 0.5;
   vec2 shift = vec2(100.0);
@@ -49,7 +47,7 @@ void main() {
   vec3 color = vec3(0.0);
 
   float speed = u_time * 10.0;
-  float value = 0.8; // cos(u_time) * cos(u_time);
+  float value = cos(u_time) * cos(u_time);
 
   vec2 q = vec2(0.0);
   q.x = fbm(st + 0.00 * speed);

assets/shaders/lightning_attack.frag

@@ -1,10 +1,8 @@
-#version 120
 uniform vec2 u_resolution;
 uniform float u_time;
 uniform sampler2D source;
 uniform float u_mouse;
 uniform float value = 0.2;
-uniform int octaves=8;
 
 float random (in vec2 st) {
     return fract(sin(dot(st.xy,
@@ -28,7 +26,7 @@ float noise(in vec2 st) {
     (d - b) * u.x * u.y;
 }
 
-float fbm(in vec2 st) {
+float fbm(in vec2 st, int octaves=8) {
   float v = 0.0;
   float a = 0.5;
   vec2 shift = vec2(100.0);

assets/styles.json

@@ -1,17 +0,0 @@
-[
-  {
-    "name": "Mossy Blue Ceiling",
-    "floor": "gray_stone_floor_light",
-    "walls": "wall_moss"
-  },
-  {
-    "name": "Plain",
-    "floor": "floor_tile",
-    "walls": "wall_plain"
-  },
-  {
-    "name": "Wood Walls",
-    "floor": "floor_tile",
-    "walls": "wood_wall"
-  }
-]

assets/tiles.json

@@ -1,74 +1,23 @@
 {
-  "floor_tile": {
+  "FLOOR_TILE": {
-    "texture": "assets/textures/floor_gray_stone.png",
+    "texture": "assets/floor_tile_test-256.png",
+    "foreground": [40, 15, 125],
+    "background": [200, 15, 75],
     "collision": false,
-    "display": 8284,
+    "display": 10398
-    "ceiling": "ceiling_black",
-    "light": 0,
-    "foreground": [40, 40, 40],
-    "id": 0
   },
-  "wall_plain": {
+  "WALL_PLAIN": {
-    "texture": "assets/textures/wall_plain.png",
+    "texture": "assets/wall_texture_test-256.png",
+    "foreground": [230, 20, 30],
+    "background": [230, 20, 120],
     "collision": true,
-    "display": 9608,
+    "display": 9608
-    "light": 0,
-    "foreground": [100, 100, 100],
-    "background": [10, 10, 10],
-    "id": 1
   },
-  "wall_moss": {
+  "WALL_VINES": {
-    "texture": "assets/textures/glowing_moss_wall.png",
+    "texture": "assets/wall_with_vines-256.png",
-    "collision": true,
+    "foreground": [230, 20, 30],
-    "display": 9256,
+    "background": [230, 20, 120],
-    "light": 20,
-    "background": [100, 100, 180],
-    "foreground": [100, 150, 100],
-    "id": 2
-  },
-  "ceiling_black": {
-    "texture": "assets/textures/ceiling_black.png",
-    "collision": false,
-    "display": 35,
-    "light": 0,
-    "foreground": [100, 100, 100],
-    "id": 4
-  },
-  "lava_floor": {
-    "texture": "assets/textures/lava_floor.png",
-    "collision": false,
-    "display": 10899,
-    "ceiling": "ceiling_black",
-    "light": 20,
-    "foreground": [200, 100, 100],
-    "background": [100, 100, 50],
-    "id": 5
-  },
-  "gray_stone_floor_light": {
-    "texture": "assets/textures/gray_stone_floor_light.png",
-    "collision": false,
-    "display": 11590,
-    "ceiling": "zceiling_blue_light",
-    "light": 40,
-    "background": [80, 80, 80],
-    "foreground": [40, 60, 180],
-    "id": 6
-  },
-  "wood_wall": {
-    "texture": "assets/textures/wood_wall.png",
-    "collision": false,
-    "display": 10747,
-    "light": 0,
-    "foreground": [70, 70, 70],
-    "background": [100, 100, 100],
-    "id": 8
-  },
-  "zceiling_blue_light": {
-    "texture": "assets/textures/ceiling_blue_light.png",
     "collision": false,
-    "display": 8285,
+    "display": 35
-    "light": 0,
-    "foreground": [100, 100, 100],
-    "id": 7
   }
 }