Refactor/destroy genclosestammo cache class

.github/CODEOWNERS

@@ -1 +1 @@
-*       @CombatExtendedRWMod/playtesters @CombatExtendedRWMod/coders
+*       @CombatExtended-Continued/playtesters @CombatExtended-Continued/coders

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,40 @@
+---
+name: Bug Report
+about: Report gameplay issues and errors to help us improve.
+title: "[Bug]:"
+labels: bug
+assignees: ''
+
+---
+
+**Complete the template below. Reports that do not follow the template will not be deleted.**
+**Title should be:** [Bug]: (Short description of bug)
+
+**Specifications**
+Please provide the following.
+
+Rimworld version:
+Combat Extended version:
+Combat Extended source (Steam, GitHub, etc.):
+Your operating system:
+Your mod list:
+
+**Description**
+Provide a concise description of the issue or concern. What happened?
+
+**Expected behavior**
+What did you expect to happen?
+
+**To reproduce**
+Provide clear steps to reproduce the behavior. How do we make this happen?
+
+**Screenshots & log dumps**
+Whenever possible, add screenshots to help explain your problem, and share error or crash logs to make our jobs easier. For logs, please enter the logs into a pastebin site (e.g pastebin.com, justpasteit.com, etc.) 
+and provide a link. Do not paste the entire log here. 
+
+**Complete the following checklist**
+I hereby verify that I have done the following:
+- [ ] Confirmed that my game version and load order are correct.
+- [ ] Confirmed that I am running the appropriate and most updated version of Combat Extended and required compatibility patches.
+- [ ] Confirmed I am not running any mods with known incompatibilities with Combat Extended.
+- [ ] Disabled Combat Extended and attempted to reproduce the behavior without success.

.github/ISSUE_TEMPLATE/discussion-template.md

@@ -0,0 +1,11 @@
+---
+name: Discussion Template
+about: For general discussions among contributors on matters relating to the mod.
+  Not for off-topic chatter. Label as appropriate.
+title: "[Discussion]:"
+labels: discussion
+assignees: ''
+
+---
+
+**Note: These are to be used for discussions related to Combat Extended, primarily by team members and other contributors. Not for feedback, requests, etc. Off-topic chatter will be deleted.**

.github/ISSUE_TEMPLATE/patch-request.md

@@ -0,0 +1,40 @@
+---
+name: Patch Request
+about: 'Request a new or updated Combat Extended compatibility patch for a mod. '
+title: "[Patch Request]:"
+labels: patch request
+assignees: ''
+
+---
+
+**Read and complete the template below. Requests that fail to follow the template will be deleted without warning.**
+
+**If a Patch Request (open or closed) already exists for the same mod, you may add a reaction to indicate your support. Do not create another request. Duplicate requests will be deleted.**
+
+**Title should be:** [Patch Request]: (Mod Name)
+
+**Mod name:**
+
+**Link to mod download (preferably Steam workshop or Github):**
+
+**Description:**
+Provide a brief overview of what content the mod adds or modifies. Specify what content in particular you believe require a patch to be compatibly with Combat Extended.
+
+**Content:**
+What does the new mod contain? Check all that apply.
+- [ ] New weapons.
+- [ ] New animals, humanoids, or other creatures.
+- [ ] New factions.
+- [ ] New armor or apparel.
+
+
+**Complete the following checklist before submitting a request.**
+I hereby verify that I have done all of the following:
+- [ ] Searched the Steam workshop, Discord, and Github for an existing patch and not found one.
+- [ ] Confirmed there are no other open Patch Requests for this mod.
+- [ ] Confirmed the requested mod is not known to be fundamentally incompatible with Combat Extended.
+- [ ] **Have completed this template accurately and completely.**
+- [ ] **Understand that putting in a Patch Request does not guarantee a patch will be made.**
+- [ ] **Agree that I will not directly contact contributors to ask about patch requests.**
+
+**Putting in request does not guarantee a patch will be made. Do not directly contact team members about Patch Requests. For smaller mods, consider reviewing the guide and making a patch yourself. If you wish to create a patch for any requested mod, there is no need to ask for permission.**

.github/pull_request_template.md

@@ -1,18 +1,18 @@
 ## Additions
 
-Describe the functionality added by your code, e.g.
+Describe new functionality added by your code, e.g.
 - Tribal smoke bombs
 - New tribal smoke bomb sprite
 - Tribal smoke bomb recipes at smithing bench and crafting spot using prometheum
 
 ## Changes
 
-Adjustments to other features made in this merge, e.g.
+Describe adjustments to existing features made in this merge, e.g.
 - Increased regular smoke bomb radius
 
 ## References
 
-Links to the associated issues, e.g.
+Links to the associated issues or other related pull requests, e.g.
 - Closes #[ISSUE_NUMBER]
 - Contributes towards #[ISSUE_NUMBER]
 

About/About.xml

@@ -2,9 +2,8 @@
 <ModMetaData>
 	<name>Combat Extended</name>
 	<author>CE Team</author>
-	<url>https://ludeon.com/forums/index.php?topic=33461.0</url>
+	<url>https://github.com/CombatExtended-Continued/CombatExtended</url>
 	<supportedVersions>
-		<li>1.0</li>
 		<li>1.1</li>
 	</supportedVersions>
 	<packageId>CETeam.CombatExtended</packageId>

Defs/Ammo/Rocket/M74.xml

@@ -88,7 +88,7 @@
 				<explosionDamageDef>Bomb</explosionDamageDef>
 				<explosionRadius>1</explosionRadius>
 				<fragments>
-          <Fragment_RocketFrag>30</Fragment_RocketFrag>
+          <Fragment_Large>30</Fragment_Large>
 				</fragments>
 				<soundExplode>MortarBomb_Explode</soundExplode>
 			</li>

Languages/English/Keyed/FloatMenu.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LanguageData>
+    <CE_NoAmmoAvailable>no viable ammo found nearby</CE_NoAmmoAvailable>
+    <CE_TurretFull>turret magazine is fully loaded</CE_TurretFull>
+    <CE_TurretNonAllied>turret belongs to a hostile faction</CE_TurretNonAllied>
+    <CE_TurretAlreadyReloading>already reloading turret</CE_TurretAlreadyReloading>
+    <CE_TurretIsBurning>turret is on fire</CE_TurretIsBurning>
+</LanguageData>

Patches/Core/PawnKindDefs_Humanlike/PawnKinds.xml

@@ -142,7 +142,7 @@
   </Operation>
 
   <Operation Class="PatchOperationAddModExtension">
-  	<xpath>Defs/PawnKindDef[defName="Mercenary_Gunner"]</xpath>
+  	<xpath>Defs/PawnKindDef[defName="Mercenary_Gunner" or defName="Mercenary_Gunner_Acidifier"]</xpath>
   	<value>
       <li Class="CombatExtended.LoadoutPropertiesExtension">
         <primaryMagazineCount>
@@ -174,7 +174,7 @@
   </Operation>
 
   <Operation Class="PatchOperationAdd">
-    <xpath>Defs/PawnKindDef[defName="Mercenary_Sniper"]</xpath>
+    <xpath>Defs/PawnKindDef[defName="Mercenary_Sniper" or defName="Mercenary_Sniper_Acidifier"]</xpath>
     <value>
 	<weaponMoney>415~550</weaponMoney>
     </value>
@@ -252,7 +252,7 @@
   </Operation>
 
   <Operation Class="PatchOperationAddModExtension">
-    <xpath>Defs/PawnKindDef[defName = "Mercenary_Slasher"]</xpath>
+    <xpath>Defs/PawnKindDef[defName = "Mercenary_Slasher" or defName="Mercenary_Slasher_Acidifier"]</xpath>
     <value>
       <li Class="CombatExtended.LoadoutPropertiesExtension">
         <shieldMoney>
@@ -286,7 +286,7 @@
    </Operation>	
 
   <Operation Class="PatchOperationAddModExtension">
-  	<xpath>Defs/PawnKindDef[@Name = "MercenaryEliteTierBase"]</xpath>
+  	<xpath>Defs/PawnKindDef[@Name = "MercenaryEliteTierBase"  or defName="Mercenary_Elite_Acidifier"]</xpath>
   	<value>
       <li Class="CombatExtended.LoadoutPropertiesExtension">
         <primaryMagazineCount>

Patches/Core/ThingDefs_Misc/Weapons_Guns.xml

@@ -842,8 +842,8 @@
             <li>Blunt</li>
           </capacities>
           <power>10</power>
-          <cooldownTime>1.9</cooldownTime>
-          <armorPenetration>0.118</armorPenetration>
+          <cooldownTime>2.44</cooldownTime>
+          <armorPenetrationBlunt>3.5</armorPenetrationBlunt>
           <linkedBodyPartsGroup>Barrels</linkedBodyPartsGroup>
         </li>
       </tools>
@@ -943,7 +943,7 @@
       <li Class="CombatExtended.CompProperties_Fragments">
         <fragSpeedFactor>1</fragSpeedFactor>
         <fragments>
-          <Fragment_RocketFrag>400</Fragment_RocketFrag>
+          <Fragment_Large>400</Fragment_Large>
         </fragments>
       </li>
     </value>
@@ -1047,7 +1047,7 @@
       <li Class="CombatExtended.CompProperties_Fragments">
         <fragSpeedFactor>1</fragSpeedFactor>
         <fragments>
-          <Fragment_RocketFrag>150</Fragment_RocketFrag>
+          <Fragment_Large>150</Fragment_Large>
         </fragments>
       </li>
     </value>
@@ -1158,8 +1158,8 @@
             <li>Blunt</li>
           </capacities>
           <power>10</power>
-          <cooldownTime>1.9</cooldownTime>
-          <armorPenetration>0.118</armorPenetration>
+          <cooldownTime>2.44</cooldownTime>
+          <armorPenetrationBlunt>3.5</armorPenetrationBlunt>
           <linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
         </li>
       </tools>
@@ -1225,8 +1225,8 @@
             <li>Blunt</li>
           </capacities>
           <power>10</power>
-          <cooldownTime>1.9</cooldownTime>
-          <armorPenetration>0.118</armorPenetration>
+          <cooldownTime>2.44</cooldownTime>
+          <armorPenetrationBlunt>3.5</armorPenetrationBlunt>
           <linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
         </li>
       </tools>
@@ -1289,8 +1289,8 @@
             <li>Blunt</li>
           </capacities>
           <power>10</power>
-          <cooldownTime>1.9</cooldownTime>
-          <armorPenetration>0.118</armorPenetration>
+          <cooldownTime>2.44</cooldownTime>
+          <armorPenetrationBlunt>3.5</armorPenetrationBlunt>
           <linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
         </li>
       </tools>

Patches/Core/ThinkTreeDefs/Humanlike.xml

@@ -42,6 +42,15 @@
 		</value>
 	</Operation>
 
+	<!-- =========== Add turret reloading to mechanoids ===========-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/DutyDef[defName="Defend"]/thinkNode/subNodes</xpath>
+		<value>
+			<li Class="CombatExtended.JobGiver_DefenderReloadTurret"/>
+		</value>
+		<order>Prepend</order>
+	</Operation>
+
 	<!--<Operation Class="PatchOperationAttributeSet">
 		<xpath>Defs/ThinkTreeDef[defName="HumanlikeConstant"]/thinkRoot/subNodes/li[@Class="ThinkNode_ConditionalCanDoConstantThinkTreeJobNow"]/subNodes/li[@Class="JobGiver_ConfigurableHostilityResponse"]</xpath>
 		<attribute>Class</attribute>

Patches/DefensiveMachineGunTurretPack/DMGT_CE_Patch_ResearchProjectDefs.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Defensive Machine Gun Turret Pack</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+			<!-- Remove RecoilOperation research, as turrets have been reassigned to existing CE research projects -->
+
+			<li Class="PatchOperationRemove">
+				<xpath>Defs/ResearchProjectDef[defName="RecoilOperation"]</xpath>
+			</li>
+
+			</operations>
+		</match>
+	</Operation>
+</Patch>

Patches/DefensiveMachineGunTurretPack/ThingDefs/DMGT_Defensive_Turrets.xml → Patches/DefensiveMachineGunTurretPack/DMGT_CE_Patch_ThingDefs_Defensive_Turrets.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
-	<Operation Class="PatchOperationSequence">
-		<success>Always</success>
-		<operations>
-			<li Class="CombatExtended.PatchOperationFindMod">
-				<modName>Defensive Machine Gun Turret Pack</modName>
-			</li>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Defensive Machine Gun Turret Pack</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
 
 			<!-- ========== Mounted DP-28 Turret ========== -->
 
@@ -360,7 +360,7 @@
 				</value>
 			</li>
 
-		</operations>	
+			</operations>
+		</match>
 	</Operation>
-
 </Patch>