diff --git a/assets/animseq/weapons/drumstick/ptpov_baton_lifeline/inspect.rseq b/assets/animseq/weapons/drumstick/ptpov_baton_lifeline/inspect.rseq deleted file mode 100644 index a4282b98..00000000 Binary files a/assets/animseq/weapons/drumstick/ptpov_baton_lifeline/inspect.rseq and /dev/null differ diff --git a/assets/cpu/c_a_flyer_skin01.cpu b/assets/cpu/c_a_flyer_skin01.cpu deleted file mode 100644 index 4e9524df..00000000 Binary files a/assets/cpu/c_a_flyer_skin01.cpu and /dev/null differ diff --git a/assets/cpu/c_a_flyer_skin02.cpu b/assets/cpu/c_a_flyer_skin02.cpu deleted file mode 100644 index 4e9524df..00000000 Binary files a/assets/cpu/c_a_flyer_skin02.cpu and /dev/null differ diff --git a/assets/cpu/crow_dropship_hero_01.cpu b/assets/cpu/crow_dropship_hero_01.cpu deleted file mode 100644 index 4e9524df..00000000 Binary files a/assets/cpu/crow_dropship_hero_01.cpu and /dev/null differ diff --git a/assets/cpu/crow_dropship_hero_02.cpu b/assets/cpu/crow_dropship_hero_02.cpu deleted file mode 100644 index 8403ba68..00000000 Binary files a/assets/cpu/crow_dropship_hero_02.cpu and /dev/null differ diff --git a/assets/cpu/crow_dropship_hero_03.cpu b/assets/cpu/crow_dropship_hero_03.cpu deleted file mode 100644 index 4e9524df..00000000 Binary files a/assets/cpu/crow_dropship_hero_03.cpu and /dev/null differ diff --git a/assets/cpu/dragon_base_main.cpu b/assets/cpu/dragon_base_main.cpu deleted file mode 100644 index 5950a3c4..00000000 Binary files a/assets/cpu/dragon_base_main.cpu and /dev/null differ diff --git a/assets/cpu/dragon_base_parts.cpu b/assets/cpu/dragon_base_parts.cpu deleted file mode 100644 index 4ab4ec59..00000000 Binary files a/assets/cpu/dragon_base_parts.cpu and /dev/null differ diff --git a/assets/cpu/imc_phantom_big.cpu b/assets/cpu/imc_phantom_big.cpu deleted file mode 100644 index 8403ba68..00000000 Binary files a/assets/cpu/imc_phantom_big.cpu and /dev/null differ diff --git a/assets/cpu/imc_phantom_cockpit_interior.cpu b/assets/cpu/imc_phantom_cockpit_interior.cpu deleted file mode 100644 index 8403ba68..00000000 Binary files a/assets/cpu/imc_phantom_cockpit_interior.cpu and /dev/null differ diff --git a/assets/cpu/imc_phantom_glass_o.cpu b/assets/cpu/imc_phantom_glass_o.cpu deleted file mode 100644 index 923d00a7..00000000 Binary files a/assets/cpu/imc_phantom_glass_o.cpu and /dev/null differ diff --git a/assets/cpu/loba_body.cpu b/assets/cpu/loba_body.cpu deleted file mode 100644 index cf0fa30d..00000000 Binary files a/assets/cpu/loba_body.cpu and /dev/null differ diff --git a/assets/cpu/loba_face.cpu b/assets/cpu/loba_face.cpu deleted file mode 100644 index a18f4553..00000000 Binary files a/assets/cpu/loba_face.cpu and /dev/null differ diff --git a/assets/cpu/rbt_drone_air_skn_02.cpu b/assets/cpu/rbt_drone_air_skn_02.cpu deleted file mode 100644 index 8403ba68..00000000 Binary files a/assets/cpu/rbt_drone_air_skn_02.cpu and /dev/null differ diff --git a/assets/cpu/rbt_drone_air_skn_03.cpu b/assets/cpu/rbt_drone_air_skn_03.cpu deleted file mode 100644 index 8403ba68..00000000 Binary files a/assets/cpu/rbt_drone_air_skn_03.cpu and /dev/null differ diff --git a/assets/cpu/thermite_grenade_charge.cpu b/assets/cpu/thermite_grenade_charge.cpu deleted file mode 100644 index 6f2cea35..00000000 Binary files a/assets/cpu/thermite_grenade_charge.cpu and /dev/null differ diff --git a/assets/cpu/thermite_grenade_glass_charge.cpu b/assets/cpu/thermite_grenade_glass_charge.cpu deleted file mode 100644 index 9edb8ef5..00000000 Binary files a/assets/cpu/thermite_grenade_glass_charge.cpu and /dev/null differ diff --git a/assets/cpu/titan_ar_marker.cpu b/assets/cpu/titan_ar_marker.cpu deleted file mode 100644 index fa88b0cb..00000000 Binary files a/assets/cpu/titan_ar_marker.cpu and /dev/null differ diff --git a/assets/cpu/veh_air_olympus_hovercraft_brakelight_on.cpu b/assets/cpu/veh_air_olympus_hovercraft_brakelight_on.cpu deleted file mode 100644 index ad65e6f9..00000000 Binary files a/assets/cpu/veh_air_olympus_hovercraft_brakelight_on.cpu and /dev/null differ diff --git a/assets/cpu/veh_air_olympus_hovercraft_common.cpu b/assets/cpu/veh_air_olympus_hovercraft_common.cpu deleted file mode 100644 index 1ffbf9c1..00000000 Binary files a/assets/cpu/veh_air_olympus_hovercraft_common.cpu and /dev/null differ diff --git a/assets/cpu/veh_air_olympus_hovercraft_headlight.cpu b/assets/cpu/veh_air_olympus_hovercraft_headlight.cpu deleted file mode 100644 index ebaf5a4b..00000000 Binary files a/assets/cpu/veh_air_olympus_hovercraft_headlight.cpu and /dev/null differ diff --git a/assets/cpu/veh_air_olympus_hovercraft_main.cpu b/assets/cpu/veh_air_olympus_hovercraft_main.cpu deleted file mode 100644 index 1ffbf9c1..00000000 Binary files a/assets/cpu/veh_air_olympus_hovercraft_main.cpu and /dev/null differ diff --git a/assets/cpu/w_loot_wep_iso_armor_energy_01_tier5.cpu b/assets/cpu/w_loot_wep_iso_armor_energy_01_tier5.cpu deleted file mode 100644 index 31d3a9bc..00000000 Binary files a/assets/cpu/w_loot_wep_iso_armor_energy_01_tier5.cpu and /dev/null differ diff --git a/assets/cpudata/sentinel_esr.cpu b/assets/cpudata/sentinel_esr.cpu deleted file mode 100644 index 5c2ca8ea..00000000 Binary files a/assets/cpudata/sentinel_esr.cpu and /dev/null differ diff --git a/assets/datatable/survival_loot_sdk.csv b/assets/datatable/survival_loot_sdk.csv index cf4847b8..c05fae0c 100644 --- a/assets/datatable/survival_loot_sdk.csv +++ b/assets/datatable/survival_loot_sdk.csv @@ -1,7 +1,9 @@ "featureFlag","pingCommsAction","pickupString","ref","type","lootTags","tier","baseWeapon","baseMods","supportedAttachments","fakeAmmoIcon","icon","pickupModel","skinOverride","passive","attachSound","pickupSound_1p","pickupSound_3p","carrySound","desc","countPerDrop","inventorySlotCount","netInt","minInWorld","minPVPCurrency","maxPVPCurrency","scrapValue","droppodRotate","conditional","isDynamic" "","PING_AMMO_SNIPER","Sniper Ammo","sniper","ammo","",1,"","","","","rui/hud/gametype_icons/survival/sur_ammo_sniper","mdl/weapons_r5/loot/_master/w_loot_wep_ammo_sniper.rmdl",0,"","","survival_loot_pickup_HeavyAmmo","survival_loot_pickup_3p_HeavyAmmo","","#SURVIVAL_PICKUP_BULLETS_HINT",15,30,"",0.0,0,0,0,false,false,false +"","PING_AMMO_EXPLOSIVE","Explosive Ammo","explosive","ammo","",1,"","","","","rui/hud/gametype_icons/survival/sur_ammo_explosive","mdl/weapons_r5/loot/_master/w_loot_wep_ammo_exp.rmdl",0,"","","survival_loot_pickup_titan_ammo","survival_loot_pickup_3p_titan_ammo","","#SURVIVAL_PICKUP_BULLETS_HINT",15,30,"",0.0,0,0,0,false,false,false "","PING_WEAPON_VOLT","","mp_weapon_volt_smg","main_weapon","smg",1,"","","mag grip","","","",0,"","","survival_loot_pickup_weapon_hemlok_smg","survival_loot_pickup_3p_weapon_hemlok_smg","","",1,1,"",0.0,0,0,0,false,false,false "","PING_WEAPON_VOLT","","mp_weapon_volt_smg_gold","main_weapon","smg",4,"mp_weapon_volt_smg","gold optic_cq_threat energy_mag_l4 stock_tactical_l3 barrel_stabilizer_l4_flash_hider","sight mag grip","","","",0,"","","survival_loot_pickup_weapon_hemlok_smg","survival_loot_pickup_3p_weapon_hemlok_smg","","",1,1,"",0.0,0,0,0,false,false,false "","PING_WEAPON_SMART_PISTOL","","mp_weapon_smart_pistol","main_weapon","pistol",1,"","","mag","","","",0,"","","survival_loot_pickup_weapon_smart_pistol","survival_loot_pickup_3p_weapon_smart_pistol","","",1,1,"",0.0,0,0,0,false,false,false "","PING_WEAPON_SENTINEL","","mp_weapon_sentinel","main_weapon","sniper",1,"","","sight mag grip","","","",0,"","","survival_loot_pickup_weapon_sniper","survival_loot_pickup_3p_weapon_sniper","","",1,1,"",0.0,0,0,0,false,false,false +"","PING_WEAPON_EPG","","mp_weapon_epg","main_weapon","launcher",1,"","","","","","",0,"","","survival_loot_pickup_weapon_epg","survival_loot_pickup_3p_weapon_epg","","",1,1,"",0.0,0,0,0,false,false,false "string","string","string","string","string","string","int","string","string","string","assetnoprecache","assetnoprecache","asset","int","string","string","string","string","string","string","int","int","string","float","int","int","int","bool","bool","bool" \ No newline at end of file diff --git a/assets/datatable/survival_loot_sdk.csv.bak b/assets/datatable/survival_loot_sdk.csv.bak deleted file mode 100644 index 1aeace2c..00000000 --- a/assets/datatable/survival_loot_sdk.csv.bak +++ /dev/null @@ -1,6 +0,0 @@ -"featureFlag","pingCommsAction","pickupString","ref","type","lootTags","tier","baseWeapon","baseMods","supportedAttachments","fakeAmmoIcon","icon","pickupModel","skinOverride","passive","attachSound","pickupSound_1p","pickupSound_3p","carrySound","desc","countPerDrop","inventorySlotCount","netInt","minInWorld","minPVPCurrency","maxPVPCurrency","scrapValue","droppodRotate","conditional","isDynamic" -"","PING_WEAPON_VOLT","","mp_weapon_volt_smg","main_weapon","smg",1,"","","mag grip","","","",0,"","","survival_loot_pickup_weapon_hemlok_smg","survival_loot_pickup_3p_weapon_hemlok_smg","","",1,1,"",0.0,0,0,0,false,false,false -"","PING_WEAPON_VOLT","","mp_weapon_volt_smg_gold","main_weapon","smg",4,"mp_weapon_volt_smg","gold optic_cq_threat energy_mag_l4 stock_tactical_l3 barrel_stabilizer_l4_flash_hider","sight mag grip","","","",0,"","","survival_loot_pickup_weapon_hemlok_smg","survival_loot_pickup_3p_weapon_hemlok_smg","","",1,1,"",0.0,0,0,0,false,false,false -"","PING_WEAPON_SMART_PISTOL","","mp_weapon_smart_pistol","main_weapon","pistol",1,"","","mag","","","",0,"","","survival_loot_pickup_weapon_smart_pistol","survival_loot_pickup_3p_weapon_smart_pistol","","",1,1,"",0.0,0,0,0,false,false,false -"","PING_WEAPON_SENTINEL","","mp_weapon_sentinel","main_weapon","sniper",1,"","","sight mag grip","","","",0,"","","survival_loot_pickup_weapon_sniper","survival_loot_pickup_3p_weapon_sniper","","",1,1,"",0.0,0,0,0,false,false,false -"string","string","string","string","string","string","int","string","string","string","assetnoprecache","assetnoprecache","asset","int","string","string","string","string","string","string","int","int","string","float","int","int","int","bool","bool","bool" \ No newline at end of file diff --git a/assets/mdl/Weapons/arms/pov_pilot_light_support.rmdl b/assets/mdl/Weapons/arms/pov_pilot_light_support.rmdl deleted file mode 100644 index b69db2c9..00000000 Binary files a/assets/mdl/Weapons/arms/pov_pilot_light_support.rmdl and /dev/null differ diff --git a/assets/mdl/Weapons/arms/pov_pilot_light_support.vg b/assets/mdl/Weapons/arms/pov_pilot_light_support.vg deleted file mode 100644 index 425e5fa3..00000000 Binary files a/assets/mdl/Weapons/arms/pov_pilot_light_support.vg and /dev/null differ diff --git a/assets/mdl/Weapons/lifeline_drone/ptpov_lifeline_drone_held.rmdl b/assets/mdl/Weapons/lifeline_drone/ptpov_lifeline_drone_held.rmdl deleted file mode 100644 index c8de995e..00000000 Binary files a/assets/mdl/Weapons/lifeline_drone/ptpov_lifeline_drone_held.rmdl and /dev/null differ diff --git a/assets/mdl/Weapons/lifeline_drone/ptpov_lifeline_drone_held.vg b/assets/mdl/Weapons/lifeline_drone/ptpov_lifeline_drone_held.vg deleted file mode 100644 index a8df5df5..00000000 Binary files a/assets/mdl/Weapons/lifeline_drone/ptpov_lifeline_drone_held.vg and /dev/null differ diff --git a/assets/mdl/Weapons/nemesis/nemesis_base_v.rmdl b/assets/mdl/Weapons/nemesis/nemesis_base_v.rmdl deleted file mode 100644 index 4c63f203..00000000 Binary files a/assets/mdl/Weapons/nemesis/nemesis_base_v.rmdl and /dev/null differ diff --git a/assets/mdl/Weapons/nemesis/nemesis_base_v.vg b/assets/mdl/Weapons/nemesis/nemesis_base_v.vg deleted file mode 100644 index 0beb3cad..00000000 Binary files a/assets/mdl/Weapons/nemesis/nemesis_base_v.vg and /dev/null differ diff --git a/assets/mdl/creatures/spider/spider.phy b/assets/mdl/creatures/spider/spider.phy deleted file mode 100644 index f0f5abcd..00000000 Binary files a/assets/mdl/creatures/spider/spider.phy and /dev/null differ diff --git a/assets/mdl/creatures/spider/spider.rmdl b/assets/mdl/creatures/spider/spider.rmdl deleted file mode 100644 index 23eb5c7b..00000000 Binary files a/assets/mdl/creatures/spider/spider.rmdl and /dev/null differ diff --git a/assets/mdl/creatures/spider/spider.vg b/assets/mdl/creatures/spider/spider.vg deleted file mode 100644 index f0bc4902..00000000 Binary files a/assets/mdl/creatures/spider/spider.vg and /dev/null differ diff --git a/assets/mdl/props/lifeline_drone/lifeline_drone.phy b/assets/mdl/props/lifeline_drone/lifeline_drone.phy deleted file mode 100644 index bfd57d7b..00000000 Binary files a/assets/mdl/props/lifeline_drone/lifeline_drone.phy and /dev/null differ diff --git a/assets/mdl/props/lifeline_drone/lifeline_drone.rmdl b/assets/mdl/props/lifeline_drone/lifeline_drone.rmdl deleted file mode 100644 index 3fe1b87a..00000000 Binary files a/assets/mdl/props/lifeline_drone/lifeline_drone.rmdl and /dev/null differ diff --git a/assets/mdl/props/lifeline_drone/lifeline_drone.vg b/assets/mdl/props/lifeline_drone/lifeline_drone.vg deleted file mode 100644 index 96c7edcf..00000000 Binary files a/assets/mdl/props/lifeline_drone/lifeline_drone.vg and /dev/null differ diff --git a/assets/mdl/weapons_r5/loot/_master/w_loot_cha_shield_upgrade_body_v1_lvl5.phy b/assets/mdl/weapons_r5/loot/_master/w_loot_cha_shield_upgrade_body_v1_lvl5.phy deleted file mode 100644 index 071c39a8..00000000 Binary files a/assets/mdl/weapons_r5/loot/_master/w_loot_cha_shield_upgrade_body_v1_lvl5.phy and /dev/null differ diff --git a/assets/mdl/weapons_r5/loot/_master/w_loot_cha_shield_upgrade_body_v1_lvl5.rmdl b/assets/mdl/weapons_r5/loot/_master/w_loot_cha_shield_upgrade_body_v1_lvl5.rmdl deleted file mode 100644 index 0e4f22f8..00000000 Binary files a/assets/mdl/weapons_r5/loot/_master/w_loot_cha_shield_upgrade_body_v1_lvl5.rmdl and /dev/null differ diff --git a/assets/mdl/weapons_r5/loot/_master/w_loot_cha_shield_upgrade_body_v1_lvl5.vg b/assets/mdl/weapons_r5/loot/_master/w_loot_cha_shield_upgrade_body_v1_lvl5.vg deleted file mode 100644 index e37001f7..00000000 Binary files a/assets/mdl/weapons_r5/loot/_master/w_loot_cha_shield_upgrade_body_v1_lvl5.vg and /dev/null differ diff --git a/common_sdk.json b/common_sdk.json index 0671efe5..3e71f061 100644 --- a/common_sdk.json +++ b/common_sdk.json @@ -49,6 +49,39 @@ "28": "texture/wep_test_pickups_ammo_sni_blend/0x2ca850081a8423ad" } }, + { + "$type": "matl", + "path": "models/test/weapons_test/pickups_test/wep_test_pickups_ammo_exp_blend", + "type": "rgdp", + "shaderset": "0x210121da41f7fbbc", + "cpu": "cpu/wep_test_pickups_ammo_exp_blend", + "blendStates": "F0000000 F0000000 F0000000 F0000000 F0000000 F0000000 F0000000 F0000000", + "samplers": "001D0300", + "flags2": "56000020", + "depthStencilFlags": 23, + "rasterizerFlags": 6, + "unkFlags": 4, + "width": 1024, + "height": 1024, + "textureSlotCount": 29, + "textures": { + "0": "texture/models/weapons_r5/loot/wep_test_pickups_ammo_exp_blend/wep_test_pickups_ammo_exp_blend_col", + "1": "texture/wep_test_pickups_ammo_sni_blend/0x310192c3364037e4", + "2": "texture/wep_test_pickups_ammo_sni_blend/0x66d5f660bd0cb994", + "3": "texture/wep_test_pickups_ammo_sni_blend/0xf97e5c380a3d4bba", + "4": "texture/models/weapons_r5/loot/wep_test_pickups_ammo_exp_blend/wep_test_pickups_ammo_exp_blend_ilm", + "5": "texture/wep_test_pickups_ammo_sni_blend/0x2ca850081a8423ad", + "11": "texture/wep_test_pickups_ammo_sni_blend/0xe332e8d3d442186d", + "12": "texture/wep_test_pickups_ammo_sni_blend/0xe332e8d3d442186d", + "16": "texture/wep_test_pickups_ammo_sni_blend/0x686d1c46592d0f29", + "22": "texture/models/weapons_r5/loot/wep_test_pickups_ammo_exp_blend/wep_test_pickups_ammo_exp_blend_col", + "23": "texture/wep_test_pickups_ammo_sni_blend/0x310192c3364037e4", + "24": "texture/wep_test_pickups_ammo_sni_blend/0x66d5f660bd0cb994", + "25": "texture/wep_test_pickups_ammo_sni_blend/0xf97e5c380a3d4bba", + "26": "texture/models/weapons_r5/loot/wep_test_pickups_ammo_exp_blend/wep_test_pickups_ammo_exp_blend_ilm2", + "28": "texture/wep_test_pickups_ammo_sni_blend/0x2ca850081a8423ad" + } + }, { "$type": "matl", "path": "models/weapons/bolo_sword/bolo_sword_02", @@ -1267,6 +1300,14 @@ "path": "mdl/weapons_r5/loot/_master/w_loot_wep_ammo_sniper.rmdl", "usePhysics": true, "static": true + }, + { + "$type": "rmdl", + "path": "mdl/weapons_r5/loot/_master/w_loot_wep_ammo_exp.rmdl", + "usePhysics": true, + "materials": [ + "models/test/weapons_test/pickups_test/wep_test_pickups_ammo_exp_blend_rgdp" + ] } ] }