Skip to content

Commit

Permalink
Merge pull request #600 from payday-restoration/dev
Browse files Browse the repository at this point in the history
V12.2.2
  • Loading branch information
EssCee authored Sep 25, 2023
2 parents 44b3996 + e2708d6 commit 4a9feac
Show file tree
Hide file tree
Showing 154 changed files with 3,110 additions and 1,138 deletions.
4 changes: 2 additions & 2 deletions Core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ function restoration:Init()
"cane", --Santa's Workshop
"brb", --Brooklyn Bank
"mus", --The Diamond
"born", --Biker 1
"run", --Heat Street
"ranc", --Midland Ranch
"sah", --Shacklethorne
Expand Down Expand Up @@ -341,8 +342,7 @@ function restoration:Init()
"vit", --White House
"nmh", --No Mercy
"des", --Henry's Rock
"bph", --Hell's Island
"born", --Biker 1
"bph", --Hell's Island
"fex", --Buluc's Mansion
--Skirmish heists below
"skmc_mad",
Expand Down
2 changes: 2 additions & 0 deletions addMISC.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<table directory="assets">

<!--RPK for The Commissar that outsmarted you again-->
<unit_mat path="units/pd2_mod_reapers/weapons/wpn_npc_rpk_sc/wpn_npc_rpk_sc" load="false" force="false"/>

<!--Biker Dozer-->
<unit path="units/payday2/characters/ene_bulldozer_biker_1/ene_bulldozer_biker_1" load="true"/>
Expand Down
12 changes: 10 additions & 2 deletions addSC.xml
Original file line number Diff line number Diff line change
Expand Up @@ -945,8 +945,11 @@
<!--Winter with his cool shield (Jarey)-->
<!--doesn't exist yet :c NVM IT DOES NOW BAYBEEEEEE-->
<model path="units/pd2_dlc_vip/characters/ene_acc_shield_vip/ene_acc_shield_vip" force="true"/>
<object path="units/pd2_dlc_vip/characters/ene_acc_shield_vip/ene_acc_shield_vip" force="true"/>
<texture path="units/pd2_dlc_vip/characters/ene_acc_shield_vip/shield_vip_df" force="true"/>
<object path="units/pd2_dlc_vip/characters/ene_acc_shield_vip/ene_acc_shield_vip" force="true"/>
<unit path="units/pd2_dlc_vip/characters/ene_acc_shield_vip/ene_acc_shield_vip" force="true" load="true"/>
<unit path="units/pd2_dlc_vip/characters/ene_acc_shield_vip/ene_acc_shield_vip_dummy" load="true"/>
<sequence_manager path="units/pd2_dlc_vip/characters/ene_acc_shield_vip/ene_acc_shield_vip"/>
<texture path="units/pd2_dlc_vip/characters/ene_acc_shield_vip/shield_vip_df" force="true"/>

<!--Winter AssFuckeng Squad-->

Expand All @@ -967,6 +970,11 @@
<df_nm path="units/pd2_mod_omnia/characters/shared_textures/helmets_omnia_atlas" force="false"/>
<texture path="units/pd2_dlc_vip/characters/shared_textures/ene_mask_lpf_il" force="false" load="true"/>

<!--Phalanx Shields-->
<sequence_manager path="units/pd2_dlc_vip/characters/ene_acc_shield_phalanx/ene_acc_shield_phalanx"/>
<unit path="units/pd2_dlc_vip/characters/ene_acc_shield_phalanx/ene_acc_shield_phalanx" force="true" load="true"/>
<unit path="units/pd2_dlc_vip/characters/ene_acc_shield_phalanx/ene_acc_shield_phalanx_dummy" load="true"/>

<!--Halloween Axe-->
<object path="units/pd2_mod_halloween/weapons/wpn_mel_hw_axe/wpn_mel_hw_axe" force="false"/>
<cooked_physics path="units/pd2_mod_halloween/weapons/wpn_mel_hw_axe/wpn_mel_hw_axe" force="false"/>
Expand Down
1 change: 1 addition & 0 deletions addhudmisc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<texture path="guis/textures/restoration/mission_briefing/classic"/>
<texture path="guis/textures/restoration/mission_briefing/hector"/>
<texture path="guis/textures/restoration/mission_briefing/jiufeng"/>
<texture path="guis/textures/restoration/mission_briefing/shayu"/>
<texture path="guis/textures/restoration/mission_briefing/mcshay"/>
<texture path="guis/textures/restoration/mission_briefing/blaine"/>
<texture path="guis/textures/restoration/mission_briefing/unknown"/>
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<unit type="items" slot="8" >
<network sync="spawn"/>
<object file="units/pd2_dlc_vip/characters/ene_acc_shield_phalanx/ene_acc_shield_phalanx" />

<dependencies>
<depends_on bnk="soundbanks/regular_sfx"/>
<depends_on effect="effects/particles/dest/security_camera_dest"/>
<depends_on effect="effects/particles/explosions/explosion_flash_grenade"/>
<depends_on effect="effects/particles/bullet_hit/glass_breakable/bullet_hit_glass_breakable"/>
<depends_on effect="effects/payday2/particles/character/marshal_red_light"/>
<depends_on effect="effects/payday2/particles/character/marshal_bright_light"/>
</dependencies>

<extensions>
<extension name="unit_data" class="ScriptUnitData"/>
<extension name="base" class="ShieldFlashBase">
<var name="_shield_tweak_name" value="phalanx_minion"/>
<var name="_effect_parent_obj_name" value="e_01"/>
</extension>
<extension name="damage" class="UnitDamage">
<var name="_collision_event" value="USM_Drop"/>
<var name="_collision_sfx_quite_time" value="0.1"/>
</extension>
</extensions>

<sounds>
<default_soundsource source="rp_ene_acc_shield_phalanx"/>
</sounds>
</unit>
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<unit type="items" slot="8" >
<!-- <network sync="spawn"/> -->
<object file="units/pd2_dlc_vip/characters/ene_acc_shield_phalanx/ene_acc_shield_phalanx" />
<extensions>
<extension name="unit_data" class="ScriptUnitData"/>
<!--
<extension name="base" class="ShieldFlashBase">
<var name="_shield_tweak_name" value="phalanx_minion"/>
<var name="_effect_parent_obj_name" value="e_01"/>
</extension>
<extension name="damage" class="UnitDamage">
<var name="_collision_event" value="USM_Drop"/>
<var name="_collision_sfx_quite_time" value="0.1"/>
</extension>
-->
</extensions>

<!--
<sounds>
<default_soundsource source="rp_ene_acc_shield_phalanx"/>
</sounds>
-->
</unit>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<unit type="items" slot="8" >
<network sync="spawn"/>
<object file="units/pd2_dlc_vip/characters/ene_acc_shield_vip/ene_acc_shield_vip" />

<dependencies>
<depends_on bnk="soundbanks/regular_sfx"/>
<depends_on effect="effects/particles/dest/security_camera_dest"/>
<depends_on effect="effects/particles/explosions/explosion_flash_grenade"/>
<depends_on effect="effects/particles/bullet_hit/glass_breakable/bullet_hit_glass_breakable"/>
<depends_on effect="effects/payday2/particles/character/marshal_red_light"/>
<depends_on effect="effects/payday2/particles/character/marshal_bright_light"/>
</dependencies>

<extensions>
<extension name="unit_data" class="ScriptUnitData"/>
<extension name="base" class="ShieldFlashBase">
<var name="_shield_tweak_name" value="phalanx_vip"/>
<var name="_effect_parent_obj_name" value="e_01"/>
</extension>
<extension name="damage" class="UnitDamage">
<var name="_collision_event" value="USM_Drop"/>
<var name="_collision_sfx_quite_time" value="0.1"/>
</extension>
</extensions>

<sounds>
<default_soundsource source="rp_ene_acc_shield_phalanx"/>
</sounds>
</unit>
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<unit type="items" slot="8" >
<!-- <network sync="spawn"/> -->
<object file="units/pd2_dlc_vip/characters/ene_acc_shield_vip/ene_acc_shield_vip" />

<extensions>
<extension name="unit_data" class="ScriptUnitData"/>
<!--
<extension name="base" class="ShieldFlashBase">
<var name="_shield_tweak_name" value="phalanx_vip"/>
<var name="_effect_parent_obj_name" value="e_01"/>
</extension>
<extension name="damage" class="UnitDamage">
<var name="_collision_event" value="USM_Drop"/>
<var name="_collision_sfx_quite_time" value="0.1"/>
</extension>
-->
</extensions>

<!--
<sounds>
<default_soundsource source="rp_ene_acc_shield_phalanx"/>
</sounds>
-->
</unit>
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
<var name="can_be_marked" value="true" />
<var name="_tweak_table" value="phalanx_minion" />
<var name="_default_weapon_id" value="beretta92_titan" />
<var name="_default_weapons" type="table">
<var name="primary" value="lmg_titan"/>
<var name="secondary" value="beretta92_titan"/>
</var>
</extension>
<extension name="inventory" class="CopInventory" >
<var name="_shield_unit_name" value="units/pd2_dlc_vip/characters/ene_acc_shield_phalanx/ene_acc_shield_phalanx" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@
<var name="can_be_marked" value="true" />
<var name="_tweak_table" value="phalanx_minion" />
<var name="_default_weapon_id" value="beretta92_titan" />
<var name="_default_weapons" type="table">
<var name="primary" value="lmg_titan"/>
<var name="secondary" value="beretta92_titan"/>
</var>
</extension>
<extension name="inventory" class="HuskCopInventory" >
<var name="_shield_unit_name" value="units/pd2_dlc_vip/characters/ene_acc_shield_phalanx/ene_acc_shield_phalanx" />
<var name="_shield_unit_name" value="units/pd2_dlc_vip/characters/ene_acc_shield_phalanx/ene_acc_shield_phalanx_dummy" />
</extension>
<extension name="brain" class="HuskCopBrain" />
<extension name="anim_data" class="PlayerAnimationData" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

<dependencies>
<depends_on bnk="soundbanks/regular_vox" />
<depends_on bnk="soundbanks/sfx_hos" />
<depends_on unit="units/pd2_dlc_vip/characters/ene_acc_shield_phalanx/ene_acc_shield_phalanx" />
<depends_on unit="units/payday2/weapons/wpn_npc_beretta92_titan/wpn_npc_beretta92_titan" />
</dependencies>
Expand All @@ -16,6 +15,10 @@
<var name="can_be_marked" value="true" />
<var name="_tweak_table" value="phalanx_minion_assault" />
<var name="_default_weapon_id" value="beretta92_titan" />
<var name="_default_weapons" type="table">
<var name="primary" value="aa12_conc_npc"/>
<var name="secondary" value="beretta92_titan"/>
</var>
</extension>
<extension name="inventory" class="CopInventory" >
<var name="_shield_unit_name" value="units/pd2_dlc_vip/characters/ene_acc_shield_phalanx/ene_acc_shield_phalanx" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<dependencies>
<depends_on bnk="soundbanks/regular_vox" />
<depends_on unit="units/pd2_dlc_vip/characters/ene_acc_shield_phalanx/ene_acc_shield_phalanx" />
<depends_on unit="units/pd2_dlc_vip/characters/ene_acc_shield_phalanx/ene_acc_shield_phalanx_dummy" />
<depends_on unit="units/payday2/weapons/wpn_npc_beretta92_titan/wpn_npc_beretta92_titan" />
</dependencies>

Expand All @@ -15,9 +15,13 @@
<var name="can_be_marked" value="true" />
<var name="_tweak_table" value="phalanx_minion_assault" />
<var name="_default_weapon_id" value="beretta92_titan" />
<var name="_default_weapons" type="table">
<var name="primary" value="aa12_conc_npc"/>
<var name="secondary" value="beretta92_titan"/>
</var>
</extension>
<extension name="inventory" class="HuskCopInventory" >
<var name="_shield_unit_name" value="units/pd2_dlc_vip/characters/ene_acc_shield_phalanx/ene_acc_shield_phalanx" />
<var name="_shield_unit_name" value="units/pd2_dlc_vip/characters/ene_acc_shield_phalanx/ene_acc_shield_phalanx_dummy" />
</extension>
<extension name="brain" class="HuskCopBrain" />
<extension name="anim_data" class="PlayerAnimationData" />
Expand Down
4 changes: 4 additions & 0 deletions assets/units/pd2_dlc_vip/characters/ene_vip_1/ene_vip_1.unit
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
<var name="can_be_marked" value="true" />
<var name="_tweak_table" value="phalanx_vip" />
<var name="_default_weapon_id" value="mp9" />
<var name="_default_weapons" type="table">
<var name="primary" value="benelli"/>
<var name="secondary" value="mp9"/>
</var>
</extension>
<extension name="inventory" class="CopInventory" >
<var name="_shield_unit_name" value="units/pd2_dlc_vip/characters/ene_acc_shield_vip/ene_acc_shield_vip" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<dependencies>
<depends_on bnk="soundbanks/regular_vox" />
<depends_on unit="units/pd2_dlc_vip/characters/ene_acc_shield_vip/ene_acc_shield_vip" />
<depends_on unit="units/pd2_dlc_vip/characters/ene_acc_shield_vip/ene_acc_shield_vip_dummy" />
<depends_on unit="units/payday2/weapons/wpn_npc_smg_mp9/wpn_npc_smg_mp9" />
</dependencies>

Expand All @@ -15,9 +15,13 @@
<var name="can_be_marked" value="true" />
<var name="_tweak_table" value="phalanx_vip" />
<var name="_default_weapon_id" value="mp9" />
<var name="_default_weapons" type="table">
<var name="primary" value="benelli"/>
<var name="secondary" value="mp9"/>
</var>
</extension>
<extension name="inventory" class="HuskCopInventory" >
<var name="_shield_unit_name" value="units/pd2_dlc_vip/characters/ene_acc_shield_vip/ene_acc_shield_vip" />
<var name="_shield_unit_name" value="units/pd2_dlc_vip/characters/ene_acc_shield_vip/ene_acc_shield_vip_dummy" />
</extension>
<extension name="brain" class="HuskCopBrain" />
<extension name="anim_data" class="PlayerAnimationData" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
<var name="can_be_marked" value="true" />
<var name="_tweak_table" value="phalanx_minion_assault" />
<var name="_default_weapon_id" value="beretta92_titan" />
<var name="_default_weapons" type="table">
<var name="primary" value="aa12_conc_npc"/>
<var name="secondary" value="beretta92_titan"/>
</var>
</extension>
<extension name="inventory" class="CopInventory" >
<var name="_shield_unit_name" value="units/pd2_dlc_vip/characters/ene_acc_shield_phalanx/ene_acc_shield_phalanx" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
<var name="can_be_marked" value="true" />
<var name="_tweak_table" value="phalanx_minion_assault" />
<var name="_default_weapon_id" value="beretta92_titan" />
<var name="_default_weapons" type="table">
<var name="primary" value="aa12_conc_npc"/>
<var name="secondary" value="beretta92_titan"/>
</var>
</extension>
<extension name="inventory" class="HuskCopInventory" >
<var name="_shield_unit_name" value="units/pd2_dlc_vip/characters/ene_acc_shield_phalanx/ene_acc_shield_phalanx" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,29 @@
<unit type="items" slot="8" >
<network sync="spawn"/>
<object file="units/pd2_mod_reapers/characters/ene_acc_shield_akan_phalanx/ene_acc_shield_akan_phalanx" />
<dependencies>

<dependencies>
<depends_on bnk="soundbanks/regular_sfx"/>
<depends_on effect="effects/particles/dest/security_camera_dest"/>
</dependencies>
<depends_on effect="effects/particles/explosions/explosion_flash_grenade"/>
<depends_on effect="effects/particles/bullet_hit/glass_breakable/bullet_hit_glass_breakable"/>
<depends_on effect="effects/payday2/particles/character/marshal_red_light"/>
<depends_on effect="effects/payday2/particles/character/marshal_bright_light"/>
</dependencies>

<extensions>
<extension name="unit_data" class="ScriptUnitData" />
<extension name="damage" class="UnitDamage" />
</extensions>
<extension name="unit_data" class="ScriptUnitData"/>
<extension name="base" class="ShieldFlashBase">
<var name="_shield_tweak_name" value="phalanx_minion"/>
<var name="_effect_parent_obj_name" value="e_01"/>
</extension>
<extension name="damage" class="UnitDamage">
<var name="_collision_event" value="USM_Drop"/>
<var name="_collision_sfx_quite_time" value="0.1"/>
</extension>
</extensions>

<sounds>
<default_soundsource source="rp_ene_acc_shield_phalanx"/>
</sounds>
</unit>
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<unit type="items" slot="8" >
<!-- <network sync="spawn"/> -->
<object file="units/pd2_mod_reapers/characters/ene_acc_shield_akan_phalanx/ene_acc_shield_akan_phalanx" />
<extensions>
<extension name="unit_data" class="ScriptUnitData"/>
<!--
<extension name="base" class="ShieldFlashBase">
<var name="_shield_tweak_name" value="phalanx_minion"/>
<var name="_effect_parent_obj_name" value="e_01"/>
</extension>
<extension name="damage" class="UnitDamage">
<var name="_collision_event" value="USM_Drop"/>
<var name="_collision_sfx_quite_time" value="0.1"/>
</extension>
-->
</extensions>

<!--
<sounds>
<default_soundsource source="rp_ene_acc_shield_phalanx"/>
</sounds>
-->
</unit>
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
<graphic_group name="character" enabled="true" culling_object="g_body">

<lod_object name="lod_body">
<object name="g_body" enabled="true" max_distance="9999999999" max_draw_lod="0" cpy_material_vars="contour_color, contour_opacity">
<object name="g_body" enabled="true" max_distance="3000" max_draw_lod="0" cpy_material_vars="contour_color, contour_opacity">
<material materials="mtr_body" max_distance="1000" />
<material materials="mtr_body_lod1" max_distance="1500" />
<material materials="mtr_body_lod2" />
Expand All @@ -208,7 +208,7 @@
</lod_object>

<lod_object name="lod_head">
<object name="g_head" enabled="true" max_distance="9999999999" max_draw_lod="0" cpy_material_vars="contour_color, contour_opacity">
<object name="g_head" enabled="true" max_distance="3000" max_draw_lod="0" cpy_material_vars="contour_color, contour_opacity">
<material materials="mtr_head" max_distance="1000" />
<material materials="mtr_head_lod1" max_distance="1500" />
<material materials="mtr_head_lod2" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
<var name="can_be_marked" value="true" />
<var name="_tweak_table" value="phalanx_minion_assault" />
<var name="_default_weapon_id" value="beretta92_titan" />
<var name="_default_weapons" type="table">
<var name="primary" value="saiga_conc_npc"/>
<var name="secondary" value="beretta92_titan"/>
</var>
</extension>
<extension name="inventory" class="CopInventory" >
<var name="_shield_unit_name" value="units/pd2_mod_reapers/characters/ene_acc_shield_akan_phalanx/ene_acc_shield_akan_phalanx" />
Expand Down
Loading

0 comments on commit 4a9feac

Please sign in to comment.