Skip to content
This repository has been archived by the owner on Apr 14, 2020. It is now read-only.

Merger from FastTrack fork - Phase I (Core) #1006

Merged
merged 451 commits into from
Feb 20, 2020
Merged

Merger from FastTrack fork - Phase I (Core) #1006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
451 commits
Select commit Hold shift + click to select a range
6dab6d4
Fix error in Supported Third-Party Mods list (2)
sumghai Nov 8, 2019
79ab6c1
Merge pull request #126 from NoImageAvailable/master
sumghai Nov 9, 2019
db00ad2
Rebalance Advanced ammo/projectile stats
Nov 9, 2019
52b2d2a
Rebalance High Caliber ammo/projectile stats
Nov 9, 2019
dc8b4b2
Rebalance Rifle ammo/projectile stats
Nov 9, 2019
98eb7d3
Rebalance Shell ammo/projectile stats
Nov 9, 2019
c884c40
Rebalance Shotgun ammo/projectile stats
Nov 9, 2019
2e99958
Update to 1.0.1.6-FT-007
Nov 9, 2019
99b1381
Rebalance Rifle ammo/projectile stats (final)
Nov 9, 2019
411b132
Merge pull request #131 from NoImageAvailable/master
sumghai Nov 10, 2019
c4ed93c
Flatten Dragonian Race patch structure
Nov 10, 2019
1eee61e
Flatten Kurin patch structure and integrate updates
Nov 10, 2019
d38d21d
Update RN & RH Armor and Headgear stats
Nov 10, 2019
2462662
Rebalance High Caliber ammo/projectile stats (final)
Nov 10, 2019
33de9e7
Update to 1.0.1.6-FT-008
Nov 10, 2019
d8a907e
Mark Kurin as also patched by upstream CE
AthenaSulisMinerva Nov 10, 2019
ef6232c
Merge pull request #134 from NoImageAvailable/master
AthenaSulisMinerva Nov 11, 2019
f03b5e4
Merge Rabbie patch with content from upstream CE
AthenaSulisMinerva Nov 11, 2019
6d1375c
Update compatible mod list
AthenaSulisMinerva Nov 11, 2019
24f6b5e
Rebalance C4 charge ammo/projectile stats (final)
Nov 11, 2019
05c769a
Update Mechanoids Extraordinaire patches to 1.7
Nov 12, 2019
c734be9
Rebalance Shell ammo/projectile stats (final)
Nov 12, 2019
ee7d050
Adjust Red Horse LMM T-55 tank carrying capacity
Nov 12, 2019
f1aa6fb
Adjust Android Tiers M7 Mech carrying capacity
Nov 12, 2019
19deb88
Adjust MVT Precision Turret magazine size
Nov 12, 2019
a23217e
Merge branch 'master' of https://github.com/NoImageAvailable/CombatEx…
AthenaSulisMinerva Nov 12, 2019
a278c0a
Rebuild assembly for 1.7
AthenaSulisMinerva Nov 12, 2019
02dfa4d
Tweak Rimefeller Synthamide StuffPower_Armor_Heat
sumghai Nov 13, 2019
702b2cd
Merge branch 'master' of https://github.com/NoImageAvailable/CombatEx…
AthenaSulisMinerva Nov 13, 2019
533cd06
Rebuild assembly for 1.8
AthenaSulisMinerva Nov 13, 2019
a91d71c
Cleanup Megafauna patches
AthenaSulisMinerva Nov 13, 2019
7582d85
Merge pull request #141 from NoImageAvailable/master
AthenaSulisMinerva Nov 14, 2019
db1f1aa
Rebalance Glitter Tech Orion Corp armor
sumghai Nov 15, 2019
e1f2838
Rebalance Glitter Tech Nanosuit armor
sumghai Nov 15, 2019
6d6ee14
Add 50mm GS-50 Grenade ammo defs
Nov 15, 2019
18141d2
Add Soviet Armory infantry weapons patch
Nov 15, 2019
56f4eb1
Add CE recipe for Soviet Armory RPO-Z launcher
Nov 16, 2019
deab42a
Add Soviet Armory turret weapons patch
Nov 16, 2019
abdb8b5
Tweak Soviet Armory AGS-17 LoS setting
Nov 16, 2019
1b159ba
Fix incorrect Soviet Armory turret specialDisplayRadius
Nov 16, 2019
5137fde
Rebalance DMGTP turret ranges and display radii
Nov 16, 2019
77ef114
Rebalance More Vanilla Turrets ranges and display radii
Nov 16, 2019
6d42bf9
Add missing minRange values for More Vanilla Turrets
Nov 16, 2019
8921915
Update Devastator mortar for More Vanilla Turrets
Nov 16, 2019
5bc5a7e
Add Alpha Animals patch
Nov 16, 2019
2639462
Merge branch 'master' of https://github.com/NoImageAvailable/CombatEx…
AthenaSulisMinerva Nov 16, 2019
3484c39
Update Android Tiers patch with selected upstream changes
AthenaSulisMinerva Nov 16, 2019
f23f222
Merge branch 'master' of https://github.com/NoImageAvailable/CombatEx…
Nov 17, 2019
e38f6c3
Add Mantrap patch for Alpha Animals
Nov 17, 2019
fb69782
Tweak Alpha Animals projectile armor penetration stats
Nov 17, 2019
61da9f6
Amend list with mods patched from upstream CE only
sumghai Nov 17, 2019
edbb420
Update upstream CE patches count
sumghai Nov 17, 2019
91119b8
Update modlist with CE:FT additions
sumghai Nov 17, 2019
ee42663
Update CE:FT patched mods count
sumghai Nov 17, 2019
1ae7dcb
Fix error in patch list
sumghai Nov 17, 2019
d22b5df
Fix patch list count
sumghai Nov 17, 2019
f4da74b
Update to 1.0.1.8-FT-009
sumghai Nov 17, 2019
27f391b
Rebalance DMGTP turrets; add minRange for Mk 19
Nov 17, 2019
a9b161e
Merge branch 'master' of https://github.com/NoImageAvailable/CombatEx…
AthenaSulisMinerva Nov 18, 2019
674c899
Clean up Android Tiers patch update
AthenaSulisMinerva Nov 18, 2019
7053ce1
Rebuild assembly for 1.8.2
AthenaSulisMinerva Nov 18, 2019
835d31c
Update RN Clothing backpack and harness layers
Nov 18, 2019
223a7d1
Update RH Elite Crew harness layers
Nov 18, 2019
6bedbf9
Update RH The Ghosts backpack layers
Nov 18, 2019
80601de
Update NewRatkinPlus backpack and sack layers
Nov 18, 2019
ab0a499
Merge pull request #159 from NoImageAvailable/master
sumghai Nov 18, 2019
01da5d7
Consolidate Xenohumans patch with upstream content
Nov 18, 2019
118eac9
Update Weapons_Mechanoid.xml
Nov 19, 2019
7817dcd
Merge pull request #161 from NickZiggy/patch-1
sumghai Nov 19, 2019
c7498f9
Update RN Clothing parka/jacket StuffEffectMultiplierArmor
Nov 19, 2019
828a698
Remove StuffEffectMultiplierArmor patch from RN Clothing Ghillie
Nov 19, 2019
743f104
Update RH Factions parka/jacket StuffEffectMultiplierArmor
Nov 19, 2019
86d4148
Update RH Furniture parka/jacket StuffEffectMultiplierArmor
Nov 19, 2019
2468379
Update RH Faction and Furniture armor/headgear stats
Nov 19, 2019
d685075
Add Crepuscular Beetle patch for Alpha Animals
Nov 19, 2019
8c7d029
Update RH Elite Crew grenade and C4 patches
Nov 19, 2019
a4e3547
Add RH Elite Crew skinner knife patch
Nov 19, 2019
f363b3c
Patch RN Clothing PASGT helmet costlist with Rimefeller option
Nov 20, 2019
8d2f7dc
Rebalance Rocket ammo/projectile stats (final)
Nov 21, 2019
91e99ed
Merge pull request #165 from NoImageAvailable/master
AthenaSulisMinerva Nov 22, 2019
2413ba7
Rebalance Grenade ammo/projectile stats (final)
Nov 23, 2019
2680839
Fix error in PIAT grenade projectile
Nov 23, 2019
1eff654
Add British Military Kit patch
Nov 23, 2019
6482c90
Update compatible mods list
AthenaSulisMinerva Nov 23, 2019
d91c4f4
Reorder compatible mods list
AthenaSulisMinerva Nov 23, 2019
273e05c
Update to 1.0.1.8-FT-010
AthenaSulisMinerva Nov 23, 2019
1561e64
Fix incorrect defName for 7.92x57mm Mauser rifle cartridge
Nov 24, 2019
3075bf5
Add 7.65x20mm Longue Pistol cartridge ammo definition
Nov 24, 2019
dfc9805
Add .455 Webley Pistol cartridge ammo definition
Nov 24, 2019
923ff77
Merge pull request #169 from NoImageAvailable/master
AthenaSulisMinerva Nov 25, 2019
4118770
Reduce Red Horse LMM T-55 tank blunt armor rating
Nov 25, 2019
b72f6af
Add [Pratt] WW2 Weapons ranged, melee and turret weapons patches
Nov 26, 2019
72bf742
Fix incorrect 9x19mm Parabellum Tranq pistol cartridge crafting product
Nov 26, 2019
7801716
Add [Pratt] WW2 Weapons grenade patches
Nov 27, 2019
e2f956a
Fix success=Always for [Pratt] WW2 Weapons grenade patches
Nov 28, 2019
34f44ed
Add [Ods] Kaiser Reich's Imperial Army Apparel patches
Nov 28, 2019
364d277
Add [Ods] Third Reich Uniforms patches
Nov 29, 2019
b162569
Update gas mask from FashionRIMsta
Nov 30, 2019
f41fd69
Update gas mask from Red Horse Umbra Company
Nov 30, 2019
7a1c9e0
Update gas masks from RN Clothing
Nov 30, 2019
0a5f721
Remove unneeded tags from RN Weapons Orbital EMP
Nov 30, 2019
6d5c561
Rebalance Advanced ammo/projectile stats (final)
Nov 30, 2019
912ef42
Rebalance Alien Weapons ammo/projectile stats (final)
Nov 30, 2019
68c0028
Merge pull request #180 from NoImageAvailable/master
AthenaSulisMinerva Dec 1, 2019
6815e3b
Rebuild assembly for 1.8.2 + changes
AthenaSulisMinerva Dec 1, 2019
94f7e53
Update compatible mods list
AthenaSulisMinerva Dec 1, 2019
1357fd7
Update to 1.0.1.8-FT-011
AthenaSulisMinerva Dec 1, 2019
e61d79a
Update T-45b Power Armor armor/headgear stats
Dec 3, 2019
5a39835
Rebalance and fix missing Ni'Hal weapon melee tool stats
Dec 3, 2019
57bc65b
Update melee stats and tools for RH The Ghosts German Shepard
Dec 4, 2019
9be3bcd
Add 130mm Type 63 Rocket ammo definition
Dec 7, 2019
e77d8f8
Add 120mm Cannon Shell ammo definition
Dec 7, 2019
d81809c
Add 155mm Howitzer Shell ammo definition
Dec 7, 2019
2be04bc
Add 57x483mm Bofors Autocannon ammo definition
Dec 7, 2019
06f218a
Add 28cm Spgr. Cannon Shell ammo definition
Dec 7, 2019
aa782b1
Add 20x128mm Oerlikon Autocannon ammo definition
Dec 7, 2019
56aa03b
Add 30x173mm NATO Autocannon ammo definition
Dec 7, 2019
4fc19e3
Fix missing 130mm Type 63 Rocket ammo ThingCatDef label
Dec 7, 2019
bf2abdb
Tweak Heavy Weapons research project description
Dec 8, 2019
4f0962c
Increase 20x102mm NATO Autocannon ammo stack size
Dec 8, 2019
4c2cd78
Add missing effects and tweak mortar/shell/rocket gravity modifier
Dec 8, 2019
6f25982
Add Turret Collection patches
Dec 8, 2019
c658420
Merge pull request #198 from NoImageAvailable/master
AthenaSulisMinerva Dec 10, 2019
885b1f6
Rebalance 28cm Spgr. Cannon Shell ammo stats
Dec 10, 2019
ef5f42c
Add new graphics for 120mm Cannon Shell ammo
Dec 10, 2019
726938f
Add new graphics for 130mm Type 63 Rocket ammo
Dec 10, 2019
d29bf14
Reorganize rocket ammo and project graphics location
Dec 10, 2019
5e9b50d
Create indirect-fire version of M74 rocket ammo for TC Incendiary Lau…
Dec 11, 2019
d952a7c
Update [Pratt] WW2 Weapons patches with new ranged weapons
Dec 11, 2019
5ffe099
Tweak [Pratt] WW2 Weapons Chauchat LMG FireModes
Dec 12, 2019
3b36ab5
Update [Pratt] WW2 Weapons patches with new hand grenades
Dec 12, 2019
053fb2a
Rebalance Shotgun ammo/projectile stats (final)
Dec 12, 2019
a94b22e
Add unique artwork for 50mm GS-50 Grenade ammo
Dec 13, 2019
d7e31d0
Add new compatible mods
sumghai Dec 13, 2019
5f0f4ad
Update to 1.0.1.8-FT-012
sumghai Dec 13, 2019
bf220a0
Move CP British Military Kit patch folder
Dec 14, 2019
7828b7d
Rename CP British Military Kit patch files
Dec 14, 2019
c8815d6
Merge pull request #202 from NoImageAvailable/master
AthenaSulisMinerva Dec 15, 2019
8a6d962
Fix Forsakens Nightling stats and melee tools
AthenaSulisMinerva Dec 15, 2019
473a25f
Reduce damage for tranq ammo
Dec 15, 2019
b444938
Add [CP] Metal Gear Solid patches
Dec 15, 2019
c5d5f72
Add [CP] Spec Ops: The Line patches
Dec 17, 2019
85a7555
Update 5x35mmCharged.xml
Dec 17, 2019
f7c78df
Update 5x35mmCharged.xml
Dec 18, 2019
25fcdd6
Merge pull request #210 from NickZiggy/patch-1
sumghai Dec 18, 2019
2b8dbe6
Fix stats for assorted ammo
Dec 22, 2019
cc691e4
Add 76.2x385mmR Cannon Shell ammo definition
Dec 22, 2019
491a129
Reduce drug item bulk
Dec 22, 2019
4a6c70e
Add WWII Soviet Faction patches
Dec 22, 2019
c5e4067
Fix Elite Guardener apparel PatchOp in NewRatkinPlus patches
AthenaSulisMinerva Dec 23, 2019
7e29410
Reduce MVT Devastator mortar cooldown time
Dec 23, 2019
894a147
Simplify stack size graphics for 120mm Cannon Shell ammo
Dec 23, 2019
410112b
Update NewRatkinPlus patches with new armor stats
AthenaSulisMinerva Dec 24, 2019
4f5cf66
Update NewRatkinPlus patches with new weapons and melee stats
AthenaSulisMinerva Dec 26, 2019
6884f12
Update NewRatkinPlus patches with new King Hamster and race stats
AthenaSulisMinerva Dec 26, 2019
c504cef
Rebalance RN Weapons melee tools and ranged stats
Dec 29, 2019
8018e06
Rebalance RH Umbra Company guns and melee tools stats
Dec 31, 2019
4b94714
Rebalance and consolidate RH Umbra Company apparel patches
Dec 31, 2019
f946026
Add BTR-70 APC & KPV HMG to RH Umbra Company patches
Dec 31, 2019
6c3ae04
Add APC crew and tweak RH Umbra Company pawn patches
Dec 31, 2019
cd2c699
List All Your Base as an incompatible mod
AthenaSulisMinerva Dec 31, 2019
c388409
Rebalance RH The Ghosts guns and melee tools stats
Dec 31, 2019
9ff6cec
Rebalance and consolidate RH The Ghosts apparel patches
Dec 31, 2019
a686a91
Tweak RH The Ghosts pawn patches
Dec 31, 2019
c5c0704
Remove Lizardmen patches
AthenaSulisMinerva Jan 1, 2020
d09858c
Remove Yabils patches
AthenaSulisMinerva Jan 1, 2020
13162cc
Remove support for Lizardmen and Yabils
AthenaSulisMinerva Jan 1, 2020
e6e3d10
Rebalance RH Task Force 141 guns and melee tools stats
Jan 1, 2020
e8bc07b
Rebalance and consolidate RH Task Force 141 apparel patches
Jan 1, 2020
b7fe232
Rebalance RH MSF guns and melee tools stats
Jan 1, 2020
c7c8ea1
Rebalance and consolidate RH MSF apparel patches
Jan 1, 2020
da8ee6d
Rebalance RH Elite Crew guns and melee tools stats
Jan 2, 2020
3baf7d4
Rebalance and consolidate RH Elite Crew apparel patches
Jan 2, 2020
b904f2d
Add RGD-5 grenade, bomber pawn for RH Elite Crew patches
Jan 2, 2020
09bf2ff
Rebalance RN Clothing patches and fix cross-mod compatibility
Jan 4, 2020
4c34566
Update RH Furniture patch with new FBI content
Jan 4, 2020
5a1a0ee
Update RH Last Man Mercs to Last Man Contingent
Jan 4, 2020
2b27bb6
Fix incorrect ammo for CP/RH/RN Uzis
Jan 5, 2020
561bfd0
Update RH Last Man Contingent patches with ammo for scenario
Jan 5, 2020
0ab893a
Add RH Cordis Die patches
Jan 6, 2020
c84396b
Merge branch 'master' of https://github.com/NoImageAvailable/CombatEx…
AthenaSulisMinerva Jan 6, 2020
c26c557
Rebuild for 1.0.1.8 with updated assembly info
AthenaSulisMinerva Jan 6, 2020
e6cabe1
Merge branch 'master' of https://github.com/NoImageAvailable/CombatEx…
AthenaSulisMinerva Jan 7, 2020
d875197
Manually update Android Tiers patches
AthenaSulisMinerva Jan 7, 2020
b60b18b
Merge pull request #235 from NoImageAvailable/master
AthenaSulisMinerva Jan 7, 2020
971d6e5
Merge branch 'master' of https://github.com/NoImageAvailable/CombatEx…
AthenaSulisMinerva Jan 8, 2020
4752d21
Manually update Kurin patches BodyDefs
AthenaSulisMinerva Jan 8, 2020
c6896b7
Manually update Rabbie the Moonrabbit patches BodyDefs
AthenaSulisMinerva Jan 8, 2020
7b01752
Add optional ammoConsumedPerShotCount parameter to Verb_ShootCE
Jan 11, 2020
40ce8cc
Merge pull request #241 from NoImageAvailable/master
AthenaSulisMinerva Jan 12, 2020
36218db
Add Doom Kit - Classic unique ammo
Jan 13, 2020
9576942
Add DOOM Kit - Classic patches
Jan 13, 2020
94fd8c0
Merge pull request #247 from NoImageAvailable/master
AthenaSulisMinerva Jan 13, 2020
ff3f6c5
Merge pull request #252 from NoImageAvailable/master
AthenaSulisMinerva Jan 16, 2020
c0bc973
Tweak Doom Classic UAC Energy Cell thingCategory
Jan 16, 2020
dd3a60c
Buff Praetor suit carrying capacity for DOOM Kit - Classic patches
Jan 16, 2020
b7d8421
Rebalance generic Plasma ammo mass and bulk
Jan 24, 2020
5e9e58a
Rebalance Doom Kit - Classic unique ammo stats
Jan 24, 2020
b8a48c3
Remove crafting cost changes from DOOM Kit - Classic patches
Jan 24, 2020
fb95b44
Add Doom 1.0 unique ammo
Jan 24, 2020
6281537
Add DOOM 1.0 patches
Jan 24, 2020
3005236
Fix incorrect weapon sounddef for WWII Soviet Faction patches
Jan 26, 2020
67e10aa
Add missing M9 HRT pistol for Umbra Company patches
Jan 26, 2020
6fdffa8
Update pawn sidearm + ammo inventory for CP/RH/RN faction patches
Jan 26, 2020
365679c
Add new compatible mods
sumghai Jan 26, 2020
9c8d256
Add new ammoConsumedPerShotCount feature
sumghai Jan 26, 2020
146e93b
Update to 1.0.1.8-FT-013
sumghai Jan 26, 2020
214f33f
Create issue templates
AthenaSulisMinerva Jan 27, 2020
c9c411e
Test reverting assembly version number
Jan 28, 2020
c3d94c7
Test re-increment assembly version number
Jan 29, 2020
1f42f46
Revert "Test re-increment assembly version number"
Jan 29, 2020
c5c10f3
Merge pull request #273 from AthenaSulisMinerva/vefs-ce-debug
sumghai Jan 29, 2020
a2b2f03
Update to 1.0.1.8-FT-014
sumghai Jan 29, 2020
c9d5948
Simplify Declarations of Due Diligence subsection
sumghai Feb 3, 2020
eb85b74
Fix checkbox
sumghai Feb 3, 2020
345698c
Remove checkboxes from Detailed Information
sumghai Feb 3, 2020
aec4e14
Patches: Fix Mechanoids Extraordinaire
cal066 Feb 5, 2020
01b3c61
Merge pull request #283 from cal066/fix-me
AthenaSulisMinerva Feb 6, 2020
9ac8665
Patches: Star Wars - Factions
cal066 Feb 6, 2020
d9dda4c
Merge pull request #286 from cal066/starwasfactions
AthenaSulisMinerva Feb 7, 2020
45c3215
Move mod-unqiue ammo textures to ThirdParty subfolder
Feb 16, 2020
50a656c
Move sub-30mm Shells to High Caliber
Feb 16, 2020
ce2d397
Move Missile ammo defs back to Rocket folder (housekeeping)
Feb 16, 2020
52c0ff1
Rebalance crafting stats for Tranq ammo
Feb 16, 2020
dc98e03
Rebalance various ammo stats
Feb 16, 2020
7bc3ae3
Merge branch 'Development' of https://github.com/CombatExtendedRWMod/…
Feb 17, 2020
9fb046e
Misc patch fixes from upstream
Feb 17, 2020
e90f76d
Merge pull request #297 from CombatExtendedRWMod/Development
sumghai Feb 17, 2020
95da7a0
Merge branch 'master' of https://github.com/CombatExtendedRWMod/Comba…
Feb 17, 2020
86b0163
Merge branch 'CombatExtendedRWMod-master'
Feb 17, 2020
e000bb2
Merge branch 'master' of https://github.com/AthenaSulisMinerva/Combat…
Feb 17, 2020
db4a980
Change Bofors ammo category to Shells
Feb 18, 2020
f3ef28e
Temp fix for placeholder textures used by mod-unique ammo
Feb 18, 2020
5b118b8
Revert debug log prefix to "Combat Extended"
Feb 18, 2020
793e15b
Remove mod-unique ammo
Feb 18, 2020
503fe3b
Revert to CE 1.9 patches
Feb 18, 2020
8dc992f
Remove issue templates
Feb 18, 2020
4ee1f7e
Revert to CE About and mod metadata files
Feb 18, 2020
671ef32
Revert to CE original preview image
Feb 18, 2020
9ac45fa
Misc sync with CE dev branch
Feb 18, 2020
426a930
Misc sync with CE dev branch 2
Feb 19, 2020
c404e4c
Misc sync with CE dev branch 3
Feb 19, 2020
d7373bc
Misc sync with CE dev branch 4
Feb 19, 2020
6787088
Misc sync with CE dev branch 5
Feb 19, 2020
d55f516
Add drug item bulk adjustments; revert to original CE README
Feb 19, 2020
a71b8e8
Update leftover FT mention
zozilin Feb 19, 2020
edc2a6f
Move Tranq Nonlethal ammo category to general
Feb 20, 2020
0a721e3
Temporarily remove Tranq Nonlethal ammo from library
Feb 20, 2020
2d3daa1
Fix incorrect texture paths for various rockets and missiles
Feb 20, 2020
0f5cd42
Add missing ThingCategoryDef for missile and medieval ammo
Feb 20, 2020
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
40 changes: 20 additions & 20 deletions About/Manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Manifest>
<identifier>CombatExtended</identifier>
<version>1.0.1.8.2</version>
<dependencies>
</dependencies>
<incompatibleWith>
<li>1508165821</li> <!-- [XND] Targeting Modes -->
</incompatibleWith>
<loadBefore>
</loadBefore>
<loadAfter>
</loadAfter>
<suggests>
<li>CombatExtendedGuns</li> <!-- CE Guns -->
</suggests>
<showCrossPromotions>true</showCrossPromotions>
<manifestUri>https://raw.githubusercontent.com/NoImageAvailable/CombatExtended/master/About/Manifest.xml</manifestUri>
<downloadUri>https://github.com/NoImageAvailable/CombatExtended/releases/latest</downloadUri>
</Manifest>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Manifest>
<identifier>CombatExtended</identifier>
<version>1.0.1.8.2</version>
<dependencies>
</dependencies>
<incompatibleWith>
<li>1508165821</li> <!-- [XND] Targeting Modes -->
</incompatibleWith>
<loadBefore>
</loadBefore>
<loadAfter>
</loadAfter>
<suggests>
<li>CombatExtendedGuns</li> <!-- CE Guns -->
</suggests>
<showCrossPromotions>true</showCrossPromotions>
<manifestUri>https://raw.githubusercontent.com/NoImageAvailable/CombatExtended/master/About/Manifest.xml</manifestUri>
<downloadUri>https://github.com/NoImageAvailable/CombatExtended/releases/latest</downloadUri>
</Manifest>
Binary file modified Assemblies/CombatExtended.dll
View file
Open in desktop
Binary file not shown.
103 changes: 103 additions & 0 deletions Defs/Ammo/Advanced/12mmRailgun.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<ThingCategoryDef>
<defName>Ammo12mmRailgun</defName>
<label>12mm Railgun</label>
<parent>AmmoAdvanced</parent>
<iconPath>UI/Icons/ThingCategories/CaliberRailgunHighCaliber</iconPath>
</ThingCategoryDef>

<!-- ==================== AmmoSet ========================== -->

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_12mmRailgun</defName>
<label>12mm Railgun</label>
<ammoTypes>
<Ammo_12mmRailgun_Sabot>Bullet_12mmRailgun_Sabot</Ammo_12mmRailgun_Sabot>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<!-- ==================== Ammo ========================== -->

<ThingDef Class="CombatExtended.AmmoDef" ParentName="SmallAmmoBase">
<defName>Ammo_12mmRailgun_Sabot</defName>
<label>12mm Railgun cartridge (Sabot)</label>
<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for large-caliber railgun weapons.</description>
<statBases>
<Mass>0.051</Mass>
<Bulk>0.04</Bulk>
<MarketValue>0.33</MarketValue>
</statBases>
<tradeTags>
<li>CE_AutoEnableTrade</li>
<li>CE_AutoEnableCrafting_TableMachining</li>
<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
</tradeTags>
<thingCategories>
<li>Ammo12mmRailgun</li>
</thingCategories>
<stackLimit>200</stackLimit>
<graphicData>
<texPath>Things/Ammo/Railgun/HighCaliber</texPath>
<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
</graphicData>
<ammoClass>RailgunSabot</ammoClass>
</ThingDef>

<!-- ================== Projectiles ================== -->

<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBullet">
<defName>Bullet_12mmRailgun_Sabot</defName>
<label>12mm Railgun bullet (Sabot)</label>
<graphicData>
<texPath>Things/Projectile/Bullet_Big</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bullet</damageDef>
<damageAmountBase>76</damageAmountBase>
<armorPenetrationSharp>140</armorPenetrationSharp>
<armorPenetrationBlunt>2918.76</armorPenetrationBlunt>
<speed>500</speed>
</projectile>
</ThingDef>

<!-- ==================== Recipes ========================== -->

<RecipeDef ParentName="AmmoRecipeBase">
<defName>MakeAmmo_12mmRailgun_Sabot</defName>
<label>make 12mm Railgun cartridge (Sabot) x200</label>
<description>Craft 200 12mm Railgun (Sabot) cartridges.</description>
<jobString>Making 12mm Railgun (Sabot) cartridges.</jobString>
<workAmount>2200</workAmount>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>2</count>
</li>
<li>
<filter>
<thingDefs>
<li>Uranium</li>
</thingDefs>
</filter>
<count>10</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
<li>Uranium</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_12mmRailgun_Sabot>200</Ammo_12mmRailgun_Sabot>
</products>
</RecipeDef>

</Defs>
102 changes: 102 additions & 0 deletions Defs/Ammo/Advanced/6mmRailgun.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<ThingCategoryDef>
<defName>Ammo6mmRailgun</defName>
<label>6mm Railgun</label>
<parent>AmmoAdvanced</parent>
<iconPath>UI/Icons/ThingCategories/CaliberRailgunRifle</iconPath>
</ThingCategoryDef>

<!-- ==================== AmmoSet ========================== -->

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_6mmRailgun</defName>
<label>6mm Railgun</label>
<ammoTypes>
<Ammo_6mmRailgun_Sabot>Bullet_6mmRailgun_Sabot</Ammo_6mmRailgun_Sabot>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<!-- ==================== Ammo ========================== -->

<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
<defName>Ammo_6mmRailgun_Sabot</defName>
<label>6mm Railgun cartridge (Sabot)</label>
<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
<statBases>
<Mass>0.01</Mass>
<Bulk>0.008</Bulk>
<MarketValue>0.06</MarketValue>
</statBases>
<tradeTags>
<li>CE_AutoEnableTrade</li>
<li>CE_AutoEnableCrafting_TableMachining</li>
<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
</tradeTags>
<thingCategories>
<li>Ammo6mmRailgun</li>
</thingCategories>
<graphicData>
<texPath>Things/Ammo/Railgun/Rifle</texPath>
<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
</graphicData>
<ammoClass>RailgunSabot</ammoClass>
</ThingDef>

<!-- ================== Projectiles ================== -->

<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBullet">
<defName>Bullet_6mmRailgun_Sabot</defName>
<label>6mm Railgun bullet (Sabot)</label>
<graphicData>
<texPath>Things/Projectile/Bullet_Small</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bullet</damageDef>
<damageAmountBase>27</damageAmountBase>
<armorPenetrationSharp>59</armorPenetrationSharp>
<armorPenetrationBlunt>290.80</armorPenetrationBlunt>
<speed>400</speed>
</projectile>
</ThingDef>

<!-- ==================== Recipes ========================== -->

<RecipeDef ParentName="AmmoRecipeBase">
<defName>MakeAmmo_6mmRailgun_Sabot</defName>
<label>make 6mm Railgun cartridge (Sabot) x500</label>
<description>Craft 500 6mm Railgun (Sabot) cartridges.</description>
<jobString>Making 6mm Railgun (Sabot) cartridges.</jobString>
<workAmount>1000</workAmount>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>2</count>
</li>
<li>
<filter>
<thingDefs>
<li>Uranium</li>
</thingDefs>
</filter>
<count>4</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
<li>Uranium</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_6mmRailgun_Sabot>500</Ammo_6mmRailgun_Sabot>
</products>
</RecipeDef>

</Defs>
102 changes: 102 additions & 0 deletions Defs/Ammo/Advanced/8mmRailgun.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<ThingCategoryDef>
<defName>Ammo8mmRailgun</defName>
<label>8mm Railgun</label>
<parent>AmmoAdvanced</parent>
<iconPath>UI/Icons/ThingCategories/CaliberRailgunPistol</iconPath>
</ThingCategoryDef>

<!-- ==================== AmmoSet ========================== -->

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_8mmRailgun</defName>
<label>8mm Railgun</label>
<ammoTypes>
<Ammo_8mmRailgun_Sabot>Bullet_8mmRailgun_Sabot</Ammo_8mmRailgun_Sabot>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<!-- ==================== Ammo ========================== -->

<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
<defName>Ammo_8mmRailgun_Sabot</defName>
<label>8mm Railgun cartridge (Sabot)</label>
<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun pistols.</description>
<statBases>
<Mass>0.009</Mass>
<Bulk>0.01</Bulk>
<MarketValue>0.06</MarketValue>
</statBases>
<tradeTags>
<li>CE_AutoEnableTrade</li>
<li>CE_AutoEnableCrafting_TableMachining</li>
<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
</tradeTags>
<thingCategories>
<li>Ammo8mmRailgun</li>
</thingCategories>
<graphicData>
<texPath>Things/Ammo/Railgun/Pistol</texPath>
<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
</graphicData>
<ammoClass>RailgunSabot</ammoClass>
</ThingDef>

<!-- ================== Projectiles ================== -->

<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBullet">
<defName>Bullet_8mmRailgun_Sabot</defName>
<label>8mm Railgun bullet (Sabot)</label>
<graphicData>
<texPath>Things/Projectile/Bullet_Small</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bullet</damageDef>
<damageAmountBase>28</damageAmountBase>
<armorPenetrationSharp>57</armorPenetrationSharp>
<armorPenetrationBlunt>252.720</armorPenetrationBlunt>
<speed>360</speed>
</projectile>
</ThingDef>

<!-- ==================== Recipes ========================== -->

<RecipeDef ParentName="AmmoRecipeBase">
<defName>MakeAmmo_8mmRailgun_Sabot</defName>
<label>make 8mm Railgun cartridge (Sabot) x500</label>
<description>Craft 500 8mm Railgun (Sabot) cartridges.</description>
<jobString>Making 8mm Railgun (Sabot) cartridges.</jobString>
<workAmount>1000</workAmount>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>2</count>
</li>
<li>
<filter>
<thingDefs>
<li>Uranium</li>
</thingDefs>
</filter>
<count>4</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
<li>Uranium</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_8mmRailgun_Sabot>500</Ammo_8mmRailgun_Sabot>
</products>
</RecipeDef>

</Defs>
Loading