Skip to content

Commit

Permalink
Version 1.3.27
Browse files Browse the repository at this point in the history 
See release.
  • Loading branch information
@GeodesicDragon
GeodesicDragon committed Jan 28, 2023
1 parent e5131de commit d759a19
Show file tree
Hide file tree
Showing 10 changed files with 426 additions and 244 deletions.
5 changes: 1 addition & 4 deletions GolfClub/About/About.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@
<packageId>geodesicdragon.golfclub</packageId>
<url>https://discord.gg/BGKnpza</url>
<supportedVersions>
<li>1.0</li>
<li>1.1</li>
<li>1.2</li>
<li>1.3</li>
<li>1.4</li>
</supportedVersions>
<description>After glitterworld golfers found themselves stranded on the rimworlds when their escape pods crashed, it didn't take long for them to start using their clubs as weapons, while at the same time finding time to play the game they enjoy so much.\n\nINCLUDES THE FOLLOWING:\n\n- Golf club (melee)\n- Golf club (ranged)\n- Putting hole</description>
<description>After glitterworld golfers found themselves stranded on the rimworlds when their escape pods crashed, it didn't take long for them to start using their clubs as weapons, while at the same time finding time to play the game they enjoy so much.\n\nINCLUDES THE FOLLOWING:\n\n- Golf club (melee)\n- Golf club (ranged)\n- Putting hole\n\nCOMPATIBLE WITH COMBAT EXTENDED!</description>
</ModMetaData>
11 changes: 11 additions & 0 deletions GolfClub/About/Changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
Version 1.3.27 (January 28th 2022)

* Added support for Combat Extended.
* Ranged golf clubs require golf balls as ammo (howls of amazement). The magazine size is 1 (naturally) with a 3 second reload time.
* Golf balls are made in packs of 50 at a crafting spot or smithy using 5 steel.
* IMPORTANT: I don't use CE, so these patches are untested. Please inform me ASAP if you encounter any issues.
* Removed support for versions 1.0, 1.1 and 1.2 of RimWorld.
* Reduced power of the golf club shaft to 2 (was 6).
* Reduced power of the golf club head to 6.5 (was 13).
* Reduced range of the golf club to 25 (was 30).

Version 1.2.23 (October 6th 2022)

* Mod is now compatible with the RimWorld 1.4 patch.
Expand Down
81 changes: 81 additions & 0 deletions GolfClub/Combat Extended/Defs/Ammo/GolfBalls.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<ThingCategoryDef>
<defName>Ammo_GolfBall</defName>
<label>Golf Balls</label>
<parent>Ammo</parent>
<iconPath>Things/Ammo/Ammo_GolfBall</iconPath>
</ThingCategoryDef>

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

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_GolfBalls</defName>
<label>golf balls</label>
<ammoTypes>
<Ammo_GolfBall>Projectile_GolfBall</Ammo_GolfBall>
</ammoTypes>
</CombatExtended.AmmoSetDef>

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

<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
<defName>Ammo_GolfBall</defName>
<label>golf balls</label>
<description>A package containing golf balls.\n\nSimple, but effective.</description>
<statBases>
<Mass>0.015</Mass>
<Bulk>0.01</Bulk>
<MarketValue>0.25</MarketValue>
</statBases>
<tradeTags>
<li>CE_AutoEnableTrade</li>
<!--<li>CE_AutoEnableCrafting_FabricationBench</li>-->
</tradeTags>
<thingCategories>
<li>Ammo_GolfBall</li>
</thingCategories>
<graphicData>
<texPath>Things/Ammo/Ammo_GolfBall</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<ammoClass>FullMetalJacket</ammoClass>
</ThingDef>

<!-- Projectile is already defined elsewhere -->

<!-- Recipes -->

<RecipeDef ParentName="ChargeAmmoRecipeBase">
<defName>MakeAmmo_GolfBall</defName>
<label>make golf ball x50</label>
<description>Craft a box of 50 golf balls.</description>
<jobString>Making golf balls.</jobString>
<workAmount>600</workAmount>
<recipeUsers>
<li>CraftingSpot</li>
<li>ElectricSmithy</li>
<li>FueledSmithy</li>
</recipeUsers>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>5</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_GolfBall>50</Ammo_GolfBall>
</products>
</RecipeDef>

</Defs>
83 changes: 83 additions & 0 deletions GolfClub/Combat Extended/Patches/GolfClub_CEPatches.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
<Patch>

<!--MELEE-->

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="MeleeWeapon_GolfClub"]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
<label>shaft</label>
<capacities>
<li>Blunt</li>
</capacities>
<power>2</power>
<chanceFactor>0.25</chanceFactor>
<cooldownTime>2</cooldownTime>
<armorPenetrationBlunt>0.125</armorPenetrationBlunt>
<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
</li>
<li Class="CombatExtended.ToolCE">
<label>head</label>
<capacities>
<li>Blunt</li>
</capacities>
<power>6.5</power>
<cooldownTime>2.5</cooldownTime>
<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
</li>
</tools>
</value>
</Operation>

<!--RANGED-->

<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>GolfClub_Ranged</defName>
<statBases>
<Mass>2</Mass>
<AccuracyTouch>0.15</AccuracyTouch>
<AccuracyShort>0.25</AccuracyShort>
<AccuracyMedium>0.55</AccuracyMedium>
<AccuracyLong>0.60</AccuracyLong>
<RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
<SightsEfficiency>0.3</SightsEfficiency>
<ShotSpread>0.5</ShotSpread>
<SwayFactor>2</SwayFactor>
<Bulk>3</Bulk>
<!-- <ToughnessRating>2.5</ToughnessRating> --> <!-- Base toughness rating of a weapon -->
<WorkToMake>900</WorkToMake>
</statBases>
<costStuffCount>125</costStuffCount>
<stuffCategories>
<li>Metallic</li>
<li>Woody</li>
</stuffCategories>
<Properties>
<recoilAmount>3</recoilAmount>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Projectile_GolfBall</defaultProjectile>
<warmupTime>2</warmupTime>
<range>25</range>
<soundCast>ThrowGrenade</soundCast>
<soundCastTail>GunTail_Light</soundCastTail>
<muzzleFlashScale>0</muzzleFlashScale>
</Properties>
<AmmoUser>
<magazineSize>1</magazineSize>
<reloadTime>3</reloadTime>
<ammoSet>AmmoSet_GolfBall</ammoSet>
</AmmoUser>
<FireModes>
<aiUseBurstMode>FALSE</aiUseBurstMode>
<aiAimMode>Snapshot</aiAimMode>
</FireModes>
<weaponTags>
<li>SimpleGun</li>
<li>CE_AI_BROOM</li>
</weaponTags>
</Operation>

</Patch>
Loading

0 comments on commit d759a19

Please sign in to comment.