Merge branch 'master' of https://github.com/I-am-Erk/CDDA-Tilesets

I-am-Erk · Feb 18, 2020 · 4fef17f · 4fef17f
2 parents 0127e36 + 4e44e79
commit 4fef17f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 0 deletions.
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/furniture/f_flower_spurge/f_flower_spurge.json b/gfx/UltimateCataclysm/pngs_normal_32x32/furniture/f_flower_spurge/f_flower_spurge.json
@@ -0,0 +1,7 @@
+{
+  "id": "f_flower_spurge",
+  "fg": [
+    "f_flower_spurge"
+  ],
+  "bg": []
+}
diff --git a/...timateCataclysm/pngs_normal_32x32/furniture/f_flower_spurge/f_flower_spurge.png b/...timateCataclysm/pngs_normal_32x32/furniture/f_flower_spurge/f_flower_spurge.png
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/furniture/f_flower_tulip/f_flower_tulip.json b/gfx/UltimateCataclysm/pngs_normal_32x32/furniture/f_flower_tulip/f_flower_tulip.json
@@ -0,0 +1,8 @@
+{
+  "id": "f_flower_tulip",
+  "fg": [
+    { "weight": 1, "sprite": "f_flower_tulip_1" },
+    { "weight": 2, "sprite": "f_flower_tulip_2" }
+  ],
+  "bg": []
+}
diff --git a/...timateCataclysm/pngs_normal_32x32/furniture/f_flower_tulip/f_flower_tulip_1.png b/...timateCataclysm/pngs_normal_32x32/furniture/f_flower_tulip/f_flower_tulip_1.png
diff --git a/...timateCataclysm/pngs_normal_32x32/furniture/f_flower_tulip/f_flower_tulip_2.png b/...timateCataclysm/pngs_normal_32x32/furniture/f_flower_tulip/f_flower_tulip_2.png
diff --git a/scratch/UltimateCataclysm/furniture/flowers.kra b/scratch/UltimateCataclysm/furniture/flowers.kra