Skip to content
This repository has been archived by the owner on Dec 28, 2023. It is now read-only.

Commit

Permalink
Не будем ставить метки на предметы по ЦЗ
Browse files Browse the repository at this point in the history
  • Loading branch information
dsh2dsh committed Dec 13, 2020
1 parent 91a7470 commit d339985
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 18 deletions.
28 changes: 14 additions & 14 deletions gamedata/scripts/se/se_item.script
Expand Up @@ -8,13 +8,13 @@ end
function se_outfit:on_register()
cse_alife_item_custom_outfit.on_register( self )
-- Ðåãèñòðàöèÿ â òàñêìåíåäæåðå
task_manager.get_random_task():register_target( self )
-- task_manager.get_random_task():register_target( self )
end


function se_outfit:on_unregister()
-- Îòðåãèñòðàöèÿ â òàñêìåíåäæåðå
task_manager.get_random_task():unregister_target( self )
-- task_manager.get_random_task():unregister_target( self )
end


Expand All @@ -32,13 +32,13 @@ end
function se_weapon:on_register()
cse_alife_item_weapon.on_register( self )
-- Ðåãèñòðàöèÿ â òàñêìåíåäæåðå
task_manager.get_random_task():register_target( self )
-- task_manager.get_random_task():register_target( self )
end


function se_weapon:on_unregister()
-- Îòðåãèñòðàöèÿ â òàñêìåíåäæåðå
task_manager.get_random_task():unregister_target( self )
-- task_manager.get_random_task():unregister_target( self )
end


Expand All @@ -56,13 +56,13 @@ end
function se_weapon_shotgun:on_register()
cse_alife_item_weapon_shotgun.on_register( self )
-- Ðåãèñòðàöèÿ â òàñêìåíåäæåðå
task_manager.get_random_task():register_target( self )
-- task_manager.get_random_task():register_target( self )
end


function se_weapon_shotgun:on_unregister()
-- Îòðåãèñòðàöèÿ â òàñêìåíåäæåðå
task_manager.get_random_task():unregister_target( self )
-- task_manager.get_random_task():unregister_target( self )
end


Expand All @@ -80,13 +80,13 @@ end
function se_weapon_magazined:on_register()
cse_alife_item_weapon_magazined.on_register( self )
-- Ðåãèñòðàöèÿ â òàñêìåíåäæåðå
task_manager.get_random_task():register_target( self )
-- task_manager.get_random_task():register_target( self )
end


function se_weapon_magazined:on_unregister()
-- Îòðåãèñòðàöèÿ â òàñêìåíåäæåðå
task_manager.get_random_task():unregister_target( self )
-- task_manager.get_random_task():unregister_target( self )
end


Expand All @@ -104,13 +104,13 @@ end
function se_weapon_magazined_w_gl:on_register()
cse_alife_item_weapon_magazined_w_gl.on_register( self )
-- Ðåãèñòðàöèÿ â òàñêìåíåäæåðå
task_manager.get_random_task():register_target( self )
-- task_manager.get_random_task():register_target( self )
end


function se_weapon_magazined_w_gl:on_unregister()
-- Îòðåãèñòðàöèÿ â òàñêìåíåäæåðå
task_manager.get_random_task():unregister_target( self )
-- task_manager.get_random_task():unregister_target( self )
end


Expand All @@ -122,13 +122,13 @@ end
function se_item:on_register()
cse_alife_item.on_register( self )
-- Ðåãèñòðàöèÿ â òàñêìåíåäæåðå
task_manager.get_random_task():register_target( self )
-- task_manager.get_random_task():register_target( self )
end


function se_item:on_unregister()
-- Îòðåãèñòðàöèÿ â òàñêìåíåäæåðå
task_manager.get_random_task():unregister_target( self )
-- task_manager.get_random_task():unregister_target( self )
end


Expand All @@ -140,13 +140,13 @@ end
function se_item_torch:on_register()
cse_alife_item_torch.on_register( self )
-- Ðåãèñòðàöèÿ â òàñêìåíåäæåðå
task_manager.get_random_task():register_target( self )
-- task_manager.get_random_task():register_target( self )
end


function se_item_torch:on_unregister()
-- Îòðåãèñòðàöèÿ â òàñêìåíåäæåðå
task_manager.get_random_task():unregister_target( self )
-- task_manager.get_random_task():unregister_target( self )
end


Expand Down
4 changes: 2 additions & 2 deletions gamedata/scripts/se/se_stalker.script
Expand Up @@ -395,7 +395,7 @@ function se_stalker:on_register()
end

-- Ðåãèñòðàöèÿ â òàñêìåíåäæåðå
task_manager.get_random_task():register_target( self )
-- task_manager.get_random_task():register_target( self )
self.se_respawn = se_respawn.get_respawner_by_npc_id( self.id )
alife():set_interactive( self, true )
self.on_register_level_name = self.level_name
Expand All @@ -407,7 +407,7 @@ function se_stalker:on_unregister()
smart_terrain.unregister_npc( self )

--' Îòðåãèñòðàöèÿ â òàñêìåíåäæåðå
task_manager.get_random_task():unregister_target(self)
-- task_manager.get_random_task():unregister_target(self)
actor_stats.remove_from_ranking( self.id )

stalkers[ self.id ] = nil
Expand Down
12 changes: 10 additions & 2 deletions gamedata/scripts/task_manager.script
Expand Up @@ -66,7 +66,7 @@ local cycle_task = {
local map_locations = {
[ "defend_lager" ] = "defend_lager_location",
[ "eliminate_lager" ] = "eliminate_lager_location",
[ "find_item" ] = "find_item_location",
-- [ "find_item" ] = "find_item_location",
[ "kill_stalker" ] = "kill_stalker_location",
}

Expand Down Expand Up @@ -614,10 +614,12 @@ function CRandomTask:action_give_task_engine( actor, npc, p1, p2 )
task_desc.selected_target, task_desc.target_dialog, task_id
)
end
elseif task_desc.type == "find_item" then
--[=[
elseif task_desc.type == "find_item" and map_locations[ task_desc.type ] then
objective:set_map_hint( task_desc.text )
objective:set_map_location( map_locations[ task_desc.type ] )
objective:set_object_id( task_desc.selected_target )
--]=]
end
objective:add_complete_func( "task_manager.task_complete" )
task:add_objective (objective )
Expand Down Expand Up @@ -945,6 +947,7 @@ function CRandomTask:check_task_props( task_id )
elseif t.type == "kill_stalker" then
t.enabled_props = false
return
--[=[
elseif t.type == "find_item" then
if t.target_objects == nil or table.getn( t.target_objects ) == 0 then
t.enabled_props = false
Expand All @@ -970,6 +973,7 @@ function CRandomTask:check_task_props( task_id )
t.enabled_props = false
return
end
--]=]
else
t.enabled_props = true
return
Expand Down Expand Up @@ -1351,9 +1355,11 @@ function CRandomTask:register_target( obj )
)
end
end
--[=[
else
-- Âîçìîæíî ðåãèñòðèðóåòñÿ öåëü äëÿ êâåñòà "íàéòè ïðåäìåò"
tasks = self.by_target.find_item[ obj:section_name() ]
--]=]
end
if tasks then
for _, k in ipairs( tasks ) do
Expand All @@ -1371,9 +1377,11 @@ function CRandomTask:unregister_target( obj )
if IsStalker( obj ) then
-- Âîçìîæíî ðåãèñòðèðóåòñÿ öåëü äëÿ êâåñòà "óáèòü ñòàëêåðà"
tasks = self.by_target.kill_stalker[ obj:profile_name() ]
--[=[
elseif obj:clsid() ~= clsid.smart_terrain then
-- Âîçìîæíî ðåãèñòðèðóåòñÿ öåëü äëÿ êâåñòà "íàéòè ïðåäìåò"
tasks = self.by_target.find_item[ obj:section_name() ]
--]=]
end
if tasks then
for _, k in ipairs( tasks ) do
Expand Down

0 comments on commit d339985

Please sign in to comment.