-
Notifications
You must be signed in to change notification settings - Fork 257
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'Development' into pr/ViralReaction/3355
- Loading branch information
Showing
51 changed files
with
2,555 additions
and
341 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| name: Check Patch Duplicates | ||
| on: | ||
| pull_request: | ||
| branches: [ master, Development ] | ||
|
|
||
| # Restrict the permissions of the ephemeral GitHub token used by this workflow | ||
| permissions: | ||
| contents: read | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Check for duplicate virtual file paths | ||
| run: | | ||
| python3 DupeFinder.py -c |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,3 +24,5 @@ UnityEngine.dll | |
|
|
||
|
|
||
| .idea/ | ||
| __pycache__ | ||
| ModPatches/*/Assemblies/ | ||
File renamed without changes.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| from xml.dom.minidom import parse as XMLOpen | ||
| from twisted.python.filepath import FilePath | ||
| import sys | ||
| err = "-c" not in sys.argv | ||
|
|
||
| used = {} | ||
| mods = set() | ||
| ContentRoot = FilePath(".") | ||
| ec = 0 | ||
|
|
||
| def process(node): | ||
| global ec | ||
| mod = c.getAttribute("IfModActive") | ||
| if not mod: | ||
| mod = "CETeam.CombatExtended" | ||
| dp = c.firstChild.data.replace(''', "'") | ||
| if (mod, dp) in mods: | ||
| ec += 1 | ||
| msg = f"Mod {mod} is listed in LoadFolders.xml twice, both pointing to {c.firstChild.data}" | ||
| if err: | ||
| raise RuntimeError(msg) | ||
| else: | ||
| print(msg) | ||
| mods.add((mod, dp)) | ||
| root = FilePath("./" + dp) | ||
| if not ContentRoot in root.parents(): | ||
| return | ||
| for fd in root.walk(): | ||
| if fd.isdir(): | ||
| continue | ||
| if not fd.basename().endswith(".xml"): | ||
| continue | ||
| relative = tuple(fd.segmentsFrom(root)) | ||
| if relative in used: | ||
| msg = f"""Relative paths collision found: {str.join("/", fd.segmentsFrom(ContentRoot))} overrides {str.join("/", used[relative].segmentsFrom(ContentRoot))}""" | ||
| if err: | ||
| raise RuntimeError(msg) | ||
| else: | ||
| ec += 1 | ||
| print(msg) | ||
| used[relative] = fd | ||
|
|
||
| with XMLOpen("LoadFolders.xml") as x: | ||
| v1_5 = x.getElementsByTagName("v1.5") | ||
| for n in v1_5: | ||
| for c in n.getElementsByTagName("li"): | ||
| process(c) | ||
|
|
||
|
|
||
| raise SystemExit(ec) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
ModPatches/RH2 Faction - Gruppa Krovi/Defs/Ammo_Gruppa_Krovi.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Defs> | ||
|
|
||
| <!--Ammo for Tesla Coil--> | ||
| <CombatExtended.AmmoSetDef> | ||
| <defName>AmmoSet_RNTeslaCharge</defName> | ||
| <label>tesla coil power cell</label> | ||
| <ammoTypes> | ||
| <Ammo_PlasmaCellHeavy>Bullet_CE_RNBullet_Tesla_Charge</Ammo_PlasmaCellHeavy> | ||
| </ammoTypes> | ||
| </CombatExtended.AmmoSetDef> | ||
|
|
||
| <ThingDef ParentName="BaseExplosiveBullet"> | ||
| <defName>Bullet_CE_RNBullet_Tesla_Charge</defName> | ||
| <label>Tesla Charge</label> | ||
| <graphicData> | ||
| <texPath>Things/Projectile/Tesla_Arc</texPath> | ||
| <graphicClass>Graphic_Single</graphicClass> | ||
| <shaderType>TransparentPostLight</shaderType> | ||
| <drawSize>4</drawSize> | ||
| </graphicData> | ||
| <projectile Class="CombatExtended.ProjectilePropertiesCE"> | ||
| <damageDef>Electrical</damageDef> | ||
| <explosionRadius>2.0</explosionRadius> | ||
| <speed>25</speed> | ||
| <flyOverhead>false</flyOverhead> | ||
| <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof> | ||
| <soundExplode>RN_Tesla_Explode</soundExplode> | ||
| <damageAmountBase>93</damageAmountBase> | ||
| <stoppingPower>3.2</stoppingPower> | ||
| <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors> | ||
| <screenShakeFactor>0</screenShakeFactor> | ||
| <armorPenetrationSharp>0</armorPenetrationSharp> | ||
| <armorPenetrationBlunt>0</armorPenetrationBlunt> | ||
| </projectile> | ||
| <comps> | ||
| <li Class="CompProperties_ThrownFleckEmitter"> | ||
| <fleck>Smoke</fleck> | ||
| <offsetMin>(-0.3,0,0.35)</offsetMin> | ||
| <offsetMax>(0.3,0,0.35)</offsetMax> | ||
| <emissionInterval>90</emissionInterval> | ||
| <scale>1~1.1</scale> | ||
| <colorA>(0,235,31,255)</colorA> | ||
| <colorB>(0,235,31,255)</colorB> | ||
| </li> | ||
| </comps> | ||
| </ThingDef> | ||
|
|
||
|
|
||
| <!--Ammo for Red Star Plasma Cannon--> | ||
| <CombatExtended.AmmoSetDef> | ||
| <defName>AmmoSet_RNPlasmaCharge</defName> | ||
| <label>plasma cannon power cell</label> | ||
| <ammoTypes> | ||
| <Ammo_PlasmaCellHeavy>Bullet_CE_RNBullet_RedStar_Plasma</Ammo_PlasmaCellHeavy> | ||
| </ammoTypes> | ||
| </CombatExtended.AmmoSetDef> | ||
|
|
||
| <ThingDef ParentName="BaseExplosiveBullet"> | ||
| <defName>Bullet_CE_RNBullet_RedStar_Plasma</defName> | ||
| <label>Plasma Bolt</label> | ||
| <graphicData> | ||
| <texPath>Things/Projectile/RedStar_Plasma</texPath> | ||
| <graphicClass>Graphic_Single</graphicClass> | ||
| <shaderType>TransparentPostLight</shaderType> | ||
| <drawSize>4</drawSize> | ||
| </graphicData> | ||
| <projectile Class="CombatExtended.ProjectilePropertiesCE"> | ||
| <damageDef>RN2_RedStarBomb</damageDef> | ||
| <explosionRadius>1.95</explosionRadius> | ||
| <speed>30</speed> | ||
| <flyOverhead>false</flyOverhead> | ||
| <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof> | ||
| <soundExplode>RN_RedStar_Explode</soundExplode> | ||
| <damageAmountBase>76</damageAmountBase> | ||
| <stoppingPower>3</stoppingPower> | ||
| <screenShakeFactor>0</screenShakeFactor> | ||
| <armorPenetrationSharp>0</armorPenetrationSharp> | ||
| <armorPenetrationBlunt>0</armorPenetrationBlunt> | ||
| </projectile> | ||
| <comps> | ||
| <li Class="CompProperties_ThrownFleckEmitter"> | ||
| <fleck>Smoke</fleck> | ||
| <offsetMin>(-0.3,0,0.35)</offsetMin> | ||
| <offsetMax>(0.3,0,0.35)</offsetMax> | ||
| <emissionInterval>90</emissionInterval> | ||
| <scale>1~1.1</scale> | ||
| <colorA>(0,235,31,255)</colorA> | ||
| <colorB>(0,235,31,255)</colorB> | ||
| </li> | ||
| </comps> | ||
| </ThingDef> | ||
|
|
||
| </Defs> |
Oops, something went wrong.