Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@KMiSSioNX
KMiSSioNX committed Apr 9, 2020
1 parent 6123b3c commit 2cc2039
Show file tree
Hide file tree
Showing 25 changed files with 1,335 additions and 406 deletions.
Binary file removed Colo-VTOL/assetbundles/chrprfvhcl_warriorvtol
View file
Binary file not shown.
Binary file added Colo-VTOL/assetbundles/warrior_body
View file
Binary file not shown.
Binary file removed Colo-VTOL/assetbundles/warrior_parts
View file
Binary file not shown.
175 changes: 130 additions & 45 deletions Colo-VTOL/hardpoints/hardpointdatadef_warriorvtol.json
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,132 @@
{
"ID" : "hardpointdatadef_warriorvtol",
"HardpointData" : [
{
"location" : "front",
"weapons" : [
[
"chrprfweap_warriorvtol_turret_generic_eh1"
]
],
"blanks" : [

],
"mountingPoints" : [

]
},
{
"location" : "right",
"weapons" : [
[
"chrprfweap_warriorvtol_turret_generic_eh1"
]
],
"blanks" : [

],
"mountingPoints" : [

]
},
{
"location" : "left",
"weapons" : [
[
"chrprfweap_warriorvtol_turret_generic_eh1"
]
],
"blanks" : [

],
"mountingPoints" : [

]
}
]
"ID": "hardpointdatadef_warriorvtol",
"CustomHardpoints": {
"prefabs": [
{
"prefab": "warrior_left_empty",
"shaderSrc": "chrPrfWeap_atlas_centertorso_laser_eh1",
"emitters": ["fire1","fire2"]
},
{
"prefab": "warrior_right_empty",
"shaderSrc": "chrPrfWeap_atlas_centertorso_laser_eh1",
"emitters": ["fire1","fire2"]
},
{
"prefab": "warrior_front_weapon_cannon",
"shaderSrc": "chrPrfWeap_atlas_centertorso_laser_eh1",
"emitters": ["fire1"]
},
{
"prefab": "warrior_front_weapon_gauss",
"shaderSrc": "chrPrfWeap_atlas_centertorso_laser_eh1",
"emitters": ["fire1"]
},
{
"prefab": "warrior_front_weapon_laser_large",
"shaderSrc": "chrPrfWeap_atlas_centertorso_laser_eh1",
"emitters": ["fire1"]
},
{
"prefab": "warrior_front_weapon_laser_small",
"shaderSrc": "chrPrfWeap_atlas_centertorso_laser_eh1",
"emitters": ["fire1"]
},
{
"prefab": "warrior_front_weapon_missile",
"shaderSrc": "chrPrfWeap_atlas_centertorso_laser_eh1",
"emitters": ["fire1","fire2","fire3","fire4","fire5","fire6","fire7","fire8","fire9","fire10","fire11","fire12","fire13"]
},
{
"prefab": "warrior_front_weapon_small",
"shaderSrc": "chrPrfWeap_atlas_centertorso_laser_eh1",
"emitters": ["fire1"]
}
],
"aliases": {
"chrPrfWeap_warriorvtol_left_laser_eh1": { "location": "left", "prefab": "warrior_left_empty" },
"chrPrfWeap_warriorvtol_left_ppc_eh1": { "location": "left", "prefab": "warrior_left_empty" },
"chrPrfWeap_warriorvtol_left_flamer_eh1": { "location": "left", "prefab": "warrior_left_empty" },
"chrPrfWeap_warriorvtol_left_lrm5_mh1": { "location": "left", "prefab": "warrior_left_empty" },
"chrPrfWeap_warriorvtol_left_lrm10_mh1": { "location": "left", "prefab": "warrior_left_empty" },
"chrPrfWeap_warriorvtol_left_lrm15_mh1": { "location": "left", "prefab": "warrior_left_empty" },
"chrPrfWeap_warriorvtol_left_lrm20_mh1": { "location": "left", "prefab": "warrior_left_empty" },
"chrPrfWeap_warriorvtol_left_srm2_mh1": { "location": "left", "prefab": "warrior_left_empty" },
"chrPrfWeap_warriorvtol_left_srm4_mh1": { "location": "left", "prefab": "warrior_left_empty" },
"chrPrfWeap_warriorvtol_left_srm6_mh1": { "location": "left", "prefab": "warrior_left_empty" },
"chrPrfWeap_warriorvtol_left_ac2_bh1": { "location": "left", "prefab": "warrior_left_empty" },
"chrPrfWeap_warriorvtol_left_ac5_bh1": { "location": "left", "prefab": "warrior_left_empty" },
"chrPrfWeap_warriorvtol_left_ac10_bh1": { "location": "left", "prefab": "warrior_left_empty" },
"chrPrfWeap_warriorvtol_left_ac20_bh1": { "location": "left", "prefab": "warrior_left_empty" },
"chrPrfWeap_warriorvtol_left_gauss_bh1": { "location": "left", "prefab": "warrior_left_empty" },
"chrPrfWeap_warriorvtol_left_lbx_bh1": { "location": "left", "prefab": "warrior_left_empty" },
"chrPrfWeap_warriorvtol_left_mg_bh1": { "location": "left", "prefab": "warrior_left_empty" },
"chrPrfWeap_warriorvtol_left_uac5_bh1": { "location": "left", "prefab": "warrior_left_empty" },

"chrPrfWeap_warriorvtol_right_laser_eh1": { "location": "right", "prefab": "warrior_right_empty" },
"chrPrfWeap_warriorvtol_right_ppc_eh1": { "location": "right", "prefab": "warrior_right_empty" },
"chrPrfWeap_warriorvtol_right_flamer_eh1": { "location": "right", "prefab": "warrior_right_empty" },
"chrPrfWeap_warriorvtol_right_lrm5_mh1": { "location": "right", "prefab": "warrior_right_empty" },
"chrPrfWeap_warriorvtol_right_lrm10_mh1": { "location": "right", "prefab": "warrior_right_empty" },
"chrPrfWeap_warriorvtol_right_lrm15_mh1": { "location": "right", "prefab": "warrior_right_empty" },
"chrPrfWeap_warriorvtol_right_lrm20_mh1": { "location": "right", "prefab": "warrior_right_empty" },
"chrPrfWeap_warriorvtol_right_srm2_mh1": { "location": "right", "prefab": "warrior_right_empty" },
"chrPrfWeap_warriorvtol_right_srm4_mh1": { "location": "right", "prefab": "warrior_right_empty" },
"chrPrfWeap_warriorvtol_right_srm6_mh1": { "location": "right", "prefab": "warrior_right_empty" },
"chrPrfWeap_warriorvtol_right_ac2_bh1": { "location": "right", "prefab": "warrior_right_empty" },
"chrPrfWeap_warriorvtol_right_ac5_bh1": { "location": "right", "prefab": "warrior_right_empty" },
"chrPrfWeap_warriorvtol_right_ac10_bh1": { "location": "right", "prefab": "warrior_right_empty" },
"chrPrfWeap_warriorvtol_right_ac20_bh1": { "location": "right", "prefab": "warrior_right_empty" },
"chrPrfWeap_warriorvtol_right_gauss_bh1": { "location": "right", "prefab": "warrior_right_empty" },
"chrPrfWeap_warriorvtol_right_lbx_bh1": { "location": "right", "prefab": "warrior_right_empty" },
"chrPrfWeap_warriorvtol_right_mg_bh1": { "location": "right", "prefab": "warrior_right_empty" },
"chrPrfWeap_warriorvtol_right_uac5_bh1": { "location": "right", "prefab": "warrior_right_empty" },

"chrPrfWeap_warriorvtol_front_laser_eh1": { "location": "front", "prefab": "warrior_front_weapon_laser_small" },
"chrPrfWeap_warriorvtol_front_ppc_eh1": { "location": "front", "prefab": "warrior_front_weapon_laser_large" },
"chrPrfWeap_warriorvtol_front_flamer_eh1": { "location": "front", "prefab": "warrior_front_weapon_laser_small" },
"chrPrfWeap_warriorvtol_front_lrm5_mh1": { "location": "front", "prefab": "warrior_front_weapon_missile" },
"chrPrfWeap_warriorvtol_front_lrm10_mh1": { "location": "front", "prefab": "warrior_front_weapon_missile" },
"chrPrfWeap_warriorvtol_front_lrm15_mh1": { "location": "front", "prefab": "warrior_front_weapon_missile" },
"chrPrfWeap_warriorvtol_front_lrm20_mh1": { "location": "front", "prefab": "warrior_front_weapon_missile" },
"chrPrfWeap_warriorvtol_front_srm2_mh1": { "location": "front", "prefab": "warrior_front_weapon_missile" },
"chrPrfWeap_warriorvtol_front_srm4_mh1": { "location": "front", "prefab": "warrior_front_weapon_missile" },
"chrPrfWeap_warriorvtol_front_srm6_mh1": { "location": "front", "prefab": "warrior_front_weapon_missile" },
"chrPrfWeap_warriorvtol_front_ac2_bh1": { "location": "front", "prefab": "warrior_front_weapon_cannon" },
"chrPrfWeap_warriorvtol_front_ac5_bh1": { "location": "front", "prefab": "warrior_front_weapon_cannon" },
"chrPrfWeap_warriorvtol_front_ac10_bh1": { "location": "front", "prefab": "warrior_front_weapon_cannon" },
"chrPrfWeap_warriorvtol_front_ac20_bh1": { "location": "front", "prefab": "warrior_front_weapon_cannon" },
"chrPrfWeap_warriorvtol_front_gauss_bh1": { "location": "front", "prefab": "warrior_front_weapon_gauss" },
"chrPrfWeap_warriorvtol_front_lbx_bh1": { "location": "front", "prefab": "warrior_front_weapon_cannon" },
"chrPrfWeap_warriorvtol_front_mg_bh1": { "location": "front", "prefab": "warrior_front_weapon_small" },
"chrPrfWeap_warriorvtol_front_uac5_bh1": { "location": "front", "prefab": "warrior_front_weapon_cannon" }

}
},
"HardpointData": [
{
"location": "front",
"weapons": [
[]
],
"blanks": [],
"mountingPoints": []
},
{
"location": "right",
"weapons": [
[]
],
"blanks": [],
"mountingPoints": []
},
{
"location": "left",
"weapons": [
[]
],
"blanks": [],
"mountingPoints": []
}
]
}
16 changes: 9 additions & 7 deletions Colo-VTOL/mod.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
"Manifest": [
{ "Type": "AssetBundle", "Path": "assetbundles" },

{ "Type": "Prefab", "Path": "assets/character/vehicle/prefabs/chrprfvhcl_warriorvtol.prefab", "AssetBundleName": "chrprfvhcl_warriorvtol" },
{ "Type": "Prefab", "Path": "assets/character/vehicle/prefabs/weapons/warriorvtol/chrprfweap_warriorvtol_turret_generic_eh1.prefab", "AssetBundleName": "chrprfvhcl_warriorvtol" },
{ "Type": "Prefab", "Path": "assets/rotor/warrior_rotor_bottom_x10_brass.prefab", "AssetBundleName": "warrior_parts" },
{ "Type": "Prefab", "Path": "assets/rotor/warrior_rotor_top_x10_brass.prefab", "AssetBundleName": "warrior_parts" },
{ "Type": "Prefab", "Path": "assets/rotor/warrior_turret_x10_red.prefab", "AssetBundleName": "warrior_parts" },


{ "Type": "Prefab", "Path": "assets/character/vehicle/prefabs/warrior_body.prefab", "AssetBundleName": "warrior_body" },
{ "Type": "Prefab", "Path": "assets/character/vehicle/prefabs/warrior_front_weapon_cannon.prefab", "AssetBundleName": "warrior_body" },
{ "Type": "Prefab", "Path": "assets/character/vehicle/prefabs/warrior_front_weapon_gauss.prefab", "AssetBundleName": "warrior_body" },
{ "Type": "Prefab", "Path": "assets/character/vehicle/prefabs/warrior_front_weapon_laser_large.prefab", "AssetBundleName": "warrior_body" },
{ "Type": "Prefab", "Path": "assets/character/vehicle/prefabs/warrior_front_weapon_laser_small.prefab", "AssetBundleName": "warrior_body" },
{ "Type": "Prefab", "Path": "assets/character/vehicle/prefabs/warrior_front_weapon_missile.prefab", "AssetBundleName": "warrior_body" },
{ "Type": "Prefab", "Path": "assets/character/vehicle/prefabs/warrior_front_weapon_small.prefab", "AssetBundleName": "warrior_body" },
{ "Type": "Prefab", "Path": "assets/character/vehicle/prefabs/warrior_left_empty.prefab", "AssetBundleName": "warrior_body" },
{ "Type": "Prefab", "Path": "assets/character/vehicle/prefabs/warrior_right_empty.prefab", "AssetBundleName": "warrior_body" },
{ "Type": "SoundBankDef", "Path": "soundbanks" },
{ "Type": "HardpointDataDef", "Path": "hardpoints" },
{ "Type": "MovementCapabilitiesDef", "Path": "movement" },
Expand Down
1 change: 0 additions & 1 deletion Colo-VTOL/modstate.json
View file

This file was deleted.

4 changes: 2 additions & 2 deletions Colo-VTOL/movement/movedef_warriorvtol.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"Details" : "",
"Icon" : ""
},
"MaxWalkDistance" : 165.0,
"MaxSprintDistance" : 275.0,
"MaxWalkDistance" : 420.0,
"MaxSprintDistance" : 540.0,
"WalkVelocity" : 20.0,
"RunVelocity" : 28.0,
"SprintVelocity" : 31.0,
Expand Down
Binary file modified Colo-VTOL/soundbanks/Helicopter.bnk
View file
Binary file not shown.
23 changes: 15 additions & 8 deletions Colo-VTOL/vehicle/vehicledef_WARRIOR_VTOL.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,36 +60,43 @@
],
"inventory" : [
{
"ComponentDefID" : "Weapon_Laser_SmallLaserER_0-STOCK",
"ComponentDefID" : "Weapon_MachineGun_MachineGun_0-STOCK",
"ComponentDefType" : "Weapon",
"MountedLocation" : "Front",
"HardpointSlot" : 0,
"prefabName": "chrprfweap_warriorvtol_turret_generic_eh1",
"hasPrefabName": true,
"prefabName": null,
"hasPrefabName": false,
"DamageLevel" : "Functional"
},
{
"ComponentDefID" : "Weapon_SRM_SRM4_0-UNG",
"ComponentDefType" : "Weapon",
"MountedLocation" : "Left",
"HardpointSlot" : 0,
"prefabName": "chrprfweap_warriorvtol_turret_generic_eh1",
"hasPrefabName": true,
"prefabName": null,
"hasPrefabName": false,
"DamageLevel" : "Functional"
},
{
"ComponentDefID" : "Weapon_SRM_SRM4_0-UNG",
"ComponentDefType" : "Weapon",
"MountedLocation" : "Right",
"HardpointSlot" : 0,
"prefabName": "chrprfweap_warriorvtol_turret_generic_eh1",
"hasPrefabName": true,
"prefabName": null,
"hasPrefabName": false,
"DamageLevel" : "Functional"
},
{
"ComponentDefID" : "Ammo_AmmunitionBox_Generic_SRM",
"ComponentDefType" : "AmmunitionBox",
"MountedLocation" : "Front",
"MountedLocation" : "Rear",
"HardpointSlot" : -1,
"DamageLevel" : "Functional"
},
{
"ComponentDefID" : "Ammo_AmmunitionBox_Generic_MG",
"ComponentDefType" : "AmmunitionBox",
"MountedLocation" : "Rear",
"HardpointSlot" : -1,
"DamageLevel" : "Functional"
}
Expand Down
Loading

0 comments on commit 2cc2039

Please sign in to comment.