diff --git a/assets/config.json b/assets/config.json index 04d5676..e4721ea 100644 --- a/assets/config.json +++ b/assets/config.json @@ -3,10 +3,15 @@ "armored_knight": "assets/armored_knight_1-256.png", "sword": "assets/cinqueda_1-512.png", "barrel": "assets/wood_barrel_large-256.png", + "hanging_brazier": "assets/hanging_brazier-256.png", + "torch_pillar": "assets/torch_pillar-256.png", + "torch_crappy": "assets/torch_crappy-256.png", "evil_eye": "assets/evil_eye-sprites.png", "peasant_girl": "assets/undead_peasant-256.png", "floor": "assets/floor_tile_test-256.png", - "ceiling": "assets/ceiling_test-256.png" + "ceiling": "assets/ceiling_test-256.png", + "healing_potion_small": "assets/healing_potion_small-256.png", + "cinqueda": "assets/cinqueda_1-256.png" }, "enemy": { "HEARING_DISTANCE": 20 diff --git a/assets/enemies.json b/assets/enemies.json index c7b1353..f900bd8 100644 --- a/assets/enemies.json +++ b/assets/enemies.json @@ -8,7 +8,7 @@ }, {"_type": "Combat", "hp": 200, "damage": 15, "dead": false}, {"_type": "Motion", "dx": 0, "dy": 0, "random": false}, - {"_type": "LightSource", "strength": 70, "radius": 2}, + {"_type": "LightSource", "strength": 60, "radius": 1.8}, {"_type": "EnemyConfig", "hearing_distance": 5}, {"_type": "Sprite", "name": "peasant_girl"} ] @@ -21,7 +21,7 @@ }, {"_type": "Combat", "hp": 20, "damage": 1, "dead": false}, {"_type": "Motion", "dx": 0, "dy": 0, "random": false}, - {"_type": "LightSource", "strength": 70, "radius": 2}, + {"_type": "LightSource", "strength": 40, "radius": 1.2}, {"_type": "EnemyConfig", "hearing_distance": 5}, {"_type": "Sprite", "name": "armored_knight"} ] diff --git a/assets/hanging_brazier-256.png b/assets/hanging_brazier-256.png new file mode 100644 index 0000000..005defd Binary files /dev/null and b/assets/hanging_brazier-256.png differ diff --git a/assets/healing_potion_small-256.png b/assets/healing_potion_small-256.png new file mode 100644 index 0000000..0a6c770 Binary files /dev/null and b/assets/healing_potion_small-256.png differ diff --git a/assets/items.json b/assets/items.json index 0d57dbe..67192b1 100644 --- a/assets/items.json +++ b/assets/items.json @@ -10,7 +10,7 @@ "foreground": [24, 120, 189], "background": [230,120, 120] }, - {"_type": "Sprite", "name": "barrel"} + {"_type": "Sprite", "name": "torch_crappy"} ] }, "SWORD_RUSTY": { @@ -24,22 +24,7 @@ "foreground": [24, 120, 189], "background": [24, 120, 189] }, - {"_type": "Sprite", "name": "barrel"} - ] - }, - "SWORD_LIGHT_AND_FLAME": { - "id": "SWORD_LIGHT_AND_FLAME", - "name": "Sword of Light and Flame", - "description": "A sword so powerful, a great man from the Land of The Rising Sun thrust it into the ocean of Nerf to chill its effects.", - "inventory_count": 1, - "components": [ - {"_type": "LightSource", "strength": 70, "radius": 1.8}, - {"_type": "Tile", "display": "\u0236", - "foreground": [24, 205, 210], - "background": [24, 205, 210] - }, - {"_type": "Weapon", "damage": 30}, - {"_type": "Sprite", "name": "barrel"} + {"_type": "Sprite", "name": "cinqueda"} ] }, "CHEST_SMALL": { @@ -56,10 +41,10 @@ ], "inventory_count": 1 }, - "WALL_TORCH": { - "id": "WALL_TORCH", - "name": "Basic Wall Torch", - "description": "A torch on a wall you can't pick up.", + "TORCH_PILLAR": { + "id": "TORCH_PILLAR", + "name": "Light Hanging from Ceiling", + "description": "Light Hanging from Ceiling", "inventory_count": 0, "components": [ {"_type": "Tile", "display": "\u077e", @@ -67,7 +52,7 @@ "background": [24, 205, 210] }, {"_type": "LightSource", "strength": 60, "radius": 1.8}, - {"_type": "Sprite", "name": "barrel"} + {"_type": "Sprite", "name": "torch_pillar"} ] }, "POTION_HEALING_SMALL": { @@ -81,7 +66,7 @@ "background": [255, 205, 189] }, {"_type": "Curative", "hp": 20}, - {"_type": "Sprite", "name": "barrel"} + {"_type": "Sprite", "name": "healing_potion_small"} ] } } diff --git a/assets/tiles.json b/assets/tiles.json index 59806e4..53a28c4 100644 --- a/assets/tiles.json +++ b/assets/tiles.json @@ -15,15 +15,15 @@ }, "WALL_VINES": { "texture": "assets/wall_with_vines-256.png", - "foreground": [40, 15, 125], - "background": [200, 29, 75], + "foreground": [230, 20, 30], + "background": [230, 20, 120], "collision": false, "display":"\u0799" }, "WALL_PILLAR": { "texture": "assets/wall_with_pillars-256.png", - "foreground": [40, 15, 125], - "background": [200, 29, 75], + "foreground": [230, 20, 30], + "background": [230, 20, 120], "collision": false, "display":"\u2274" } diff --git a/assets/torch_crappy-256.png b/assets/torch_crappy-256.png new file mode 100644 index 0000000..9e7bcdc Binary files /dev/null and b/assets/torch_crappy-256.png differ diff --git a/assets/torch_pillar-256.png b/assets/torch_pillar-256.png new file mode 100644 index 0000000..9431f04 Binary files /dev/null and b/assets/torch_pillar-256.png differ diff --git a/assets/torch_pillar-512.png b/assets/torch_pillar-512.png new file mode 100644 index 0000000..d7f580e Binary files /dev/null and b/assets/torch_pillar-512.png differ