BlackMATov/evolved.lua
1
0
Fork 0
mirror of https://github.com/BlackMATov/evolved.lua.git synced 2025-12-14 20:11:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

required fragments work with pairs by primary fragment

Browse Source
This commit is contained in:
BlackMATov
2025-08-01 06:46:43 +07:00
parent dbca453bbb
commit 35c6592418
2 changed files with 250 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

223
develop/testing/pairs_tests.lua
View File

@@ -303,8 +303,8 @@ do
assert(evo.has(e, f2))
assert(evo.get(e, f2) == 84)
assert(not evo.has(e, f3))
assert(evo.get(e, f3) == nil)
assert(evo.has(e, f3))
assert(evo.get(e, f3) == true)
end
do
@@ -1195,9 +1195,218 @@ do
end
end
do
do
local f, p, s = evo.id(3)
evo.set(p, evo.DESTRUCTION_POLICY, evo.DESTRUCTION_POLICY_DESTROY_ENTITY)
local e = evo.builder()
:set(f, 21)
:set(evo.pair(p, s), 42)
:spawn()
evo.destroy(p)
assert(not evo.alive(e) and evo.empty(e))
assert(not evo.has(e, f) and evo.get(e, f) == nil)
assert(not evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == nil)
end
do
local f, p, s = evo.id(3)
evo.set(p, evo.DESTRUCTION_POLICY, evo.DESTRUCTION_POLICY_DESTROY_ENTITY)
local e = evo.builder()
:set(f, 21)
:set(evo.pair(p, s), 42)
:spawn()
evo.destroy(s)
assert(evo.alive(e) and not evo.empty(e))
assert(evo.has(e, f) and evo.get(e, f) == 21)
assert(not evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == nil)
end
do
local f, p, s = evo.id(3)
evo.set(p, evo.DESTRUCTION_POLICY, evo.DESTRUCTION_POLICY_REMOVE_FRAGMENT)
local e = evo.builder()
:set(f, 21)
:set(evo.pair(p, s), 42)
:spawn()
evo.destroy(p)
assert(evo.alive(e) and not evo.empty(e))
assert(evo.has(e, f) and evo.get(e, f) == 21)
assert(not evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == nil)
end
do
local f, p, s = evo.id(3)
evo.set(p, evo.DESTRUCTION_POLICY, evo.DESTRUCTION_POLICY_REMOVE_FRAGMENT)
local e = evo.builder()
:set(f, 21)
:set(evo.pair(p, s), 42)
:spawn()
evo.destroy(s)
assert(evo.alive(e) and not evo.empty(e))
assert(evo.has(e, f) and evo.get(e, f) == 21)
assert(not evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == nil)
end
do
local f, p, s = evo.id(3)
evo.set(p, evo.DESTRUCTION_POLICY, evo.DESTRUCTION_POLICY_REMOVE_FRAGMENT)
evo.set(s, evo.DESTRUCTION_POLICY, evo.DESTRUCTION_POLICY_DESTROY_ENTITY)
local e = evo.builder()
:set(f, 21)
:set(evo.pair(p, s), 42)
:spawn()
evo.destroy(p)
assert(evo.alive(e) and not evo.empty(e))
assert(evo.has(e, f) and evo.get(e, f) == 21)
assert(not evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == nil)
end
do
local f, p, s = evo.id(3)
evo.set(p, evo.DESTRUCTION_POLICY, evo.DESTRUCTION_POLICY_REMOVE_FRAGMENT)
evo.set(s, evo.DESTRUCTION_POLICY, evo.DESTRUCTION_POLICY_DESTROY_ENTITY)
local e = evo.builder()
:set(f, 21)
:set(evo.pair(p, s), 42)
:spawn()
evo.destroy(s)
assert(not evo.alive(e) and evo.empty(e))
assert(not evo.has(e, f) and evo.get(e, f) == nil)
assert(not evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == nil)
end
end
do
do
local p, s = evo.id(2)
evo.set(p, evo.DEFAULT, 42)
do
local e = evo.id()
evo.set(e, evo.pair(p, s))
assert(evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == 42)
end
do
local e = evo.builder():set(evo.pair(p, s)):spawn()
assert(evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == 42)
end
end
do
local p, s = evo.id(2)
evo.set(s, evo.DEFAULT, 21)
do
local e = evo.id()
evo.set(e, evo.pair(p, s))
assert(evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == true)
end
do
local e = evo.builder():set(evo.pair(p, s)):spawn()
assert(evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == true)
end
end
do
local p, s = evo.id(2)
evo.set(p, evo.DEFAULT, 42)
evo.set(s, evo.DEFAULT, 21)
do
local e = evo.id()
evo.set(e, evo.pair(p, s))
assert(evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == 42)
end
do
local e = evo.builder():set(evo.pair(p, s)):spawn()
assert(evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == 42)
end
end
end
do
do
local f, p, s = evo.id(3)
evo.set(p, evo.REQUIRES, { f })
do
local e = evo.id()
evo.set(e, evo.pair(p, s))
assert(evo.has(e, f) and evo.get(e, f) == true)
assert(evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == true)
end
do
local e = evo.builder():set(evo.pair(p, s)):spawn()
assert(evo.has(e, f) and evo.get(e, f) == true)
assert(evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == true)
end
end
do
local f, p, s = evo.id(3)
evo.set(s, evo.REQUIRES, { f })
do
local e = evo.id()
evo.set(e, evo.pair(p, s))
assert(not evo.has(e, f) and evo.get(e, f) == nil)
assert(evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == true)
end
do
local e = evo.builder():set(evo.pair(p, s)):spawn()
assert(not evo.has(e, f) and evo.get(e, f) == nil)
assert(evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == true)
end
end
do
local f, p, s = evo.id(3)
evo.set(p, evo.REQUIRES, { f })
evo.set(f, evo.REQUIRES, { evo.pair(s, p) })
evo.set(s, evo.REQUIRES, { p })
do
local e = evo.id()
evo.set(e, evo.pair(p, s))
assert(evo.has(e, f) and evo.get(e, f) == true)
assert(evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == true)
assert(evo.has(e, evo.pair(s, p)) and evo.get(e, evo.pair(s, p)) == true)
assert(evo.has(e, p) and evo.get(e, p) == true)
end
do
local e = evo.builder():set(evo.pair(p, s)):spawn()
assert(evo.has(e, f) and evo.get(e, f) == true)
assert(evo.has(e, evo.pair(p, s)) and evo.get(e, evo.pair(p, s)) == true)
assert(evo.has(e, evo.pair(s, p)) and evo.get(e, evo.pair(s, p)) == true)
assert(evo.has(e, p) and evo.get(e, p) == true)
end
end
end
-- TODO:
-- How should required fragments work with pairs?
-- How can we set defaults for paired fragments?
-- Prevent setting wildcard pairs to entities!
-- Should we have destruction policies analog for pairs?
-- Should we call hooks for pairs?
-- Add errors on modifying pairs

26
evolved.lua
View File

@@ -1194,8 +1194,8 @@ function __iterator_fns.__secondaries_iterator(secondaries_state)
end
local pairs = entity_chunk.__primary_pairs[primary_fragment]
local pair_list = pairs and pairs.__item_list
local pair_count = pairs and pairs.__item_count or 0
local pair_list = pairs and pairs.__item_list --[=[@as evolved.id[]]=]
local pair_count = pairs and pairs.__item_count or 0 --[[@as integer]]
if primary_pair_index >= 1 and primary_pair_index <= pair_count then
secondaries_state[5] = primary_pair_index + 1
@@ -2282,14 +2282,14 @@ local function __chunk_required_fragments(chunk, req_fragment_set, req_fragment_
fragment_stack_size = fragment_stack_size - 1
if __is_pair(stack_fragment) then
-- this is a pair fragment, just skip it
else
stack_fragment = __evolved_unpair(stack_fragment)
end
local fragment_requires = __sorted_requires[stack_fragment]
local fragment_require_list = fragment_requires and fragment_requires.__item_list
local fragment_require_count = fragment_requires and fragment_requires.__item_count or 0
for fragment_require_index = 1, fragment_require_count do
---@cast fragment_require_list -?
local required_fragment = fragment_require_list[fragment_require_index]
if req_fragment_set[required_fragment] then
@@ -2299,16 +2299,11 @@ local function __chunk_required_fragments(chunk, req_fragment_set, req_fragment_
req_fragment_set[required_fragment] = req_fragment_count
req_fragment_list[req_fragment_count] = required_fragment
if __is_pair(required_fragment) then
-- this is a pair fragment, just skip it
else
fragment_stack_size = fragment_stack_size + 1
fragment_stack[fragment_stack_size] = required_fragment
end
end
end
end
end
__release_table(__table_pool_tag.fragment_list, fragment_stack, true)
return req_fragment_count
@@ -2337,14 +2332,14 @@ local function __fragment_required_fragments(fragment, req_fragment_set, req_fra
fragment_stack_size = fragment_stack_size - 1
if __is_pair(stack_fragment) then
-- this is a pair fragment, just skip it
else
stack_fragment = __evolved_unpair(stack_fragment)
end
local fragment_requires = __sorted_requires[stack_fragment]
local fragment_require_list = fragment_requires and fragment_requires.__item_list
local fragment_require_count = fragment_requires and fragment_requires.__item_count or 0
for fragment_require_index = 1, fragment_require_count do
---@cast fragment_require_list -?
local required_fragment = fragment_require_list[fragment_require_index]
if req_fragment_set[required_fragment] then
@@ -2354,16 +2349,11 @@ local function __fragment_required_fragments(fragment, req_fragment_set, req_fra
req_fragment_set[required_fragment] = req_fragment_count
req_fragment_list[req_fragment_count] = required_fragment
if __is_pair(required_fragment) then
-- this is a pair fragment, just skip it
else
fragment_stack_size = fragment_stack_size + 1
fragment_stack[fragment_stack_size] = required_fragment
end
end
end
end
end
__release_table(__table_pool_tag.fragment_list, fragment_stack, true)
return req_fragment_count