.gitignore

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

Makefile

@@ -10,7 +10,7 @@ endif
 %.cpp : %.rl
 	ragel -o $@ $<
 
-build:
+build: lel_parser.cpp
 	meson compile -j 10 -C builddir
 
 release_build:
@@ -26,7 +26,7 @@ tracy_build:
 	meson compile -j 10 -C builddir
 
 test: build
-	./builddir/runtests "[event_router]"
+	./builddir/runtests
 
 run: build test
 ifeq '$(OS)' 'Windows_NT'
@@ -49,7 +49,7 @@ clean:
 	meson compile --clean -C builddir
 
 debug_test: build
-	gdb --nx -x .gdbinit --ex run --args builddir/runtests -e "[event_router]"
+	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'

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",
-    "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"
+    "fireball_01": "assets/sounds/fireball_01.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":
-    {"path": "assets/sprites/axe_ranger.png",
+    "sword":
+    {"path": "assets/cinqueda_1-256.png",
       "frame_width": 256,
       "frame_height": 256
     },
-    "hairy_spider":
-    {"path": "assets/sprites/hairy_spider.png",
+    "rat_with_sword":
+    {"path": "assets/rat_with_sword-256.png",
       "frame_width": 256,
       "frame_height": 256
     },
-    "rat_with_sword":
-    {"path": "assets/sprites/rat_with_sword.png",
+    "rat_king":
+    {"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":
-    {"path": "assets/items/broken_locket.png",
-      "frame_width": 256,
-      "frame_height": 256
-    },
-    "broken_pen_knife":
-    {"path": "assets/items/broken_pen_knife.png",
-      "frame_width": 256,
-      "frame_height": 256
-    },
-    "broken_yoyo":
-    {"path": "assets/items/broken_yoyo.png",
-      "frame_width": 256,
-      "frame_height": 256
-    },
-    "chess_pawn":
-    {"path": "assets/items/chess_pawn.png",
-      "frame_width": 256,
-      "frame_height": 256
-    },
-    "dirty_kerchief":
-    {"path": "assets/items/dirty_kerchief.png",
-      "frame_width": 256,
-      "frame_height": 256
-    },
-    "leather_pouch":
-    {"path": "assets/items/leather_pouch.png",
-      "frame_width": 256,
-      "frame_height": 256
-    },
-    "mushroom":
-    {"path": "assets/items/mushroom.png",
-      "frame_width": 256,
-      "frame_height": 256
-    },
-    "pocket_watch":
-    {"path": "assets/items/pocket_watch.png",
-      "frame_width": 256,
-      "frame_height": 256
-    },
-    "rusty_nails":
-    {"path": "assets/items/rusty_nails.png",
-      "frame_width": 256,
-      "frame_height": 256
-    },
-    "severed_finger":
-    {"path": "assets/items/severed_finger.png",
-      "frame_width": 256,
-      "frame_height": 256
-    },
-    "stone_doll_cursed":
-    {"path": "assets/items/stone_doll_cursed.png",
-      "frame_width": 256,
-      "frame_height": 256
-    },
-    "dubious_combination":
-    {"path": "assets/items/dubious_combination.png",
-      "frame_width": 256,
-      "frame_height": 256
+    "broken_locket-64":
+    {"path": "assets/rituals/broken_locket-64.png",
+      "frame_width": 64,
+      "frame_height": 64
+    },
+    "broken_locket-128":
+    {"path": "assets/rituals/broken_locket-128.png",
+      "frame_width": 128,
+      "frame_height": 128
+    },
+    "broken_pen_knife-64":
+    {"path": "assets/rituals/broken_pen_knife-64.png",
+      "frame_width": 64,
+      "frame_height": 64
+    },
+    "broken_pen_knife-128":
+    {"path": "assets/rituals/broken_pen_knife-128.png",
+      "frame_width": 128,
+      "frame_height": 128
+    },
+    "broken_yoyo-64":
+    {"path": "assets/rituals/broken_yoyo-64.png",
+      "frame_width": 64,
+      "frame_height": 64
+    },
+    "broken_yoyo-128":
+    {"path": "assets/rituals/broken_yoyo-128.png",
+      "frame_width": 128,
+      "frame_height": 128
+    },
+    "chess_pawn-64":
+    {"path": "assets/rituals/chess_pawn-64.png",
+      "frame_width": 64,
+      "frame_height": 64
+    },
+    "chess_pawn-128":
+    {"path": "assets/rituals/chess_pawn-128.png",
+      "frame_width": 128,
+      "frame_height": 128
+    },
+    "dirty_kerchief-64":
+    {"path": "assets/rituals/dirty_kerchief-64.png",
+      "frame_width": 64,
+      "frame_height": 64
+    },
+    "dirty_kerchief-128":
+    {"path": "assets/rituals/dirty_kerchief-128.png",
+      "frame_width": 128,
+      "frame_height": 128
+    },
+    "leather_pouch-64":
+    {"path": "assets/rituals/leather_pouch-64.png",
+      "frame_width": 64,
+      "frame_height": 64
+    },
+    "leather_pouch-128":
+    {"path": "assets/rituals/leather_pouch-128.png",
+      "frame_width": 128,
+      "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": {
-    "black": [0, 0, 0, 255],
-    "dark_dark": [10, 10, 10, 255],
-    "dark_mid": [30, 30, 30, 255],
-    "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"
-  }
+  "test_rituals": [
+      { "has_spikes": true, "active": true },
+      { "has_magick": true, "active": true },
+      { "has_magick": true, "shiny_bauble": true, "active": true }
+  ]
 }

assets/devices.json

@@ -40,7 +40,7 @@
     "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]
       },

assets/enemies.json

@@ -8,22 +8,7 @@
       },
       {"_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}
-    ]
-  },
-  "GOLD_SAVIOR": {
-    "components": [
-      {"_type": "Tile", "display": 2189,
-        "foreground": [131, 213, 238],
-        "background": [30, 20, 75]
-      },
-      {"_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"}
+      {"_type": "LightSource", "strength": 45, "radius": 2.0}
     ]
   },
   "KNIGHT": {
@@ -52,7 +37,7 @@
       {"_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"}
     ]
   },

assets/items.json

@@ -14,15 +14,31 @@
       {"_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": 85,
+      {"_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"}
     ],
@@ -68,6 +84,7 @@
         "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/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,61 +1,23 @@
 {
-  "floor_tile": {
-    "texture": "assets/textures/floor_gray_stone.png",
+  "FLOOR_TILE": {
+    "texture": "assets/floor_tile_test-256.png",
+    "foreground": [40, 15, 125],
+    "background": [200, 15, 75],
     "collision": false,
-    "display": 10398,
-    "ceiling": "ceiling_black",
-    "light": 0,
-    "id": 0
+    "display": 10398
   },
-  "wall_plain": {
-    "texture": "assets/textures/wall_plain.png",
+  "WALL_PLAIN": {
+    "texture": "assets/wall_texture_test-256.png",
+    "foreground": [230, 20, 30],
+    "background": [230, 20, 120],
     "collision": true,
-    "display": 9608,
-    "light": 0,
-    "id": 1
+    "display": 9608
   },
-  "wall_moss": {
-    "texture": "assets/textures/glowing_moss_wall.png",
-    "collision": true,
-    "display": 8820,
-    "light": 20,
-    "id": 2
-  },
-  "ceiling_black": {
-    "texture": "assets/textures/ceiling_black.png",
-    "collision": false,
-    "display": 35,
-    "light": 0,
-    "id": 4
-  },
-  "lava_floor": {
-    "texture": "assets/textures/lava_floor.png",
-    "collision": false,
-    "display": 35,
-    "ceiling": "ceiling_black",
-    "light": 20,
-    "id": 5
-  },
-  "gray_stone_floor_light": {
-    "texture": "assets/textures/gray_stone_floor_light.png",
-    "collision": false,
-    "display": 35,
-    "ceiling": "ceiling_blue_light",
-    "light": 40,
-    "id": 6
-  },
-  "ceiling_blue_light": {
-    "texture": "assets/textures/ceiling_blue_light.png",
-    "collision": false,
-    "display": 35,
-    "light": 0,
-    "id": 7
-  },
-  "wood_wall": {
-    "texture": "assets/textures/wood_wall.png",
+  "WALL_VINES": {
+    "texture": "assets/wall_with_vines-256.png",
+    "foreground": [230, 20, 30],
+    "background": [230, 20, 120],
     "collision": false,
-    "display": 35,
-    "light": 0,
-    "id": 8
+    "display": 35
   }
 }