games/Rampant
1
0
Fork 0
mirror of https://github.com/veden/Rampant.git synced 2025-01-28 03:29:34 +02:00
Code Issues Releases Activity

see changelog

Browse Source
This commit is contained in:
Aaron Veden 2020-03-14 19:11:16 -07:00
parent 663aeb69b4
commit 9337c948c9
No known key found for this signature in database
GPG Key ID: FF5990B1C6DD3F84
8 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Upgrade.lua
View File

@ -364,11 +364,15 @@ function upgrade.attempt(natives, setNewSurface)
natives.pendingStealGroups = {}
natives.pendingStealGroups.len = 1
if not setNewSurface then
game.surfaces[natives.activeSurface].print("Rampant - Version 0.18.4")
end
global.version = 104
end
if (global.version < 105) then
if not setNewSurface then
game.surfaces[natives.activeSurface].print("Rampant - Version 0.18.5")
end
global.version = 105
end
return starting ~= global.version, natives
end

11
changelog.txt
View File

@ -1,3 +1,14 @@
---------------------------------------------------------------------------------------------------
Version: 0.18.5
Date: 14. 3. 2020
Improvements:
- Added on hit damage for biters include filter for fire
Tweaks:
- Decreased sticker movement speed reduction and removed friction modifier from vehicle
- Vehicles are less slowed then the character on foot for stickers
Bugfixes:
- Fixed splash damage with friendly fire disabled not affecting neutral objects
---------------------------------------------------------------------------------------------------
Version: 0.18.4
Date: 2. 2. 2020

2
info.json
View File

@ -1,7 +1,7 @@
{
"name" : "Rampant",
"factorio_version" : "0.18",
"version" : "0.18.4",
"version" : "0.18.5",
"title" : "Rampant",
"author" : "Veden",
"homepage" : "https://forums.factorio.com/viewtopic.php?f=94&t=31445",

12
prototypes/SwarmUtils.lua
View File

@ -122,7 +122,7 @@ local bombAttackNumeric = {
}
local slowStickerNumeric = {
["stickerMovementModifier"] = { 0.8, 0.8, 0.7, 0.7, 0.6, 0.6, 0.5, 0.5, 0.4, 0.4 },
["stickerMovementModifier"] = { 0.8, 0.8, 0.75, 0.75, 0.7, 0.7, 0.65, 0.65, 0.5, 0.5 },
["stickerDuration"] = { 1800, 1800, 1900, 1900, 2000, 2000, 2100, 2100, 2200, 2200 }
}
@ -183,7 +183,7 @@ local spitterAttributeNumeric = {
["stickerDuration"] = { 600, 610, 620, 630, 640, 650, 660, 670, 680, 690 },
["damagePerTick"] = { 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1 },
["stickerDamagePerTick"] = { 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5 },
["stickerMovementModifier"] = { 0.8, 0.7, 0.6, 0.55, 0.50, 0.45, 0.40, 0.35, 0.30, 0.25 },
["stickerMovementModifier"] = { 0.8, 0.8, 0.75, 0.75, 0.7, 0.7, 0.65, 0.65, 0.5, 0.5 },
["damage"] = { 16, 30, 45, 60, 90, 110, 130, 150, 170, 190 },
["particleVerticalAcceleration"] = { 0.01, 0.01, 0.02, 0.02, 0.03, 0.03, 0.04, 0.04, 0.05, 0.05 },
["particleHoizontalSpeed"] = { 0.6, 0.6, 0.7, 0.7, 0.8, 0.8, 0.9, 0.9, 1, 1 },
@ -206,7 +206,7 @@ local droneAttributeNumeric = {
["particleHoizontalSpeed"] = { 0.6, 0.6, 0.7, 0.7, 0.8, 0.8, 0.9, 0.9, 1, 1 },
["particleHoizontalSpeedDeviation"] = { 0.0025, 0.0025, 0.0024, 0.0024, 0.0023, 0.0023, 0.0022, 0.0022, 0.0021, 0.0021 },
["stickerDuration"] = { 600, 610, 620, 630, 640, 650, 660, 670, 680, 690 },
["stickerMovementModifier"] = { 0.8, 0.7, 0.6, 0.55, 0.50, 0.45, 0.40, 0.35, 0.30, 0.25 },
["stickerMovementModifier"] = { 0.8, 0.8, 0.75, 0.75, 0.7, 0.7, 0.65, 0.65, 0.5, 0.5 },
["damagePerTick"] = { 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1 },
["cooldown"] = { 60, 60, 55, 55, 50, 50, 45, 45, 40, 40 },
["ttl"] = { 300, 300, 350, 350, 400, 400, 450, 450, 500, 500 },
@ -262,7 +262,7 @@ local hiveAttributeNumeric = {
local wormAttributeNumeric = {
["stickerDuration"] = { 800, 810, 820, 830, 840, 850, 860, 870, 880, 890 },
["stickerMovementModifier"] = { 0.8, 0.7, 0.6, 0.55, 0.50, 0.45, 0.40, 0.35, 0.30, 0.25 },
["stickerMovementModifier"] = { 0.8, 0.8, 0.75, 0.75, 0.7, 0.7, 0.65, 0.65, 0.5, 0.5 },
["damagePerTick"] = { 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1 },
["range"] = { 25, 27, 31, 33, 35, 36, 37, 38, 39, 40 },
["cooldown"] = { 70, 70, 68, 66, 64, 62, 60, 58, 56, 54 },
@ -1017,7 +1017,7 @@ local function buildAttack(faction, template)
}
end
elseif (attack == "slow") then
template.force = "enemy"
template.force = "not-same"
template.stickerAnimation = {
filename = "__base__/graphics/entity/slowdown-sticker/slowdown-sticker.png",
priority = "extra-high",
@ -1072,7 +1072,7 @@ local function buildAttack(faction, template)
attack.tint2)) or nil)
end
elseif (attack == "noFriendlyFire") then
template["force"] = "enemy"
template["force"] = "not-same"
elseif (attack == "noAcidPuddle") then
template.noAcidPuddle = true
elseif (type(attack) == "table") then

2
prototypes/utils/AttackBall.lua
View File

@ -26,7 +26,7 @@ function AttackBall.createAttackBall(attributes)
local templateArea = {
type = "area",
radius = attributes.radius,
force = (DISALLOW_FRIENDLY_FIRE and "enemy") or attributes.force or nil,
force = (DISALLOW_FRIENDLY_FIRE and "not-same") or attributes.force or nil,
ignore_collision_condition = true,
action_delivery = (attributes.areaActionDelivery and attributes.areaActionDelivery(attributes)) or
{

2
prototypes/utils/AttackFlame.lua
View File

@ -59,7 +59,7 @@ function attackFlame.createAttackFlame(attributes)
{
type = "area",
radius = attributes.radius or 2.5,
force = (DISALLOW_FRIENDLY_FIRE and "enemy") or nil,
force = (DISALLOW_FRIENDLY_FIRE and "not-same") or nil,
action_delivery =
{
type = "instant",

3
prototypes/utils/ParticleUtils.lua
View File

@ -41,7 +41,8 @@ function particleUtils.makeDamagedParticle(attributes)
type = "create-entity",
entity_name = name,
offset_deviation = {{-0.5, -0.5}, {0.5, 0.5}},
offsets = {{0,0}}
offsets = {{0,0}},
damage_type_filters = "fire"
}
end

8
prototypes/utils/StickerUtils.lua
View File

@ -34,10 +34,12 @@ function stickerUtils.makeSticker(attributes)
duration_in_ticks = attributes.stickerDuration or (30 * 60),
target_movement_modifier_from = attributes.stickerMovementModifier or 1,
target_movement_modifier_to = 1,
vehicle_speed_modifier_from = attributes.stickerMovementModifier or 1,
vehicle_speed_modifier_from = (attributes.stickerMovementModifier and math.min(attributes.stickerMovementModifier * 1.25, 1)) or 1,
-- vehicle_speed_modifier_from = attributes.stickerMovementModifier or 1,
vehicle_speed_modifier_to = 1,
vehicle_friction_modifier_from = 1.5,
vehicle_friction_modifier_to = 1,
-- vehicle_friction_modifier_from = 1.5,
-- vehicle_friction_modifier_from = 1,
-- vehicle_friction_modifier_to = 1,
damage_per_tick = attributes.stickerDamagePerTick and { amount = attributes.stickerDamagePerTick or 100 / 60,
type = attributes.stickerDamagePerTickType or "fire" },