Skip to content

Commit

Permalink
Merge branch 'Development' into pr/masakitenchi/3063
Browse files Browse the repository at this point in the history
  • Loading branch information
@N7Huntsman
N7Huntsman committed Apr 23, 2024
2 parents 60c7b48 + 48cfe57 commit 91f20e4
Show file tree
Hide file tree
Showing 6,253 changed files with 564,774 additions and 627,844 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ jobs:
run: |
TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer
- name: build compat
run: |
TEMP=${{ runner.temp }}/ python BuildCompat.py
#- name: build compat
# run: |
# TEMP=${{ runner.temp }}/ python BuildCompat.py

- name: package
run: |
mkdir CombatExtended
cp -r Source/ Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Sounds/ Textures/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
cp -r Source/ Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
zip -9 -r build.zip CombatExtended
- name: Upload to DO
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pullrequest.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ jobs:
run: |
TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer
- name: build compat
run: |
TEMP=${{ runner.temp }}/ python BuildCompat.py
#- name: build compat
# run: |
# TEMP=${{ runner.temp }}/ python BuildCompat.py

- name: package
run: |
mkdir CombatExtended
cp -r Source/ Assemblies/ AssembliesCompat/ AssembliesCore/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Sounds/ Textures/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
cp -r Source/ Assemblies/ AssembliesCompat/ AssembliesCore/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
zip -9 -r build.zip CombatExtended
- name: Upload to DO
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
- name: build core
run: |
TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer
- name: build compat
run: |
TEMP=${{ runner.temp }}/ python BuildCompat.py
#- name: build compat
# run: |
# TEMP=${{ runner.temp }}/ python BuildCompat.py
- name: package
run: |
mkdir CombatExtended
cp -r Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Sounds/ Textures/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
cp -r Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
zip -9 -r CombatExtended.zip CombatExtended
- name: Upload Package
id: upload-package
Expand Down
6 changes: 4 additions & 2 deletions About/About.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
<author>CE Team</author>
<url>https://github.com/CombatExtended-Continued/CombatExtended</url>
<supportedVersions>
<li>1.4</li>
<li>1.5</li>
</supportedVersions>
<packageId>CETeam.CombatExtended</packageId>
<description>Version: 1.4.5.7\n\nExtends combat mechanics to make them deeper and more tactical.</description>
<description>Version: 15.6.0.0\n\nExtends combat mechanics to make them deeper and more tactical.</description>
<modIconPath>UI/Icons/CE_ModIcon_JustHat</modIconPath>
<modDependencies>
<li>
<packageId>brrainz.harmony</packageId>
Expand Down Expand Up @@ -86,6 +87,7 @@
<li>OskarPotocki.VFE.Tribals</li>
<li>Sarg.AlphaMemes</li>
<li>K4G.Sultanate</li>
<li>Argon.VMEu</li>
</loadAfter>

</ModMetaData>
14 changes: 0 additions & 14 deletions About/Manifest.xml
View file

This file was deleted.

7 changes: 0 additions & 7 deletions Biotech/Patches/ThingDefs_Misc/Apparel_BiotechHeadgear.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,6 @@
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Apparel_GasMask"]/apparel/hatRenderedFrontOfFace</xpath>
<value>
<hatRenderedFrontOfFace>false</hatRenderedFrontOfFace>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Apparel_GasMask"]/apparel/layers</xpath>
<value>
Expand Down
4 changes: 2 additions & 2 deletions Biotech/Patches/ThingDefs_Misc/Apparel_BiotechPacks.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Apparel_PackTox"]/comps/li[@Class="CompProperties_Reloadable"]/ammoDef</xpath>
<xpath>Defs/ThingDef[defName="Apparel_PackTox"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoDef</xpath>
<value>
<ammoDef>Weapon_GrenadeTox</ammoDef>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Apparel_PackTox"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill</xpath>
<xpath>Defs/ThingDef[defName="Apparel_PackTox"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoCountToRefill</xpath>
<value>
<ammoCountToRefill>3</ammoCountToRefill>
</value>
Expand Down
20 changes: 10 additions & 10 deletions Defs/Ammo/Advanced/30x64mmFuelCell.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<ThingDef Class="CombatExtended.AmmoDef" Name="30x64mmFuelBase" ParentName="SpacerMediumAmmoBase" Abstract="True">
<description>Container holding fuel for incendiary shot firearms.</description>
<statBases>
<Mass>0.08</Mass>
<Mass>0.4</Mass>
<Bulk>0.14</Bulk>
</statBases>
<tradeTags>
Expand All @@ -46,7 +46,7 @@
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>3.4</MarketValue>
<MarketValue>4.66</MarketValue>
</statBases>
<ammoClass>IncendiaryFuel</ammoClass>
</ThingDef>
Expand All @@ -59,7 +59,7 @@
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>4.91</MarketValue>
<MarketValue>6.18</MarketValue>
</statBases>
<ammoClass>ThermobaricFuel</ammoClass>
</ThingDef>
Expand All @@ -72,7 +72,7 @@
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>3.66</MarketValue>
<MarketValue>4.93</MarketValue>
</statBases>
<ammoClass>FoamFuel</ammoClass>
<generateAllowChance>0</generateAllowChance>
Expand Down Expand Up @@ -149,7 +149,7 @@
<li>Steel</li>
</thingDefs>
</filter>
<count>8</count>
<count>40</count>
</li>
<li>
<filter>
Expand Down Expand Up @@ -178,7 +178,7 @@
<products>
<Ammo_30x64mmFuel_Incendiary>50</Ammo_30x64mmFuel_Incendiary>
</products>
<workAmount>7600</workAmount>
<workAmount>10800</workAmount>
</RecipeDef>

<RecipeDef ParentName="LauncherAmmoRecipeBase">
Expand All @@ -194,7 +194,7 @@
<li>Steel</li>
</thingDefs>
</filter>
<count>8</count>
<count>40</count>
</li>
<li>
<filter>
Expand Down Expand Up @@ -222,7 +222,7 @@
<products>
<Ammo_30x64mmFuel_Thermobaric>50</Ammo_30x64mmFuel_Thermobaric>
</products>
<workAmount>10400</workAmount>
<workAmount>13600</workAmount>
</RecipeDef>

<RecipeDef ParentName="LauncherAmmoRecipeBase">
Expand All @@ -242,7 +242,7 @@
<li>Steel</li>
</thingDefs>
</filter>
<count>8</count>
<count>40</count>
</li>
<li>
<filter>
Expand Down Expand Up @@ -273,7 +273,7 @@
<products>
<Ammo_30x64mmFuel_Foam>50</Ammo_30x64mmFuel_Foam>
</products>
<workAmount>11400</workAmount>
<workAmount>14600</workAmount>
</RecipeDef>

</Defs>
18 changes: 5 additions & 13 deletions Defs/DamageDefs/Damages_LocalInjury.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,24 +150,16 @@
<hediff>Flashbanged</hediff>
</DamageDef>

<DamageDef Name="Bullet">
<DamageDef ParentName="Bullet">
<defName>CE_Laser</defName>
<label>laser</label>
<workerClass>DamageWorker_AddInjury</workerClass>
<externalViolence>true</externalViolence>
<deathMessage>{0} has been scorched to death.</deathMessage>
<hediff>BurnSecondary</hediff>
<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
<hasForcefulImpact>false</hasForcefulImpact>
<impactSoundType>Bullet</impactSoundType>
<armorCategory>Sharp</armorCategory>
<overkillPctToDestroyPart>0~0.7</overkillPctToDestroyPart>
<isRanged>true</isRanged>
<makesAnimalsFlee>true</makesAnimalsFlee>
<hasForcefulImpact>false</hasForcefulImpact>
<minDamageToFragment>99999</minDamageToFragment>
<defaultDamage>1</defaultDamage>
<defaultArmorPenetration>0</defaultArmorPenetration>
<buildingDamageFactor>0.100</buildingDamageFactor>
<defaultDamage>1</defaultDamage>
<defaultArmorPenetration>0</defaultArmorPenetration>
<buildingDamageFactor>0.1</buildingDamageFactor>
<plantDamageFactor>2</plantDamageFactor>
</DamageDef>

Expand Down
1 change: 1 addition & 0 deletions Defs/ThingDefs_Buildings/Buildings_Defenses.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
<designationCategory>Structure</designationCategory>
<staticSunShadowHeight>1</staticSunShadowHeight>
<blockLight>false</blockLight>
<disableImpassableShotOverConfigError>true</disableImpassableShotOverConfigError>
<stuffCategories>
<li>Metallic</li>
<li>Woody</li>
Expand Down
4 changes: 0 additions & 4 deletions Defs/ThingDefs_Misc/Apparel_Headgear.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@
<li>IndustrialMilitaryBasic</li>
<li>GasMask</li>
</tags>
<hatRenderedFrontOfFace>false</hatRenderedFrontOfFace>
</apparel>
<modExtensions>
<li Class="CombatExtended.ApparelHediffExtension">
Expand Down Expand Up @@ -197,7 +196,6 @@
<tags>
<li>GasMask</li>
</tags>
<hatRenderedFrontOfFace>false</hatRenderedFrontOfFace>
</apparel>
<modExtensions>
<li Class="CombatExtended.ApparelHediffExtension">
Expand Down Expand Up @@ -261,7 +259,6 @@
<defaultOutfitTags>
<li>Soldier</li>
</defaultOutfitTags>
<hatRenderedFrontOfFace>false</hatRenderedFrontOfFace>
</apparel>
<modExtensions>
<li Class="CombatExtended.ApperalRenderingExtension">
Expand Down Expand Up @@ -325,7 +322,6 @@
<defaultOutfitTags>
<li>Soldier</li>
</defaultOutfitTags>
<hatRenderedFrontOfFace>false</hatRenderedFrontOfFace>
</apparel>
<modExtensions>
<li Class="CombatExtended.ApperalRenderingExtension">
Expand Down
Loading

0 comments on commit 91f20e4

Please sign in to comment.