diff --git a/1.6/1.6/Assemblies/ArachnaeSwarm.dll b/1.6/1.6/Assemblies/ArachnaeSwarm.dll
index 164255d..e2ba914 100644
Binary files a/1.6/1.6/Assemblies/ArachnaeSwarm.dll and b/1.6/1.6/Assemblies/ArachnaeSwarm.dll differ
diff --git a/1.6/1.6/Defs/BackstoryDefs/ARA_BackstoryDef.xml b/1.6/1.6/Defs/BackstoryDefs/ARA_BackstoryDef.xml
index bf4f139..fe65e8f 100644
--- a/1.6/1.6/Defs/BackstoryDefs/ARA_BackstoryDef.xml
+++ b/1.6/1.6/Defs/BackstoryDefs/ARA_BackstoryDef.xml
@@ -100,7 +100,7 @@
-10
-10
- 5
+ 50
@@ -129,7 +129,7 @@
Intellectual
- 5
+ 50
@@ -158,7 +158,7 @@
Intellectual
- 5
+ 50
@@ -187,8 +187,8 @@
Intellectual
- 5
- 5
+ 50
+ 50
@@ -217,8 +217,8 @@
Intellectual
- 3
- 3
+ 30
+ 30
@@ -247,8 +247,8 @@
Intellectual
- 8
- 5
+ 80
+ 50
@@ -301,7 +301,7 @@
- 10
+ 100
diff --git a/1.6/1.6/Defs/Stats/ARA_Stats.xml b/1.6/1.6/Defs/Stats/ARA_Stats.xml
index abd7706..4ac1829 100644
--- a/1.6/1.6/Defs/Stats/ARA_Stats.xml
+++ b/1.6/1.6/Defs/Stats/ARA_Stats.xml
@@ -31,22 +31,22 @@
ARA_IncubationCost
孵化该武装器官/织物所需的总营养
- ARA_Incubation_StatCategory
+ Basics
1
0
FloatOne
{0} 份
5010
-
+
+ false
true
ARA_IncubationTime
孵化该武装器官/织物所需的时间
- ARA_Incubation_StatCategory
+ Basics
1
0
FloatOne
@@ -54,7 +54,7 @@
5011
-
+ false
true
\ No newline at end of file
diff --git a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml
index 24c89ec..7116d0a 100644
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml
+++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml
@@ -976,7 +976,7 @@
- 2.25
+ 3
100
40
diff --git a/1.6/1.6/Defs/Thing_Misc/Weapons/ARA_Missile_Weapon.xml b/1.6/1.6/Defs/Thing_Misc/Weapons/ARA_Missile_Weapon.xml
index de0abe8..7f4a573 100644
--- a/1.6/1.6/Defs/Thing_Misc/Weapons/ARA_Missile_Weapon.xml
+++ b/1.6/1.6/Defs/Thing_Misc/Weapons/ARA_Missile_Weapon.xml
@@ -109,7 +109,7 @@
SpitterSpawn
- ARA_Technology_5PAV
+
UnfinishedWeapon
@@ -202,7 +202,7 @@
SpitterSpawn
- ARA_Technology_7PAV
+
UnfinishedWeapon
diff --git a/1.6/1.6/Defs/Thing_Misc/Weapons/ARA_Weapon.xml b/1.6/1.6/Defs/Thing_Misc/Weapons/ARA_Weapon.xml
index 9ceca4d..b9ace96 100644
--- a/1.6/1.6/Defs/Thing_Misc/Weapons/ARA_Weapon.xml
+++ b/1.6/1.6/Defs/Thing_Misc/Weapons/ARA_Weapon.xml
@@ -104,6 +104,8 @@
1000
5
+ 120
+ 5
@@ -132,6 +134,11 @@
RewardStandardQualitySuper
+
+
+
ARA_Whip
@@ -180,6 +187,8 @@
1000
5
+ 350
+ 12
@@ -201,6 +210,9 @@
RewardStandardQualitySuper
+
90
2.5
@@ -386,6 +398,8 @@
0.35
0.3
2.5
+ 150
+ 6
@@ -415,6 +429,9 @@
RewardStandardQualitySuper
+
ARA_Weapon_Damage_Toxid
@@ -444,7 +461,7 @@
SpitterSpawn
- ARA_Technology_6PAV
+
UnfinishedWeapon
@@ -526,6 +543,8 @@
0.65
0.55
2.2
+ 450
+ 15
@@ -553,6 +572,9 @@
RewardStandardQualitySuper
+
ARA_ChainReload
1
@@ -617,6 +639,8 @@
0.45
0.3
2.5
+ 30
+ 3.5
@@ -649,6 +673,9 @@
RewardStandardQualitySuper
+
ARA_Weapon_Damage_Acid
@@ -719,6 +746,8 @@
0.45
0.3
2.5
+ 200
+ 8
@@ -752,6 +781,9 @@
RewardStandardQualitySuper
+
@@ -795,6 +827,8 @@
0.25
0.1
3.5
+ 450
+ 15
@@ -827,6 +861,9 @@
RewardStandardQualitySuper
+
ARA_Huge_Weapon
@@ -908,6 +945,8 @@
0.45
0.3
2.5
+ 160
+ 7
@@ -939,6 +978,9 @@
RewardStandardQualitySuper
+
ARA_Weapon_Damage_Spawn
diff --git a/1.6/1.6/Defs/Thing_building/ARA_Building.xml b/1.6/1.6/Defs/Thing_building/ARA_Building.xml
index 59f3bd0..acd448c 100644
--- a/1.6/1.6/Defs/Thing_building/ARA_Building.xml
+++ b/1.6/1.6/Defs/Thing_building/ARA_Building.xml
@@ -546,12 +546,6 @@
使织域种离开织座。
-
UI/Commands/EggSpew
@@ -632,7 +626,7 @@
- 5
+ 25
diff --git a/1.6/1.6/Defs/Thing_building/ARA_InteractiveEggSac.xml b/1.6/1.6/Defs/Thing_building/ARA_InteractiveEggSac.xml
index 0e8828c..e190085 100644
--- a/1.6/1.6/Defs/Thing_building/ARA_InteractiveEggSac.xml
+++ b/1.6/1.6/Defs/Thing_building/ARA_InteractiveEggSac.xml
@@ -675,7 +675,15 @@
ARA_Cocoon_Cloth_1Stage
一个脆弱、易燃、黏滑的囊状物，是阿拉克涅工艺种所诞之卵，内含孵化一套基础织物装备的营养物质，可以通过阿拉克涅工艺种的交互完成激活进程——参阅茧的超链接，了解其能生产的所有装备的特点。\n\n孵化茧对温度极度敏感（该类型的茧适温为-30~55°C），需要小心保护！
-
+
+ ARA_Bodystocking_White
+ ARA_Bodystocking_Black
+ ARA_Latex_Catsuit
+ ARA_Pantyhose_Black
+ ARA_Pantyhose_White
+ ARA_Maid_Uniform
+
+
diff --git a/1.6/1.6/Defs/Thing_building/ARA_SwarmTurret.xml b/1.6/1.6/Defs/Thing_building/ARA_SwarmTurret.xml
index d86859e..ac5ceee 100644
--- a/1.6/1.6/Defs/Thing_building/ARA_SwarmTurret.xml
+++ b/1.6/1.6/Defs/Thing_building/ARA_SwarmTurret.xml
@@ -325,6 +325,8 @@
1
true
true
+ true
+ true
300
@@ -460,6 +462,8 @@
1
true
true
+ true
+ true
300
@@ -615,6 +619,8 @@
1
true
true
+ true
+ true
300
diff --git a/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/.suo b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/.suo
index a89630e..66d03ca 100644
Binary files a/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/.suo and b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/.suo differ
diff --git a/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/DocumentLayout.json b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/DocumentLayout.json
index ee53ed6..6e20ec9 100644
--- a/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/DocumentLayout.json
+++ b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/DocumentLayout.json
@@ -1,9 +1,13 @@
{
"Version": 1,
- "WorkspaceRootPath": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\",
+ "WorkspaceRootPath": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|d:\\steamlibrary\\steamapps\\common\\rimworld\\mods\\arachnaeswarm\\source\\arachnaeswarm\\stat\\statworker_incubationinfo.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "AbsoluteMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|e:\\steamlibrary\\steamapps\\common\\rimworld\\mods\\arachnaeswarm\\source\\arachnaeswarm\\hediffs\\moharhediffs\\hediffcomp_spawner.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|solutionrelative:hediffs\\moharhediffs\\hediffcomp_spawner.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|e:\\steamlibrary\\steamapps\\common\\rimworld\\mods\\arachnaeswarm\\source\\arachnaeswarm\\stat\\statworker_incubationinfo.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|solutionrelative:stat\\statworker_incubationinfo.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
@@ -23,10 +27,23 @@
{
"$type": "Document",
"DocumentIndex": 0,
+ "Title": "HediffComp_Spawner.cs",
+ "DocumentMoniker": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Hediffs\\MoharHediffs\\HediffComp_Spawner.cs",
+ "RelativeDocumentMoniker": "Hediffs\\MoharHediffs\\HediffComp_Spawner.cs",
+ "ToolTip": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Hediffs\\MoharHediffs\\HediffComp_Spawner.cs*",
+ "RelativeToolTip": "Hediffs\\MoharHediffs\\HediffComp_Spawner.cs*",
+ "ViewState": "AgIAAKABAAAAAAAAAAAUwLoBAAAUAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-09-30T23:28:37.585Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 1,
"Title": "StatWorker_IncubationInfo.cs",
- "DocumentMoniker": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Stat\\StatWorker_IncubationInfo.cs",
+ "DocumentMoniker": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Stat\\StatWorker_IncubationInfo.cs",
"RelativeDocumentMoniker": "Stat\\StatWorker_IncubationInfo.cs",
- "ToolTip": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Stat\\StatWorker_IncubationInfo.cs",
+ "ToolTip": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Stat\\StatWorker_IncubationInfo.cs",
"RelativeToolTip": "Stat\\StatWorker_IncubationInfo.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
diff --git a/Source/ArachnaeSwarm/Hediffs/MoharHediffs/HediffComp_Spawner.cs b/Source/ArachnaeSwarm/Hediffs/MoharHediffs/HediffComp_Spawner.cs
index 377b3fc..87a1de1 100644
--- a/Source/ArachnaeSwarm/Hediffs/MoharHediffs/HediffComp_Spawner.cs
+++ b/Source/ArachnaeSwarm/Hediffs/MoharHediffs/HediffComp_Spawner.cs
@@ -425,31 +425,49 @@ namespace ArachnaeSwarm.MoharHediffs
}
}
- private bool TryFindSpawnCell(out IntVec3 result)
- {
- result = IntVec3.Invalid;
- bool result2;
- if (this.pawn == null)
- {
- result2 = false;
- }
- else
- {
- Map map = this.pawn.Map;
- if (map == null)
- {
- result2 = false;
- }
- else
- {
- result = CellFinder.RandomClosewalkCellNear(this.pawn.Position, map, 5, null);
- result2 = true;
- }
- }
- return result2;
- }
+ private bool TryFindSpawnCell(out IntVec3 result)
+ {
+ result = IntVec3.Invalid;
+ bool result2;
+ if (this.pawn == null)
+ {
+ result2 = false;
+ }
+ else
+ {
+ Map map = this.pawn.Map;
+ if (map == null)
+ {
+ result2 = false;
+ }
+ else
+ {
+ // 뾶5ٵ2λøpawn
+ int searchRadius = 2;
- private void ResetCountdown()
+ // ȳpawnڵԪɣ뾶Ϊ1
+ result = CellFinder.RandomClosewalkCellNear(this.pawn.Position, map, 1, null);
+
+ // ڵԪҲλãٳԶһ㣨뾶Ϊ2
+ if (!result.IsValid)
+ {
+ result = CellFinder.RandomClosewalkCellNear(this.pawn.Position, map, searchRadius, null);
+ }
+
+ // ҲpawnǰλãΪֶΣ
+ if (!result.IsValid && this.pawn.Position.IsValid && this.pawn.Position.Walkable(map))
+ {
+ result = this.pawn.Position;
+ }
+
+ result2 = result.IsValid;
+ }
+ }
+ return result2;
+ }
+
+
+ private void ResetCountdown()
{
this.ticksUntilSpawn = (int)(this.RandomDays2wait() * 60000f);
this.initialTicksUntilSpawn = this.ticksUntilSpawn;