diff --git a/changelog.txt b/changelog.txt index cc66afe4..582e1e5b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -23,6 +23,7 @@ Date: ??? - moved the arqad used comb recycling recipe from arqad stage 2 to arqad stage 1 - added new recipes for creating wax from sugar and honey - updated the locale for caravan gui to better explain what the actions do + - added a very nice, very safe, very healthy effect when drinking an energy drink Bhoddos: - bhoddos chain was completely reworked. previously this fungus suffered from 'lack of identity'. its changed to be a biological version of a fission reactor - added nuclear reactor to bhoddos culture building recipe diff --git a/data-updates.lua b/data-updates.lua index 4dbc8d7b..45b99204 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -538,3 +538,16 @@ if register_cache_file ~= nil then register_cache_file({"pycoalprocessing","pyfusionenergy","pyindustry","pyrawores","pypetroleumhandling","pyalienlife"}, "__pyalienlife__/cached-configs/pyalienlife+pycoalprocessing+pyfusionenergy+pyindustry+pypetroleumhandling+pyrawores") register_cache_file({"pycoalprocessing","pyfusionenergy","pyindustry","pyrawores","pyhightech","pypetroleumhandling","pyalienlife"}, "__pyalienlife__/cached-configs/pyalienlife+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores") end + +-- make players flammable +for _, character in pairs(data.raw.character) do + if character.flags then + local new_flags = {} + for _, flag in pairs(character.flags) do + if flag ~= 'not-flammable' then + table.insert(new_flags, flag) + end + end + character.flags = new_flags + end +end diff --git a/data.lua b/data.lua index c0260bb6..1d58d03e 100644 --- a/data.lua +++ b/data.lua @@ -468,6 +468,7 @@ end --(( ITEMS ))-- require('prototypes/items/items') require('prototypes/items/items2') +require('prototypes/items/energy-drink') require('prototypes/biofluid/guano') if mods['pyhightech'] then diff --git a/locale/en/entity.cfg b/locale/en/entity.cfg index a9cb9933..76ea1c7a 100644 --- a/locale/en/entity.cfg +++ b/locale/en/entity.cfg @@ -1,4 +1,5 @@ [entity-name] +speedup-sticker=Speedup sticker seaweed=Seaweed moss-farm-mk01=Moss farm MK 01 moss-farm-mk02=Moss farm MK 02 diff --git a/locale/en/techs.cfg b/locale/en/techs.cfg index 779e4a4d..304eb6d1 100644 --- a/locale/en/techs.cfg +++ b/locale/en/techs.cfg @@ -704,7 +704,7 @@ mega-farm-yotoi=Unlock the yotoi range of automated seedling recipes. mega-farm-kicalk=Unlock the kicalk range of automated seedling recipes. mega-farm-cadaveric-arum=Unlock the cadaveric arum range of automated seedling recipes. mega-farm-bioreserve=Unlock the Bioreserve range of automated seedling recipes. -energy-drink=Unlocks the energy drink chain. +energy-drink=Burden breaker. chitin=Unlocks chitin processing into chitosan and all its variants. phytomining=Develop your plants' and natural fungi capabilities to allow growth in water with very high concentrations of metals, absorbing these metals through their roots, and concentrating extremely high levels of metals in their tissues. phytomining-mk02=Adding chelators to the crops will increase the output of rich biomass. diff --git a/prototypes/items/energy-drink.lua b/prototypes/items/energy-drink.lua new file mode 100644 index 00000000..ccb7abe1 --- /dev/null +++ b/prototypes/items/energy-drink.lua @@ -0,0 +1,79 @@ +ITEM { + type = 'capsule', + name = 'energy-drink', + icon = '__pyalienlifegraphics__/graphics/icons/energy-drink.png', + icon_size = 64, + flags = {}, + subgroup = 'py-alienlife-items', + order = 'f', + stack_size = 100, + capsule_action = { + attack_parameters = { + activation_type = 'consume', + ammo_category = 'capsule', + ammo_type = { + action = { + action_delivery = { + target_effects = { + { + sticker = 'speedup-sticker', + type = 'create-sticker' + }, + { + entity_name = 'slowdown-capsule-explosion', + type = 'create-entity' + }, + { + sound = { + { + filename = '__base__/sound/eat.ogg', + volume = 0.6 + }, + { + filename = '__base__/sound/eat-1.ogg', + volume = 0.6 + }, + { + filename = '__base__/sound/eat-2.ogg', + volume = 0.6 + }, + { + filename = '__base__/sound/eat-3.ogg', + volume = 0.6 + }, + { + filename = '__base__/sound/eat-4.ogg', + volume = 0.6 + } + }, + type = 'play-sound' + } + }, + type = 'instant' + }, + type = 'direct' + }, + category = 'capsule', + target_type = 'position' + }, + cooldown = 30, + range = 0, + type = 'projectile' + }, + type = 'use-on-self' + } +} + +local speedup_sticker = table.deepcopy(data.raw['sticker']['slowdown-sticker']) +speedup_sticker.name = 'speedup-sticker' +speedup_sticker.spread_fire_entity = 'fire-flame-on-tree' +speedup_sticker.fire_spread_radius = 3 +speedup_sticker.duration_in_ticks = 60 * 60 +speedup_sticker.damage_interval = 70 +speedup_sticker.damage_per_tick = { + amount = 8, + type = 'fire' +} +speedup_sticker.target_movement_modifier_from = 1 +speedup_sticker.target_movement_modifier_to = 40 +data:extend{speedup_sticker} \ No newline at end of file diff --git a/prototypes/items/items.lua b/prototypes/items/items.lua index d69255bf..00a9897e 100644 --- a/prototypes/items/items.lua +++ b/prototypes/items/items.lua @@ -4665,47 +4665,6 @@ ITEM { stack_size = 100 } -ITEM { - type = "capsule", - name = "energy-drink", - icon = "__pyalienlifegraphics__/graphics/icons/energy-drink.png", - icon_size = 64, - flags = {}, - subgroup = "py-alienlife-items", - order = "f", - stack_size = 100, - capsule_action = - { - type = "use-on-self", - attack_parameters = - { - type = "projectile", - ammo_category = "capsule", - cooldown = 30, - range = 0, - - ammo_type = - { - category = "capsule", - target_type = "position", - action = - { - type = "direct", - action_delivery = - { - type = "instant", - target_effects = - { - type = "damage", - damage = {type = "physical", amount = 0} - } - } - } - } - } - }, -} - ITEM { type = "capsule", name = "dried-meat",