Merge branch 'main' of https://git.ra3battle.cn/Kalospacer/WulaFallenEmpireRW

1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Laser_Weapon.xml

@@ -218,7 +218,7 @@
   <ThingDef ParentName="BaseBullet">
     <defName>Bullet_WULA_RW_Penetrating_Beam</defName>
     <label>穿透光束</label>
-    <thingClass>WulaFallenEmpire.Projectile_WulaBeam</thingClass>
+    <thingClass>WulaFallenEmpire.Projectile_WulaPenetratingBeam</thingClass>
     <modExtensions>
       <li Class="WulaFallenEmpire.Wula_BeamPierce_Extension">
         <maxHits>-1</maxHits>        <!-- -1 for infinite hits -->
@@ -246,7 +246,7 @@
   <ThingDef ParentName="BaseBullet">
     <defName>Bullet_WULA_RW_Penetrating_Beam_Ranged</defName>
     <label>穿透光束</label>
-    <thingClass>WulaFallenEmpire.Projectile_WulaBeam</thingClass>
+    <thingClass>WulaFallenEmpire.Projectile_WulaPenetratingBeam</thingClass>
     <modExtensions>
       <li Class="WulaFallenEmpire.Wula_BeamPierce_Extension">
         <maxHits>-1</maxHits>        <!-- -1 for infinite hits -->
@@ -362,7 +362,7 @@
   <ThingDef ParentName="BaseBullet">
     <defName>Bullet_WULA_RW_Sphene_MG</defName>
     <label>榍石光束</label>
-    <thingClass>WulaFallenEmpire.Projectile_WulaBeam</thingClass>
+    <thingClass>WulaFallenEmpire.Projectile_WulaPenetratingBeam</thingClass>
     <graphicData>
       <texPath>Things/Projectile/ChargeLanceShot</texPath>
       <graphicClass>Graphic_Single</graphicClass>

Source/WulaFallenEmpire/Projectiles/Projectile_WulaPenetratingBeam.cs

@@ -16,7 +16,7 @@ namespace WulaFallenEmpire
         public float beamStartOffset = 0f;
     }
 
-    public class Projectile_WulaBeam : Bullet
+    public class Projectile_WulaPenetratingBeam : Bullet
     {
         private int hitCounter = 0;
         private List<Thing> alreadyDamaged = new List<Thing>();

Source/WulaFallenEmpire/WulaFallenEmpire.csproj

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -70,7 +69,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="WULA_Energy\CompChargingBed.cs" />
-    <Compile Include="Verb\CompCleave.cs" />
+    <Compile Include="Verb\MeleeAttack_Cleave\CompCleave.cs" />
     <Compile Include="WULA_AutoMechCarrier\CompAutoMechCarrier.cs" />
     <Compile Include="WULA_AutoMechCarrier\CompProperties_AutoMechCarrier.cs" />
     <Compile Include="WULA_AutoMechCarrier\PawnProductionEntry.cs" />
@@ -85,18 +84,18 @@
     <Compile Include="CompUseEffect_FixAllHealthConditions.cs" />
     <Compile Include="CompUseEffect_PassionTrainer.cs" />
     <Compile Include="CompUseEffect_WulaSkillTrainer.cs" />
-    <Compile Include="EventSystem\CompOpenCustomUI.cs" />
-    <Compile Include="EventSystem\Condition.cs" />
-    <Compile Include="EventSystem\DebugActions.cs" />
-    <Compile Include="EventSystem\Dialog_ManageEventVariables.cs" />
-    <Compile Include="EventSystem\DelayedActionManager.cs" />
-    <Compile Include="EventSystem\Dialog_CustomDisplay.cs" />
-    <Compile Include="EventSystem\Effect.cs" />
-    <Compile Include="EventSystem\EventVariableManager.cs" />
-    <Compile Include="EventSystem\EventDef.cs" />
-    <Compile Include="EventSystem\EventUIConfigDef.cs" />
-    <Compile Include="EventSystem\Letter_EventChoice.cs" />
-    <Compile Include="EventSystem\QuestNode_Root_EventLetter.cs" />
+    <Compile Include="WULA_EventSystem\CompOpenCustomUI.cs" />
+    <Compile Include="WULA_EventSystem\Condition.cs" />
+    <Compile Include="WULA_EventSystem\DebugActions.cs" />
+    <Compile Include="WULA_EventSystem\Dialog_ManageEventVariables.cs" />
+    <Compile Include="WULA_EventSystem\DelayedActionManager.cs" />
+    <Compile Include="WULA_EventSystem\Dialog_CustomDisplay.cs" />
+    <Compile Include="WULA_EventSystem\Effect.cs" />
+    <Compile Include="WULA_EventSystem\EventVariableManager.cs" />
+    <Compile Include="WULA_EventSystem\EventDef.cs" />
+    <Compile Include="WULA_EventSystem\EventUIConfigDef.cs" />
+    <Compile Include="WULA_EventSystem\Letter_EventChoice.cs" />
+    <Compile Include="WULA_EventSystem\QuestNode_Root_EventLetter.cs" />
     <Compile Include="HarmonyPatches\Caravan_NeedsTracker_TrySatisfyPawnNeeds_Patch.cs" />
     <Compile Include="HarmonyPatches\DamageInfo_Constructor_Patch.cs" />
     <Compile Include="HarmonyPatches\FloatMenuOptionProvider_Ingest_Patch.cs" />
@@ -105,7 +104,7 @@
     <Compile Include="HarmonyPatches\Patch_JobGiver_GatherOfferingsForPsychicRitual.cs" />
     <Compile Include="HarmonyPatches\NoBloodForWulaPatch.cs" />
     <Compile Include="HarmonyPatches\Patch_CaravanInventoryUtility_FindShuttle.cs" />
-    <Compile Include="HediffComp_RegenerateBackstory.cs" />
+    <Compile Include="HediffComp\HediffComp_RegenerateBackstory.cs" />
     <Compile Include="WULA_Energy\HediffComp_WulaCharging.cs" />
     <Compile Include="HarmonyPatches\IngestPatch.cs" />
     <Compile Include="WULA_Energy\JobDriver_FeedWulaPatient.cs" />
@@ -123,8 +122,8 @@
     <Compile Include="WULA_BrokenPersonality\MentalStateDefExtension_BrokenPersonality.cs" />
     <Compile Include="WULA_Energy\Need_WulaEnergy.cs" />
     <Compile Include="WULA_Energy\NeedDefExtension_Energy.cs" />
-    <Compile Include="Projectiles\Projectile_WulaPenetrating.cs" />
-    <Compile Include="Projectiles\Projectile_WulaBeam.cs" />
+    <Compile Include="Projectiles\Projectile_WulaPenetratingBullet.cs" />
+    <Compile Include="Projectiles\Projectile_WulaPenetratingBeam.cs" />
     <Compile Include="Projectiles\Projectile_TrackingBullet.cs" />
     <Compile Include="Projectiles\TrackingBulletDef.cs" />
     <Compile Include="Projectiles\ExplosiveTrackingBulletDef.cs" />
@@ -133,9 +132,9 @@
     <Compile Include="WULA_PsychicRitual\PsychicRitual_TechOffering.cs" />
     <Compile Include="WULA_PsychicRitual\PsychicRitualDef_AddHediff.cs" />
     <Compile Include="WULA_PsychicRitual\PsychicRitualToil_AddHediff.cs" />
-    <Compile Include="MoharHediffs\HediffCompProperties_Spawner.cs" />
-    <Compile Include="MoharHediffs\HediffComp_Spawner.cs" />
-    <Compile Include="MoharHediffs\Tools.cs" />
+    <Compile Include="HediffComp\MoharHediffs\HediffCompProperties_Spawner.cs" />
+    <Compile Include="HediffComp\MoharHediffs\HediffComp_Spawner.cs" />
+    <Compile Include="HediffComp\MoharHediffs\Tools.cs" />
     <Compile Include="WULA_PsychicRitual\RitualTagExtension.cs" />
     <Compile Include="WULA_PsychicRitual\PsychicRitualDef_Wula.cs" />
     <Compile Include="WULA_PsychicRitual\PsychicRitualDef_WulaBase.cs" />
@@ -143,14 +142,14 @@
     <Compile Include="Recipe_AdministerWulaMechRepairKit.cs" />
     <Compile Include="SectionLayer_WulaHull.cs" />
     <Compile Include="WULA_Energy\ThingDefExtension_EnergySource.cs" />
-    <Compile Include="HediffComp_TimedExplosion.cs" />
+    <Compile Include="HediffComp\HediffComp_TimedExplosion.cs" />
     <Compile Include="Projectiles\Projectile_ConfigurableHellsphereCannon.cs" />
     <Compile Include="Verb\Verb_ShootShotgun.cs" />
     <Compile Include="Verb\Verb_ShootArc.cs" />
     <Compile Include="Projectiles\Projectile_CruiseMissile.cs" />
-    <Compile Include="Verb\Verb_ShootBeamExplosive.cs" />
-    <Compile Include="Verb\VerbPropertiesExplosiveBeam.cs" />
-    <Compile Include="Verb\Verb_MeleeAttack_Cleave.cs" />
+    <Compile Include="Verb\Verb_ShootBeamExplosive\Verb_ShootBeamExplosive.cs" />
+    <Compile Include="Verb\Verb_ShootBeamExplosive\VerbPropertiesExplosiveBeam.cs" />
+    <Compile Include="Verb\MeleeAttack_Cleave\Verb_MeleeAttack_Cleave.cs" />
     <Compile Include="WULA_Energy\WorkGiver_FeedWulaPatient.cs" />
     <Compile Include="WULA_Energy\WorkGiver_Warden_DeliverEnergy.cs" />
     <Compile Include="WULA_Energy\WorkGiver_Warden_FeedWula.cs" />
@@ -160,12 +159,12 @@
     <Compile Include="WULA_Energy\WulaStatDefOf.cs" />
     <Compile Include="WULA_Maintenance\Building_MaintenancePod.cs" />
     <Compile Include="WULA_Maintenance\HediffComp_MaintenanceNeed.cs" />
-    <Compile Include="HediffComp_DamageResponse.cs" />
+    <Compile Include="HediffComp\HediffComp_DamageResponse.cs" />
     <Compile Include="WULA_Maintenance\JobDefOf_WULA.cs" />
     <Compile Include="ThingDefOf_WULA.cs" />
     <Compile Include="Cinder_WeaponSwitch\WeaponSwitch.cs" />
-    <Compile Include="Verb\CompMultiStrike.cs" />
-    <Compile Include="Verb\Verb_MeleeAttack_MultiStrike.cs" />
+    <Compile Include="Verb\MeleeAttack_MultiStrike\CompMultiStrike.cs" />
+    <Compile Include="Verb\MeleeAttack_MultiStrike\Verb_MeleeAttack_MultiStrike.cs" />
     <Compile Include="Projectiles\Projectile_ExplosiveWithTrail.cs" />
     <Compile Include="Projectiles\BulletWithTrail.cs" />
     <Compile Include="WULA_Shuttle\ArmedShuttleIncoming.cs" />
@@ -176,33 +175,34 @@
     <Compile Include="WULA_Shuttle\GenStep_WulaPocketSpaceSmall.cs" />
     <Compile Include="WULA_Shuttle\PocketSpaceThingHolder.cs" />
     <Compile Include="HarmonyPatches\Patch_DropCellFinder_SkyfallerCanLandAt.cs" />
-    <Compile Include="MechWeapon\FloatMenuProvider_Mech.cs" />
-    <Compile Include="MechWeapon\Patch_MissingWeapon.cs" />
-    <Compile Include="MechWeapon\Patch_WeaponDrop.cs" />
-    <Compile Include="MechWeapon\CompMechWeapon.cs" />
-    <Compile Include="Verb\VerbProperties_WeaponStealBeam.cs" />
-    <Compile Include="Verb\Verb_ShootWeaponStealBeam.cs" />
+    <Compile Include="HarmonyPatches\MechWeapon\FloatMenuProvider_Mech.cs" />
+    <Compile Include="HarmonyPatches\MechWeapon\Patch_MissingWeapon.cs" />
+    <Compile Include="HarmonyPatches\MechWeapon\Patch_WeaponDrop.cs" />
+    <Compile Include="HarmonyPatches\MechWeapon\CompMechWeapon.cs" />
+    <Compile Include="Verb\Verb_ShootWeaponStealBeam\VerbProperties_WeaponStealBeam.cs" />
+    <Compile Include="Verb\Verb_ShootWeaponStealBeam\Verb_ShootWeaponStealBeam.cs" />
     <Compile Include="Verb\Verb_ShootMeltBeam.cs" />
-    <Compile Include="Hediff_DamageShield.cs" />
-    <Compile Include="DRMDamageShield.cs" />
+    <Compile Include="WULA_HediffDamgeShield\Hediff_DamageShield.cs" />
+    <Compile Include="WULA_HediffDamgeShield\DRMDamageShield.cs" />
     <Compile Include="CompUseEffect_AddDamageShieldCharges.cs" />
-    <Compile Include="HediffCompProperties_GiveHediffsInRangeToRace.cs" />
-    <Compile Include="HediffComp_GiveHediffsInRangeToRace.cs" />
-    <Compile Include="CompForceTargetable.cs" />
-    <Compile Include="Patch_ForceTargetable.cs" />
-    <Compile Include="Verb\VerbProperties_Excalibur.cs" />
-    <Compile Include="Verb\Verb_Excalibur.cs" />
-    <Compile Include="HediffComp_TopTurret.cs" />
+    <Compile Include="HediffComp\HediffCompProperties_GiveHediffsInRangeToRace.cs" />
+    <Compile Include="HediffComp\HediffComp_GiveHediffsInRangeToRace.cs" />
+    <Compile Include="HarmonyPatches\GD3_TurretForceTargetable\CompForceTargetable.cs" />
+    <Compile Include="HarmonyPatches\GD3_TurretForceTargetable\Patch_ForceTargetable.cs" />
+    <Compile Include="Verb\Verb_Excalibur\VerbProperties_Excalibur.cs" />
+    <Compile Include="Verb\Verb_Excalibur\Verb_Excalibur.cs" />
+    <Compile Include="HediffComp\GD3_HediffComp_TopTurret\HediffComp_TopTurret.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Spawner\CompMultiFuelSpawner.cs" />
-    <Compile Include="Spawner\CompRefuelableWithKey.cs" />
-    <Compile Include="Spawner\Patch_CompRefuelableWithKey.cs" />
-    <Compile Include="Spawner\Utility.cs" />
+    <Compile Include="WULA_MutiFuelSpawner\CompMultiFuelSpawner.cs" />
+    <Compile Include="WULA_MutiFuelSpawner\CompRefuelableWithKey.cs" />
+    <Compile Include="WULA_MutiFuelSpawner\Patch_CompRefuelableWithKey.cs" />
+    <Compile Include="WULA_MutiFuelSpawner\Utility.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Thing_ExcaliburBeam.cs" />
+    <Compile Include="Verb\Verb_Excalibur\Thing_ExcaliburBeam.cs" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 自定义清理任务，删除obj文件夹中的临时文件 -->
   <Target Name="CleanDebugFiles" AfterTargets="Build">