Compare commits
15 Commits
tahrion_te
...
613b7ead83
| Author | SHA1 | Date | |
|---|---|---|---|
| 613b7ead83 | |||
| 94dc3fa819 | |||
| 6c77b5a38c | |||
| c41ee05b55 | |||
| 87c6e5f3f3 | |||
| e435b21b43 | |||
| 0baa7af759 | |||
| 83304bbfc1 | |||
| 7dbd2f3be8 | |||
| b41448da7b | |||
| 865f46b734 | |||
| 3dd28858f5 | |||
| 9119582ddd | |||
| a12091fc93 | |||
| cfadf47951 |
@@ -1,5 +1,5 @@
|
|||||||
name: Сообщение об ошибке
|
name: PR-template
|
||||||
about: Сообщить о недоработке игры, которую необходимо исправить.
|
about: PR-template
|
||||||
labels:
|
labels:
|
||||||
- pr/wait review
|
- pr/wait review
|
||||||
- review/need a maintainer
|
- review/need a maintainer
|
||||||
@@ -23,12 +23,12 @@ body:
|
|||||||
attributes:
|
attributes:
|
||||||
label: Требования
|
label: Требования
|
||||||
options:
|
options:
|
||||||
- label: Я запускал игру и убедился в том, что она работает.
|
|
||||||
required: true
|
|
||||||
- label: Я ознакомлен с соглашением по разработке и мои изменения следуют принятым стандартам.
|
- label: Я ознакомлен с соглашением по разработке и мои изменения следуют принятым стандартам.
|
||||||
required: true
|
required: true
|
||||||
|
- label: Я запускал игру и убедился в том, что она работает.
|
||||||
|
required: false
|
||||||
- label: Я указал в описании запроса метки (label) с префиксом `Edit:` в соответствии с теми изменениями, которые сделал.
|
- label: Я указал в описании запроса метки (label) с префиксом `Edit:` в соответствии с теми изменениями, которые сделал.
|
||||||
required: true
|
required: false
|
||||||
- type: markdown
|
- type: markdown
|
||||||
attributes:
|
attributes:
|
||||||
value: |
|
value: |
|
||||||
|
|||||||
@@ -1,117 +1,28 @@
|
|||||||
local HASH_SPLITTER = '&'
|
|
||||||
|
|
||||||
local modInfo = Mod.getInfo('smc__core__craft_system')
|
local modInfo = Mod.getInfo('smc__core__craft_system')
|
||||||
local require = modInfo.require
|
local require = modInfo.require
|
||||||
|
|
||||||
---@alias CraftSystem.shapelessCraftsList table<CraftSystem.Craft.Group, table<string, CraftSystem.ShapelessCraft[]>>
|
---@type CraftSystem.PrimitiveCraftHandler
|
||||||
---@alias CraftSystem.processualCraftsList table<CraftSystem.Craft.Group, table<string, CraftSystem.ProcessualCraft[]>>
|
local PrimitiveCraftHandler = require('CraftSystem.PrimitiveCraftHandler')
|
||||||
|
---@type CraftSystem.ImmersiveCraftHandler
|
||||||
|
local ImmersiveCraftHandler= require('CraftSystem.ImmersiveCraftHandler')
|
||||||
|
|
||||||
|
---@alias CraftSystem.CraftGroup string
|
||||||
|
---@alias CraftSystem.CraftRecipe string[]
|
||||||
|
---@alias CraftSystem.CraftType 'primitive'|'immersive'
|
||||||
|
|
||||||
---@class CraftSystem
|
---@class CraftSystem
|
||||||
---@field shapelessCraftsList CraftSystem.shapelessCraftsList
|
local CraftSystem = {}
|
||||||
---@field processualCraftsList CraftSystem.processualCraftsList
|
|
||||||
local CraftSystem = {
|
|
||||||
shapelessCraftsList = {},
|
|
||||||
processualCraftsList = {},
|
|
||||||
}
|
|
||||||
|
|
||||||
---@alias CraftSystem.Craft.Type
|
---@param craftName string
|
||||||
---|'shapeless'
|
---@param def CraftSystem.PrimitiveCraftDef
|
||||||
---|'processual'
|
function CraftSystem.registerPrimitiveCraft(craftName, def)
|
||||||
---@alias CraftSystem.Craft.Group string
|
PrimitiveCraftHandler:addCraft(craftName, def)
|
||||||
---@alias CraftSystem.Craft.Recipe string[]
|
|
||||||
|
|
||||||
---@alias shapelessCraftFunc fun(self:CraftSystem.ShapelessCraft, input:ItemStack[], workbenchMeta:NodeMetaRef?):boolean
|
|
||||||
---@alias processualCraftFunc fun(self:CraftSystem.ProcessualCraft, input:ItemStack[], workbenchMeta:NodeMetaRef?, processTime:number):boolean
|
|
||||||
|
|
||||||
---@class CraftSystem.BaseCraft
|
|
||||||
---@field type CraftSystem.Craft.Type
|
|
||||||
---@field group CraftSystem.Craft.Group
|
|
||||||
---@field output string
|
|
||||||
---@field recipe CraftSystem.Craft.Recipe
|
|
||||||
---@field return table? TODO: доделать тут тип
|
|
||||||
---@field craftFunc (fun(self, ...):boolean)?
|
|
||||||
|
|
||||||
---@class CraftSystem.ShapelessCraft : CraftSystem.BaseCraft
|
|
||||||
---@field craftFunc shapelessCraftFunc?
|
|
||||||
|
|
||||||
---@class CraftSystem.ProcessualCraft : CraftSystem.BaseCraft
|
|
||||||
---@field processTime number
|
|
||||||
---@field craftFunc processualCraftFunc?
|
|
||||||
|
|
||||||
---@param type CraftSystem.Craft.Type
|
|
||||||
---@return CraftSystem.shapelessCraftsList|CraftSystem.processualCraftsList
|
|
||||||
local function getCraftList(type)
|
|
||||||
local craftList
|
|
||||||
|
|
||||||
if type == 'shapeless' then
|
|
||||||
craftList = CraftSystem.shapelessCraftsList
|
|
||||||
elseif type == 'processual' then
|
|
||||||
craftList = CraftSystem.processualCraftsList
|
|
||||||
else
|
|
||||||
error(string.format('Craft type `%s` does not exist.', type))
|
|
||||||
end
|
end
|
||||||
|
|
||||||
return craftList
|
---@param craftName string
|
||||||
end
|
---@param def CraftSystem.ImmersiveCraftDef
|
||||||
|
function CraftSystem.registerImmersiveCraft(craftName, def)
|
||||||
---@param type CraftSystem.Craft.Type
|
ImmersiveCraftHandler:addCraft(craftName, def)
|
||||||
---@param group CraftSystem.Craft.Group
|
|
||||||
---@return table<string, table>
|
|
||||||
local function getCraftGroup(type, group)
|
|
||||||
local craftList = getCraftList(type)
|
|
||||||
|
|
||||||
---@type table<string, table>?
|
|
||||||
local craftGroup = craftList[group]
|
|
||||||
|
|
||||||
assert(craftGroup ~= nil, string.format('Craft group `%s` does not exist.', type))
|
|
||||||
|
|
||||||
return craftGroup
|
|
||||||
end
|
|
||||||
|
|
||||||
---@param type CraftSystem.Craft.Type
|
|
||||||
---@param group CraftSystem.Craft.Group
|
|
||||||
function CraftSystem.registerCraftGroup(type, group)
|
|
||||||
local craftList = getCraftList(type)
|
|
||||||
|
|
||||||
assert(craftList[group] == nil, string.format('Craft group `%s` is already registered.', type))
|
|
||||||
|
|
||||||
craftList[group] = {}
|
|
||||||
end
|
|
||||||
|
|
||||||
---@param recipe CraftSystem.Craft.Recipe
|
|
||||||
---@return string
|
|
||||||
function CraftSystem.getCraftHash(recipe)
|
|
||||||
table.sort(recipe)
|
|
||||||
|
|
||||||
local hash = ''
|
|
||||||
|
|
||||||
for i = 0, #recipe-1 do
|
|
||||||
hash = hash..recipe[i]..HASH_SPLITTER
|
|
||||||
end
|
|
||||||
|
|
||||||
return hash..recipe[#recipe]
|
|
||||||
end
|
|
||||||
|
|
||||||
---@param craftDef CraftSystem.ShapelessCraft|CraftSystem.ProcessualCraft
|
|
||||||
function CraftSystem.registerCraft(craftDef)
|
|
||||||
local craftGroup = getCraftGroup(craftDef.type, craftDef.group)
|
|
||||||
|
|
||||||
local hash = CraftSystem.getCraftHash(craftDef.recipe)
|
|
||||||
|
|
||||||
table.insert(craftGroup[hash], craftDef)
|
|
||||||
end
|
|
||||||
|
|
||||||
---@param type CraftSystem.Craft.Type
|
|
||||||
---@param group CraftSystem.Craft.Group
|
|
||||||
---@return CraftSystem.ShapelessCraft[] |
|
|
||||||
--- CraftSystem.processualCraftsList[] |
|
|
||||||
--- nil
|
|
||||||
function CraftSystem.getCraftResults(type, group, recipe)
|
|
||||||
local craftGroup = getCraftGroup(type, group)
|
|
||||||
|
|
||||||
local hash = CraftSystem.getCraftHash(recipe)
|
|
||||||
|
|
||||||
return craftGroup[hash]
|
|
||||||
end
|
end
|
||||||
|
|
||||||
return CraftSystem
|
return CraftSystem
|
||||||
13
mods/CORE/CraftSystem/src/CraftSystem/BaseCraft.lua
Normal file
13
mods/CORE/CraftSystem/src/CraftSystem/BaseCraft.lua
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
---Abstract class for craft.
|
||||||
|
---@class CraftSystem.BaseCraft
|
||||||
|
---@field name string
|
||||||
|
---@field group CraftSystem.CraftGroup
|
||||||
|
local BaseCraft = {}
|
||||||
|
|
||||||
|
---Definition table for the `CraftSystem.BaseCraft`.
|
||||||
|
---
|
||||||
|
---**Only for EmmyLua.**
|
||||||
|
---@class CraftSystem.BaseCraftDef
|
||||||
|
---@field group CraftSystem.CraftGroup
|
||||||
|
|
||||||
|
return BaseCraft
|
||||||
47
mods/CORE/CraftSystem/src/CraftSystem/BaseCraftHandler.lua
Normal file
47
mods/CORE/CraftSystem/src/CraftSystem/BaseCraftHandler.lua
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
---Abstract class for handling crafting.
|
||||||
|
---@class CraftSystem.BaseCraftHandler
|
||||||
|
---@field craftsByName table<string, CraftSystem.BaseCraft>
|
||||||
|
---@field craftsByGroup table<CraftSystem.CraftGroup, CraftSystem.BaseCraft[]>
|
||||||
|
---@field craftsList CraftSystem.BaseCraft[]
|
||||||
|
---@field learnedCrafts table<string, table<string, CraftSystem.BaseCraft>>
|
||||||
|
local BaseCraftHandler = {
|
||||||
|
craftsByName = {},
|
||||||
|
craftsByGroup = {},
|
||||||
|
craftsList = {},
|
||||||
|
learnedCrafts = {},
|
||||||
|
}
|
||||||
|
|
||||||
|
---@param craftName string
|
||||||
|
---@return CraftSystem.BaseCraft
|
||||||
|
function BaseCraftHandler:getCraftByName(craftName)
|
||||||
|
local craft = self.craftsByName[craftName]
|
||||||
|
|
||||||
|
assert(craft ~= nil, ('There is no primitive craft named `%s`.'):format(
|
||||||
|
craftName))
|
||||||
|
|
||||||
|
return craft
|
||||||
|
end
|
||||||
|
|
||||||
|
---@param craftGroup CraftSystem.CraftGroup
|
||||||
|
---@return CraftSystem.BaseCraft[]
|
||||||
|
function BaseCraftHandler:getCraftsByGroup(craftGroup)
|
||||||
|
local crafts = self.craftsByGroup[craftGroup]
|
||||||
|
|
||||||
|
assert(crafts ~= nil, ('There are no primitive crafts with `%s` group'):format(
|
||||||
|
craftGroup))
|
||||||
|
|
||||||
|
return crafts
|
||||||
|
end
|
||||||
|
|
||||||
|
---@param playerName string
|
||||||
|
---@return table<string, CraftSystem.BaseCraft>
|
||||||
|
function BaseCraftHandler:getLearnedCrafts(playerName)
|
||||||
|
local crafts = self.learnedCrafts[playerName]
|
||||||
|
|
||||||
|
assert(crafts ~= nil, ('There is no primitive crafting data for a player named `%s`.'):format(
|
||||||
|
playerName))
|
||||||
|
|
||||||
|
return crafts
|
||||||
|
end
|
||||||
|
|
||||||
|
return BaseCraftHandler
|
||||||
48
mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraft.lua
Normal file
48
mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraft.lua
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
local getInstance, extend = Class.getInstance, Class.extend
|
||||||
|
|
||||||
|
local modInfo = Mod.getInfo('smc__core__craft_system')
|
||||||
|
local require = modInfo.require
|
||||||
|
|
||||||
|
---@type CraftSystem.BaseCraft
|
||||||
|
local BaseCraft = require('CraftSystem.BaseCraft')
|
||||||
|
---@type CraftSystem.ImmersiveCraftStage
|
||||||
|
local ImmersiveCraftStage = require('CraftSystem.ImmersiveCraftStage')
|
||||||
|
|
||||||
|
---@class CraftSystem.ImmersiveCraft : CraftSystem.BaseCraft
|
||||||
|
---@field startStageName string
|
||||||
|
---@field triggerItem string
|
||||||
|
---@field stagesByName table<string, CraftSystem.ImmersiveCraftStage>
|
||||||
|
local ImmersiveCraft = extend(BaseCraft, {})
|
||||||
|
|
||||||
|
---Definition table for the `CraftSystem.ImmersiveCraft`.
|
||||||
|
---
|
||||||
|
---**Only for EmmyLua.**
|
||||||
|
---@class CraftSystem.ImmersiveCraftDef : CraftSystem.BaseCraftDef
|
||||||
|
---@field startStageName string
|
||||||
|
---@field triggerItem string
|
||||||
|
---@field stages CraftSystem.ImmersiveCraftStageDef[]
|
||||||
|
|
||||||
|
---@param name string
|
||||||
|
---@param def CraftSystem.ImmersiveCraftDef
|
||||||
|
---@return CraftSystem.ImmersiveCraft
|
||||||
|
function ImmersiveCraft:new(name, def)
|
||||||
|
local stagesByName = {}
|
||||||
|
|
||||||
|
for _, stageDef in ipairs(def.stages) do
|
||||||
|
local stage = ImmersiveCraftStage:new(stageDef)
|
||||||
|
|
||||||
|
stagesByName[stageDef.name] = stage
|
||||||
|
end
|
||||||
|
|
||||||
|
local instance = getInstance(self, {
|
||||||
|
name = name,
|
||||||
|
group = def.group,
|
||||||
|
startStageName = def.startStageName,
|
||||||
|
triggerItem = def.triggerItem,
|
||||||
|
stagesByName = stagesByName,
|
||||||
|
})
|
||||||
|
|
||||||
|
return instance
|
||||||
|
end
|
||||||
|
|
||||||
|
return ImmersiveCraft
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
local extend = Class.extend
|
||||||
|
|
||||||
|
local tableInsert = table.insert
|
||||||
|
|
||||||
|
local modInfo = Mod.getInfo('smc__core__craft_system')
|
||||||
|
local require = modInfo.require
|
||||||
|
|
||||||
|
---@type CraftSystem.BaseCraftHandler
|
||||||
|
local BaseCraftHandler = require('CraftSystem.BaseCraftHandler')
|
||||||
|
---@type CraftSystem.ImmersiveCraft
|
||||||
|
local ImmersiveCraft = require('CraftSystem.ImmersiveCraft')
|
||||||
|
|
||||||
|
---@class CraftSystem.ImmersiveCraftHandler : CraftSystem.BaseCraftHandler
|
||||||
|
---@field craftsByTriggerItem table<string, CraftSystem.ImmersiveCraft[]>
|
||||||
|
---@field getCraftByName fun(craftName:string):CraftSystem.ImmersiveCraft
|
||||||
|
---@field getCraftsByGroup fun(craftGroup):CraftSystem.ImmersiveCraft[]
|
||||||
|
---@field getLearnedCrafts fun(playerName):table<string, CraftSystem.ImmersiveCraft>
|
||||||
|
local ImmersiveCraftHandler = extend(BaseCraftHandler, {
|
||||||
|
craftsByTriggerItem = {},
|
||||||
|
})
|
||||||
|
|
||||||
|
---@param craftName string
|
||||||
|
---@param def CraftSystem.ImmersiveCraftDef
|
||||||
|
function ImmersiveCraftHandler:addCraft(craftName, def)
|
||||||
|
assert(self.craftsByName[craftName] == nil, ('A craft named `%s` already exists.'):format(
|
||||||
|
craftName))
|
||||||
|
|
||||||
|
local craft = ImmersiveCraft:new(craftName, def)
|
||||||
|
|
||||||
|
local group = def.group
|
||||||
|
|
||||||
|
if self.craftsByGroup[group] == nil then
|
||||||
|
self.craftsByGroup[group] = {}
|
||||||
|
end
|
||||||
|
|
||||||
|
local triggerItem = def.triggerItem
|
||||||
|
|
||||||
|
if self.craftsByTriggerItem[triggerItem] == nil then
|
||||||
|
self.craftsByTriggerItem[triggerItem] = {}
|
||||||
|
end
|
||||||
|
|
||||||
|
self.craftsByName[craftName] = craft
|
||||||
|
tableInsert(self.craftsByGroup[group], craft)
|
||||||
|
tableInsert(self.craftsByTriggerItem[triggerItem], craft)
|
||||||
|
tableInsert(self.craftsList, craft)
|
||||||
|
end
|
||||||
|
|
||||||
|
---@param triggerItem string
|
||||||
|
---@return CraftSystem.ImmersiveCraft[]?
|
||||||
|
function ImmersiveCraftHandler:getCraftsByTriggerItem(triggerItem)
|
||||||
|
local crafts = self.craftsByTriggerItem[triggerItem]
|
||||||
|
|
||||||
|
return crafts
|
||||||
|
end
|
||||||
|
|
||||||
|
return ImmersiveCraftHandler
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
local getInstance = Class.getInstance
|
||||||
|
|
||||||
|
---@alias CraftSystem.ImmersiveCraftStage.HandlerFunc fun(self, Player)
|
||||||
|
|
||||||
|
---@class CraftSystem.ImmersiveCraftStage
|
||||||
|
---@field name string
|
||||||
|
---@field startHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
|
||||||
|
---@field processHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
|
||||||
|
---@field endHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
|
||||||
|
---@field data table
|
||||||
|
---@field returnItems table? TODO: доделать тут тип
|
||||||
|
local ImmersiveCraftStage = {
|
||||||
|
data = {}
|
||||||
|
}
|
||||||
|
|
||||||
|
---Definition table for the `CraftSystem.ImmersiveCraft`.
|
||||||
|
---
|
||||||
|
---**Only for EmmyLua.**
|
||||||
|
---@class CraftSystem.ImmersiveCraftStageDef
|
||||||
|
---@field name string
|
||||||
|
---@field startHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
|
||||||
|
---@field processHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
|
||||||
|
---@field endHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
|
||||||
|
---@field returnItems table? TODO: доделать тут тип
|
||||||
|
|
||||||
|
---@param def CraftSystem.ImmersiveCraftStageDef
|
||||||
|
---@return CraftSystem.ImmersiveCraftStage
|
||||||
|
function ImmersiveCraftStage:new(def)
|
||||||
|
local instance = getInstance(self, {
|
||||||
|
name = def.name,
|
||||||
|
startHandler = def.startHandler,
|
||||||
|
processHandler = def.processHandler,
|
||||||
|
endHandler = def.endHandler
|
||||||
|
})
|
||||||
|
|
||||||
|
return instance
|
||||||
|
end
|
||||||
|
|
||||||
|
return ImmersiveCraftStage
|
||||||
38
mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraft.lua
Normal file
38
mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraft.lua
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
local getInstance, extend = Class.getInstance, Class.extend
|
||||||
|
|
||||||
|
local modInfo = Mod.getInfo('smc__core__craft_system')
|
||||||
|
local require = modInfo.require
|
||||||
|
|
||||||
|
---@type CraftSystem.BaseCraft
|
||||||
|
local BaseCraft = require('CraftSystem.BaseCraft')
|
||||||
|
|
||||||
|
---@class CraftSystem.PrimitiveCraft : CraftSystem.BaseCraft
|
||||||
|
---@field output string
|
||||||
|
---@field recipe CraftSystem.CraftRecipe
|
||||||
|
---@field returnItems table? TODO: доделать тут тип
|
||||||
|
local PrimitiveCraft = extend(BaseCraft, {})
|
||||||
|
|
||||||
|
---Definition table for the `CraftSystem.PrimitiveCraft`.
|
||||||
|
---
|
||||||
|
---**Only for EmmyLua.**
|
||||||
|
---@class CraftSystem.PrimitiveCraftDef : CraftSystem.BaseCraftDef
|
||||||
|
---@field output string
|
||||||
|
---@field recipe CraftSystem.CraftRecipe
|
||||||
|
---@field returnItems table? TODO: доделать тут тип
|
||||||
|
|
||||||
|
---@param name string
|
||||||
|
---@param def CraftSystem.PrimitiveCraftDef
|
||||||
|
---@return CraftSystem.PrimitiveCraft
|
||||||
|
function PrimitiveCraft:new(name, def)
|
||||||
|
local instance = getInstance(self, {
|
||||||
|
name = name,
|
||||||
|
group = def.group,
|
||||||
|
output = def.output,
|
||||||
|
recipe = def.recipe,
|
||||||
|
returnItems = def.returnItems or {}
|
||||||
|
})
|
||||||
|
|
||||||
|
return instance
|
||||||
|
end
|
||||||
|
|
||||||
|
return PrimitiveCraft
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
local extend = Class.extend
|
||||||
|
|
||||||
|
local tableInsert = table.insert
|
||||||
|
|
||||||
|
local modInfo = Mod.getInfo('smc__core__craft_system')
|
||||||
|
local require = modInfo.require
|
||||||
|
|
||||||
|
---@type CraftSystem.BaseCraftHandler
|
||||||
|
local BaseCraftHandler = require('CraftSystem.BaseCraftHandler')
|
||||||
|
|
||||||
|
---@type CraftSystem.PrimitiveCraft
|
||||||
|
local PrimitiveCraft = require('CraftSystem.PrimitiveCraft')
|
||||||
|
|
||||||
|
---@class CraftSystem.PrimitiveCraftHandler : CraftSystem.BaseCraftHandler
|
||||||
|
---@field getCraftByName fun(craftName:string):CraftSystem.PrimitiveCraft
|
||||||
|
---@field getCraftsByGroup fun(craftGroup):CraftSystem.PrimitiveCraft[]
|
||||||
|
---@field getLearnedCrafts fun(playerName):table<string, CraftSystem.PrimitiveCraft>
|
||||||
|
local PrimitiveCraftHandler = extend(BaseCraftHandler, {})
|
||||||
|
|
||||||
|
---@param craftName string
|
||||||
|
---@param def CraftSystem.PrimitiveCraftDef
|
||||||
|
function PrimitiveCraftHandler:addCraft(craftName, def)
|
||||||
|
assert(self.craftsByName[craftName] == nil, ('A craft named `%s` already exists.'):format(
|
||||||
|
craftName))
|
||||||
|
|
||||||
|
local craft = PrimitiveCraft:new(craftName, def)
|
||||||
|
|
||||||
|
local group = def.group
|
||||||
|
|
||||||
|
if self.craftsByGroup[group] == nil then
|
||||||
|
self.craftsByGroup[group] = {}
|
||||||
|
end
|
||||||
|
|
||||||
|
self.craftsByName[craftName] = craft
|
||||||
|
tableInsert(self.craftsByGroup[group], craft)
|
||||||
|
tableInsert(self.craftsList, craft)
|
||||||
|
end
|
||||||
|
|
||||||
|
return PrimitiveCraftHandler
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
local modInfo = Mod.getInfo('smc__core__entity')
|
||||||
|
local require = modInfo.require
|
||||||
|
|
||||||
|
return require('Entity')
|
||||||
16
mods/CORE/Entity/src/Entity.lua
Normal file
16
mods/CORE/Entity/src/Entity.lua
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
local getInstance = Class.getInstance
|
||||||
|
|
||||||
|
---@class Entity
|
||||||
|
local Entity = {}
|
||||||
|
|
||||||
|
---@param def Entity.EntityDefinition
|
||||||
|
---@return Entity
|
||||||
|
function Entity:new(def)
|
||||||
|
local instance = getInstance(self, {
|
||||||
|
|
||||||
|
})
|
||||||
|
|
||||||
|
return instance
|
||||||
|
end
|
||||||
|
|
||||||
|
return Entity
|
||||||
4
mods/CORE/Entity/src/Entity/EntityDefinition.lua
Normal file
4
mods/CORE/Entity/src/Entity/EntityDefinition.lua
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
---@class Entity.EntityDefinition
|
||||||
|
local EntityDefinition = {}
|
||||||
|
|
||||||
|
return EntityDefinition
|
||||||
9
mods/CORE/Item/locale/item.ru.tr
Normal file
9
mods/CORE/Item/locale/item.ru.tr
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
# textdomain: item
|
||||||
|
|
||||||
|
Rarity=Редкость
|
||||||
|
common=простой
|
||||||
|
uncommon=необычный
|
||||||
|
distinguished=выдающийся
|
||||||
|
eminent=исключительный
|
||||||
|
prime=Превосходный
|
||||||
|
unique=Уникальный
|
||||||
@@ -5,9 +5,36 @@ local require = modInfo.require
|
|||||||
|
|
||||||
local ItemFactory = Mod.getInfo('smc__core__item_factory').require('ItemFactory')
|
local ItemFactory = Mod.getInfo('smc__core__item_factory').require('ItemFactory')
|
||||||
|
|
||||||
|
---Determines whether common rarity will be shown in item descriptions or not.
|
||||||
|
local SHOW_COMMON_RARITY = true
|
||||||
|
|
||||||
|
---Colors corresponding to the rarity color in the item description.
|
||||||
|
---@type table<Item.Rarity, ColorString>
|
||||||
|
local RARITY_COLORS = {
|
||||||
|
['common'] = '#C0C0C0',
|
||||||
|
['uncommon'] = '#7cd2e2',
|
||||||
|
['distinguished'] = '#7ce2da',
|
||||||
|
['eminent'] = '#44d1a9',
|
||||||
|
['prime'] = '#9CF0B1',
|
||||||
|
['unique'] = '#f4c95a'
|
||||||
|
}
|
||||||
|
|
||||||
|
---Whether to show the numeric index in the rarity description.
|
||||||
|
local SHOW_RARITY_INDEX = true
|
||||||
|
|
||||||
|
---@type table<Item.Rarity, integer>
|
||||||
|
local RARITY_INDEX = {
|
||||||
|
['common'] = 1,
|
||||||
|
['uncommon'] = 2,
|
||||||
|
['distinguished'] = 3,
|
||||||
|
['eminent'] = 4,
|
||||||
|
['prime'] = 5,
|
||||||
|
['unique'] = 0
|
||||||
|
}
|
||||||
|
|
||||||
---@class Item
|
---@class Item
|
||||||
---@field itemDef Item.ItemDefinition
|
---@field itemDef Item.ItemDefinition
|
||||||
---@field luantiDef table
|
---@field luantiDef ItemDefinition
|
||||||
---@field getVisual fun(): string
|
---@field getVisual fun(): string
|
||||||
---@field defaultDef Item.ItemDefinition
|
---@field defaultDef Item.ItemDefinition
|
||||||
local Item = {
|
local Item = {
|
||||||
@@ -18,12 +45,34 @@ local Item = {
|
|||||||
description = '',
|
description = '',
|
||||||
titleColor = '#FFFFFF',
|
titleColor = '#FFFFFF',
|
||||||
descriptionColor = '#C0C0C0',
|
descriptionColor = '#C0C0C0',
|
||||||
|
rarity = 'common',
|
||||||
addModName = true,
|
addModName = true,
|
||||||
},
|
},
|
||||||
callbacks = {}
|
callbacks = {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
---Adds an item's rarity tag to the description.
|
||||||
|
---@param rarity Item.Rarity
|
||||||
|
---@param desc string
|
||||||
|
---@return string
|
||||||
|
local function addRarityToDesc(rarity, desc)
|
||||||
|
if not SHOW_COMMON_RARITY and rarity == 'common' then
|
||||||
|
return desc
|
||||||
|
end
|
||||||
|
|
||||||
|
local S = core.get_translator('item')
|
||||||
|
local color = RARITY_COLORS[rarity]
|
||||||
|
|
||||||
|
local rarityString = S('Rarity')..': '..S(rarity)
|
||||||
|
|
||||||
|
if SHOW_RARITY_INDEX then
|
||||||
|
rarityString = rarityString..' ['..RARITY_INDEX[rarity]..']'
|
||||||
|
end
|
||||||
|
|
||||||
|
return desc..'\n'..core.colorize(color, rarityString)
|
||||||
|
end
|
||||||
|
|
||||||
---The alias `table.merge` for EmmyLua
|
---The alias `table.merge` for EmmyLua
|
||||||
---@type fun(...):(NodeDefinition|ItemDefinition)
|
---@type fun(...):(NodeDefinition|ItemDefinition)
|
||||||
local defMerge = function(...)
|
local defMerge = function(...)
|
||||||
@@ -62,26 +111,30 @@ local function itemDefToLuantiDef(itemDef)
|
|||||||
error('Item description color parameters cannot be empty.')
|
error('Item description color parameters cannot be empty.')
|
||||||
end
|
end
|
||||||
|
|
||||||
s.title, s.description = nil, description
|
assert(s.rarity ~= nil, 'The rarity of an item cannot be empty.')
|
||||||
|
|
||||||
|
description = addRarityToDesc(s.rarity, description)
|
||||||
|
|
||||||
|
s.title, s.description = nil, description..core.get_background_escape_sequence('#110F13')
|
||||||
|
|
||||||
local luantiDef = defMerge(s, c)
|
local luantiDef = defMerge(s, c)
|
||||||
|
|
||||||
return luantiDef
|
return luantiDef
|
||||||
end
|
end
|
||||||
|
|
||||||
---@param luantiDef NodeDefinition|ItemDefinition
|
---@param luantiDef NodeDefinition
|
||||||
local function register3dItem(luantiDef)
|
local function register3dItem(luantiDef)
|
||||||
local ld = luantiDef
|
local name = luantiDef.name
|
||||||
local name = ld.name
|
luantiDef.name = nil
|
||||||
ld.name = nil
|
|
||||||
core.register_node(':'..name, luantiDef)
|
core.register_node(':'..name, luantiDef)
|
||||||
end
|
end
|
||||||
|
|
||||||
---@param luantiDef ItemDefinition
|
---@param luantiDef ItemDefinition
|
||||||
local function registerFlatItem(luantiDef)
|
local function registerFlatItem(luantiDef)
|
||||||
local ld = luantiDef
|
local name = luantiDef.name
|
||||||
local name = ld.name
|
luantiDef.name = nil
|
||||||
ld.name = nil
|
|
||||||
core.register_craftitem(':'..name, luantiDef)
|
core.register_craftitem(':'..name, luantiDef)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -91,23 +144,23 @@ local defMerge = function(...)
|
|||||||
return table.merge(...)
|
return table.merge(...)
|
||||||
end
|
end
|
||||||
|
|
||||||
---@param itemDef Item.ItemDefinition|Node.NodeDefinition
|
---@param def Item.ItemDefinition|Node.NodeDefinition
|
||||||
---@return Item
|
---@return Item
|
||||||
function Item:new(itemDef)
|
function Item:new(def)
|
||||||
---Adding default parameters
|
---Adding default parameters
|
||||||
itemDef = defMerge(itemDef, self.defaultDef, true)
|
def = defMerge(def, self.defaultDef, true)
|
||||||
|
|
||||||
---@type Item
|
---@type Item
|
||||||
local instance = getInstance(self, {})
|
local instance = getInstance(self, {})
|
||||||
|
|
||||||
local luantiDef = itemDefToLuantiDef(itemDef)
|
local luantiDef = itemDefToLuantiDef(def)
|
||||||
local visual = itemDef.settings.visual
|
local visual = def.settings.visual
|
||||||
|
|
||||||
if visual == nil then
|
if visual == nil then
|
||||||
visual = 'item_2d'
|
visual = 'item_2d'
|
||||||
end
|
end
|
||||||
|
|
||||||
itemDef.settings.visual = nil
|
def.settings.visual = nil
|
||||||
|
|
||||||
if visual == 'item_3d' then
|
if visual == 'item_3d' then
|
||||||
register3dItem(luantiDef)
|
register3dItem(luantiDef)
|
||||||
@@ -120,7 +173,7 @@ function Item:new(itemDef)
|
|||||||
return visual
|
return visual
|
||||||
end
|
end
|
||||||
|
|
||||||
instance.itemDef = itemDef
|
instance.itemDef = def
|
||||||
instance.luantiDef = luantiDef
|
instance.luantiDef = luantiDef
|
||||||
|
|
||||||
return instance
|
return instance
|
||||||
|
|||||||
8
mods/CORE/Item/src/Item/Rarity.lua
Normal file
8
mods/CORE/Item/src/Item/Rarity.lua
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
---Rarity of items:
|
||||||
|
--- * `common`
|
||||||
|
--- * `uncommon`
|
||||||
|
--- * `distinguished`
|
||||||
|
--- * `eminent`
|
||||||
|
--- * `prime`
|
||||||
|
--- * `unique`
|
||||||
|
---@alias Item.Rarity 'common'|'uncommon'|'distinguished'|'eminent'|'prime'|'unique'
|
||||||
@@ -37,6 +37,9 @@ Settings.descriptionColor = nil
|
|||||||
---@type Item.Visual?
|
---@type Item.Visual?
|
||||||
Settings.visual = nil
|
Settings.visual = nil
|
||||||
|
|
||||||
|
---Formal (lore) rarity of an item. Default `common`.
|
||||||
|
---@type Item.Rarity?
|
||||||
|
Settings.rarity = nil
|
||||||
|
|
||||||
|
|
||||||
---Table of groups-characteristics of Item.
|
---Table of groups-characteristics of Item.
|
||||||
|
|||||||
@@ -425,9 +425,9 @@ end
|
|||||||
function MapGen:registerPeak(layerName, category, def)
|
function MapGen:registerPeak(layerName, category, def)
|
||||||
local layer = self:getLayerByName(layerName)
|
local layer = self:getLayerByName(layerName)
|
||||||
|
|
||||||
--assert(self:getPeakByPos(layer, category, def.pos) == nil,
|
assert(self:getPeakByPos(layer, category, def.pos) == nil,
|
||||||
--('In the `%s` layer in the `%s` category there is already a peak with coordinates: %s, %s, %s.'):format(
|
('In the `%s` layer in the `%s` category there is already a peak with coordinates: %s, %s, %s.'):format(
|
||||||
-- layerName, category, def.pos.x, def.pos.y, def.pos.z))
|
layerName, category, def.pos.x, def.pos.y, def.pos.z))
|
||||||
|
|
||||||
---@type MapGen.Peak
|
---@type MapGen.Peak
|
||||||
local peak = Peak:new(def)
|
local peak = Peak:new(def)
|
||||||
@@ -607,7 +607,7 @@ function MapGen:initLayersTriangultaion()
|
|||||||
local triangles = Triangulation.triangulate(peaks)
|
local triangles = Triangulation.triangulate(peaks)
|
||||||
|
|
||||||
layer.trianglesList[category] = triangles
|
layer.trianglesList[category] = triangles
|
||||||
--self:initTriangultaionBoundaryRegion(layer, category, triangles)
|
self:initTriangultaionBoundaryRegion(layer, category, triangles)
|
||||||
-- layer.tetrahedronsList = Triangulation.tetrahedralize(layer.peaksList) -- 3D not supported
|
-- layer.tetrahedronsList = Triangulation.tetrahedralize(layer.peaksList) -- 3D not supported
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -52,19 +52,7 @@ mapGenerator:registerLayer('midgard', {
|
|||||||
biomesGorizontalScattering = 5
|
biomesGorizontalScattering = 5
|
||||||
})
|
})
|
||||||
|
|
||||||
|
local land1 = {
|
||||||
-- TODO: Config should be imported from .json file in the world's folder
|
|
||||||
local ocean = {
|
|
||||||
['landscape'] = {
|
|
||||||
offset = -10,
|
|
||||||
scale = 3,
|
|
||||||
spread = {x = 10, y = 10, z = 10},
|
|
||||||
seed = 420,
|
|
||||||
octaves = 2,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['temp'] = {
|
|
||||||
offset = -10,
|
offset = -10,
|
||||||
scale = 5,
|
scale = 5,
|
||||||
spread = {x = 10, y = 10, z = 10},
|
spread = {x = 10, y = 10, z = 10},
|
||||||
@@ -72,369 +60,120 @@ local ocean = {
|
|||||||
octaves = 3,
|
octaves = 3,
|
||||||
persistence = 0.4,
|
persistence = 0.4,
|
||||||
lacunarity = 2,
|
lacunarity = 2,
|
||||||
},
|
|
||||||
['humidity'] = {
|
|
||||||
offset = -10,
|
|
||||||
scale = 5,
|
|
||||||
spread = {x = 10, y = 10, z = 10},
|
|
||||||
seed = 47,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
local common_lands = {
|
local land2 = {
|
||||||
['landscape'] = {
|
|
||||||
offset = 0,
|
|
||||||
scale = 5,
|
|
||||||
spread = {x = 10, y = 10, z = 10},
|
|
||||||
seed = 88005553535,
|
|
||||||
octaves = 2,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['temp'] = {
|
|
||||||
offset = -10,
|
|
||||||
scale = 5,
|
|
||||||
spread = {x = 10, y = 10, z = 10},
|
|
||||||
seed = 47,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['humidity'] = {
|
|
||||||
offset = -10,
|
|
||||||
scale = 5,
|
|
||||||
spread = {x = 10, y = 10, z = 10},
|
|
||||||
seed = 47,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
local foresty_lands = {
|
|
||||||
['landscape'] = {
|
|
||||||
offset = 5,
|
|
||||||
scale = 8,
|
|
||||||
spread = {x = 15, y = 15, z = 15},
|
|
||||||
seed = 12345,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.5,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['temp'] = {
|
|
||||||
offset = 20,
|
offset = 20,
|
||||||
scale = 10,
|
scale = 5,
|
||||||
spread = {x = 20, y = 20, z = 20},
|
spread = {x = 30, y = 30, z = 30},
|
||||||
seed = 48,
|
seed = 47,
|
||||||
octaves = 3,
|
octaves = 3,
|
||||||
persistence = 0.4,
|
persistence = 0.4,
|
||||||
lacunarity = 2,
|
lacunarity = 2,
|
||||||
},
|
|
||||||
['humidity'] = {
|
|
||||||
offset = 60,
|
|
||||||
scale = 15,
|
|
||||||
spread = {x = 15, y = 15, z = 15},
|
|
||||||
seed = 49,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
local hilly_lands = {
|
local land3 = {
|
||||||
['landscape'] = {
|
|
||||||
offset = 15,
|
|
||||||
scale = 12,
|
|
||||||
spread = {x = 20, y = 20, z = 20},
|
|
||||||
seed = 54321,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.5,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['temp'] = {
|
|
||||||
offset = 15,
|
|
||||||
scale = 10,
|
|
||||||
spread = {x = 25, y = 25, z = 25},
|
|
||||||
seed = 50,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['humidity'] = {
|
|
||||||
offset = 40,
|
offset = 40,
|
||||||
scale = 15,
|
scale = 5,
|
||||||
spread = {x = 20, y = 20, z = 20},
|
spread = {x = 45, y = 20, z = 45},
|
||||||
seed = 51,
|
seed = 472,
|
||||||
octaves = 3,
|
octaves = 3,
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
local low_mountains = {
|
|
||||||
['landscape'] = {
|
|
||||||
offset = 30,
|
|
||||||
scale = 20,
|
|
||||||
spread = {x = 25, y = 25, z = 25},
|
|
||||||
seed = 11111,
|
|
||||||
octaves = 4,
|
|
||||||
persistence = 0.5,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['temp'] = {
|
|
||||||
offset = 5,
|
|
||||||
scale = 15,
|
|
||||||
spread = {x = 30, y = 30, z = 30},
|
|
||||||
seed = 52,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['humidity'] = {
|
|
||||||
offset = 30,
|
|
||||||
scale = 15,
|
|
||||||
spread = {x = 25, y = 25, z = 25},
|
|
||||||
seed = 53,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
local high_mountains = {
|
|
||||||
['landscape'] = {
|
|
||||||
offset = 60,
|
|
||||||
scale = 35,
|
|
||||||
spread = {x = 30, y = 30, z = 30},
|
|
||||||
seed = 22222,
|
|
||||||
octaves = 4,
|
|
||||||
persistence = 0.55,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['temp'] = {
|
|
||||||
offset = -10,
|
|
||||||
scale = 15,
|
|
||||||
spread = {x = 35, y = 35, z = 35},
|
|
||||||
seed = 54,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['humidity'] = {
|
|
||||||
offset = 20,
|
|
||||||
scale = 10,
|
|
||||||
spread = {x = 30, y = 30, z = 30},
|
|
||||||
seed = 55,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
local highest_peaks = {
|
|
||||||
['landscape'] = {
|
|
||||||
offset = 100,
|
|
||||||
scale = 50,
|
|
||||||
spread = {x = 40, y = 40, z = 40},
|
|
||||||
seed = 33333,
|
|
||||||
octaves = 5,
|
|
||||||
persistence = 0.6,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['temp'] = {
|
|
||||||
offset = -30,
|
|
||||||
scale = 10,
|
|
||||||
spread = {x = 50, y = 50, z = 50},
|
|
||||||
seed = 56,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['humidity'] = {
|
|
||||||
offset = 10,
|
|
||||||
scale = 10,
|
|
||||||
spread = {x = 40, y = 40, z = 40},
|
|
||||||
seed = 57,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
local rivers = {
|
|
||||||
['landscape'] = {
|
|
||||||
offset = -5,
|
|
||||||
scale = 2,
|
|
||||||
spread = {x = 5, y = 5, z = 100},
|
|
||||||
seed = 44444,
|
|
||||||
octaves = 2,
|
|
||||||
persistence = 0.3,
|
persistence = 0.3,
|
||||||
lacunarity = 2,
|
lacunarity = 2,
|
||||||
},
|
}
|
||||||
['temp'] = {
|
|
||||||
offset = 10,
|
local climat1 = {
|
||||||
scale = 5,
|
|
||||||
spread = {x = 50, y = 50, z = 50},
|
|
||||||
seed = 58,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['humidity'] = {
|
|
||||||
offset = 80,
|
offset = 80,
|
||||||
scale = 10,
|
scale = 10,
|
||||||
spread = {x = 20, y = 20, z = 20},
|
spread = {x = 10, y = 10, z = 10},
|
||||||
seed = 59,
|
seed = 47,
|
||||||
octaves = 3,
|
octaves = 8,
|
||||||
persistence = 0.4,
|
persistence = 0.6,
|
||||||
lacunarity = 2,
|
lacunarity = 2,
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
local lakes = {
|
local climat2 = {
|
||||||
['landscape'] = {
|
offset = 30,
|
||||||
offset = -8,
|
|
||||||
scale = 2,
|
|
||||||
spread = {x = 15, y = 15, z = 15},
|
|
||||||
seed = 55555,
|
|
||||||
octaves = 2,
|
|
||||||
persistence = 0.3,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['temp'] = {
|
|
||||||
offset = 10,
|
|
||||||
scale = 5,
|
|
||||||
spread = {x = 30, y = 30, z = 30},
|
|
||||||
seed = 60,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['humidity'] = {
|
|
||||||
offset = 90,
|
|
||||||
scale = 5,
|
|
||||||
spread = {x = 20, y = 20, z = 20},
|
|
||||||
seed = 61,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
local rocky_shores = {
|
|
||||||
['landscape'] = {
|
|
||||||
offset = 2,
|
|
||||||
scale = 4,
|
|
||||||
spread = {x = 8, y = 8, z = 8},
|
|
||||||
seed = 66666,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.5,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['temp'] = {
|
|
||||||
offset = 15,
|
|
||||||
scale = 8,
|
|
||||||
spread = {x = 15, y = 15, z = 15},
|
|
||||||
seed = 62,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['humidity'] = {
|
|
||||||
offset = 70,
|
|
||||||
scale = 10,
|
scale = 10,
|
||||||
spread = {x = 15, y = 15, z = 15},
|
spread = {x = 10, y = 10, z = 10},
|
||||||
seed = 63,
|
seed = 47,
|
||||||
octaves = 3,
|
octaves = 8,
|
||||||
persistence = 0.4,
|
persistence = 0.6,
|
||||||
lacunarity = 2,
|
lacunarity = 2,
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
local rocky_islands = {
|
local climat0 = {
|
||||||
['landscape'] = {
|
offset = 50,
|
||||||
offset = 8,
|
scale = 0,
|
||||||
scale = 10,
|
spread = {x = 10, y = 10, z = 10},
|
||||||
spread = {x = 12, y = 12, z = 12},
|
seed = 47,
|
||||||
seed = 77777,
|
octaves = 8,
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.5,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['temp'] = {
|
|
||||||
offset = 20,
|
|
||||||
scale = 8,
|
|
||||||
spread = {x = 20, y = 20, z = 20},
|
|
||||||
seed = 64,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
persistence = 0.4,
|
||||||
lacunarity = 2,
|
lacunarity = 2,
|
||||||
},
|
|
||||||
['humidity'] = {
|
|
||||||
offset = 60,
|
|
||||||
scale = 15,
|
|
||||||
spread = {x = 20, y = 20, z = 20},
|
|
||||||
seed = 65,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
local swamp_land = {
|
|
||||||
['landscape'] = {
|
|
||||||
offset = 1,
|
|
||||||
scale = 2,
|
|
||||||
spread = {x = 12, y = 12, z = 12},
|
|
||||||
seed = 88888,
|
|
||||||
octaves = 2,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['temp'] = {
|
|
||||||
offset = 25,
|
|
||||||
scale = 5,
|
|
||||||
spread = {x = 15, y = 15, z = 15},
|
|
||||||
seed = 66,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
['humidity'] = {
|
|
||||||
offset = 85,
|
|
||||||
scale = 10,
|
|
||||||
spread = {x = 15, y = 15, z = 15},
|
|
||||||
seed = 67,
|
|
||||||
octaves = 3,
|
|
||||||
persistence = 0.4,
|
|
||||||
lacunarity = 2,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
local v = vector.new
|
local v = vector.new
|
||||||
|
--[[
|
||||||
|
mapGenerator:register2DPeaks('midgard',
|
||||||
|
{
|
||||||
|
landscapeNoise = land1,
|
||||||
|
tempNoise = climat2,
|
||||||
|
humidityNoise = climat2,
|
||||||
|
},{
|
||||||
|
v(500, 0, 500),
|
||||||
|
v(-500, 0, -500),
|
||||||
|
v(-500, 0, 500),
|
||||||
|
v(500, 0, -500),
|
||||||
|
})
|
||||||
|
|
||||||
|
mapGenerator:register2DPeaks('midgard',
|
||||||
|
{
|
||||||
|
landscapeNoise = land2,
|
||||||
|
tempNoise = climat1,
|
||||||
|
humidityNoise = climat1,
|
||||||
|
},{
|
||||||
|
v(-300, 0, 300),
|
||||||
|
v(200, 0, -400),
|
||||||
|
})
|
||||||
|
|
||||||
|
mapGenerator:register2DPeaks('midgard',
|
||||||
|
{
|
||||||
|
landscapeNoise = land2,
|
||||||
|
tempNoise = climat2,
|
||||||
|
humidityNoise = climat2,
|
||||||
|
},{
|
||||||
|
v(200, 0, 100),
|
||||||
|
v(-300, 0, -200),
|
||||||
|
})--]]
|
||||||
|
|
||||||
for _, c in ipairs({'landscape', 'temp', 'humidity'}) do
|
for _, c in ipairs({'landscape', 'temp', 'humidity'}) do
|
||||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#4978c6', ocean[c])
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#4978c6', land1)
|
||||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#81c948', common_lands[c])
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#77ea72', land2)
|
||||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#187726', foresty_lands[c])
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#46B331', land3)
|
||||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#357a60', hilly_lands[c])
|
--[[
|
||||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#5a7269', low_mountains[c])
|
mapGenerator:register2DPeaks('midgard', c, {
|
||||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#773b18', high_mountains[c])
|
{
|
||||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#a3a3a3', highest_peaks[c])
|
color = '#77ea72',
|
||||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#182077', rivers[c])
|
pos = vector.new(512, 0, 512)
|
||||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#06f5ff', lakes[c])
|
},
|
||||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#677a48', rocky_shores[c])
|
{
|
||||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#e4dc36', rocky_islands[c])
|
color = '#4978c6',
|
||||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#3b7718', swamp_land[c])
|
pos = vector.new(512, 0, -512)
|
||||||
|
},
|
||||||
|
{
|
||||||
|
color = '#77ea72',
|
||||||
|
pos = vector.new(-512, 0, -512)
|
||||||
|
},
|
||||||
|
{
|
||||||
|
color = '#4978c6',
|
||||||
|
pos = vector.new(-512, 0, 512)
|
||||||
|
},
|
||||||
|
})--]]
|
||||||
end
|
end
|
||||||
|
|
||||||
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 32,{x=0, y=0}, 'landscape')
|
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 100,{x=0, y=0}, 'landscape')
|
||||||
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 32,{x=0, y=0}, 'temp')
|
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 150,{x=0, y=0}, 'temp')
|
||||||
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 32,{x=0, y=0}, 'humidity')
|
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 200,{x=0, y=0}, 'humidity')
|
||||||
|
|
||||||
-- [[
|
-- [[
|
||||||
mapGenerator:registerCavern('midgard', 'cavern1', {
|
mapGenerator:registerCavern('midgard', 'cavern1', {
|
||||||
|
|||||||
Binary file not shown.
@@ -45,9 +45,28 @@ local function registerRocksTypes(postfix, x)
|
|||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local function registerPilarStaff(rock, y)
|
||||||
|
local columnTop = ts:t(9, y)
|
||||||
|
|
||||||
|
rockFactory:registerNodesByShortDef({
|
||||||
|
{rock..'_fluted_column', {columnTop, columnTop, ts:t(6, y)}},
|
||||||
|
{rock..'_ionic_chapiter', {
|
||||||
|
ts:t(3, y),
|
||||||
|
columnTop,
|
||||||
|
ts:t(7, y),
|
||||||
|
ts:t(7, y),
|
||||||
|
ts:t(8, y),
|
||||||
|
ts:t(8, y)}},
|
||||||
|
})
|
||||||
|
end
|
||||||
|
|
||||||
|
registerPilarStaff('sylite_black', 2)
|
||||||
|
|
||||||
registerRocksTypes('', 0)
|
registerRocksTypes('', 0)
|
||||||
registerRocksTypes('_block', 2)
|
registerRocksTypes('_chipped', 1)
|
||||||
registerRocksTypes('_bricks', 5)
|
registerRocksTypes('_block', 3)
|
||||||
|
registerRocksTypes('_bricks', 4)
|
||||||
|
registerRocksTypes('_bricks_2', 5)
|
||||||
|
|
||||||
--[[
|
--[[
|
||||||
rockFactory:registerItems({
|
rockFactory:registerItems({
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 151 KiB |
@@ -197,6 +197,7 @@ soilFactory:registerItems({
|
|||||||
title = "Barren Rocky Soil",
|
title = "Barren Rocky Soil",
|
||||||
--description = "",
|
--description = "",
|
||||||
tiles = rockyTiles,
|
tiles = rockyTiles,
|
||||||
|
rarity = 'uncommon'
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
---@type Node.NodeDefinition
|
---@type Node.NodeDefinition
|
||||||
@@ -206,6 +207,7 @@ soilFactory:registerItems({
|
|||||||
title = "Poor Rocky Soil",
|
title = "Poor Rocky Soil",
|
||||||
--description = "",
|
--description = "",
|
||||||
tiles = rockyTiles,
|
tiles = rockyTiles,
|
||||||
|
rarity = 'distinguished'
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
---@type Node.NodeDefinition
|
---@type Node.NodeDefinition
|
||||||
@@ -215,6 +217,7 @@ soilFactory:registerItems({
|
|||||||
title = "Moderate Rocky Soil",
|
title = "Moderate Rocky Soil",
|
||||||
--description = "",
|
--description = "",
|
||||||
tiles = rockyTiles,
|
tiles = rockyTiles,
|
||||||
|
rarity = 'eminent'
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
---@type Node.NodeDefinition
|
---@type Node.NodeDefinition
|
||||||
@@ -224,6 +227,7 @@ soilFactory:registerItems({
|
|||||||
title = "Fertile Rocky Soil",
|
title = "Fertile Rocky Soil",
|
||||||
--description = "",
|
--description = "",
|
||||||
tiles = rockyTiles,
|
tiles = rockyTiles,
|
||||||
|
rarity = 'prime'
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
---@type Node.NodeDefinition
|
---@type Node.NodeDefinition
|
||||||
@@ -248,6 +252,7 @@ Node:new({
|
|||||||
groups = {
|
groups = {
|
||||||
dig_immediate = 2,
|
dig_immediate = 2,
|
||||||
soil_fertiliry = 100, -- Soil fertility for agriculture
|
soil_fertiliry = 100, -- Soil fertility for agriculture
|
||||||
}
|
},
|
||||||
|
rarity = 'unique'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
local setMetaTable, TableCopy = setmetatable, table.copy_with_metatables
|
local setMetaTable, tableCopy = setmetatable, table.copy_with_metatables
|
||||||
|
|
||||||
---@class Class
|
---@class Class
|
||||||
Class = {}
|
Class = {}
|
||||||
|
|
||||||
---Returns a child class with inherited parameters from the parent class.
|
---Returns a child class with inherited parameters from the parent class.
|
||||||
---@param parent table
|
---@param parent table
|
||||||
---@param child table
|
---@param child table?
|
||||||
function Class.extend(parent, child)
|
function Class.extend(parent, child)
|
||||||
return setmetatable(child or {}, { __index = TableCopy(parent) })
|
return setMetaTable(child or {}, { __index = tableCopy(parent) })
|
||||||
end
|
end
|
||||||
|
|
||||||
---Intended for class constructors.
|
---Intended for class constructors.
|
||||||
@@ -23,7 +23,7 @@ function Class.getInstance(self, params, metatable)
|
|||||||
metatable = {}
|
metatable = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
metatable.__index = TableCopy(self)
|
metatable.__index = tableCopy(self)
|
||||||
|
|
||||||
local instance = setMetaTable(params, metatable)
|
local instance = setMetaTable(params, metatable)
|
||||||
|
|
||||||
|
|||||||
Submodule util/ide-helper updated: 3eb0f97115...1d0043bfe7
Reference in New Issue
Block a user