diff --git a/gamedir/Data-1.13/TableData/LogicalBodyTypes/AnimationSurfaces.xml b/gamedir/Data-1.13/TableData/LogicalBodyTypes/AnimationSurfaces.xml index a7d1bbe79..412efc07e 100644 --- a/gamedir/Data-1.13/TableData/LogicalBodyTypes/AnimationSurfaces.xml +++ b/gamedir/Data-1.13/TableData/LogicalBodyTypes/AnimationSurfaces.xml @@ -1,9 +1,15 @@  + + + ]> &AnimSurfaces_LobotRGM; + &AnimSurfaces_LobotRGM_UZI; &AnimSurfaces_LobotBGM; + &AnimSurfaces_LobotRGF; + &AnimSurfaces_LobotRGF_UZI; diff --git a/gamedir/Data-1.13/TableData/LogicalBodyTypes/Filters.xml b/gamedir/Data-1.13/TableData/LogicalBodyTypes/Filters.xml index 02617f664..ad10a67cd 100644 --- a/gamedir/Data-1.13/TableData/LogicalBodyTypes/Filters.xml +++ b/gamedir/Data-1.13/TableData/LogicalBodyTypes/Filters.xml @@ -6,24 +6,22 @@ 200 - + + + GUN_PISTOL + + + + - 283, 295, 806, 818, 821, 830, 833, 840, 842, 843, 844, 847, 848, 849, 850, 851, 856, 857, 858, 859, 860, 865, 866, 867, 868, 869 + GUN_PISTOL + 0 - - - 283, 295, 806, 818, 821, 830, 833, 840, 842, 843, 844, 847, 848, 849, 850, 851, 856, 857, 858, 859, 860, 865, 866, 867, 868, 869 - - - GUN_PISTOL - GUN_M_PISTOL - + + GUN_M_PISTOL - - - 283, 295, 806, 818, 821, 830, 833, 840, 842, 843, 844, 847, 848, 849, 850, 851, 856, 857, 858, 859, 860, 865, 866, 867, 868, 869 - + GUN_PISTOL GUN_M_PISTOL @@ -33,11 +31,34 @@ GUN_M_PISTOL - + + GUN_PISTOL + + + GUN_M_PISTOL + + + + HasPistolInLeftHand + HasMPistolInLeftHand + + + - 283, 295, 806, 818, 821, 830, 833, 840, 842, 843, 844, 847, 848, 849, 850, 851, 856, 857, 858, 859, 860, 865, 866, 867, 868, 869 - 1 + HasPistolInHand + HasPistolOrMPistolInLeftHand + + + + HasMPistolInHand + HasPistolOrMPistolInLeftHand + + + + SMGCLASS RIFLECLASS @@ -45,19 +66,57 @@ SHOTGUNCLASS - + - 161, 162, 163, 164, 165, 166, 167, 168, 169, 196, 197, 198, 283, 295, 803, 806, 812, 815, 818, 821, 824, 827, 830, 833, 836, 840, 842, 843, 844, 847, 848, 849, 850, 851, 856, 857, 858, 859, 860, 865, 866, 867, 868, 869 + 282, 845, 846, 852, 853, 854, 855 - + - 285 + 283, 284, 842, 843, 844, 847, 848, 849, 850, 851 + + + + + 283, 295, 806, 818, 821, 830, 833, 840, 856, 857, 858, 859, 860, 865, 866, 867, 868, 869 + + + + + Longsleeves + HasPistolOrMPistolInLeftHand + + + + + Longsleeves + HasPistolOrMPistolInRightHand + + + + + Longsleeves + HasRifleTypeWeaponInHand - + 176, 177, 178, 179, 180, 181, 182, 293, 302, 801, 804, 810, 813, 816, 819, 822, 825, 828, 831, 834, 839, 1100, 1135 + + + + + IsWearingHelmet + + + HasPistolInHand + HasMPistolInHand + + + + + IsWearingHelmet + HasRifleTypeWeaponInHand @@ -67,70 +126,41 @@ - 302, 801, 804, 810, 813, 816, 822, 825, 828, 834, 839, 1100, 1135 + IsWearingCamoHelmet - GUN_PISTOL - GUN_M_PISTOL - + HasPistolInHand + HasMPistolInHand + - 302, 801, 804, 810, 813, 816, 822, 825, 828, 834, 839, 1100, 1135 + IsWearingCamoHelmet + HasRifleTypeWeaponInHand - - SMGCLASS - RIFLECLASS - MGCLASS - SHOTGUNCLASS - - - - - 288 - - - - - 213 - 213 - - - - - 211, 246, 1024, 1025 - 211, 246, 1024, 1025 - - 838 + 838, 294 - - - 838 - 1 - - - SMGCLASS - RIFLECLASS - MGCLASS - SHOTGUNCLASS - - - 838 + HasKneepads - GUN_PISTOL - GUN_M_PISTOL - + HasPistolInHand + HasMPistolInHand + + + + + HasKneepads + HasRifleTypeWeaponInHand + - 1 @@ -141,28 +171,27 @@ - 1 GUN_SHOTGUN - 32, 33, 340 + 32, 33, 340, 680, 731, 741 - 775 + 341, 621, 696, 775, 898, 899 - 28, 29, 647, 648 + 28, 29, 629, 647, 648, 712, 713, 714, 715, 1195 - 24, 30 + 24, 30, 646, 659, 660, 663, 704, 781, 789 @@ -171,28 +200,22 @@ - - 1 - GUN_AS_RIFLE - 14, 25, 26, 347, 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, 616, 708, 785 - + + 14, 25, 26, 347, 612, 613, 614, 615, 708, 757, 785 + - 1 - GUN_AS_RIFLE - 606, 607, 608, 609, 610, 611, 616, 655, 656, 742 + 602, 603, 606, 607, 608, 609, 610, 611, 616, 617, 655, 656, 742, 782 - 1 RIFLECLASS - 1 GUN_SMG @@ -201,9 +224,14 @@ 15 + + + 345 + + - 11, 737 + 11, 737, 1179 @@ -213,7 +241,6 @@ - 1 GUN_RIFLE @@ -223,7 +250,12 @@ GUN_AS_RIFLE - 17, 22, 27, 684, 753 + 17, 22, 27, 683, 753, 1193 + + + + + 348, 896, 897, 1074 @@ -238,12 +270,12 @@ - 699, 700 + 649, 661, 687, 699, 700 - 116, 335, 620, 697 + 116, 335, 620, 639, 657, 682, 697, 774 @@ -251,6 +283,11 @@ GUN_SN_RIFLE + + + 709, 777, 778 + + 18, 734, 735 @@ -258,280 +295,187 @@ - 334, 674 + 334, 654, 674, 676, 779, 1069, 1201 - 19, 684, 685, 698, 728, 729 + 19, 625, 684, 698 - + + + 19, 634, 685, 728, 729 + + + 40, 50, 903, 906, 907, 908, 920, 922 - - - 1 - - - SMGCLASS - RIFLECLASS - MGCLASS - SHOTGUNCLASS - - - - - GUN_PISTOL - - - - - - GUN_PISTOL - 0 - - - - - GUN_M_PISTOL - - - - - - GUN_PISTOL - GUN_M_PISTOL - - - GUN_PISTOL - GUN_M_PISTOL - - - - - GUN_PISTOL - GUN_M_PISTOL - - - - - GUN_PISTOL - - - - - GUN_M_PISTOL - - - - - - GUN_PISTOL - - - GUN_PISTOL - GUN_M_PISTOL - - - - - GUN_M_PISTOL - - - GUN_PISTOL - GUN_M_PISTOL - - - 7, 637, 638, 758 + 7, 56, 637, 638, 758, 766, 767, 768, 1192 - 7, 637, 638, 758 + 7, 56, 637, 638, 758, 766, 767, 768, 1192 - 7, 637, 638, 758 + HasDesertEagleInHand + HasPistolOrMPistolInLeftHand - - GUN_PISTOL - GUN_M_PISTOL - - - 892, 893, 894 - + + 6, 66, 707, 736, 770, 771, 772, 892, 893, 894, 887, 888, 892, 893, 894, 1194 + - - 892, 893, 894 - + + 6, 66, 707, 736, 770, 771, 772, 892, 893, 894, 887, 888, 892, 893, 894, 1194 + - 892, 893, 894 + HasSW500InHand + HasPistolOrMPistolInLeftHand + + + + + 10, 330, 601, 619, 673, 688, 692, 701, 730 + + + + + 10, 330, 601, 619, 673, 688, 692, 701, 730 + + + + + HasUziInHand + HasPistolOrMPistolInLeftHand - - GUN_PISTOL - GUN_M_PISTOL - - 1 + IsWearingBackpack - GUN_PISTOL - GUN_M_PISTOL + HasPistolInHand + HasMPistolInHand - 1 - 1 + IsWearingBackpack + HasRifleTypeWeaponInHand - - SMGCLASS - RIFLECLASS - MGCLASS - SHOTGUNCLASS - - + 288 - 1 - - SMGCLASS - RIFLECLASS - MGCLASS - SHOTGUNCLASS - - 288 + IsWearingBeret - GUN_PISTOL - GUN_M_PISTOL + HasPistolInHand + HasMPistolInHand - + + + IsWearingBeret + HasRifleTypeWeaponInHand + + + 285 + + + + IsWearingHat + - GUN_PISTOL - GUN_M_PISTOL + HasPistolInHand + HasMPistolInHand - 285 - 1 + IsWearingHat + HasRifleTypeWeaponInHand - - SMGCLASS - RIFLECLASS - MGCLASS - SHOTGUNCLASS - - - - 176, 177, 178, 179, 180, 181, 182, 293, 302, 801, 804, 810, 813, 816, 819, 822, 825, 828, 831, 834, 839, 1100, 1135 - + - GUN_PISTOL - GUN_M_PISTOL + 161, 162, 163, 164, 165, 166, 167, 168, 169, 196, 197, 198, 283, 295, 803, 806, 812, 815, 818, 821, 824, 827, 830, 833, 836, 840, 842, 843, 844, 847, 848, 849, 850, 851, 856, 857, 858, 859, 860, 865, 866, 867, 868, 869 - - - 176, 177, 178, 179, 180, 181, 182, 293, 302, 801, 804, 810, 813, 816, 819, 822, 825, 828, 831, 834, 839, 1100, 1135 - - - SMGCLASS - RIFLECLASS - MGCLASS - SHOTGUNCLASS - - - 161, 162, 163, 164, 165, 166, 167, 168, 169, 196, 197, 198, 283, 295, 803, 806, 812, 815, 818, 821, 824, 827, 830, 833, 836, 840, 842, 843, 844, 847, 848, 849, 850, 851, 856, 857, 858, 859, 860, 865, 866, 867, 868, 869 + FlakJacket - GUN_PISTOL - GUN_M_PISTOL + HasPistolInHand + HasMPistolInHand - 161, 162, 163, 164, 165, 166, 167, 168, 169, 196, 197, 198, 283, 295, 803, 806, 812, 815, 818, 821, 824, 827, 830, 833, 836, 840, 842, 843, 844, 847, 848, 849, 850, 851, 856, 857, 858, 859, 860, 865, 866, 867, 868, 869 + FlakJacket + HasRifleTypeWeaponInHand + + - SMGCLASS - RIFLECLASS - MGCLASS - SHOTGUNCLASS - + 213 + 213 + - - 213 - 213 - - GUN_PISTOL - GUN_M_PISTOL + IsWearingGasmask + + HasPistolInHand + HasMPistolInHand + - - 213 - 213 - - SMGCLASS - RIFLECLASS - MGCLASS - SHOTGUNCLASS + IsWearingGasmask + HasRifleTypeWeaponInHand + + + 211, 246, 1024, 1025 + 211, 246, 1024, 1025 + + - - 211, 246, 1024, 1025 - 211, 246, 1024, 1025 - - GUN_PISTOL - GUN_M_PISTOL + IsWearingGasmask + + HasPistolInHand + HasMPistolInHand + - - 211, 246, 1024, 1025 - 211, 246, 1024, 1025 - - SMGCLASS - RIFLECLASS - MGCLASS - SHOTGUNCLASS + IsWearingGasmask + HasRifleTypeWeaponInHand @@ -544,6 +488,12 @@ 64 + + + HasKnifeInHand + HasCrowbarInHand + + @@ -555,4 +505,44 @@ BIGMALE + + + REGFEMALE + + + + + 14 + + + + + IsFox + Longsleeves + + + + + IsFox + IsWearingHelmet + + + + + IsFox + IsWearingCamoHelmet + + + + + IsFox + IsWearingGasmask + + + + + IsFox + IsWearingNVG + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_BGM/AnimationSurfaces_LBT_BGM.xml b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_BGM/AnimationSurfaces_LBT_BGM.xml index 0d1423544..1e896fa42 100644 --- a/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_BGM/AnimationSurfaces_LBT_BGM.xml +++ b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_BGM/AnimationSurfaces_LBT_BGM.xml @@ -2538,6 +2538,8 @@ + + @@ -2577,6 +2579,8 @@ + + @@ -2616,6 +2620,8 @@ + + @@ -2655,6 +2661,8 @@ + + diff --git a/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_BGM/LogicalBodyType_LBT_BGM.xml b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_BGM/LogicalBodyType_LBT_BGM.xml index 464c5a759..c81a288b5 100644 --- a/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_BGM/LogicalBodyType_LBT_BGM.xml +++ b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_BGM/LogicalBodyType_LBT_BGM.xml @@ -150,6 +150,12 @@ + + + + + + @@ -3127,4 +3133,12 @@ + + + + + + + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGF/AnimationSurfaces_LBT_RGF.xml b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGF/AnimationSurfaces_LBT_RGF.xml new file mode 100644 index 000000000..9333d688e --- /dev/null +++ b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGF/AnimationSurfaces_LBT_RGF.xml @@ -0,0 +1,2491 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGF/AnimationSurfaces_LBT_RGF_UZI.xml b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGF/AnimationSurfaces_LBT_RGF_UZI.xml new file mode 100644 index 000000000..080f423c4 --- /dev/null +++ b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGF/AnimationSurfaces_LBT_RGF_UZI.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGF/LogicalBodyType_LBT_RGF.xml b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGF/LogicalBodyType_LBT_RGF.xml new file mode 100644 index 000000000..ac301c67d --- /dev/null +++ b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGF/LogicalBodyType_LBT_RGF.xml @@ -0,0 +1,2910 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGF/LogicalBodyType_RGF_gun_paletteswaps.xml b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGF/LogicalBodyType_RGF_gun_paletteswaps.xml new file mode 100644 index 000000000..60c99d0d1 --- /dev/null +++ b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGF/LogicalBodyType_RGF_gun_paletteswaps.xml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGM/AnimationSurfaces_LBT_RGM_UZI.xml b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGM/AnimationSurfaces_LBT_RGM_UZI.xml new file mode 100644 index 000000000..11b7a2c1c --- /dev/null +++ b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGM/AnimationSurfaces_LBT_RGM_UZI.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGM/LogicalBodyType_LBT_RGM.xml b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGM/LogicalBodyType_LBT_RGM.xml index fcf624a5c..cee790420 100644 --- a/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGM/LogicalBodyType_LBT_RGM.xml +++ b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGM/LogicalBodyType_LBT_RGM.xml @@ -1180,6 +1180,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1424,6 +1461,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1552,38 +1621,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2136,6 +2173,25 @@ + + + + + + + + + + + + + + + + + + + @@ -2439,7 +2495,9 @@ + + @@ -2493,8 +2551,8 @@ - - + diff --git a/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGM/LogicalBodyType_RGM_gun_paletteswaps.xml b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGM/LogicalBodyType_RGM_gun_paletteswaps.xml new file mode 100644 index 000000000..f3d6e9553 --- /dev/null +++ b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LBT_RGM/LogicalBodyType_RGM_gun_paletteswaps.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/LogicalBodyTypes/Layers.xml b/gamedir/Data-1.13/TableData/LogicalBodyTypes/Layers.xml index b0ee5467c..d49fd6316 100644 --- a/gamedir/Data-1.13/TableData/LogicalBodyTypes/Layers.xml +++ b/gamedir/Data-1.13/TableData/LogicalBodyTypes/Layers.xml @@ -5,6 +5,7 @@ 2 4 3 + 8 8 10 11 diff --git a/gamedir/Data-1.13/TableData/LogicalBodyTypes/LogicalBodyTypes.xml b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LogicalBodyTypes.xml index b2e1a9ce1..fb7fc8c7a 100644 --- a/gamedir/Data-1.13/TableData/LogicalBodyTypes/LogicalBodyTypes.xml +++ b/gamedir/Data-1.13/TableData/LogicalBodyTypes/LogicalBodyTypes.xml @@ -1,12 +1,16 @@  + + + ]> - &LobotRGM; + &LobotRGMguns;&LobotRGM; &LobotBGM; + &LobotRGFguns;&LobotRGF; \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/LogicalBodyTypes/Palettes.xml b/gamedir/Data-1.13/TableData/LogicalBodyTypes/Palettes.xml index aa171643e..c4f803799 100644 --- a/gamedir/Data-1.13/TableData/LogicalBodyTypes/Palettes.xml +++ b/gamedir/Data-1.13/TableData/LogicalBodyTypes/Palettes.xml @@ -5,6 +5,8 @@ - + + + \ No newline at end of file diff --git a/gamedir/Data/Anims/LOBOT/RGF/default/FW_DBL.STI b/gamedir/Data/Anims/LOBOT/RGF/default/FW_DBL.STI new file mode 100644 index 000000000..cba2043b0 Binary files /dev/null and b/gamedir/Data/Anims/LOBOT/RGF/default/FW_DBL.STI differ diff --git a/gamedir/Data/Anims/LOBOT/RGF/default/FW_DIE.STI b/gamedir/Data/Anims/LOBOT/RGF/default/FW_DIE.STI new file mode 100644 index 000000000..398112a96 Binary files /dev/null and b/gamedir/Data/Anims/LOBOT/RGF/default/FW_DIE.STI differ diff --git a/gamedir/Data/Anims/LOBOT/RGF/default/FW_DIE2.STI b/gamedir/Data/Anims/LOBOT/RGF/default/FW_DIE2.STI new file mode 100644 index 000000000..30a992321 Binary files /dev/null and b/gamedir/Data/Anims/LOBOT/RGF/default/FW_DIE2.STI differ diff --git a/gamedir/Data/Anims/LOBOT/RGF/default/FW_FALL.STI b/gamedir/Data/Anims/LOBOT/RGF/default/FW_FALL.STI new file mode 100644 index 000000000..548170f6d Binary files /dev/null and b/gamedir/Data/Anims/LOBOT/RGF/default/FW_FALL.STI differ diff --git a/gamedir/Data/Anims/LOBOT/RGF/default/FW_LOB.STI b/gamedir/Data/Anims/LOBOT/RGF/default/FW_LOB.STI new file mode 100644 index 000000000..9881a0e88 Binary files /dev/null and b/gamedir/Data/Anims/LOBOT/RGF/default/FW_LOB.STI differ diff --git a/gamedir/Data/Anims/LOBOT/RGF/default/FW_N_SHT.STI b/gamedir/Data/Anims/LOBOT/RGF/default/FW_N_SHT.STI new file mode 100644 index 000000000..1f867dc04 Binary files /dev/null and b/gamedir/Data/Anims/LOBOT/RGF/default/FW_N_SHT.STI differ diff --git a/gamedir/Data/Anims/LOBOT/RGF/default/FW_N_STD.STI b/gamedir/Data/Anims/LOBOT/RGF/default/FW_N_STD.STI new file mode 100644 index 000000000..59455f2b7 Binary files /dev/null and b/gamedir/Data/Anims/LOBOT/RGF/default/FW_N_STD.STI differ diff --git a/gamedir/Data/Anims/LOBOT/RGF/default/FW_N_WLK.STI b/gamedir/Data/Anims/LOBOT/RGF/default/FW_N_WLK.STI new file mode 100644 index 000000000..c9ff41140 Binary files /dev/null and b/gamedir/Data/Anims/LOBOT/RGF/default/FW_N_WLK.STI differ diff --git a/gamedir/Data/Anims/LOBOT/RGF/default/FW_R_STD.STI b/gamedir/Data/Anims/LOBOT/RGF/default/FW_R_STD.STI new file mode 100644 index 000000000..5c71a00f9 Binary files /dev/null and b/gamedir/Data/Anims/LOBOT/RGF/default/FW_R_STD.STI differ diff --git a/gamedir/Data/Anims/LOBOT/RGF/default/FW_R_WLK.STI b/gamedir/Data/Anims/LOBOT/RGF/default/FW_R_WLK.STI new file mode 100644 index 000000000..6367df59f Binary files /dev/null and b/gamedir/Data/Anims/LOBOT/RGF/default/FW_R_WLK.STI differ diff --git a/gamedir/Data/Anims/LOBOT/RGF/default/FW_SR_AIM.STI b/gamedir/Data/Anims/LOBOT/RGF/default/FW_SR_AIM.STI new file mode 100644 index 000000000..119180df8 Binary files /dev/null and b/gamedir/Data/Anims/LOBOT/RGF/default/FW_SR_AIM.STI differ diff --git a/gamedir/Data/Anims/LOBOT/RGF/default/FW_SR_HIP_AIM.STI b/gamedir/Data/Anims/LOBOT/RGF/default/FW_SR_HIP_AIM.STI new file mode 100644 index 000000000..ae01e7c42 Binary files /dev/null and b/gamedir/Data/Anims/LOBOT/RGF/default/FW_SR_HIP_AIM.STI differ diff --git a/gamedir/Data/Anims/LOBOT/RGF/default/FW_SWIM.STI b/gamedir/Data/Anims/LOBOT/RGF/default/FW_SWIM.STI new file mode 100644 index 000000000..1ddc0b75a Binary files /dev/null and b/gamedir/Data/Anims/LOBOT/RGF/default/FW_SWIM.STI differ diff --git a/gamedir/Data/Anims/LOBOT/RGF/default/FW_TRED.STI b/gamedir/Data/Anims/LOBOT/RGF/default/FW_TRED.STI new file mode 100644 index 000000000..fa1c1a237 Binary files /dev/null and b/gamedir/Data/Anims/LOBOT/RGF/default/FW_TRED.STI differ diff --git a/gamedir/Data/Anims/LOBOT/RGF/default/F_HELIDRP.STI b/gamedir/Data/Anims/LOBOT/RGF/default/F_HELIDRP.STI new file mode 100644 index 000000000..705f0ad49 Binary files /dev/null and b/gamedir/Data/Anims/LOBOT/RGF/default/F_HELIDRP.STI differ diff --git a/gamedir/Data/Palettes/guns_universal_v2.stpbak b/gamedir/Data/Palettes/guns_universal_v2.stpbak new file mode 100644 index 000000000..e54648f9a Binary files /dev/null and b/gamedir/Data/Palettes/guns_universal_v2.stpbak differ diff --git a/gamedir/Data/Palettes/guns_v2_paletteswap.act b/gamedir/Data/Palettes/guns_v2_paletteswap.act new file mode 100644 index 000000000..254cc7b8c Binary files /dev/null and b/gamedir/Data/Palettes/guns_v2_paletteswap.act differ