Blender renders (I-am-Erk#159)

* Guardrail WIP * Pinball machine * Chicken, cow, deer, horse * Trying to fix guadrail.json * Guardrail sidewalk background * Simple outlines for cow and chicken fillers * Anvil filler * Giant frog filler * Fern filler * Keg filler, rendered by Some_stranger * Gas pump * Radio, anvil credits * 30gal barrel * sunglasses * ASRG generator * ASRG generator * welding mask * candle * fan * acoustic guitar variant * gas pump to 32x64 and clean up * Update f_compact_ASRG_containment.png * forgot to save fix to gaspump Co-authored-by: i-am-erk <[email protected]>
ShnitzelX2 · Jul 26, 2020 · 76d117f · 76d117f
1 parent 5045b48
commit 76d117f
Show file tree

Hide file tree

Showing 63 changed files with 201 additions and 1 deletion.
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/furniture/f_pinball_machine/credit.txt b/gfx/UltimateCataclysm/pngs_incomplete_32x32/furniture/f_pinball_machine/credit.txt
@@ -0,0 +1,3 @@
+https://sketchfab.com/3d-models/pinball-machine-4e14ebb2feb04cce8f47742cb77c14cd
+model by higan69
+rendered by int_ua
diff --git a/...ltimateCataclysm/pngs_incomplete_32x32/furniture/f_pinball_machine/f_pinball_machine.json b/...ltimateCataclysm/pngs_incomplete_32x32/furniture/f_pinball_machine/f_pinball_machine.json
@@ -0,0 +1,5 @@
+{
+  "id": "f_pinball_machine",
+  "fg": ["f_pinball_machine"],
+  "bg": []
+}
diff --git a/...taclysm/pngs_incomplete_32x32/furniture/f_pinball_machine/f_pinball_machine.png b/...taclysm/pngs_incomplete_32x32/furniture/f_pinball_machine/f_pinball_machine.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/30gal_barrel/30gal_barrel.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/30gal_barrel/30gal_barrel.json
@@ -0,0 +1,5 @@
+{
+  "id": "30gal_barrel",
+  "fg": ["30gal_barrel"],
+  "bg": []
+}
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/30gal_barrel/30gal_barrel.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/30gal_barrel/30gal_barrel.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/30gal_barrel/credits.txt b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/30gal_barrel/credits.txt
@@ -0,0 +1,3 @@
+https://www.blendswap.com/blend/20571
+model by Duion
+rendered by int_ua
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/acoustic_guitar/acoustic_guitar.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/acoustic_guitar/acoustic_guitar.json
@@ -1,5 +1,8 @@
 {
   "id": "acoustic_guitar",
-  "fg": ["acoustic_guitar"],
+  "fg": [
+      { "weight": 100, "sprite": "acoustic_guitar" },
+      { "weight": 100, "sprite": "acoustic_guitar2" }
+    ],
   "bg": []
 }
diff --git a/...imateCataclysm/pngs_incomplete_32x32/items/acoustic_guitar/acoustic_guitar2.png b/...imateCataclysm/pngs_incomplete_32x32/items/acoustic_guitar/acoustic_guitar2.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/acoustic_guitar/credits.txt b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/acoustic_guitar/credits.txt
@@ -0,0 +1,4 @@
+acoustic_guitar2.png
+https://sketchfab.com/3d-models/minimalist-guitar-5e254e9328764ad0bdd933b8cc6b78be
+model by Kacprzyk
+rendered by int_ua
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/anvil/anvil.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/anvil/anvil.json
@@ -0,0 +1,5 @@
+{
+  "id": "anvil",
+  "fg": ["anvil"],
+  "bg": []
+}
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/anvil/anvil.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/anvil/anvil.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/anvil/credits.txt b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/anvil/credits.txt
@@ -0,0 +1,3 @@
+https://www.blendswap.com/blend/20662
+model by AlanShukan
+rendered by int_ua
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/candle/candle.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/candle/candle.json
@@ -0,0 +1,5 @@
+{
+  "id": "candle",
+  "fg": ["candle"],
+  "bg": []
+}
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/candle/candle.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/candle/candle.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/candle/credits.txt b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/candle/credits.txt
@@ -0,0 +1,3 @@
+https://sketchfab.com/3d-models/candle-light-animated-d5e7042d18a14127a9971bb493b8c863
+model by CATENCODE
+rendered by int_ua
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/fan/credits.txt b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/fan/credits.txt
@@ -0,0 +1,3 @@
+https://sketchfab.com/3d-models/fan-animation-1757576875664d9ab891168a4c01b521
+model by 3DHaupt
+rendered by int_ua
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/fan/fan.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/fan/fan.json
@@ -0,0 +1,5 @@
+{
+  "id": "fan",
+  "fg": ["fan"],
+  "bg": []
+}
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/fan/fan.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/fan/fan.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/keg/credits.txt b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/keg/credits.txt
@@ -0,0 +1,3 @@
+https://www.blendswap.com/blend/13244
+model by Banthed
+rendered by Some_stranger
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/keg/keg.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/keg/keg.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/radio/credits.txt b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/radio/credits.txt
@@ -0,0 +1,3 @@
+https://www.blendswap.com/blend/23258
+model by chrisjpatty
+rendered by int_ua
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/radio/radio.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/radio/radio.json
@@ -0,0 +1,5 @@
+{
+  "id": "radio",
+  "fg": ["radio"],
+  "bg": []
+}
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/radio/radio.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/radio/radio.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/sunglasses/credits.txt b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/sunglasses/credits.txt
@@ -0,0 +1,3 @@
+https://sketchfab.com/3d-models/sunglasses-57185ae95254443c937b69de5c22af97
+model by martn00
+rendered by int_ua
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/sunglasses/sunglasses.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/sunglasses/sunglasses.json
@@ -0,0 +1,5 @@
+{
+  "id": "sunglasses",
+  "fg": ["sunglasses"],
+  "bg": []
+}
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/sunglasses/sunglasses.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/sunglasses/sunglasses.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/welding_mask/credits.txt b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/welding_mask/credits.txt
@@ -0,0 +1,3 @@
+https://sketchfab.com/3d-models/welding-mask-4f0462e1c43e4c1db947b8eb9d37b746
+model by guss67
+rendered by int_ua
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/welding_mask/welding_mask.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/welding_mask/welding_mask.json
@@ -0,0 +1,5 @@
+{
+  "id": "welding_mask",
+  "fg": ["welding_mask"],
+  "bg": []
+}
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/welding_mask/welding_mask.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/welding_mask/welding_mask.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_chicken/credits.txt b/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_chicken/credits.txt
@@ -0,0 +1,3 @@
+https://www.blendswap.com/blend/13807
+model by kednar
+rendered by int_ua
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_chicken/mon_chicken.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_chicken/mon_chicken.json
@@ -0,0 +1,5 @@
+{
+  "id": "mon_chicken",
+  "fg": ["mon_chicken"],
+  "bg": ["shadow_32x32_small"]
+}
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_chicken/mon_chicken.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_chicken/mon_chicken.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_cow/credits.txt b/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_cow/credits.txt
@@ -0,0 +1,3 @@
+https://www.blendswap.com/blend/20146
+model by vertexcat
+rendered by int_ua
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_cow/mon_cow.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_cow/mon_cow.json
@@ -0,0 +1,5 @@
+{
+  "id": "mon_cow",
+  "fg": ["mon_cow"],
+  "bg": ["shadow_32x32_normal"]
+}
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_cow/mon_cow.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_cow/mon_cow.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_deer/credits.txt b/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_deer/credits.txt
@@ -0,0 +1,3 @@
+https://www.blendswap.com/blend/3861
+model by chip
+rendered by int_ua
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_deer/mon_deer.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_deer/mon_deer.json
@@ -0,0 +1,5 @@
+{
+  "id": "mon_deer",
+  "fg": ["mon_deer"],
+  "bg": ["shadow_32x32_normal"]
+}
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_deer/mon_deer.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_deer/mon_deer.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_frog_giant/credits.txt b/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_frog_giant/credits.txt
@@ -0,0 +1,3 @@
+https://www.blendswap.com/blend/13078
+model by arenyart
+rendered by int_ua
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_frog_giant/mon_frog_giant.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_frog_giant/mon_frog_giant.json
@@ -0,0 +1,5 @@
+{
+  "id": "mon_frog_giant",
+  "fg": ["mon_frog_giant"],
+  "bg": ["shadow_32x32_normal"]
+}
diff --git a/...imateCataclysm/pngs_incomplete_32x32/monsters/mon_frog_giant/mon_frog_giant.png b/...imateCataclysm/pngs_incomplete_32x32/monsters/mon_frog_giant/mon_frog_giant.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_horse/credits.txt b/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_horse/credits.txt
@@ -0,0 +1,3 @@
+https://www.blendswap.com/blend/14671
+model by twin97
+rendered by int_ua
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_horse/mon_horse.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_horse/mon_horse.json
@@ -0,0 +1,5 @@
+{
+  "id": "mon_horse",
+  "fg": ["mon_horse"],
+  "bg": ["shadow_32x32_normal"]
+}
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_horse/mon_horse.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/monsters/mon_horse/mon_horse.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/terrain/t_fern/credits.txt b/gfx/UltimateCataclysm/pngs_incomplete_32x32/terrain/t_fern/credits.txt
@@ -0,0 +1,3 @@
+https://www.blendswap.com/blend/23636
+model by BluePrintRandom
+rendered by int_ua
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/terrain/t_fern/t_fern.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/terrain/t_fern/t_fern.json
@@ -0,0 +1,42 @@
+[
+  {
+    "id": "t_fern",
+    "fg": [ "t_fern" ],
+    "bg": [ "t_dirt" ]
+  },
+  {
+    "id": "t_fern_harvested",
+    "fg": [ "t_fern_harvested" ],
+    "bg": [ "t_dirt" ]
+  },
+  {
+    "id": "t_fern_season_summer",
+    "fg": [ "t_fern" ],
+    "bg": [ "t_dirt_summer" ]
+  },
+  {
+    "id": "t_fern_harvested_season_summer",
+    "fg": [ "t_fern_harvested" ],
+    "bg": [ "t_dirt_summer" ]
+  },
+  {
+    "id": "t_fern_season_autumn",
+    "fg": [ "t_fern" ],
+    "bg": [ "t_dirt_autumn" ]
+  },
+  {
+    "id": "t_fern_harvested_season_winter",
+    "fg": [ "t_fern_harvested" ],
+    "bg": [ "snow_deep" ]
+  },
+  {
+    "id": "t_fern_season_winter",
+    "fg": [ "t_fern" ],
+    "bg": [ "snow_deep" ]
+  },
+  {
+    "id": "t_fern_harvested_season_winter",
+    "fg": [ "t_fern_harvested" ],
+    "bg": [ "snow_deep" ]
+  }
+]
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/terrain/t_fern/t_fern.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/terrain/t_fern/t_fern.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/terrain/t_fern/t_fern_harvested.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/terrain/t_fern/t_fern_harvested.png
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/furniture/f_compact_ASRG_containment/credit.txt b/gfx/UltimateCataclysm/pngs_normal_32x32/furniture/f_compact_ASRG_containment/credit.txt
@@ -0,0 +1,3 @@
+https://sketchfab.com/3d-models/electric-generator-e5343992c322442fa3f9fe9a5b301d4a
+model by pesawatkertas
+rendered by int_ua
diff --git a/...sm/pngs_normal_32x32/furniture/f_compact_ASRG_containment/f_compact_ASRG_containment.json b/...sm/pngs_normal_32x32/furniture/f_compact_ASRG_containment/f_compact_ASRG_containment.json
@@ -0,0 +1,5 @@
+{
+  "id": "f_compact_ASRG_containment",
+  "fg": ["f_compact_ASRG_containment"],
+  "bg": []
+}
diff --git a/...ormal_32x32/furniture/f_compact_ASRG_containment/f_compact_ASRG_containment.png b/...ormal_32x32/furniture/f_compact_ASRG_containment/f_compact_ASRG_containment.png
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_guardrail/t_guardrail.json b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_guardrail/t_guardrail.json
@@ -0,0 +1,17 @@
+[
+  {
+    "id": [ "t_guardrail", "t_guardrail_bg_dp", "t_guardrail_hw_air" ],
+    "multitile": true,
+    "fg": [ "t_guardrail_unconnected" ],
+    "bg": ["t_sidewalk_center"],
+    "additional_tiles": [
+      { "id": "edge", "bg": ["t_sidewalk_center"], "fg": [ "t_guardrail_edge_ns", "t_guardrail_edge_ew" ] },
+      {
+        "id": "end_piece",
+        "bg": ["t_sidewalk_center"],
+        "fg": [ "t_guardrail_end_piece_n", "t_guardrail_end_piece_w", "t_guardrail_end_piece_s", "t_guardrail_end_piece_e" ]
+      },
+      { "bg": ["t_sidewalk_center"], "id": "unconnected", "fg": [ "t_guardrail_unconnected" ] }
+    ]
+  }
+]
diff --git a/...UltimateCataclysm/pngs_normal_32x32/terrain/t_guardrail/t_guardrail_edge_ew.png b/...UltimateCataclysm/pngs_normal_32x32/terrain/t_guardrail/t_guardrail_edge_ew.png
diff --git a/...UltimateCataclysm/pngs_normal_32x32/terrain/t_guardrail/t_guardrail_edge_ns.png b/...UltimateCataclysm/pngs_normal_32x32/terrain/t_guardrail/t_guardrail_edge_ns.png
diff --git a/...mateCataclysm/pngs_normal_32x32/terrain/t_guardrail/t_guardrail_end_piece_e.png b/...mateCataclysm/pngs_normal_32x32/terrain/t_guardrail/t_guardrail_end_piece_e.png
diff --git a/...mateCataclysm/pngs_normal_32x32/terrain/t_guardrail/t_guardrail_end_piece_n.png b/...mateCataclysm/pngs_normal_32x32/terrain/t_guardrail/t_guardrail_end_piece_n.png
diff --git a/...mateCataclysm/pngs_normal_32x32/terrain/t_guardrail/t_guardrail_end_piece_s.png b/...mateCataclysm/pngs_normal_32x32/terrain/t_guardrail/t_guardrail_end_piece_s.png
diff --git a/...mateCataclysm/pngs_normal_32x32/terrain/t_guardrail/t_guardrail_end_piece_w.png b/...mateCataclysm/pngs_normal_32x32/terrain/t_guardrail/t_guardrail_end_piece_w.png
diff --git a/...mateCataclysm/pngs_normal_32x32/terrain/t_guardrail/t_guardrail_unconnected.png b/...mateCataclysm/pngs_normal_32x32/terrain/t_guardrail/t_guardrail_unconnected.png
diff --git a/gfx/UltimateCataclysm/pngs_tall_32x64/furniture/f_gas_pump/credits.txt b/gfx/UltimateCataclysm/pngs_tall_32x64/furniture/f_gas_pump/credits.txt
@@ -0,0 +1,3 @@
+https://sketchfab.com/3d-models/vintage-gas-pump-7c188bdd8a8d4b9c8f5f6652009bd18c
+model by raphi14
+rendered by int_ua
diff --git a/gfx/UltimateCataclysm/pngs_tall_32x64/furniture/f_gas_pump/t_gas_pump.json b/gfx/UltimateCataclysm/pngs_tall_32x64/furniture/f_gas_pump/t_gas_pump.json
@@ -0,0 +1,12 @@
+[
+  {
+    "id": "t_gas_pump",
+    "fg": [ "t_gas_pump" ],
+    "bg": [ "t_pavement_tall" ]
+  },
+  {
+    "id": "f_gas_pump",
+    "fg": [ "t_gas_pump" ],
+    "bg": [ ]
+  }
+]
diff --git a/gfx/UltimateCataclysm/pngs_tall_32x64/furniture/f_gas_pump/t_gas_pump.png b/gfx/UltimateCataclysm/pngs_tall_32x64/furniture/f_gas_pump/t_gas_pump.png
diff --git a/tools/requirements.txt b/tools/requirements.txt
@@ -0,0 +1 @@
+pyvips