games/Rampant
1
0
Fork 0
mirror of https://github.com/veden/Rampant.git synced 2025-03-17 20:58:35 +02:00
Code Issues Releases Activity

Revert "FACTO-202: Consolidated variations and tiers"

Browse Source 
This reverts commit eae7fbe7272263d99fb7b7a50c6e391fd691497f.
This commit is contained in:
Aaron Veden 2022-12-23 21:27:32 -08:00
parent c0bae50774
commit f9fa028dac
No known key found for this signature in database
GPG Key ID: FF5990B1C6DD3F84
11 changed files with 8638 additions and 8621 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -15,7 +15,6 @@ Version: 3.2.0
Optimizations:
- Moved most constants out of global
- Removed new enemy variations setting
- Dropped number of enemy levels see during the game from 10 to 6, new tiers will now appear at 0, 0.25, 0.5, 0.75, 0.85, 0.925
- Moved neturalObject scan chunk to after a chunk is determined to be passable
---------------------------------------------------------------------------------------------------

9
libs/Constants.lua
View File

@ -406,7 +406,7 @@ local function roundToNearest(number, multiple)
end
local tiersSet = {}
constants.TIERS = 6
constants.TIERS = 10
local tierStart = settings.startup["rampant--tierStart"].value
local tierEnd = settings.startup["rampant--tierEnd"].value
@ -1836,7 +1836,12 @@ for t=1,constants.TIERS do
end
end
constants.EVO_TO_TIER_MAPPING = {0, 0.25, 0.5, 0.75, 0.85, 0.925}
local evoToTierMapping = {}
constants.EVO_TO_TIER_MAPPING = evoToTierMapping
for i=1,constants.TIERS do
evoToTierMapping[#evoToTierMapping+1] = (((i - 1) * 0.1) ^ 0.5) - 0.05
end
constantsG = constants
return constants

18
locale/en/locale.cfg
View File

@ -35,15 +35,15 @@ spitter-egg=Eggs:
worm-egg=Eggs:
t1=Larva T1
# t2=Pupae T2
t2=Worker T2
# t4=Grunt T4
t3=Soldier T3
t4=Elite T4
# t7=Champion T7
t5=Overlord T5
# t9=Titan T9
t6=Leviathan T6
t2=Pupae T2
t3=Worker T3
t4=Grunt T4
t5=Soldier T5
t6=Elite T6
t7=Champion T7
t8=Overlord T8
t9=Titan T9
t10=Leviathan T10
acid-pool=Acid Pool
fire-pool=Fire

18
locale/ko/locale.cfg
View File

@ -35,15 +35,15 @@ spitter-egg=알:
worm-egg=알:
t1=애벌레 T1
# t2=번데기 T2
t2=일꾼 T2
# t4=그런트 T4
t3=솔져 T3
t4=엘리트 T4
# t7=챔피언 T7
t5=오버로드 T5
# t9=타이탄 T9
t6=레비아탄 T6
t2=번데기 T2
t3=일꾼 T3
t4=그런트 T4
t5=솔져 T5
t6=엘리트 T6
t7=챔피언 T7
t8=오버로드 T8
t9=타이탄 T9
t10=레비아탄 T10
acid-pool=산성 연못
fire-pool=불

18
locale/ru/locale.cfg
View File

@ -32,15 +32,15 @@ spawn=Кусака:
spitter-egg=Яйца:
worm-egg=Яйца:
t1=ур.1, Личинка
# t2=ур.2, Куколка
t2=ур.2, Рабочий
# t4=ур.4, Громила
t3=ур.3, Солдат
t4=ур.4, Элита
# t7=ур.7, Чемпион
t5=ур.5, Повелитель
# t9=ур.9, Титан
t6=ур.6, Левиафан
t2=ур.2, Куколка
t3=ур.3, Рабочий
t4=ур.4, Громила
t5=ур.5, Солдат
t6=ур.6, Элита
t7=ур.7, Чемпион
t8=ур.8, Повелитель
t9=ур.9, Титан
t10=ур.10, Левиафан
acid-pool=Лужа кислоты
fire-pool=Огонь

18
locale/zh-CN/locale.cfg
View File

@ -34,15 +34,15 @@ spawn=虫巢:
egg=蛋:
t1=t1 幼虫
# t2=t2 蛹
t2=t2 社畜
# t4=t4 低等兵
t3=t3 士兵
t4=t4 精英
# t7=t7 冠军
t5=t5 霸王
# t9=t9 泰坦
t6=t6 鲲
t2=t2 蛹
t3=t3 社畜
t4=t4 低等兵
t5=t5 士兵
t6=t6 精英
t7=t7 冠军
t8=t8 霸王
t9=t9 泰坦
t10=t10 鲲
[entity-name]
crystal-v1-drain-rampant=耗电水晶

17100
migrations/rampant-3.1.3.json
View File

File diff suppressed because it is too large Load Diff

3
prototypes/Poison.lua
View File

@ -16,6 +16,7 @@
-- imports
local constants = require("__Rampant__/libs/Constants")
local smokeUtils = require("utils/SmokeUtils")
-- constants
@ -28,7 +29,7 @@ local makeCloud = smokeUtils.makeCloud
function poison.addFactionAddon()
for i=1,10 do
for i=1,constants.TIERS do
makeCloud(
{
name = "poison-cloud-v" .. i,

66
prototypes/SwarmUtils.lua
View File

@ -483,12 +483,16 @@ local wormAttributeNumeric = {
}
local propTables = {
{{0.0, 1.0}, {0.65, 0.0}},
{{0.25, 0.0}, {0.40, 0.5}, {0.80, 0.0}},
{{0.50, 0.0}, {0.60, 0.5}, {0.95, 0.0}},
{{0.75, 0.0}, {0.85, 0.5}, {1.0, 0.1}},
{{0.85, 0.0}, {0.925, 0.5}, {1.0, 0.2}},
{{0.925, 0.0}, {0.975, 0.5}, {1.0, 0.9}}
{{0, 1}, {0.65, 0.0}},
{{0.3, 0}, {0.35, 0.5}, {0.80, 0.0}},
{{0.4, 0}, {0.45, 0.5}, {0.90, 0.0}},
{{0.5, 0}, {0.55, 0.5}, {0.90, 0.0}},
{{0.6, 0}, {0.65, 0.5}, {0.95, 0.0}},
{{0.7, 0}, {0.75, 0.5}, {0.975, 0.0}},
{{0.8, 0}, {0.825, 0.5}, {0.975, 0.0}},
{{0.85, 0}, {0.875, 0.5}, {0.975, 0.0}},
{{0.90, 0}, {0.925, 0.5}, {0.975, 0.0}},
{{0.93, 0}, {1, 1.0}}
}
local function fillUnitTable(result, unitSet, tier, probability)
@ -501,11 +505,15 @@ local function unitSetToProbabilityTable(unitSet)
local result = {}
fillUnitTable(result, unitSet, 1, {{0, 1}, {0.65, 0.0}})
fillUnitTable(result, unitSet, 2, {{0.25, 0}, {0.4, 0.5}, {0.80, 0.0}})
fillUnitTable(result, unitSet, 3, {{0.5, 0}, {0.60, 0.5}, {0.95, 0.0}})
fillUnitTable(result, unitSet, 4, {{0.75, 0.0}, {0.85, 0.5}, {1.0, 0.1}})
fillUnitTable(result, unitSet, 5, {{0.85, 0.0}, {0.925, 0.5}, {1.0, 0.2}})
fillUnitTable(result, unitSet, 6, {{0.925, 0.0}, {0.975, 0.5}, {1.0, 0.9}})
fillUnitTable(result, unitSet, 2, {{0.3, 0}, {0.35, 0.5}, {0.80, 0.0}})
fillUnitTable(result, unitSet, 3, {{0.4, 0}, {0.45, 0.5}, {0.90, 0.0}})
fillUnitTable(result, unitSet, 4, {{0.5, 0}, {0.55, 0.5}, {0.90, 0.0}})
fillUnitTable(result, unitSet, 5, {{0.6, 0}, {0.65, 0.5}, {0.95, 0.0}})
fillUnitTable(result, unitSet, 6, {{0.7, 0}, {0.75, 0.5}, {0.975, 0.0}})
fillUnitTable(result, unitSet, 7, {{0.8, 0}, {0.825, 0.5}, {0.975, 0.0}})
fillUnitTable(result, unitSet, 8, {{0.85, 0}, {0.875, 0.5}, {0.975, 0.0}})
fillUnitTable(result, unitSet, 9, {{0.90, 0}, {0.925, 0.5}, {0.975, 0.0}})
fillUnitTable(result, unitSet, 10, {{0.93, 0}, {1, 1.0}})
return result
end
@ -596,17 +604,6 @@ local function scaleAttributes (entity)
end
end
-- local function distort(xorRandom, num, min, max)
-- local min = min or num * 0.85
-- local max = max or num * 1.30
-- if (num < 0) then
-- local t = min
-- min = max
-- max = t
-- end
-- return roundToNearest(gaussianRandomRangeRG(num, num * 0.15, min, max, xorRandom), 0.01)
-- end
local function fillEntityTemplate(entity)
local tier = entity.effectiveLevel
@ -827,7 +824,7 @@ local function fillEntityTemplate(entity)
projectile = createCapsuleProjectile(attack,
attack.faction .. "-" .. attribute[2]
.. "-v" .. attack.variation .. "-t"
.. attack.tier .. "-rampant"),
.. attack.effectiveLevel .. "-rampant"),
direction_deviation = 0.6,
starting_speed = 0.25,
max_range = attack.range,
@ -845,7 +842,6 @@ local function fillEntityTemplate(entity)
end
end
-- print(serpent.dump(entity))
scaleAttributes(entity)
end
@ -938,6 +934,20 @@ function swarmUtils.buildUnits(template)
unit.roarSounds = biterRoarSounds[effectiveLevel]
entity = makeBiter(unit)
elseif (unit.type == "drone") then
-- if not unit.death then
-- unit.death = {
-- type = "direct",
-- action_delivery =
-- {
-- type = "instant",
-- target_effects =
-- {
-- type = "create-entity",
-- entity_name = "massive-explosion"
-- }
-- }
-- }
-- end
entity = makeDrone(unit)
end
@ -956,7 +966,9 @@ local function buildEntities(entityTemplates)
local unitSet = {}
for tier=1, TIERS do
local entityTemplate = entityTemplates[tier]
local effectiveLevel = TIER_UPGRADE_SET[tier]
local entityTemplate = entityTemplates[effectiveLevel]
for ei=1,#entityTemplate do
local template = entityTemplate[ei]
@ -1228,7 +1240,7 @@ local function buildAttack(faction, template)
{
{
type="create-entity",
entity_name = "poison-cloud-v" .. attributes.tier .. "-cloud-rampant"
entity_name = "poison-cloud-v" .. attributes.effectiveLevel .. "-cloud-rampant"
}
}
end
@ -1368,7 +1380,7 @@ local function buildAttack(faction, template)
if (attack[1] == "drone") then
template.entityGenerator = function (attributes)
return template.faction .. "-" .. attack[2] .. "-v" ..
attributes.variation .. "-t" .. attributes.tier .. "-drone-rampant"
attributes.variation .. "-t" .. attributes.effectiveLevel .. "-drone-rampant"
end
end
else

6
prototypes/UnitClasses.lua
View File

@ -23,9 +23,9 @@ function generateMigration()
local faction = factions[fi]
for t = 1, 10 do
local adjT = t
if t > 5 then
adjT = t - 5
end
-- if t > 5 then
-- adjT = t - 5
-- end
for v = 2, 20 do
print(" [\"" .. faction .. "-biter-spawner-v" .. v .. "-t" .. t .. "-rampant\", \"" .. faction .. "-biter-spawner-v1-t" .. adjT .. "-rampant\"],")
print(" [\"" .. faction .. "-spitter-spawner-v" .. v .. "-t" .. t .. "-rampant\", \"" .. faction .. "-spitter-spawner-v1-t" .. adjT .. "-rampant\"],")

2
prototypes/buildings/ChunkScanner.lua
View File

@ -96,7 +96,7 @@ local subTypes = constants.HIVE_BUILDINGS_TYPES
for si=1,#subTypes do
local st = subTypes[si]
if scales[st] then
for t=1,10 do
for t=1,constants.TIERS do
-- local scale = scales[st][t]
local scale = scales["biter-spawner"][t]