Skip to content

Commit

Permalink
Updated to 1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Bilka2 committed Sep 2, 2020
1 parent 7ed821a commit 6e744b6
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 49 deletions.
6 changes: 6 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
---------------------------------------------------------------------------------------------------
Version: 0.1.0
Date: 2020-09-02
Features:
- Updated to 1.0.0.
- Enforced "dummy-x" naming scheme for more prototypes.
---------------------------------------------------------------------------------------------------
Version: 0.0.3
Date: 2020-07-03
Features:
Expand Down
2 changes: 1 addition & 1 deletion common-properties.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ local properties = {}

properties.sound_filename = "__core__/sound/achievement-unlocked.ogg"
properties.sprite_filename = "__core__/graphics/empty.png"
properties.sprite_filename_32px = "__core__/graphics/factorio-icon.png"
properties.sprite_filename_32px = "__core__/graphics/icons/unknown.png"
properties.render_layer = "object"

-- This function is applied directly to the prototype table and adds the icon to it
Expand Down
34 changes: 6 additions & 28 deletions data.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ require("equipment")
-- The utility constants are defined in the core mod.
-- Removing this property means trigger-target-types "common" and "ground-unit" do not have to be created.
data.raw["utility-constants"]["default"].default_trigger_target_mask_by_type = nil
-- The "x-unknown" prototypes are defined in the core mod.
-- Setting the subgroup to an existing one means the default subgroup "fluid" does not have to be created.
data.raw["fluid"]["fluid-unknown"].subgroup = "other"
-- Setting the collision mask to something walkable means the game accepts this as the needed tile prototype.
data.raw["tile"]["tile-unknown"].collision_mask = {"ground-tile"}

-- Miscellaneous prototypes that are required by the required prototypes. Mostly categories.
data:extend({
Expand Down Expand Up @@ -57,33 +62,6 @@ data:extend({
name = "other",
group = "dummy-item-group"
},
properties.add_icon
{
type = "fluid",
name = "dummy-fluid",
base_color = properties.color(),
default_temperature = 1,
flow_color = properties.color(),
max_temperature = 1,
subgroup = "other"
},
{
type = "tile",
name = "dummy-tile",
collision_mask = {"ground-tile"},
layer = 1,
variants =
{
empty_transitions = true,
main = {{
count = 1,
picture = properties.sprite_filename_32px,
size = 1
}}
},
map_color = properties.color(),
pollution_absorption_per_second = 1
},
{
type = "equipment-grid",
name = "dummy-equipment-grid",
Expand All @@ -109,7 +87,7 @@ data:extend({
name = "signal-each",
subgroup = "other"
},
{
{
type = "damage-type",
name = "physical"
},
Expand Down
53 changes: 39 additions & 14 deletions entities.lua
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ data:extend({
},
{
type = "character",
name = "character", -- also a core prototype
name = "dummy-character",
mining_speed = 1,
running_speed = 1,
distance_per_frame = 1,
Expand All @@ -283,7 +283,6 @@ data:extend({
ticks_to_keep_gun = 1,
ticks_to_keep_aiming_direction = 1,
ticks_to_stay_in_combat = 1,
ticks_to_stay_in_combat = 1,
damage_hit_tint = properties.color(),
running_sound_animation_positions = {},
mining_with_tool_particles_animation_positions = {},
Expand Down Expand Up @@ -401,7 +400,7 @@ data:extend({
},
{
type = "deconstructible-tile-proxy",
name = "deconstructible-tile-proxy" -- also a core prototype
name = "dummy-deconstructible-tile-proxy"
},
{
type = "electric-energy-interface",
Expand Down Expand Up @@ -467,12 +466,6 @@ data:extend({
name = "dummy-fluid-wagon",
capacity = 1
},
{
type = "flying-text",
name = "flying-text", -- also a core prototype
speed = 1,
time_to_live = 1
},
{
type = "furnace",
name = "dummy-furnace",
Expand Down Expand Up @@ -599,11 +592,11 @@ data:extend({
},
{
type = "item-entity",
name = "item-on-ground" -- also a core prototype
name = "dummy-item-entity"
},
{
type = "item-request-proxy",
name = "item-request-proxy", -- also a core prototype
name = "dummy-item-request-proxy",
picture = properties.sprite()
},
{
Expand Down Expand Up @@ -697,7 +690,7 @@ data:extend({
{
type = "offshore-pump",
name = "dummy-offshore-pump",
fluid = "dummy-fluid",
fluid = "fluid-unknown",
fluid_box = properties.fluid_box(),
pumping_speed = 1,
graphics_set =
Expand Down Expand Up @@ -905,7 +898,6 @@ data:extend({
rocket_flame_right_rotation = 1,
rocket_render_layer_switch_distance = 1,
full_render_layer_switch_distance = 1,
full_render_layer_switch_distance = 1,
rocket_launch_offset = properties.vector(),
effects_fade_in_start_distance = 1,
effects_fade_in_end_distance = 1,
Expand Down Expand Up @@ -959,6 +951,39 @@ data:extend({
name = "dummy-speech-bubble",
style = "speech_bubble" -- defined in __core__/prototypes/style.lua
},
{
type = "spider-leg",
name = "dummy-spider-leg",
part_length = 1,
initial_movement_speed = 1,
movement_acceleration = 1,
movement_based_position_selection_distance = 1,
graphics_set = {}
},
add_vehicle_properties
{
type = "spider-vehicle",
name = "dummy-spider-vehicle",
energy_source = properties.void_energy_source(),
inventory_size = 1,
graphics_set = {},
spider_engine =
{
military_target = "dummy-simple-entity-with-force",
legs =
{
leg = "dummy-spider-leg",
mount_position = properties.vector(),
ground_position = properties.vector(),
blocking_legs = {}
}
},
height = 1,
chunk_exploration_radius = 1,
movement_energy_consumption = "1J",
automatic_weapon_cycling = true,
chain_shooting_cooldown_modifier = 1
},
add_transport_belt_connectable_properties
{
type = "splitter",
Expand Down Expand Up @@ -1001,7 +1026,7 @@ data:extend({
},
{
type = "tile-ghost",
name = "tile-ghost" -- also a core prototype
name = "dummy-tile-ghost"
},
{
type = "train-stop",
Expand Down
3 changes: 1 addition & 2 deletions equipment.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

local properties = require("common-properties")

-- These functions are applied directly to the prototype table.
-- This functions is applied directly to the prototype table.
-- This allows to easily create many prototypes that inherit from the same base class/prototype, without copy pasting properties.

local function add_equipment_properties(prototype)
prototype.sprite = properties.sprite()
prototype.shape = {
Expand Down
4 changes: 2 additions & 2 deletions info.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name" : "minimal-no-base-mod",
"version" : "0.0.3",
"version" : "0.1.0",
"title" : "Minimal mod allowing incompatibility with the base mod",
"author" : "Bilka",
"description" : "This mod provides the minimal prototypes needed to load the game without the base mod. Modders are encouraged to build their own mod on top of this one or depend on it to aid development of mods incompatible with the base mod.",
"factorio_version" : "0.18",
"factorio_version" : "1.0",
"dependencies" : ["! base"]
}
10 changes: 8 additions & 2 deletions items.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ data:extend({
add_selection_tool_properties
{
type = "blueprint",
name = "blueprint" -- also a core prototype
name = "dummy-sblueprint"
},
add_item_properties
{
Expand All @@ -63,7 +63,7 @@ data:extend({
add_selection_tool_properties
{
type = "copy-paste-tool",
name = "copy-paste-tool" -- also a core prototype
name = "dummy-copy-paste-tool"
},
add_selection_tool_properties
{
Expand Down Expand Up @@ -136,6 +136,12 @@ data:extend({
name = "dummy-selection-tool"
},
add_item_properties
{
type = "spidertron-remote",
name = "dummy-spidertron-remote",
icon_color_indicator_mask = properties.sprite_filename
},
add_item_properties
{
type = "tool",
name = "dummy-tool",
Expand Down

0 comments on commit 6e744b6

Please sign in to comment.