Rage/Divergent
1
0
Fork 0
Code Issues Pull Requests Actions Releases 1 Wiki Activity

Added, Updated and Removed Mods; Updated Readme

Browse Source
This commit is contained in:
Rage
2024-04-01 22:56:36 -04:00
parent 255081e1ee
commit 5caee9fba5
1056 changed files with 49175 additions and 1278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mods/Personal Adjustable Waypoint/gamedata/configs/text/eng/catsy_waypoints.xml
+19
View File
@@ -1686,4 +1686,23 @@ This message won't bother you again. Good hunting, %s.</text>
<text>Use Object Name</text>
</string>
<!-- Added in 2.2 (not yet implemented) -->
<string id="ui_mcm_pawsys_pawret_autotag_pdas">
<text>Enable Autotag for the following devices:</text>
</string>
<string id="ui_mcm_pawsys_pawret_device_pda_1">
<text>PDA 1.0</text>
</string>
<string id="ui_mcm_pawsys_pawret_device_pda_2">
<text>PDA 2.0</text>
</string>
<string id="ui_mcm_pawsys_pawret_device_pda_3">
<text>PDA 3.1</text>
</string>
<string id="ui_mcm_pawsys_pawret_device_pda_milspec">
<text>Milspec PDA (requires addon)</text>
</string>
</string_table>
mods/Personal Adjustable Waypoint/gamedata/configs/text/rus/catsy_waypoints.xml
+20 -1
View File
@@ -1683,5 +1683,24 @@
<string id="ui_mcm_lst_pawsys_msttmode_obj">
<text>Используйте название объекта</text>
</string>
<!-- Added in 2.2 (not yet implemented) -->
<string id="ui_mcm_pawsys_pawret_autotag_pdas">
<text>Включите автотег для следующих устройств:</text>
</string>
<string id="ui_mcm_pawsys_pawret_device_pda_1">
<text>PDA 1.0</text>
</string>
<string id="ui_mcm_pawsys_pawret_device_pda_2">
<text>PDA 2.0</text>
</string>
<string id="ui_mcm_pawsys_pawret_device_pda_3">
<text>PDA 3.1</text>
</string>
<string id="ui_mcm_pawsys_pawret_device_pda_milspec">
<text>Milspec PDA (требуется этот аддон)</text>
</string>
</string_table>
mods/Personal Adjustable Waypoint/gamedata/scripts/catsy_paw_mcm.script
+115 -107
View File
@@ -33,10 +33,10 @@ local pawmenu_path = "ui_mcm_pawsys_pawmenu_"
local actions_ini = ini_file_ex("scripts\\paw\\menu_actions.ltx")
local actions_ltx = actions_ini:get_sections(true)
local load_failed = false
local load_error_text1 = {id = "load_error1", type = "desc", text = "st_paw_texture_load_error1"}
local load_error_text2 = {id = "load_error2", type = "desc", text = "st_paw_texture_load_error2"}
local divider = {id = "divider", type= "line"}
local load_error_text1 = {id = "load_error1", type= "desc", text = "st_paw_texture_load_error1"}
local load_error_text2 = {id = "load_error2", type= "desc", text = "st_paw_texture_load_error2"}
local load_error_text_block = {load_error_text1,load_error_text2,divider}
local divider = {id = "divider", type = "line"}
local action_codes = {}
local action = {}
local dynamic_faves = {}
@@ -219,30 +219,38 @@ function populate_autotag_menus()
dl("populate_autotag_menus called")
local gr = {
{id = "reticle_header", type= "image", link = "ui_paw_emptytex", size= {512,170},
{id = "reticle_header", type= "image", link = "ui_paw_emptytex", size= {512,170},
ui_hook_functor = {catsy_paw_mcm.mcm_init_header_text_block},
},
{id = "reticle_mustzoom", type = "check", val = 1, def = true},
{id = "pin_auto_visible", type = "check", val = 1, def = true},
{id = "reticle_mode", type = "list", val = 2, def = 2,
{id = "reticle_mustzoom", type= "check", val = 1, def = true},
{id = "pin_auto_visible", type= "check", val = 1, def = true},
{id = "reticle_mode", type= "list", val = 2, def = 2,
content = {
{4,"pawsys_cmenu_all"},
{2,"pawsys_cmenu_cart"},
{0,"pawsys_cmenu_off"},
}
},
--{id = "show_reticle", type = "check", val = 1, def = true}, -- not implemented yet
{id = "reticle_alpha", type = "track", val = 2, min = 1, max = 255, step = 1, def = 120},
{id = "ret_fade_attack_time", type = "input", val = 2, min = 1, max = 5000, def = 150},
{id = "ret_fade_decay_time", type = "input", val = 2, min = 1, max = 5000, def = 250},
{id = "autotag_header", type = "image", link = "ui_paw_emptytex", size = {512,50},
--{id = "show_reticle", type= "check", val = 1, def = true}, -- not implemented yet
{id = "reticle_alpha", type= "track", val = 2, min = 1, max = 255, step = 1, def = 120},
{id = "ret_fade_attack_time", type= "input", val = 2, min = 1, max = 5000, def = 150},
{id = "ret_fade_decay_time", type= "input", val = 2, min = 1, max = 5000, def = 250},
{id = "autotag_header", type= "image", link = "ui_paw_emptytex", size = {512,50},
ui_hook_functor = {catsy_paw_mcm.mcm_init_header_text_block},
},
{id = "enable_autotag", type = "check", val = 1, def = false},
{id = "manual_smart_pins", type = "check", val = 1, def = true},
{id = "autotag_persistence", type = "check", val = 1, def = false},
{id = "autotag_lifetime", type = "track", val = 2, min = 0, max = 600, step = 1, def = 0},
{id = "enable_autotag", type= "check", val = 1, def = false},
{id = "manual_smart_pins", type= "check", val = 1, def = true},
{id = "autotag_persistence", type= "check", val = 1, def = false},
{id = "autotag_lifetime", type= "track", val = 2, min = 0, max = 600, step = 1, def = 0},
--[[
divider,
{id = "headertxt", type= "desc", clr = {255,255,255,0}, text = "ui_mcm_pawsys_pawret_autotag_pdas"},
{id = "device_pda_1", type= "check", val = 1, def = true},
{id = "device_pda_2", type= "check", val = 1, def = true},
{id = "device_pda_3", type= "check", val = 1, def = true},
{id = "device_pda_milspec", type= "check", val = 1, def = true},
--]]
}
if load_failed then
@@ -256,8 +264,8 @@ function populate_autotag_menus()
for tag,defs in spairs(paw.smart_pins) do
dl("populate_autotag_menus adding entry for %s (default %s)",tag,defs.pin)
enable_opt = {
id = tag.."_enable",
type = "check",
id = tag.."_enable",
type= "check",
val = 1,
def = defs.enabled,
--on_selection_functor = {catsy_paw_mcm.mcm_on_value_select},
@@ -266,7 +274,7 @@ function populate_autotag_menus()
local def = defs.pin or icon_sets["npcs"].default
menu_opt = {
id = tag,
type = "list",
type= "list",
val = 0,
def = def,
ui_hook_functor = {catsy_paw_mcm.init_mcm_set_ind},
@@ -306,7 +314,7 @@ function populate_set_menus()
{id = "indicator", type= "image", ui_hook_functor={catsy_paw_mcm.init_mcm_header_ind}},
{id = "pin_icon_group", type= "list", on_selection_functor = {catsy_paw_mcm.mcm_on_value_select}, val = 0, def = "pins", content = populate_set_list()},
{id = "divider", type= "line"},
--{id = "fave_recent", type = "list", val = 2, def = 5, content = recfaves},
--{id = "fave_recent", type= "list", val = 2, def = 5, content = recfaves},
}
if load_failed then
@@ -319,7 +327,7 @@ function populate_set_menus()
local newentry = {
id = poi.."faves",
type = "list",
type= "list",
val = 0,
def = icon_sets["faves"].default,
ui_hook_functor = {catsy_paw_mcm.init_mcm_set_ind},
@@ -333,7 +341,7 @@ function populate_set_menus()
local ig = icon_sets[g]
newentry = {
id = poi..g,
type = "list",
type= "list",
val = 0,
def = ig.default,
ui_hook_functor = {catsy_paw_mcm.init_mcm_set_ind},
@@ -344,17 +352,17 @@ function populate_set_menus()
table.insert(gr,newentry)
end
end
table.insert(gr,{id = "divider", type = "line"})
table.insert(gr,{id = "divider", type= "line"})
table.insert(gr,{id = "header", type= "slide", link= "ui_paw_menuslide_badges", size= {512,50}, spacing= 20})
table.insert(gr,{id = "patch_res", type = "list", val = 0, def = "badge",
table.insert(gr,{id = "patch_res", type= "list", val = 0, def = "badge",
content = {
{"badge","pawsys_cfg_badge_res"},
{"badge_hr","pawsys_cfg_badge_hr_res"},
{"badge_uhr","pawsys_cfg_badge_uhr_res"},
}
})
table.insert(gr,{id = "milpda_body_icon", type = "list", val = 0, def = "bodyoff",
table.insert(gr,{id = "milpda_body_icon", type= "list", val = 0, def = "bodyoff",
content = {
{"off","pawsys_cfg_bodyoff"},
{"fac","pawsys_cfg_bodyfac"},
@@ -362,10 +370,10 @@ function populate_set_menus()
}
})
--[[
table.insert(gr,{id = "use_custom_backpack_icon", type = "check", val = 1, def = false})
table.insert(gr,{id = "use_custom_backpack_icon", type= "check", val = 1, def = false})
table.insert(gr,{
id = "custom_backpack_icon",
type = "list",
type= "list",
val = 0,
def = "stash_backpack",
ui_hook_functor = {catsy_paw_mcm.init_mcm_set_ind},
@@ -373,8 +381,8 @@ function populate_set_menus()
content = populate_icon_list("faves")
})
--]]
table.insert(gr,{id = "use_custom_pin_icon", type = "check", val = 1, def = false})
table.insert(gr,{id = "custom_pin_icon", type = "input", val = 0, def = "user_defined"})
table.insert(gr,{id = "use_custom_pin_icon", type= "check", val = 1, def = false})
table.insert(gr,{id = "custom_pin_icon", type= "input", val = 0, def = "user_defined"})
vl("results for populate_set_menus:")
if verbose then
for k,v in pairs(gr) do
@@ -405,12 +413,12 @@ function on_mcm_load()
load_failed = not (paw and paw.load_me())
aspect_ratio = get_current_aspect_ratio()
_ = load_icoset_state()
load_icoset_state()
local pawgen = {
{id = "header", type= "slide", link= "ui_paw_menuslide_main", size= {512,50}, spacing= 20},
{id = "wp_hud_icon_enabled", type = "check", val = 1, def = true},
{id = "show_dist_wp", type = "list", val = 2, def = 4,
{id = "wp_hud_icon_enabled", type= "check", val = 1, def = true},
{id = "show_dist_wp", type= "list", val = 2, def = 4,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -418,7 +426,7 @@ function on_mcm_load()
{0,"pawsys_cmenu_off"},
}
},
{id = "show_dist_pins", type = "list", val = 2, def = 4,
{id = "show_dist_pins", type= "list", val = 2, def = 4,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -426,7 +434,7 @@ function on_mcm_load()
{0,"pawsys_cmenu_off"},
}
},
{id = "show_hint_pins", type = "list", val = 2, def = 2,
{id = "show_hint_pins", type= "list", val = 2, def = 2,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -456,19 +464,19 @@ function on_mcm_load()
{id = "modbin", type= "desc", text = "ui_mcm_paw_modded_binaries"},
}
if load_failed then
table.insert(pawgen,2,{id = "load_header1", type = "desc", text = "st_paw_texture_load_error_mcmhead1", clr = {255,255,0,0}, ui_hook_functor = {catsy_paw_mcm.mcm_init_load_error_block}})
table.insert(pawgen,3,{id = "load_header2", type = "desc", text = "st_paw_texture_load_error_mcmhead2", clr = {255,255,0,0}})
table.insert(pawgen,2,{id = "load_header1", type= "desc", text = "st_paw_texture_load_error_mcmhead1", clr = {255,255,0,0}, ui_hook_functor = {catsy_paw_mcm.mcm_init_load_error_block}})
table.insert(pawgen,3,{id = "load_header2", type= "desc", text = "st_paw_texture_load_error_mcmhead2", clr = {255,255,0,0}})
table.insert(pawgen,4,load_error_text1)
table.insert(pawgen,5,load_error_text2)
table.insert(pawgen,6,{id = "fix_load_order", type= "image", link = "ui_paw_mcm_fix_mo2_load_order", size= {575,50}, ui_hook_functor = {catsy_paw_mcm.mcm_init_load_error_block}})
table.insert(pawgen,7,{id = "disable_load_warning", type = "check", val = 1, def = false})
table.insert(pawgen,7,{id = "disable_load_warning", type= "check", val = 1, def = false})
table.insert(pawgen,8,divider)
else
table.insert(pawgen,2,{id = "pawgen_header", type = "image", link = "ui_paw_emptytex", size = {512,160},
table.insert(pawgen,2,{id = "pawgen_header", type= "image", link = "ui_paw_emptytex", size = {512,160},
ui_hook_functor = {catsy_paw_mcm.mcm_init_header_text_block},
})
table.insert(pawgen,3,{id = "enabled", type = "check", val = 1, def = true})
table.insert(pawgen,3,{id = "enabled", type= "check", val = 1, def = true})
end
op = { id = "pawsys", gr={
@@ -508,7 +516,7 @@ function on_mcm_load()
}
},
{id = "preview_aspect", type = "list", val = 0, def = aspect_ratio,
{id = "preview_aspect", type= "list", val = 0, def = aspect_ratio,
on_selection_functor = {catsy_paw_mcm.mcm_on_value_select},
content = {
{"16_9","paw_aspect_16_9"},
@@ -523,33 +531,33 @@ function on_mcm_load()
ui_hook_functor = {catsy_paw_mcm.init_mcm_pos_preview},
},
{id = "custompos", type = "check", val = 1, def = false,
{id = "custompos", type= "check", val = 1, def = false,
--ui_hook_functor = {catsy_paw_mcm.mcm_move_custom_pos_elements},
on_selection_functor = {catsy_paw_mcm.mcm_on_value_select},
},
{id = "pos_x", type = "input", val = 2, min = 0, max = 1024, def = 491,
{id = "pos_x", type= "input", val = 2, min = 0, max = 1024, def = 491,
--ui_hook_functor = {catsy_paw_mcm.mcm_move_custom_pos_elements},
on_selection_functor = {catsy_paw_mcm.mcm_on_value_select},
},
{id = "pos_y", type = "input", val = 2, min = 0, max = 768, def = 670,
{id = "pos_y", type= "input", val = 2, min = 0, max = 768, def = 670,
--ui_hook_functor = {catsy_paw_mcm.mcm_move_custom_pos_elements},
on_selection_functor = {catsy_paw_mcm.mcm_on_value_select},
},
divider,
{id = "themedesc", type = "desc", text = "ui_mcm_themes_list"},
{id = "themedesc", type= "desc", text = "ui_mcm_themes_list"},
{id = "themelist", type = "desc", text = "ui_mcm_themes_classicauto"},
{id = "themelist", type = "desc", text = "ui_mcm_themes_classic"},
{id = "themelist", type = "desc", text = "ui_mcm_themes_vertright"},
{id = "themelist", type = "desc", text = "ui_mcm_themes_vertleft"},
{id = "themelist", type = "desc", text = "ui_mcm_themes_gamma_left"},
{id = "themelist", type = "desc", text = "ui_mcm_themes_gamma_right"},
{id = "themelist", type = "desc", text = "ui_mcm_themes_minimal_h"},
{id = "themelist", type = "desc", text = "ui_mcm_themes_minimal_v"},
{id = "themelist", type = "desc", text = "ui_mcm_themes_minicom"},
{id = "themelist", type = "desc", text = "ui_mcm_themes_compact_noui"},
{id = "themelist", type= "desc", text = "ui_mcm_themes_classicauto"},
{id = "themelist", type= "desc", text = "ui_mcm_themes_classic"},
{id = "themelist", type= "desc", text = "ui_mcm_themes_vertright"},
{id = "themelist", type= "desc", text = "ui_mcm_themes_vertleft"},
{id = "themelist", type= "desc", text = "ui_mcm_themes_gamma_left"},
{id = "themelist", type= "desc", text = "ui_mcm_themes_gamma_right"},
{id = "themelist", type= "desc", text = "ui_mcm_themes_minimal_h"},
{id = "themelist", type= "desc", text = "ui_mcm_themes_minimal_v"},
{id = "themelist", type= "desc", text = "ui_mcm_themes_minicom"},
{id = "themelist", type= "desc", text = "ui_mcm_themes_compact_noui"},
divider,
},
},
@@ -557,28 +565,28 @@ function on_mcm_load()
-- KEYBIND SETTINGS
{ id = "pawbinds", sh=true, gr={
{id = "header", type= "slide", link= "ui_paw_menuslide_controls", size= {512,50}, borderless= true, spacing= 20},
{id = "featurehead", type = "desc", clr = {255,255,255,0}, text = "ui_mcm_paw_cartmode_head"},
{id = "featuredesc", type = "desc", text = "ui_mcm_paw_cartmode_desc"},
{id = "featurehead", type= "desc", clr = {255,255,255,0}, text = "ui_mcm_paw_cartmode_head"},
{id = "featuredesc", type= "desc", text = "ui_mcm_paw_cartmode_desc"},
{id = "bind_cartmode", type = "key_bind", val = 2, def = DIK_keys.DIK_SLASH },
{id = "modk_cartmode", type = ui_mcm.kb_mod_radio, val = 2, def = 0, hint = "mcm_kb_modifier",
{id = "bind_cartmode", type= "key_bind", val = 2, def = DIK_keys.DIK_SLASH },
{id = "modk_cartmode", type= ui_mcm.kb_mod_radio, val = 2, def = 0, hint = "mcm_kb_modifier",
content = {
{0,"mcm_kb_mod_none"},
{1,"mcm_kb_mod_shift"},
{2,"mcm_kb_mod_ctrl"},
{3,"mcm_kb_mod_alt"}
}},
{id = "cartmode_toggle", type = "check", val = 1, def = true},
{id = "cartmode_unfade", type = "check", val = 1, def = true},
{id = "cart_shows_smarts", type = "check", val = 1, def = false},
{id = "cartmode_toggle", type= "check", val = 1, def = true},
{id = "cartmode_unfade", type= "check", val = 1, def = true},
{id = "cart_shows_smarts", type= "check", val = 1, def = false},
divider,
{id = "featurehead", type = "desc", clr = {255,255,255,0}, text = "ui_mcm_paw_crosshair_target_head"},
{id = "featuredesc", type = "desc", text = "ui_mcm_paw_crosshair_target_desc"},
{id = "featurehead", type= "desc", clr = {255,255,255,0}, text = "ui_mcm_paw_crosshair_target_head"},
{id = "featuredesc", type= "desc", text = "ui_mcm_paw_crosshair_target_desc"},
{id = "bind_wp_target_obj", type = "key_bind", val = 2, def = DIK_keys.DIK_SEMICOLON },
{id = "modk_wp_target_obj", type = ui_mcm.kb_mod_radio, val = 2, def = 3, hint = "mcm_kb_modifier",
{id = "bind_wp_target_obj", type= "key_bind", val = 2, def = DIK_keys.DIK_SEMICOLON },
{id = "modk_wp_target_obj", type= ui_mcm.kb_mod_radio, val = 2, def = 3, hint = "mcm_kb_modifier",
content = {
{0,"mcm_kb_mod_none"},
{1,"mcm_kb_mod_shift"},
@@ -586,8 +594,8 @@ function on_mcm_load()
{3,"mcm_kb_mod_alt"}
}},
{id = "bind_pin_target_obj", type = "key_bind", val = 2, def = DIK_keys.DIK_APOSTROPHE },
{id = "modk_pin_target_obj", type = ui_mcm.kb_mod_radio, val = 2, def = 3, hint = "mcm_kb_modifier",
{id = "bind_pin_target_obj", type= "key_bind", val = 2, def = DIK_keys.DIK_APOSTROPHE },
{id = "modk_pin_target_obj", type= ui_mcm.kb_mod_radio, val = 2, def = 3, hint = "mcm_kb_modifier",
content = {
{0,"mcm_kb_mod_none"},
{1,"mcm_kb_mod_shift"},
@@ -597,18 +605,18 @@ function on_mcm_load()
divider,
{id = "featurehead", type = "desc", clr = {255,255,255,0}, text = "ui_mcm_paw_generalbinds_head"},
{id = "featurehead", type= "desc", clr = {255,255,255,0}, text = "ui_mcm_paw_generalbinds_head"},
{id = "bind_wptoggle", type = "key_bind", val = 2, def = DIK_keys.DIK_SEMICOLON },
{id = "modk_wptoggle", type = ui_mcm.kb_mod_radio, val = 2, def = 0, hint = "mcm_kb_modifier",
{id = "bind_wptoggle", type= "key_bind", val = 2, def = DIK_keys.DIK_SEMICOLON },
{id = "modk_wptoggle", type= ui_mcm.kb_mod_radio, val = 2, def = 0, hint = "mcm_kb_modifier",
content = {
{0,"mcm_kb_mod_none"},
{1,"mcm_kb_mod_shift"},
{2,"mcm_kb_mod_ctrl"},
{3,"mcm_kb_mod_alt"}
}},
{id = "bind_quickpin", type = "key_bind", val = 2, def = DIK_keys.DIK_APOSTROPHE },
{id = "modk_quickpin", type = ui_mcm.kb_mod_radio, val = 2, def = 0, hint = "mcm_kb_modifier",
{id = "bind_quickpin", type= "key_bind", val = 2, def = DIK_keys.DIK_APOSTROPHE },
{id = "modk_quickpin", type= ui_mcm.kb_mod_radio, val = 2, def = 0, hint = "mcm_kb_modifier",
content = {
{0,"mcm_kb_mod_none"},
{1,"mcm_kb_mod_shift"},
@@ -618,8 +626,8 @@ function on_mcm_load()
divider,
{id = "bind_set_next", type = "key_bind", val = 2, def = 52 },
{id = "modk_set_next", type = ui_mcm.kb_mod_radio, val = 2, def = 3, hint = "mcm_kb_modifier",
{id = "bind_set_next", type= "key_bind", val = 2, def = 52 },
{id = "modk_set_next", type= ui_mcm.kb_mod_radio, val = 2, def = 3, hint = "mcm_kb_modifier",
content = {
{0,"mcm_kb_mod_none"},
{1,"mcm_kb_mod_shift"},
@@ -627,24 +635,24 @@ function on_mcm_load()
{3,"mcm_kb_mod_alt"}
}},
{id = "bind_set_prev", type = "key_bind", val = 2, def = 51 },
{id = "modk_set_prev", type = ui_mcm.kb_mod_radio, val = 2, def = 3, hint = "mcm_kb_modifier",
{id = "bind_set_prev", type= "key_bind", val = 2, def = 51 },
{id = "modk_set_prev", type= ui_mcm.kb_mod_radio, val = 2, def = 3, hint = "mcm_kb_modifier",
content = {
{0,"mcm_kb_mod_none"},
{1,"mcm_kb_mod_shift"},
{2,"mcm_kb_mod_ctrl"},
{3,"mcm_kb_mod_alt"}
}},
{id = "bind_ico_next", type = "key_bind", val = 2, def = 52 },
{id = "modk_ico_next", type = ui_mcm.kb_mod_radio, val = 2, def = 0, hint = "mcm_kb_modifier",
{id = "bind_ico_next", type= "key_bind", val = 2, def = 52 },
{id = "modk_ico_next", type= ui_mcm.kb_mod_radio, val = 2, def = 0, hint = "mcm_kb_modifier",
content = {
{0,"mcm_kb_mod_none"},
{1,"mcm_kb_mod_shift"},
{2,"mcm_kb_mod_ctrl"},
{3,"mcm_kb_mod_alt"}
}},
{id = "bind_ico_prev", type = "key_bind", val = 2, def = 51 },
{id = "modk_ico_prev", type = ui_mcm.kb_mod_radio, val = 2, def = 0, hint = "mcm_kb_modifier",
{id = "bind_ico_prev", type= "key_bind", val = 2, def = 51 },
{id = "modk_ico_prev", type= ui_mcm.kb_mod_radio, val = 2, def = 0, hint = "mcm_kb_modifier",
content = {
{0,"mcm_kb_mod_none"},
{1,"mcm_kb_mod_shift"},
@@ -654,20 +662,20 @@ function on_mcm_load()
divider,
{id = "featurehead", type = "desc", clr = {255,255,255,0}, text = "ui_mcm_paw_mousewheel_head"},
{id = "featurehead", type= "desc", clr = {255,255,255,0}, text = "ui_mcm_paw_mousewheel_head"},
{id = "mwheel_enabled", type = "check", val = 1, def = true},
{id = "mwheel_notify", type = "check", val = 1, def = true},
{id = "bind_set_scroll", type = "key_bind", val = 2, def = DIK_keys.DIK_Z},
{id = "modk_set_scroll", type = ui_mcm.kb_mod_radio, val = 2, def = 2, hint = "mcm_kb_modifier",
{id = "mwheel_enabled", type= "check", val = 1, def = true},
{id = "mwheel_notify", type= "check", val = 1, def = true},
{id = "bind_set_scroll", type= "key_bind", val = 2, def = DIK_keys.DIK_Z},
{id = "modk_set_scroll", type= ui_mcm.kb_mod_radio, val = 2, def = 2, hint = "mcm_kb_modifier",
content = {
{0,"mcm_kb_mod_none"},
{1,"mcm_kb_mod_shift"},
{2,"mcm_kb_mod_ctrl"},
{3,"mcm_kb_mod_alt"}
}},
{id = "bind_ico_scroll", type = "key_bind", val = 2, def = DIK_keys.DIK_Z },
{id = "modk_ico_scroll", type = ui_mcm.kb_mod_radio, val = 2, def = 3, hint = "mcm_kb_modifier",
{id = "bind_ico_scroll", type= "key_bind", val = 2, def = DIK_keys.DIK_Z },
{id = "modk_ico_scroll", type= ui_mcm.kb_mod_radio, val = 2, def = 3, hint = "mcm_kb_modifier",
content = {
{0,"mcm_kb_mod_none"},
{1,"mcm_kb_mod_shift"},
@@ -682,10 +690,10 @@ function on_mcm_load()
{ id = "pawmenu", sh=true, gr={
-- Virtualize in ltx like the others at some point
{id = "header", type= "slide", link= "ui_paw_menuslide_menus", size= {512,50}, borderless= true, spacing= 20},
{id = "headertxt", type = "desc", text = "ui_mcm_pawsys_pawmenu_headertxt"},
{id = "headertxt", type= "desc", text = "ui_mcm_pawsys_pawmenu_headertxt"},
{id = "wp_settings", type = "list", val = 2, def = 4,
{id = "wp_settings", type= "list", val = 2, def = 4,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -694,7 +702,7 @@ function on_mcm_load()
}
},
{id = "pn_settings", type = "list", val = 2, def = 4,
{id = "pn_settings", type= "list", val = 2, def = 4,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -703,7 +711,7 @@ function on_mcm_load()
}
},
{id = "wp_set", type = "list", val = 2, def = 4,
{id = "wp_set", type= "list", val = 2, def = 4,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -711,7 +719,7 @@ function on_mcm_load()
{0,"pawsys_cmenu_off"},
}
},
{id = "wp_mov", type = "list", val = 2, def = 4,
{id = "wp_mov", type= "list", val = 2, def = 4,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -720,7 +728,7 @@ function on_mcm_load()
}
},
{id = "wp_del", type = "list", val = 2, def = 4,
{id = "wp_del", type= "list", val = 2, def = 4,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -729,7 +737,7 @@ function on_mcm_load()
}
},
{id = "pn_add", type = "list", val = 2, def = 4,
{id = "pn_add", type= "list", val = 2, def = 4,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -738,7 +746,7 @@ function on_mcm_load()
}
},
{id = "pn_del", type = "list", val = 2, def = 4,
{id = "pn_del", type= "list", val = 2, def = 4,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -747,7 +755,7 @@ function on_mcm_load()
}
},
--[[
{id = "pn_ren", type = "list", val = 2, def = 4,
{id = "pn_ren", type= "list", val = 2, def = 4,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -756,7 +764,7 @@ function on_mcm_load()
}
},
--]]
{id = "show_all_pins", type = "list", val = 2, def = 2,
{id = "show_all_pins", type= "list", val = 2, def = 2,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -765,7 +773,7 @@ function on_mcm_load()
}
},
{id = "hide_all_pins", type = "list", val = 2, def = 2,
{id = "hide_all_pins", type= "list", val = 2, def = 2,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -774,7 +782,7 @@ function on_mcm_load()
}
},
{id = "lock_pin", type = "list", val = 2, def = 2,
{id = "lock_pin", type= "list", val = 2, def = 2,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -783,7 +791,7 @@ function on_mcm_load()
}
},
{id = "unlock_pin", type = "list", val = 2, def = 4,
{id = "unlock_pin", type= "list", val = 2, def = 4,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -792,7 +800,7 @@ function on_mcm_load()
}
},
{id = "hud_vis_on", type = "list", val = 2, def = 2,
{id = "hud_vis_on", type= "list", val = 2, def = 2,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -801,7 +809,7 @@ function on_mcm_load()
}
},
{id = "hud_vis_off", type = "list", val = 2, def = 4,
{id = "hud_vis_off", type= "list", val = 2, def = 4,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -810,7 +818,7 @@ function on_mcm_load()
}
},
{id = "show_label", type = "list", val = 2, def = 2,
{id = "show_label", type= "list", val = 2, def = 2,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -819,7 +827,7 @@ function on_mcm_load()
}
},
{id = "hide_label", type = "list", val = 2, def = 4,
{id = "hide_label", type= "list", val = 2, def = 4,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -828,7 +836,7 @@ function on_mcm_load()
}
},
{id = "convert_to_pin", type = "list", val = 2, def = 2,
{id = "convert_to_pin", type= "list", val = 2, def = 2,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -837,7 +845,7 @@ function on_mcm_load()
}
},
{id = "pn_clr", type = "list", val = 2, def = 0,
{id = "pn_clr", type= "list", val = 2, def = 0,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
@@ -846,7 +854,7 @@ function on_mcm_load()
}
},
{id = "mping", type = "list", val = 2, def = 2,
{id = "mping", type= "list", val = 2, def = 2,
content = {
{4,"pawsys_cmenu_all"},
{1,"pawsys_cmenu_norm"},
mods/Personal Adjustable Waypoint/gamedata/scripts/tasks_placeable_waypoints.script
+32 -17
View File
@@ -8,8 +8,8 @@
https://www.youtube.com/channel/UCtG8fiWPUZEzWlkUn60btAw
Source: https://www.moddb.com/mods/stalker-anomaly/addons/personal-adjustable-waypoint-for-anomaly-151-152-and-gamma
Version: 2.1.2
Updated: 20240320
Version: 2.1.3
Updated: 20240330
You may alter any part of this mod and do whatever you like with it,
just give credit where due.
@@ -40,8 +40,8 @@
-- SHORTCUTS, FLAGS, AND SYSTEM STUFF
(Most of which you probably shouldn't muck with)
-- ===================================================================--]]
script_version = "2.1.2"
release_date = 20240320
script_version = "2.1.3"
release_date = 20240330
local scriptname = "tasks_placeable_waypoints"
local logprefix = "<PAW> "
local language = "eng"
@@ -174,7 +174,6 @@ mark_on_positive_id = true
reticle_mustzoom = true
reticle_mode = 2
autotag_mode = 0
autotag_milpda_feature = true
autotag_persistence = false -- if enabled, autotags are cleared on map change or the below timeout value
autotag_lifetime = 120 * 6 -- time in ms before autotags are cleared (def 2 minutes)
autotags_time_out = autotag_lifetime > 0
@@ -316,23 +315,26 @@ dynamic_faves = pawdata.dynamic_faves -- not implemented yet
-- ======================================================================
pda_defs = {
-- By default, all PDAs support waypointing
-- By default, all PDAs support waypointing and autotag
["device_pda_1"] = {
show_w = true,
autotag = true,
},
["device_pda_2"] = {
show_w = true,
},
autotag = true, },
["device_pda_3"] = {
show_w = true,
},
autotag = true, },
["device_pda_milspec"] = {
show_w = true,
autotag = true,
},
-- If you use an addon with an unsupported PDA section, add it here
-- ["device_pda_added_by_your_mod"] = {
-- show_w = false,
-- },
-- ["device_pda_added_by_your_mod"] = {
-- show_w = false,
-- autotag = false,
-- },
}
@@ -845,12 +847,13 @@ function safename(id)
end
function valid_pda()
function valid_pda(feature)
feature = feature or "show_w"
local dev = db.actor and db.actor:item_in_slot(8)
local sec = dev and dev:section()
if not sec then return false end
if dev and pda_defs[sec] then
if pda_defs[sec].show_w then return true end
if pda_defs[sec][feature] then return true end
elseif item_device.device_npc_pda[sec] then
local text = ts("st_paw_npc_pda_equipped")
dotip(text)
@@ -1724,6 +1727,8 @@ function create_smart_pin(notip,silent)
end
function autotag_target(notip,silent)
--if not valid_pda("autotag") then return end
local id = create_smart_pin(true)
set_pingspot_persistence(id,autotag_persistence)
set_pin_persistence(id,autotag_persistence)
@@ -1887,7 +1892,7 @@ function execute_context_menu_option(property_ui,id,level_name,prop)
id = last_clicked_id
last_clicked_id = nil
vl("execute_context_menu_option called for id %s\n| prop: %s\n| action %s",id,prop,action[prop])
if not (paw_enabled and id and valid_pda()) then return end
if not (paw_enabled and id and valid_pda("show_w")) then return end
if not (id and (id > 0)) then return end
local se_obj = alife_object(id)
if not se_obj then return end
@@ -2448,6 +2453,7 @@ function mcm_reload_reticle_settings()
reticle_color.a = load_mcm("pawret/reticle_alpha",reticle_color.a)
ret_fade_attack_time = load_mcm("pawret/ret_fade_attack_time",ret_fade_attack_time)
ret_fade_decay_time = load_mcm("pawret/ret_fade_decay_time",ret_fade_decay_time)
vl("Autotag settings: mode %s | mustzoom %s | manual %s",autotag_mode,reticle_mustzoom,manual_smart_pins)
for k,v in pairs(smart_pins) do
smart_pins[k].pin = load_mcm("pawret/"..k,v.pin)
smart_pins[k].enabled = load_mcm("pawret/"..k.."_enable",v.enabled)
@@ -2461,8 +2467,8 @@ function mcm_reload_reticle_settings()
if did ~= nil then
npc_ident.id_bodies = did
end
npc_ident.id_speed = ui_mcm.get("targetID/speedID") or 0.3
npc_ident.lenience = ui_mcm.get("targetID/targL") or 0.99
npc_ident.id_speed = tonumber(ui_mcm.get("targetID/speedID")) or 0.3
npc_ident.lenience = tonumber(ui_mcm.get("targetID/targL")) or 0.99
end
end
@@ -2479,6 +2485,15 @@ function on_option_change()
if load_mcm("pawgen/wipe_all") then
ui_mcm.set("pawsys/pawgen/wipe_all",false)
dl("MCM: Wiping all pin data per player request")
local hudpins = hud_pin_objs
for k,v in pairs(hudpins) do
hide_hud_pin(k)
end
hud_pin_objs = {}
for k,v in pairs(map_labels) do
map_labels[k].box:Show(false)
end
map_labels = {}
local args = {wipe_all=true,syscall=true}
do_paw_action("pn_clr",nil,nil,args)
end
@@ -2923,7 +2938,7 @@ function UIPinSettingsWnd:__init(id,args) super()
)
if pins[id].custom_colors and pins[id].colors then
local colors = pins[id].colors
printf(logprefix.."A: %s | R: %s | G: %s | B: %s",colors.a,colors.r,colors.g,colors.b)
--printf(logprefix.."A: %s | R: %s | G: %s | B: %s",colors.a,colors.r,colors.g,colors.b)
end
end
self.init_time = tostring(get_time_elapsed())
mods/Personal Adjustable Waypoint/meta.ini
+2 -2
View File
@@ -1,11 +1,11 @@
[General]
gameName=stalkeranomaly
modid=0
version=2.1.2.0
version=2.1.3.0
newestVersion=
category="3,"
nexusFileStatus=1
installationFile=Catspaw_Personal_Adjustable_Waypoint-2.1.2.zip
installationFile=Catspaw_Personal_Adjustable_Waypoint-2.1.3.zip
repository=Nexus
ignoredVersion=
comments=