Skip to content

Commit

Permalink
Merge pull request #582 from payday-restoration/dev
Browse files Browse the repository at this point in the history 
V12.1.1
  • Loading branch information
@EssCee
EssCee authored Jul 4, 2023
2 parents ca20efd + 7af22aa commit 33fcf38
Show file tree
Hide file tree
Showing 209 changed files with 16,777 additions and 12,171 deletions.
19 changes: 17 additions & 2 deletions Core.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,12 @@ function restoration:Init()
restoration.disco_inferno = false
restoration.force_halloween = false
restoration.always_bravos = false

--Disable Bravos spawning on PONRs for these heists, usually for heists that have PONRs that go on/off. Also kills forced 1 diff and music changes on Pro Job
restoration.alternate_ponr_behavior = {
"sand", --The Ukrainian Prisoner
"trai" --Lost in Transit
}

--Increased spawns, should only be reserved for larger maps.
restoration.very_large_levels = {
Expand Down Expand Up @@ -237,6 +243,7 @@ function restoration:Init()
"ascension_III", --Ascension (project eclipse 3)
"RogueCompany", --Rogue Company
"battlearena", --Five-G
"constantine_train_lvl",
"constantine_penthouse_lvl", --Penthouse Crashers (Constantine Scores)
"constantine_resort_lvl", --Scarlett Resort (Constantine Scores)
"constantine_murkyairport_lvl", --Murky Airport (Constantine Scores)
Expand Down Expand Up @@ -357,7 +364,6 @@ function restoration:Init()
restoration.fuck_hunt = {
"kenaz", --ggc
"pines", --white xmas
"spa", --brooklyn 10-10
"jolly", --aftershock
"born", --biker heist D1
"ukrainian_job", --uk joj
Expand All @@ -379,6 +385,7 @@ function restoration:Init()
"dinner",
"trai",
"corp",
--"deep",
--Custom Heists--
"tonmapjam22l"
}
Expand All @@ -400,6 +407,14 @@ function restoration:Init()
"hunter_fall",
"ruswl"
}
--GenSec (custom heists)
restoration.gensec = {
"constantine_penthouse_lvl"
}
--Cartel (custom heists)
restoration.cartel = {
"constantine_train_lvl"
}

restoration.Environment_Settings_Table = {} --leave blank, it will generate contents based on the table below

Expand Down Expand Up @@ -720,7 +735,7 @@ function restoration:mission_script_patches()
if self._mission_script_patches == nil then
local level_id = Global.game_settings and Global.game_settings.level_id
if level_id then
self._mission_script_patches = self:require("mission_script/" .. level_id:gsub("_night$", ""):gsub("_day$", "")) or false
self._mission_script_patches = self:require("mission_script/" .. level_id:gsub('_skip1$', ''):gsub('_skip2$', ''):gsub("_night$", ""):gsub("_day$", "")) or false
end
end
return self._mission_script_patches
Expand Down
52 changes: 23 additions & 29 deletions addSC.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,7 @@
<texture path="guis/dlcs/bro/textures/pd2/crimenet/counterfeit" force="true"/>
<texture path="guis/dlcs/bro/textures/pd2/crimenet/undercover" force="true"/>
<texture path="guis/dlcs/bro/textures/pd2/crimenet/dah" force="true"/>
<texture path="guis/dlcs/nmh/textures/pd2/crimenet/nmh" force="true"/>

<!-- hotline day 2 -->
<mission path="levels/instances/unique/hlm_random_left003/world/world" force="true" unload="true"/>
<mission path="levels/instances/unique/hlm_random_right003/world/world" force="true" unload="true"/>
<texture path="guis/dlcs/nmh/textures/pd2/crimenet/nmh" force="true"/>

<!--New logo-->
<texture path="guis/textures/game_small_logo" force="true"/>
Expand Down Expand Up @@ -93,8 +89,12 @@
<model path="units/payday2/props/str_prop_alley_trash_container/str_prop_alley_trash_container" force="true"/>
<texture path="units/payday2/props/str_prop_alley_trash_container/str_prop_alley_trash_container_df" force="true"/>
<texture path="units/payday2/props/str_prop_alley_trash_container/str_prop_alley_trash_container_nm" force="true"/>

<!--Tiny Heist Edits that Change like a few things-->

<!--Tiny Heist Edits that Change like a few things-->
<!-- hotline day 2 -->
<mission path="levels/instances/unique/hlm_random_left003/world/world" force="true" unload="true"/>
<mission path="levels/instances/unique/hlm_random_right003/world/world" force="true" unload="true"/>

<mission path="levels/instances/unique/trai/trai_main_wagon/world/world" force="true" unload="true"/> <!--10% chance of bravo dozer spawning inside the vault on very hard and above (loud only)-->

<mission path="levels/instances/unique/pbr/pbr_plane_cargo/world/world" force="true" unload="true"/> <!--makes the murkydozers use their actual models on the plane. not gonna touch the other instance,
Expand Down Expand Up @@ -155,6 +155,7 @@
<mission path="levels/instances/unique/sand/sand_spawn_enemies/world/world" force="true"/>
<mission path="levels/instances/unique/sand/sand_helicopter_spawn_enemies/world/world" force="true"/>
<mission path="levels/instances/unique/chca/chca_helicopter_enemies/world/world" force="true"/>
<mission path="levels/instances/unique/deep/deep_helicopter_enemies/world/world" force="true"/>
<mission path="levels/instances/unique/glace/glace_helicopter_dozer/world/world" force="true"/>
<mission path="levels/instances/unique/glace/glace_helicopter_swat/world/world" force="true"/>
<mission path="levels/instances/unique/pet_helicopter_swat/world/world" force="true"/>
Expand All @@ -172,7 +173,6 @@
<continent path="levels/narratives/bain/big/world/world" force="true" unload="true"/> <!--you can now drill the small cashbox, money cassettes spawn-->

<continent path="levels/narratives/classics/dah/world/world" force="true" unload="true"/>
<!--<nav_data path="levels/narratives/classics/dah/nav_manager_data" force="true" unload="true"/>-->

<cover_data path="levels/narratives/h_firestarter/stage_3/cover_data" force="true" unload="true"/>
<nav_data path="levels/narratives/h_firestarter/stage_3/nav_manager_data" force="true" unload="true"/>
Expand Down Expand Up @@ -251,12 +251,6 @@

<!--Misc. Changes and Fixes to Base Game Objects-->

<!-- Hoxton Breakout FBI Boss Vetcop -->
<unit path="units/payday2/characters/ene_fbi_boss_1/ene_fbi_boss_1" load="true" force="true" />
<object path="units/payday2/characters/ene_fbi_boss_1/ene_fbi_boss_1" force="true" />
<unit path="units/payday2/characters/ene_fbi_boss_1/ene_fbi_boss_1_husk" load="true" force="true" />

<!--Load Jerome The Shotty Man in case if some heist has them missing in the package-->
<add from_db="true" path="units/payday2/characters/ene_security_3/ene_security_3" type="unit">
<unit load="true" path="units/payday2/characters/ene_security_3/ene_security_3"/>
<object path="units/payday2/characters/ene_security_3/ene_security_3"/>
Expand Down Expand Up @@ -408,11 +402,7 @@
<!--Corrected NPC Weapon Sounds-->
<unit path="units/payday2/weapons/wpn_npc_ump/wpn_npc_ump" force="true" load="true" />
<unit path="units/payday2/weapons/wpn_npc_c45/wpn_npc_c45" force="true" load="true"/>
<unit path="units/pd2_dlc_chico/weapons/wpn_npc_sg417/wpn_npc_sg417" force="true" load="true"/>

<!--Panic Room Bullet Impact Fixes-->
<object path="units/pd2_dlc_flat/characters/npc_chavez/npc_chavez" force="true" />
<object path="units/pd2_dlc_flat/characters/npc_jamaican/npc_jamaican" force="true" />
<unit path="units/pd2_dlc_chico/weapons/wpn_npc_sg417/wpn_npc_sg417" force="true" load="true"/>

<!--Cops for the Bomb: Forest heist-->
<unit path="units/payday2/characters/ene_cop_1_forest/ene_cop_1_forest" load="true"/>
Expand Down Expand Up @@ -1198,16 +1188,17 @@
<texture path="units/pd2_dlc_usm1/characters/shared_textures/ene_marshal_equipment_merc_df" force="true"/>

<!--Omnia Buff Effect-->
<object path="units/pd2_mod_omnia/characters/ene_acc_omnia_buff/ene_acc_omnia_buff" force="false"/>
<cooked_physics path="units/pd2_mod_omnia/characters/ene_acc_omnia_buff/ene_acc_omnia_buff" force="false"/>
<model path="units/pd2_mod_omnia/characters/ene_acc_omnia_buff/ene_acc_omnia_buff" force="false"/>
<unit path="units/pd2_mod_omnia/characters/ene_acc_omnia_buff/ene_acc_omnia_buff" force="false" load="false"/>
<material_config path="units/pd2_mod_omnia/characters/ene_acc_omnia_buff/ene_acc_omnia_buff" force="false"/>

<effect path="effects/pd2_mod_omnia/particles/character/overkillpack/mega_rad_mutant_smoke_puff" load="false"/>
<effect path="effects/pd2_mod_omnia/particles/character/overkillpack/parts/green_smoke_var_01" load="false"/>
<effect path="effects/pd2_mod_omnia/particles/character/overkillpack/parts/green_smoke_var_02" load="false"/>
<effect path="effects/pd2_mod_omnia/particles/character/overkillpack/parts/green_smoke_var_03" load="false"/>
<object path="units/pd2_mod_omnia/characters/ene_acc_omnia_buff/ene_acc_omnia_buff" force="false"/>
<cooked_physics path="units/pd2_mod_omnia/characters/ene_acc_omnia_buff/ene_acc_omnia_buff" force="false"/>
<model path="units/pd2_mod_omnia/characters/ene_acc_omnia_buff/ene_acc_omnia_buff" force="false"/>
<unit path="units/pd2_mod_omnia/characters/ene_acc_omnia_buff/ene_acc_omnia_buff" force="false" load="true"/>
<material_config path="units/pd2_mod_omnia/characters/ene_acc_omnia_buff/ene_acc_omnia_buff" force="false"/>

<effect path="effects/pd2_mod_omnia/particles/character/overkillpack/mega_rad_mutant_smoke_puff" load="false"/>
<effect path="effects/pd2_mod_omnia/particles/character/overkillpack/parts/green_smoke_var_01" load="false"/>
<effect path="effects/pd2_mod_omnia/particles/character/overkillpack/parts/green_smoke_var_02" load="false"/>
<effect path="effects/pd2_mod_omnia/particles/character/overkillpack/parts/green_smoke_var_03" load="false"/>
<effect path="effects/pd2_mod_omnia/particles/character/shadow_cloaker/smoke_trail/smoke_distorted" load = "true"/>

<!--Loading Screen Tips-->
<texture path="guis/textures/loading/hints/grenadier_load" force="false"/>
Expand Down Expand Up @@ -1246,6 +1237,7 @@
<!--Sniper Trails-->
<effect path="effects/particles/weapons/sniper_trail_sc" force="false"/>
<effect path="effects/particles/weapons/titan_trail_sc" force="false"/>
<effect path="effects/particles/weapons/akan_titan_trail_sc" force="false"/>

<!--Weapon Mod Trails-->
<!--M249/240 casings-->
Expand Down Expand Up @@ -1384,6 +1376,8 @@

<!--Weapon Unit Overrides-->
<unit path="units/pd2_dlc_tawp/weapons/wpn_fps_pis_rsh12/wpn_fps_pis_rsh12" load="false"/>
<unit path="units/pd2_dlc_osa/weapons/wpn_fps_sho_x_judge/wpn_fps_pis_x_judge" load="false"/>
<unit path="units/pd2_dlc_osa/weapons/wpn_fps_pis_x_rage/wpn_fps_pis_x_rage" load="false"/>

<object path="units/pd2_dlc_pxp1/weapons/wpn_fps_snp_scout_pts/wpn_fps_snp_scout_b_standard" load="false"/>
<object path="units/pd2_dlc_pxp1/weapons/wpn_fps_snp_scout_pts/wpn_fps_snp_scout_body_standard" load="false"/>
Expand Down
4 changes: 4 additions & 0 deletions addoutfit.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,10 @@
<material_config path="units/pd2_mod_suits/characters/shared_materials/res_acc_suit_sunny_soprano_green_sydney"/>
<material_config path="units/pd2_mod_suits/characters/shared_materials/res_acc_suit_sunny_soprano_green_joy"/>

<!--<texture path="units/pd2_mod_suits/characters/shared_textures/res_acc_suit_sunny_neon_df"/>-->
<!--<texture path="units/pd2_mod_suits/characters/shared_textures/res_acc_suit_sunny_neonred_il"/>-->
<!--<material_config path="units/pd2_mod_suits/characters/shared_materials/res_acc_suit_sunny_neonred"/>-->



<!--Prison suit stuff-->
Expand Down
63 changes: 63 additions & 0 deletions assets/effects/particles/weapons/akan_titan_trail_sc.effect
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<effect force_synch="false">
<atom name="trail" min_size="1" max_size="1" lifetime="6" random_start_time="false" start_time="0" preroll="0" inherit_velocity_multiplier="1" fade_in_start="-1" fade_in_length="0" fade_out_start="-1" spawn_cull_policy="initialize" cull_policy="update_render" cull_gracetime="0" max_particle_radius="-1" soundbank="" cue="" ambient="false" grab_relative="effect" grab_pos="0 0 0" grab_radius="200" grab_backfacing="false" timeline="">
<initializerstack>
<boxrandomposition relative="effect" min="-1 -1 -1" max="1 1 1"/>
<boxrandomvelocity relative="effect" min="0 0 1000" max="0 0 1000"/>
<boxrandomrotation relative="effect" min="0 1 0" max="0 1 0" min_rot="0" max_rot="0"/>
<boxrandomaspectsize size="2 10" min="1" max="1"/>
</initializerstack>
<simulatorstack>
<scaledvelocityintegrator channel="world" per_particle_age="false">
<scale_keys loop="false">
<key t="0" v="0"/>
</scale_keys>
</scaledvelocityintegrator>
<rotationbyvelocity velocity="10000"/>
<variablesize name="simulator_length" size="5 15000"/>
</simulatorstack>
<visualizerstack>
<billboard texture="effects/textures/add_atlas_df" intensity="sun" billboard_type="normal_locked" rotation_channel="world_rotation" blend_mode="add" render_template="effect_op_add" origo="0.5 1" per_particle_age="false" size_input="scaled_channel" color_input="keys" opacity_input="constant" opacity="255" rotation_input="constant" rotation="0" rotation_axis="0 0 1" uv_size="0.25 0.074" uv_offset_input="constant" uv_offset="0.5 0.17">
<size_scale_keys loop="false">
<key t="0" v="1 1"/>
<key t="0.4716010093689" v="1.5 1"/>
<key t="0.85365855693817" v="1 1"/>
<key t="1.6144579648972" v="0 1"/>
</size_scale_keys>
<color_keys loop="false">
<key t="0" v="0 0 66"/>
<key t="0.15228426456451" v="0 145 145"/>
<key t="0.33840948343277" v="0 255 255"/>
<key t="1.9966160058975" v="0 0 0"/>
</color_keys>
</billboard>
<billboard texture="effects/textures/add_atlas_df" intensity="sun" billboard_type="normal_locked" rotation_channel="world_rotation" blend_mode="normal" render_template="heat_shimmer" origo="0.5 1" per_particle_age="false" size_input="scaled_channel" color_input="constant" color="255 255 255" opacity_input="keys" rotation_input="constant" rotation="0" rotation_axis="0 0 1" uv_size="0.25 0.125" uv_offset_input="constant" uv_offset="0.5 0.17">
<size_scale_keys loop="false">
<key t="0" v="1 0"/>
<key t="0.15228426456451" v="5 1"/>
</size_scale_keys>
<opacity_keys loop="false">
<key t="0.030456852167845" v="255"/>
<key t="0.28087985515594" v="20"/>
<key t="0.50384616851807" v="0"/>
</opacity_keys>
</billboard>
</visualizerstack>
</atom>
<atom name="Glow" min_size="1" max_size="1" lifetime="12" random_start_time="false" start_time="0" preroll="0" inherit_velocity_multiplier="1" fade_in_start="-1" fade_in_length="0" fade_out_start="-1" spawn_cull_policy="initialize" cull_policy="update" cull_gracetime="0" max_particle_radius="-1" soundbank="" cue="" ambient="false" grab_relative="effect" grab_pos="0 0 0" grab_radius="200" grab_backfacing="false" timeline="">
<initializerstack>
<localboxrandomposition min="0 0 0" max="0 0 0"/>
<boxrandomcolor min="253.00001525879 136 57.000003814697" max="251.00001525879 209.00001525879 168"/>
</initializerstack>
<simulatorstack>
<worldtransform transform_rotations="false"/>
</simulatorstack>
<visualizerstack>
<billboard texture="effects/textures/add_atlas_df" intensity="match" billboard_type="camera_facing" rotation_channel="world_rotation" blend_mode="add" render_template="effect_op_halo" origo="0.5 0.5" per_particle_age="false" size_input="constant" size="500 500" color_input="keys" opacity_input="constant" opacity="255" rotation_input="constant" rotation="0" rotation_axis="0 0 1" uv_size="0.125 0.03125" uv_offset_input="constant" uv_offset="0.75 0.125">
<color_keys loop="false">
<key t="0" v="37 32 255"/>
<key t="0.10769230872393" v="0 0 0"/>
</color_keys>
</billboard>
</visualizerstack>
</atom>
</effect>
Loading

0 comments on commit 33fcf38

Please sign in to comment.