factorio-draftsman 2.0.1__tar.gz → 2.0.2__tar.gz

{factorio_draftsman-2.0.1/factorio_draftsman.egg-info → factorio_draftsman-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: factorio-draftsman
-Version: 2.0.1
+Version: 2.0.2
 Summary: A complete, well-tested, and up-to-date module to manipulate Factorio blueprint strings. Compatible with mods.
 Home-page: https://github.com/redruin1/factorio-draftsman
 Author: redruin1
@@ -25,6 +25,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

factorio_draftsman-2.0.2/draftsman/_factorio_version.py

@@ -0,0 +1,4 @@
+# _factorio_version.py
+
+__factorio_version__ = "2.0.46.0"
+__factorio_version_info__ = (2, 0, 46, 0)

factorio_draftsman-2.0.2/draftsman/_version.py

@@ -0,0 +1,4 @@
+# _version.py
+
+__version__ = "2.0.2"
+__version_info__ = (2, 0, 2)

{factorio_draftsman-2.0.1 → factorio_draftsman-2.0.2}/draftsman/factorio-data/README.md

@@ -1,5 +1,5 @@
 # Factorio Data
-Tracks changes of the Lua prototype definitions in factorio in between releases.
+Tracks changes of the Lua prototype definitions in Factorio in between releases.
 
 This repo has been made publicly available to help mod authors.
 Its purpose is to allow the public to track changes to the Factorio **Lua prototype definitions**.
@@ -16,3 +16,8 @@ eg: https://github.com/wube/factorio-data/compare/0.18.43...1.1.57
 * Browse diffs between the versions, seeing the implementation of prototype changes we mention in the changelog.
 
 This repo debuted in [FFF-240](https://www.factorio.com/blog/post/fff-240).
+
+## Pull Requests Will Be Rejected
+The contents of this repository are automatically generated.  It is pointless to make a pull request as it will not be merged.  GitHub doesn't allow for deactivating the Pull requests feature.
+
+If you wish to report a bug, please do so [on our forums](https://forums.factorio.com/viewforum.php?f=7).  Thank you!

{factorio_draftsman-2.0.1 → factorio_draftsman-2.0.2}/draftsman/factorio-data/base/info.json

@@ -1,6 +1,6 @@
 {
   "name": "base",
-  "version": "2.0.42",
+  "version": "2.0.46",
   "title": "Base Mod",
   "author": "Wube Software",
   "contact": "dev@factorio.com",

{factorio_draftsman-2.0.1 → factorio_draftsman-2.0.2}/draftsman/factorio-data/base/prototypes/collision-layers.lua

@@ -25,4 +25,5 @@ data:extend(
 
   { type = "collision-layer", name = "is_lower_object" },
   { type = "collision-layer", name = "is_object" },
+  { type = "collision-layer", name = "out_of_map" }
 })

{factorio_draftsman-2.0.1 → factorio_draftsman-2.0.2}/draftsman/factorio-data/base/prototypes/entity/atomic-bomb.lua

@@ -368,18 +368,18 @@ data:extend({
         type = "instant",
         target_effects =
         {
-          {
-            type = "set-tile",
-            tile_name = "nuclear-ground",
-            radius = 12,
-            apply_projection = true,
-            tile_collision_mask = { layers={water_tile=true} }
-          },
-          {
+          { -- Destroy cliffs before changing tiles (so the cliff achievement works)
             type = "destroy-cliffs",
             radius = 9,
             explosion_at_trigger = "explosion"
           },
+          -- Explosion entities for other surface-specific effects are added here
+          {
+            type = "create-entity",
+            check_buildability = true,
+            -- This entity can have surface conditions
+            entity_name = "nuke-effects-nauvis"
+          },
           {
             type = "create-entity",
             entity_name = "nuke-explosion"

{factorio_draftsman-2.0.1 → factorio_draftsman-2.0.2}/draftsman/factorio-data/base/prototypes/entity/character-animations.lua

@@ -2,6 +2,16 @@ character_animations =
 {
   level1 =
   {
+    dead_reflection = 
+    {
+      filename = "__base__/graphics/entity/character/level1_dead_effect_map.png",
+      width = 120,
+      height = 63,
+      shift = util.by_pixel(-7.0,-5.5),
+      frame_count = 2,
+      scale = 1,
+      usage = "player"
+    },
     dead =
     {
       filename = "__base__/graphics/entity/character/level1_dead.png",

{factorio_draftsman-2.0.1 → factorio_draftsman-2.0.2}/draftsman/factorio-data/base/prototypes/entity/entities.lua

@@ -616,6 +616,21 @@ data:extend(
     hidden = true,
     open_sound = { filename = "__base__/sound/character-corpse-open.ogg", volume = 0.5 },
     close_sound = { filename = "__base__/sound/character-corpse-close.ogg", volume = 0.5 },
+    water_reflection =
+    {
+        pictures =
+        {
+          {
+            filename = "__base__/graphics/entity/character/level1_dead_effect_map.png",
+            width = 120,
+            height = 63,
+            --shift = util.by_pixel(-7.0,-5.5),
+            --frame_count = 2,
+            scale = 1,
+            usage = "player"
+          },
+        }
+      },
     pictures =
     {
       {
@@ -7351,8 +7366,8 @@ data:extend(
       usage_priority = "secondary-input"
     },
     impact_category = "metal",
-    open_sound = {filename = "__base__/sound/open-close/beacon-open.ogg", volume = 0.4},
-    close_sound = {filename = "__base__/sound/open-close/beacon-close.ogg", volume = 0.4},
+    open_sound = {filename = "__base__/sound/open-close/beacon-open.ogg", volume = 0.25},
+    close_sound = {filename = "__base__/sound/open-close/beacon-close.ogg", volume = 0.25},
     working_sound =
     {
       sound =
@@ -10000,7 +10015,7 @@ data:extend({
     name = "cargo-pod",
     icon = "__base__/graphics/icons/cargo-pod.png",
     flags = {"not-on-map"},
-    order = "c[cargo-pod]",
+    order = "d[cargo-pod]",
     collision_mask = {layers = {}},
     collision_box = {{0, 0},{0, 0}},
     selection_box = {{-0.5, -1}, {0.5, 0.5}},
@@ -10065,7 +10080,7 @@ data:extend({
     type = "temporary-container",
     name = "cargo-pod-container",
     icon = "__base__/graphics/icons/landed-cargo-pod.png",
-    order = "d[cargo-pod-container]",
+    order = "e[cargo-pod-container]",
     minable = {mining_time = 0.5},
     fast_replaceable_group = "container",
     flags = {"player-creation", "placeable-neutral", "placeable-off-grid", "not-in-kill-statistics", "not-upgradable"},

{factorio_draftsman-2.0.1 → factorio_draftsman-2.0.2}/draftsman/factorio-data/base/prototypes/entity/explosion-animations.lua

@@ -176,10 +176,178 @@ explosion_animations.small_explosion = function()
       shift = util.by_pixel(2,-7.5),
       scale = 0.5,
       usage = "explosion"
+    },
+    {
+      filename = "__base__/graphics/entity/small-explosion/small-explosion-3.png",
+      draw_as_glow = true,
+      priority = "high",
+      line_length = 6,
+      width = 154,
+      height = 222,
+      frame_count = 24,
+      animation_speed = 0.3,
+      shift = util.by_pixel( 1.5, -23.0),
+      scale = 0.5,
+      usage = "explosion"
+    },
+    {
+      filename = "__base__/graphics/entity/small-explosion/small-explosion-4.png",
+      draw_as_glow = true,
+      priority = "high",
+      line_length = 6,
+      width = 146,
+      height = 134,
+      frame_count = 24,
+      animation_speed = 0.3,
+      shift = util.by_pixel(2.5, -25.5),
+      scale = 0.5,
+      usage = "explosion"
+    },
+    {
+      filename = "__base__/graphics/entity/small-explosion/small-explosion-5.png",
+      draw_as_glow = true,
+      priority = "high",
+      line_length = 6,
+      width = 144,
+      height = 222,
+      frame_count = 24,
+      animation_speed = 0.3,
+      shift = util.by_pixel(4.5, -25.5),
+      scale = 0.5,
+      usage = "explosion"
     }
   }
 end
 
+explosion_animations.small_dust_explosion = function()
+  return
+  {
+    {
+      filename = "__base__/graphics/entity/small-explosion/small-dust-explosion-1.png",
+      draw_as_glow = true,
+      priority = "high",
+      line_length = 6,
+      width = 160,
+      height = 140,
+      frame_count = 24,
+      animation_speed = 0.3,
+      shift = util.by_pixel(-4.0, -34.5),
+      scale = 0.5,
+      usage = "explosion"
+    },
+    {
+      filename = "__base__/graphics/entity/small-explosion/small-dust-explosion-2.png",
+      draw_as_glow = true,
+      priority = "high",
+      line_length = 6,
+      width = 196,
+      height = 186,
+      frame_count = 24,
+      animation_speed = 0.3,
+      shift = util.by_pixel(0.0, -36.0),
+      scale = 0.5,
+      usage = "explosion"
+    },
+    {
+      filename = "__base__/graphics/entity/small-explosion/small-dust-explosion-3.png",
+      draw_as_glow = true,
+      priority = "high",
+      line_length = 6,
+      width = 228,
+      height = 216,
+      frame_count = 24,
+      animation_speed = 0.3,
+      shift = util.by_pixel(-5.5, -35.0),
+      scale = 0.5,
+      usage = "explosion"
+    }
+  }
+end  
+------
+explosion_animations.space_platform_foundation_explosion = function()
+  return
+  {
+    {
+      filename = "__base__/graphics/entity/small-explosion/small-dust-explosion-1.png",
+      draw_as_glow = true,
+      priority = "high",
+      line_length = 6,
+      width = 160,
+      height = 140,
+      frame_count = 24,
+      animation_speed = 0.3,
+      shift = util.by_pixel(-4.0, 5.0),
+      scale = 0.5,
+      usage = "explosion"
+    },
+    {
+      filename = "__base__/graphics/entity/small-explosion/small-dust-explosion-2.png",
+      draw_as_glow = true,
+      priority = "high",
+      line_length = 6,
+      width = 196,
+      height = 186,
+      frame_count = 24,
+      animation_speed = 0.3,
+      shift = util.by_pixel(0.0, 1.5),
+      scale = 0.5,
+      usage = "explosion"
+    },
+    {
+      filename = "__base__/graphics/entity/small-explosion/small-dust-explosion-3.png",
+      draw_as_glow = true,
+      priority = "high",
+      line_length = 6,
+      width = 228,
+      height = 216,
+      frame_count = 24,
+      animation_speed = 0.3,
+      shift = util.by_pixel(-5.5, 10.0),
+      scale = 0.5,
+      usage = "explosion"
+    },
+    -- {
+    --   filename = "__base__/graphics/entity/small-explosion/small-explosion-3.png",
+    --   draw_as_glow = true,
+    --   priority = "high",
+    --   line_length = 6,
+    --   width = 152,
+    --   height = 222,
+    --   frame_count = 24,
+    --   animation_speed = 0.3,
+    --   shift = util.by_pixel( 2.5, -3.0),
+    --   scale = 0.5,
+    --   usage = "explosion"
+    -- },
+    {
+      filename = "__base__/graphics/entity/small-explosion/small-explosion-4.png",
+      draw_as_glow = true,
+      priority = "high",
+      line_length = 6,
+      width = 146,
+      height = 134,
+      frame_count = 24,
+      animation_speed = 0.3,
+      shift = util.by_pixel(2.5, 6.0),
+      scale = 0.5,
+      usage = "explosion"
+    },
+    {
+      filename = "__base__/graphics/entity/small-explosion/small-explosion-5.png",
+      draw_as_glow = true,
+      priority = "high",
+      line_length = 6,
+      width = 144,
+      height = 222,
+      frame_count = 24,
+      animation_speed = 0.3,
+      shift = util.by_pixel(4.5, 6.0),
+      scale = 0.5,
+      usage = "explosion"
+    }
+  }
+end  
+------
 explosion_animations.nuke_shockwave = function()
   return
   {