Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.1.0.42 update changes #48

Merged
merged 8 commits into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
SCR_ChimeraCharacter : "{C9E4FEAF5AAC8D8C}Prefabs/Characters/Factions/BLUFOR/US_Army/Character_US_Medic.et" {
ID "51FA8A5F10E81780"
components {
SCR_CharacterInventoryStorageComponent "{520EA1D2DB118DAC}" {
components {
SCR_EquipmentStorageComponent "{56B49DA9722B635D}" {
InitialStorageSlots {
SCR_EquipmentStorageSlot BinocularSlot {
Prefab "{0CF54B9A85D8E0D4}Prefabs/Items/Equipment/Binoculars/Binoculars_M22/Binoculars_M22.et"
}
}
}
}
}
PS_PlayableComponent "{5EFCC1946F475F15}" {
m_bIsPlayable 1
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
SCR_ChimeraCharacter : "{26A9756790131354}Prefabs/Characters/Factions/BLUFOR/US_Army/Character_US_Rifleman.et" {
ID "52092032B0E62200"
components {
SCR_CharacterInventoryStorageComponent "{520EA1D2DB118DAC}" {
components {
SCR_EquipmentStorageComponent "{56B49DA9722B635D}" {
InitialStorageSlots {
SCR_EquipmentStorageSlot BinocularSlot {
Prefab "{0CF54B9A85D8E0D4}Prefabs/Items/Equipment/Binoculars/Binoculars_M22/Binoculars_M22.et"
}
}
}
}
}
PS_PlayableComponent "{5EFCC1946F475F15}" {
m_bIsPlayable 1
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SCR_ChimeraCharacter : "{DBC177C261C93B9D}Prefabs/Characters/Factions/BLUFOR/US_
GRAD_CharacterRoleComponent "{5EFAD1CA30638A4A}" {
m_sCharacterRole "OTF Commander"
}
PS_PlayableComponent "{5E61249FA37809F5}" {
PS_PlayableComponent "{5EFCC1946F475F15}" {
m_name "Blufor Commander"
}
SCR_InventoryStorageManagerComponent "{520EA1D2DB118DE5}" {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
SCR_ChimeraCharacter : "{AB9726163EC1BD81}Prefabs/Characters/Factions/OPFOR/USSR_Army/Character_USSR_Medic.et" {
ID "51FAD317FC20EC1B"
components {
SCR_CharacterInventoryStorageComponent "{520EA1D2DB118DAC}" {
components {
SCR_EquipmentStorageComponent "{56B49DA9722B635D}" {
InitialStorageSlots {
SCR_EquipmentStorageSlot BinocularSlot {
Prefab "{243948B23D90BECB}Prefabs/Items/Equipment/Binoculars/Binoculars_B8/Binoculars_B8.et"
}
}
}
}
}
PS_PlayableComponent "{5EFCC1946F475F15}" {
m_bIsPlayable 1
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ SCR_ChimeraCharacter : "{A5F4D7FEBDB57182}Prefabs/Characters/Factions/OPFOR/USSR
GRAD_CharacterRoleComponent "{5EFAD1CA30638A4A}" {
m_sCharacterRole "OTF Commander"
}
PS_PlayableComponent "{5E61249E802F3DC3}" {
PS_PlayableComponent "{5EFCC1946F475F15}" {
m_name "Opfor Commander"
}
CharacterWeaponSlotComponent "{520EA1D2F659CFAB}" {
WeaponTemplate "{FA5C25BF66A53DCF}Prefabs/Weapons/Rifles/AK74/Rifle_AK74.et"
}
SCR_InventoryStorageManagerComponent "{520EA1D2DB118DE5}" {
InitialInventoryItems {
ItemsInitConfigurationItem "{5F0ABB2A8C9FF1BE}" {
TargetStorage "Prefabs/Characters/Uniforms/Jacket_M88.et"
ItemsInitConfigurationItem "{54A68D6220405B43}" {
PrefabsToSpawn {
"{B0E67230AEEE2DF3}Prefabs/Items/Wallet.et"
"{77EAE5E07DC4678A}Prefabs/Weapons/Grenades/Smoke_RDG2.et" "{77EAE5E07DC4678A}Prefabs/Weapons/Grenades/Smoke_RDG2.et" "{645C73791ECA1698}Prefabs/Weapons/Grenades/Grenade_RGD5.et" "{0A84AA5A3884176F}Prefabs/Weapons/Magazines/Magazine_545x39_AK_30rnd_Last_5Tracer.et" "{0A84AA5A3884176F}Prefabs/Weapons/Magazines/Magazine_545x39_AK_30rnd_Last_5Tracer.et" "{0A84AA5A3884176F}Prefabs/Weapons/Magazines/Magazine_545x39_AK_30rnd_Last_5Tracer.et" "{0A84AA5A3884176F}Prefabs/Weapons/Magazines/Magazine_545x39_AK_30rnd_Last_5Tracer.et" "{E5912E45754CD421}Prefabs/Weapons/Magazines/Magazine_545x39_AK_30rnd_Tracer.et" "{E5912E45754CD421}Prefabs/Weapons/Magazines/Magazine_545x39_AK_30rnd_Tracer.et"
}
}
ItemsInitConfigurationItem "{54A68D6220405B43}" {
ItemsInitConfigurationItem "{5F0ABB2A8C9FF1BE}" {
TargetStorage "Prefabs/Characters/Uniforms/Jacket_M88.et"
PrefabsToSpawn {
"{77EAE5E07DC4678A}Prefabs/Weapons/Grenades/Smoke_RDG2.et" "{77EAE5E07DC4678A}Prefabs/Weapons/Grenades/Smoke_RDG2.et" "{645C73791ECA1698}Prefabs/Weapons/Grenades/Grenade_RGD5.et" "{0A84AA5A3884176F}Prefabs/Weapons/Magazines/Magazine_545x39_AK_30rnd_Last_5Tracer.et" "{0A84AA5A3884176F}Prefabs/Weapons/Magazines/Magazine_545x39_AK_30rnd_Last_5Tracer.et" "{0A84AA5A3884176F}Prefabs/Weapons/Magazines/Magazine_545x39_AK_30rnd_Last_5Tracer.et" "{0A84AA5A3884176F}Prefabs/Weapons/Magazines/Magazine_545x39_AK_30rnd_Last_5Tracer.et" "{E5912E45754CD421}Prefabs/Weapons/Magazines/Magazine_545x39_AK_30rnd_Tracer.et" "{E5912E45754CD421}Prefabs/Weapons/Magazines/Magazine_545x39_AK_30rnd_Tracer.et"
"{B0E67230AEEE2DF3}Prefabs/Items/Wallet.et"
}
}
}
Expand Down
80 changes: 34 additions & 46 deletions Prefabs/GRAD_OTF_Blufor_Flag.et
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,29 @@ GenericEntity : "{E55FC02F8C1518A2}Prefabs/Structures/Military/Flags/FlagPole_02
ADM_ShopMerchandise "{5EFC80FFD2B8E928}" {
m_Merchandise ADM_MerchandiseItem "{5EFC80FFE3F971FE}" {
m_sPrefab "{2EBF60EF24B108FC}Prefabs/Weapons/Magazines/Magazine_556x45_STANAG_30rnd_Ball.et"
m_AllowSaleWithFullInventory 0
}
m_RequiredPayment {
ADM_PaymentMethodCurrency "{5EFC80FFECB97029}" {
m_BuyPayment {
ADM_PaymentMethodCurrency "{618C86A40F3A2D59}" {
m_Quantity 10
}
}
}
ADM_ShopMerchandise "{5EFC80FFEBD53515}" {
m_Merchandise ADM_MerchandiseItem "{5EFC80FFF5FFE1B0}" {
m_sPrefab "{D8F2CA92583B23D3}Prefabs/Weapons/Magazines/Magazine_556x45_STANAG_30rnd_Last_5Tracer.et"
m_AllowSaleWithFullInventory 0
}
m_RequiredPayment {
ADM_PaymentMethodCurrency "{5EFC80FFF04ED6D9}" {
m_BuyPayment {
ADM_PaymentMethodCurrency "{618C86A40AF4A259}" {
m_Quantity 10
}
}
}
ADM_ShopMerchandise "{5EFC80FFFD8C1F89}" {
m_Merchandise ADM_MerchandiseItem "{5EFC80FFFE52977C}" {
m_sPrefab "{A9A385FE1F7BF4BD}Prefabs/Weapons/Magazines/Magazine_556x45_STANAG_30rnd_Tracer.et"
m_AllowSaleWithFullInventory 0
}
m_RequiredPayment {
ADM_PaymentMethodCurrency "{5EFC80FF0414650A}" {
m_BuyPayment {
ADM_PaymentMethodCurrency "{618C86A4119D4A57}" {
m_Quantity 10
}
}
Expand All @@ -44,8 +41,8 @@ GenericEntity : "{E55FC02F8C1518A2}Prefabs/Structures/Military/Flags/FlagPole_02
m_Merchandise ADM_MerchandiseVehicle "{5EFC9AD91D463E32}" {
m_sPrefab "{F6B23D17D5067C11}Prefabs/Vehicles/Wheeled/M151A2/M151A2_M2HB.et"
}
m_RequiredPayment {
ADM_PaymentMethodCurrency "{5EFC9AD93EFD82B5}" {
m_BuyPayment {
ADM_PaymentMethodCurrency "{618C86A41B1B5997}" {
m_Quantity 2000
}
}
Expand All @@ -54,8 +51,8 @@ GenericEntity : "{E55FC02F8C1518A2}Prefabs/Structures/Military/Flags/FlagPole_02
m_Merchandise ADM_MerchandiseVehicle "{5EFC9E9BF9C0882F}" {
m_sPrefab "{70BAEEFC2D3FEE64}Prefabs/Vehicles/Helicopters/UH1H/UH1H.et"
}
m_RequiredPayment {
ADM_PaymentMethodCurrency "{5EFC9E9B1355521B}" {
m_BuyPayment {
ADM_PaymentMethodCurrency "{618C86A42079D21D}" {
m_Quantity 3000
}
}
Expand All @@ -64,19 +61,18 @@ GenericEntity : "{E55FC02F8C1518A2}Prefabs/Structures/Military/Flags/FlagPole_02
m_Merchandise ADM_MerchandiseVehicle "{5EFC9E9B2152420F}" {
m_sPrefab "{F1FBD0972FA5FE09}Prefabs/Vehicles/Wheeled/M923A1/M923A1_transport.et"
}
m_RequiredPayment {
ADM_PaymentMethodCurrency "{5EFC9E9D9CDADA83}" {
m_BuyPayment {
ADM_PaymentMethodCurrency "{618C86A429630AAC}" {
m_Quantity 1000
}
}
}
ADM_ShopMerchandise "{5EFC9E9D7815D580}" {
m_Merchandise ADM_MerchandiseItem "{5EFC9E9C856BB5D8}" {
m_sPrefab "{3E413771E1834D2F}Prefabs/Weapons/Rifles/M16/Rifle_M16A2.et"
m_AllowSaleWithFullInventory 0
}
m_RequiredPayment {
ADM_PaymentMethodCurrency "{5EFC9E9C81E5743E}" {
m_BuyPayment {
ADM_PaymentMethodCurrency "{618C86A4308695A3}" {
m_Quantity 250
}
}
Expand All @@ -85,8 +81,8 @@ GenericEntity : "{E55FC02F8C1518A2}Prefabs/Structures/Military/Flags/FlagPole_02
m_Merchandise ADM_MerchandiseItem "{5EFCF0B366F35735}" {
m_sPrefab "{E8F00BF730225B00}Prefabs/Weapons/Grenades/Grenade_M67.et"
}
m_RequiredPayment {
ADM_PaymentMethodCurrency "{5EFCF0B36D48E38F}" {
m_BuyPayment {
ADM_PaymentMethodCurrency "{618C86A4446EC82F}" {
m_Quantity 50
}
}
Expand All @@ -95,8 +91,8 @@ GenericEntity : "{E55FC02F8C1518A2}Prefabs/Structures/Military/Flags/FlagPole_02
m_Merchandise ADM_MerchandiseItem "{5EFCF0B3756D23B1}" {
m_sPrefab "{9DB69176CEF0EE97}Prefabs/Weapons/Grenades/Smoke_ANM8HC.et"
}
m_RequiredPayment {
ADM_PaymentMethodCurrency "{5EFCF0B370B2C600}" {
m_BuyPayment {
ADM_PaymentMethodCurrency "{618C86A44251F362}" {
m_Quantity 15
}
}
Expand All @@ -105,8 +101,8 @@ GenericEntity : "{E55FC02F8C1518A2}Prefabs/Structures/Military/Flags/FlagPole_02
m_Merchandise ADM_MerchandiseItem "{5F0ABB2E02718191}" {
m_sPrefab "{D2B48DEBEF38D7D7}Prefabs/Weapons/MachineGuns/M249/MG_M249.et"
}
m_RequiredPayment {
ADM_PaymentMethodCurrency "{5F0ABB2E14AAB475}" {
m_BuyPayment {
ADM_PaymentMethodCurrency "{618C86A448161866}" {
m_Quantity 500
}
}
Expand All @@ -115,18 +111,18 @@ GenericEntity : "{E55FC02F8C1518A2}Prefabs/Structures/Military/Flags/FlagPole_02
m_Merchandise ADM_MerchandiseItem "{5F0ABB2E1ECDA3A8}" {
m_sPrefab "{06D722FC2666EB83}Prefabs/Weapons/Magazines/Box_556x45_M249_200rnd_4Ball_1Tracer.et"
}
m_RequiredPayment {
ADM_PaymentMethodCurrency "{5F0ABB2E27895E9C}" {
m_BuyPayment {
ADM_PaymentMethodCurrency "{618C86A450545472}" {
m_Quantity 80
}
}
}
ADM_ShopMerchandise "{5F0ABB2E2C76A96F}" {
m_Merchandise ADM_MerchandiseType "{5F0ABB2E2ED858DD}" {
ADM_ShopMerchandise "{618C86AA12ED6763}" {
m_Merchandise ADM_MerchandiseItem "{618C86AA27797A95}" {
m_sPrefab "{4FCBBDF274FD2157}Prefabs/Weapons/Magazines/Box_556x45_M249_200rnd_Ball.et"
}
m_RequiredPayment {
ADM_PaymentMethodCurrency "{5F0ABB2E34C23A7D}" {
m_BuyPayment {
ADM_PaymentMethodCurrency "{618C86AA4D8A4025}" {
m_Quantity 80
}
}
Expand All @@ -135,8 +131,8 @@ GenericEntity : "{E55FC02F8C1518A2}Prefabs/Structures/Military/Flags/FlagPole_02
m_Merchandise ADM_MerchandiseItem "{5F0ABB2E3D35DDFB}" {
m_sPrefab "{4EEDDB27C023B8B9}Prefabs/Weapons/Magazines/Box_556x45_M249_200rnd_Tracer.et"
}
m_RequiredPayment {
ADM_PaymentMethodCurrency "{5F0ABB2E45B303AD}" {
m_BuyPayment {
ADM_PaymentMethodCurrency "{618C86A46A0F3EFF}" {
m_Quantity 80
}
}
Expand All @@ -145,8 +141,8 @@ GenericEntity : "{E55FC02F8C1518A2}Prefabs/Structures/Military/Flags/FlagPole_02
m_Merchandise ADM_MerchandiseItem "{5F0ABB2E49426C0E}" {
m_sPrefab "{9C5C20FB0E01E64F}Prefabs/Weapons/Launchers/M72/Launcher_M72A3.et"
}
m_RequiredPayment {
ADM_PaymentMethodCurrency "{5F0ABB2E515B3CD1}" {
m_BuyPayment {
ADM_PaymentMethodCurrency "{618C86A47CE46F82}" {
m_Quantity 400
}
}
Expand All @@ -155,8 +151,8 @@ GenericEntity : "{E55FC02F8C1518A2}Prefabs/Structures/Military/Flags/FlagPole_02
m_Merchandise ADM_MerchandiseItem "{5F0ABB2E5AEFBC67}" {
m_sPrefab "{79FA751EEBE25DDE}Prefabs/Weapons/Ammo/Ammo_Rocket_M72A3.et"
}
m_RequiredPayment {
ADM_PaymentMethodCurrency "{5F0ABB2E6DC1D99C}" {
m_BuyPayment {
ADM_PaymentMethodCurrency "{618C86AB870AE11C}" {
m_Quantity 200
}
}
Expand All @@ -165,8 +161,8 @@ GenericEntity : "{E55FC02F8C1518A2}Prefabs/Structures/Military/Flags/FlagPole_02
m_Merchandise ADM_MerchandiseItem "{5F0ABB2937092439}" {
m_sPrefab "{06B68C58B72EAAC6}Prefabs/Items/Equipment/Backpacks/Backpack_ALICE_Medium.et"
}
m_RequiredPayment {
ADM_PaymentMethodCurrency "{5F0ABB293C17701D}" {
m_BuyPayment {
ADM_PaymentMethodCurrency "{618C86AB8878804B}" {
m_Quantity 10
}
}
Expand All @@ -188,14 +184,6 @@ GenericEntity : "{E55FC02F8C1518A2}Prefabs/Structures/Military/Flags/FlagPole_02
"main"
}
}
GRAD_CheckBalanceUserAction "{5F0C7C86D7075612}" {
ParentContextList {
"main"
}
UIInfo UIInfo "{5F0C7C86D39E4A6B}" {
Name "Check Balance"
}
}
}
}
RplComponent "{5EFC80FFAFF86E41}" {
Expand Down
Loading