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: Сообщение об ошибке
|
||||
about: Сообщить о недоработке игры, которую необходимо исправить.
|
||||
name: PR-template
|
||||
about: PR-template
|
||||
labels:
|
||||
- pr/wait review
|
||||
- review/need a maintainer
|
||||
@@ -23,12 +23,12 @@ body:
|
||||
attributes:
|
||||
label: Требования
|
||||
options:
|
||||
- label: Я запускал игру и убедился в том, что она работает.
|
||||
required: true
|
||||
- label: Я ознакомлен с соглашением по разработке и мои изменения следуют принятым стандартам.
|
||||
required: true
|
||||
- label: Я запускал игру и убедился в том, что она работает.
|
||||
required: false
|
||||
- label: Я указал в описании запроса метки (label) с префиксом `Edit:` в соответствии с теми изменениями, которые сделал.
|
||||
required: true
|
||||
required: false
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
local modInfo = Mod.getInfo('smc__core__craft_system')
|
||||
local require = modInfo.require
|
||||
|
||||
return require('CraftSystem')
|
||||
return require('CraftSystem')
|
||||
|
||||
@@ -1,117 +1,28 @@
|
||||
local HASH_SPLITTER = '&'
|
||||
|
||||
local modInfo = Mod.getInfo('smc__core__craft_system')
|
||||
local require = modInfo.require
|
||||
|
||||
---@alias CraftSystem.shapelessCraftsList table<CraftSystem.Craft.Group, table<string, CraftSystem.ShapelessCraft[]>>
|
||||
---@alias CraftSystem.processualCraftsList table<CraftSystem.Craft.Group, table<string, CraftSystem.ProcessualCraft[]>>
|
||||
---@type CraftSystem.PrimitiveCraftHandler
|
||||
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
|
||||
---@field shapelessCraftsList CraftSystem.shapelessCraftsList
|
||||
---@field processualCraftsList CraftSystem.processualCraftsList
|
||||
local CraftSystem = {
|
||||
shapelessCraftsList = {},
|
||||
processualCraftsList = {},
|
||||
}
|
||||
local CraftSystem = {}
|
||||
|
||||
---@alias CraftSystem.Craft.Type
|
||||
---|'shapeless'
|
||||
---|'processual'
|
||||
---@alias CraftSystem.Craft.Group string
|
||||
---@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
|
||||
|
||||
return craftList
|
||||
---@param craftName string
|
||||
---@param def CraftSystem.PrimitiveCraftDef
|
||||
function CraftSystem.registerPrimitiveCraft(craftName, def)
|
||||
PrimitiveCraftHandler:addCraft(craftName, def)
|
||||
end
|
||||
|
||||
---@param type CraftSystem.Craft.Type
|
||||
---@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
|
||||
---@param craftName string
|
||||
---@param def CraftSystem.ImmersiveCraftDef
|
||||
function CraftSystem.registerImmersiveCraft(craftName, def)
|
||||
ImmersiveCraftHandler:addCraft(craftName, def)
|
||||
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
|
||||
|
||||
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
|
||||
@@ -1,4 +1,4 @@
|
||||
local modInfo = Mod.getInfo('smc__core__item')
|
||||
local require = modInfo.require
|
||||
|
||||
return require('Item')
|
||||
return require('Item')
|
||||
|
||||
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,11 +5,38 @@ local require = modInfo.require
|
||||
|
||||
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
|
||||
---@field itemDef Item.ItemDefinition
|
||||
---@field luantiDef table
|
||||
---@field getVisual fun(): string
|
||||
---@field defaultDef Item.ItemDefinition
|
||||
---@field itemDef Item.ItemDefinition
|
||||
---@field luantiDef ItemDefinition
|
||||
---@field getVisual fun(): string
|
||||
---@field defaultDef Item.ItemDefinition
|
||||
local Item = {
|
||||
defaultDef = {
|
||||
settings = {
|
||||
@@ -18,20 +45,42 @@ local Item = {
|
||||
description = '',
|
||||
titleColor = '#FFFFFF',
|
||||
descriptionColor = '#C0C0C0',
|
||||
rarity = 'common',
|
||||
addModName = true,
|
||||
},
|
||||
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
|
||||
---@type fun(...):(NodeDefinition|ItemDefinition)
|
||||
local defMerge = function(...)
|
||||
return table.merge(...)
|
||||
end
|
||||
|
||||
---@param itemDef Item.ItemDefinition
|
||||
---@return NodeDefinition|ItemDefinition
|
||||
---@param itemDef Item.ItemDefinition
|
||||
---@return NodeDefinition|ItemDefinition
|
||||
local function itemDefToLuantiDef(itemDef)
|
||||
local modName = Mod.getInfo().shortName
|
||||
local S = core.get_translator(modName)
|
||||
@@ -62,26 +111,30 @@ local function itemDefToLuantiDef(itemDef)
|
||||
error('Item description color parameters cannot be empty.')
|
||||
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)
|
||||
|
||||
return luantiDef
|
||||
end
|
||||
|
||||
---@param luantiDef NodeDefinition|ItemDefinition
|
||||
---@param luantiDef NodeDefinition
|
||||
local function register3dItem(luantiDef)
|
||||
local ld = luantiDef
|
||||
local name = ld.name
|
||||
ld.name = nil
|
||||
local name = luantiDef.name
|
||||
luantiDef.name = nil
|
||||
|
||||
core.register_node(':'..name, luantiDef)
|
||||
end
|
||||
|
||||
---@param luantiDef ItemDefinition
|
||||
local function registerFlatItem(luantiDef)
|
||||
local ld = luantiDef
|
||||
local name = ld.name
|
||||
ld.name = nil
|
||||
local name = luantiDef.name
|
||||
luantiDef.name = nil
|
||||
|
||||
core.register_craftitem(':'..name, luantiDef)
|
||||
end
|
||||
|
||||
@@ -91,23 +144,23 @@ local defMerge = function(...)
|
||||
return table.merge(...)
|
||||
end
|
||||
|
||||
---@param itemDef Item.ItemDefinition|Node.NodeDefinition
|
||||
---@return Item
|
||||
function Item:new(itemDef)
|
||||
---@param def Item.ItemDefinition|Node.NodeDefinition
|
||||
---@return Item
|
||||
function Item:new(def)
|
||||
---Adding default parameters
|
||||
itemDef = defMerge(itemDef, self.defaultDef, true)
|
||||
def = defMerge(def, self.defaultDef, true)
|
||||
|
||||
---@type Item
|
||||
local instance = getInstance(self, {})
|
||||
|
||||
local luantiDef = itemDefToLuantiDef(itemDef)
|
||||
local visual = itemDef.settings.visual
|
||||
local luantiDef = itemDefToLuantiDef(def)
|
||||
local visual = def.settings.visual
|
||||
|
||||
if visual == nil then
|
||||
visual = 'item_2d'
|
||||
end
|
||||
|
||||
itemDef.settings.visual = nil
|
||||
def.settings.visual = nil
|
||||
|
||||
if visual == 'item_3d' then
|
||||
register3dItem(luantiDef)
|
||||
@@ -120,7 +173,7 @@ function Item:new(itemDef)
|
||||
return visual
|
||||
end
|
||||
|
||||
instance.itemDef = itemDef
|
||||
instance.itemDef = def
|
||||
instance.luantiDef = luantiDef
|
||||
|
||||
return instance
|
||||
|
||||
@@ -64,4 +64,4 @@ Callbacks.on_use = nil
|
||||
---@type fun(itemstack:ItemStack, user:Player|ObjectRef|nil, node, digparams)?
|
||||
Callbacks.after_use = nil
|
||||
|
||||
return Callbacks
|
||||
return Callbacks
|
||||
|
||||
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?
|
||||
Settings.visual = nil
|
||||
|
||||
---Formal (lore) rarity of an item. Default `common`.
|
||||
---@type Item.Rarity?
|
||||
Settings.rarity = nil
|
||||
|
||||
|
||||
---Table of groups-characteristics of Item.
|
||||
@@ -183,4 +186,4 @@ Settings.touch_interaction = nil
|
||||
Settings.sound = nil
|
||||
|
||||
|
||||
return Settings
|
||||
return Settings
|
||||
|
||||
@@ -45,9 +45,28 @@ local function registerRocksTypes(postfix, x)
|
||||
})
|
||||
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('_block', 2)
|
||||
registerRocksTypes('_bricks', 5)
|
||||
registerRocksTypes('_chipped', 1)
|
||||
registerRocksTypes('_block', 3)
|
||||
registerRocksTypes('_bricks', 4)
|
||||
registerRocksTypes('_bricks_2', 5)
|
||||
|
||||
--[[
|
||||
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",
|
||||
--description = "",
|
||||
tiles = rockyTiles,
|
||||
rarity = 'uncommon'
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
@@ -206,6 +207,7 @@ soilFactory:registerItems({
|
||||
title = "Poor Rocky Soil",
|
||||
--description = "",
|
||||
tiles = rockyTiles,
|
||||
rarity = 'distinguished'
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
@@ -215,6 +217,7 @@ soilFactory:registerItems({
|
||||
title = "Moderate Rocky Soil",
|
||||
--description = "",
|
||||
tiles = rockyTiles,
|
||||
rarity = 'eminent'
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
@@ -224,6 +227,7 @@ soilFactory:registerItems({
|
||||
title = "Fertile Rocky Soil",
|
||||
--description = "",
|
||||
tiles = rockyTiles,
|
||||
rarity = 'prime'
|
||||
},
|
||||
},
|
||||
---@type Node.NodeDefinition
|
||||
@@ -248,6 +252,7 @@ Node:new({
|
||||
groups = {
|
||||
dig_immediate = 2,
|
||||
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 = {}
|
||||
|
||||
---Returns a child class with inherited parameters from the parent class.
|
||||
---@param parent table
|
||||
---@param child table
|
||||
function Class.extend(parent ,child)
|
||||
return setmetatable(child or {}, { __index = TableCopy(parent) })
|
||||
---@param child table?
|
||||
function Class.extend(parent, child)
|
||||
return setMetaTable(child or {}, { __index = tableCopy(parent) })
|
||||
end
|
||||
|
||||
---Intended for class constructors.
|
||||
@@ -23,7 +23,7 @@ function Class.getInstance(self, params, metatable)
|
||||
metatable = {}
|
||||
end
|
||||
|
||||
metatable.__index = TableCopy(self)
|
||||
metatable.__index = tableCopy(self)
|
||||
|
||||
local instance = setMetaTable(params, metatable)
|
||||
|
||||
|
||||
Submodule util/ide-helper updated: 3eb0f97115...1d0043bfe7
Reference in New Issue
Block a user