Skip to content

Commit

Permalink
Fix xml error during merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@masakitenchi
masakitenchi committed Aug 18, 2024
1 parent 76e609f commit 39218df
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 74 deletions.
146 changes: 73 additions & 73 deletions Mods/RatkinRaceHSK/Defs/PawnKindDef_Ratkin/PawnKinds_Player.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<?xml version="1.0" encoding="utf-8"?>
<Defs>
<PawnKindDef Name="RKBasePawnKind" Abstract="True">
<combatPower>80</combatPower>
<canBeSapper>true</canBeSapper>
Expand All @@ -13,17 +13,17 @@
<backstoryCryptosleepCommonality>0</backstoryCryptosleepCommonality>
<initialResistanceRange>0~10</initialResistanceRange>
<initialWillRange>5~10</initialWillRange>
</PawnKindDef>
</PawnKindDef>
<!-- 평화 -->
<!-- 시민 -->
<PawnKindDef ParentName="RKBasePawnKind">
<defName>RatkinColonist</defName>
<label>ratkin colonist</label>
<defaultFactionType>RK_PlayerFaction</defaultFactionType>
<defaultFactionType>RK_PlayerFaction</defaultFactionType>
<xenotypeSet>
<xenotypeChances>
<Baseline_Ratkin MayRequire="Ludeon.RimWorld.Biotech">999</Baseline_Ratkin>
</xenotypeChances>
<xenotypeChances>
<Baseline_Ratkin MayRequire="Ludeon.RimWorld.Biotech">999</Baseline_Ratkin>
</xenotypeChances>
</xenotypeSet>
<backstoryCategories>
<li>RatkinStory</li>
Expand Down Expand Up @@ -137,26 +137,26 @@
</apparelTags>
<apparelRequired>
<li>RK_SistersVeil</li>
</apparelRequired>
</apparelRequired>
</PawnKindDef>


<!-- 전투 병과 -->
<PawnKindDef Name="RKCombatantBase" ParentName="RKBasePawnKind" Abstract="true">
<isFighter>true</isFighter>
</PawnKindDef>
<!-- 랫킨 상단 -->
<isFighter>true</isFighter>
</PawnKindDef>

<!-- 랫킨 상단 -->
<PawnKindDef ParentName="RKCombatantBase">
<defName>RatkinMerchant</defName>
<label>ratkin Merchant</label>
<combatPower>180</combatPower>
<isFighter>true</isFighter>
<backstoryFiltersOverride>
<li>
<categories>
<li>RatkinMerchant</li>
</categories>
<categories>
<li>RatkinMerchant</li>
</categories>
</li>
</backstoryFiltersOverride>
<apparelMoney>
Expand All @@ -183,8 +183,8 @@
<li>RK_Loadbearing</li>
</apparelTags>
<trader>true</trader>
</PawnKindDef>
</PawnKindDef>

<!-- 전투원 -->
<PawnKindDef ParentName="RKCombatantBase">
<defName>RatkinCombatant</defName>
Expand All @@ -193,9 +193,9 @@
<isFighter>true</isFighter>
<backstoryFiltersOverride>
<li>
<categories>
<li>RatkinCombatant</li>
</categories>
<categories>
<li>RatkinCombatant</li>
</categories>
</li>
</backstoryFiltersOverride>
<apparelMoney>
Expand All @@ -222,7 +222,7 @@
<li>RK_Loadbearing</li>
</apparelTags>
<apparelAllowHeadgearChance>0.1</apparelAllowHeadgearChance>
</PawnKindDef>
</PawnKindDef>
<!-- 랫킨 선붕대, 경갑과 경무장 -->
<PawnKindDef ParentName="RKCombatantBase">
<defName>RatkinVanguard</defName>
Expand All @@ -232,9 +232,9 @@
<minGenerationAge>21</minGenerationAge>
<backstoryFiltersOverride>
<li>
<categories>
<li>RatkinCombatant</li>
</categories>
<categories>
<li>RatkinCombatant</li>
</categories>
</li>
</backstoryFiltersOverride>
<apparelRequired>
Expand Down Expand Up @@ -273,9 +273,9 @@
<minGenerationAge>21</minGenerationAge>
<backstoryFiltersOverride>
<li>
<categories>
<li>RatkinDefender</li>
</categories>
<categories>
<li>RatkinDefender</li>
</categories>
</li>
</backstoryFiltersOverride>
<apparelRequired>
Expand All @@ -296,16 +296,16 @@
<apparelTags>
<li>RK_LightArmor</li>
</apparelTags>
<apparelAllowHeadgearChance>100</apparelAllowHeadgearChance>
<apparelAllowHeadgearChance>100</apparelAllowHeadgearChance>
<skills>
<li>
<skill>Melee</skill>
<range>8~12</range>
</li>
</skills>
</PawnKindDef>
<!-- 전투 병과(고급) -->
</skills>
</PawnKindDef>

<!-- 전투 병과(고급) -->
<!-- 군인 -->
<PawnKindDef ParentName="RKCombatantBase">
<defName>RatkinSoldier</defName>
Expand All @@ -314,9 +314,9 @@
<isFighter>true</isFighter>
<backstoryFiltersOverride>
<li>
<categories>
<li>RatkinSoldier</li>
</categories>
<categories>
<li>RatkinSoldier</li>
</categories>
</li>
</backstoryFiltersOverride>
<apparelMoney>
Expand Down Expand Up @@ -364,9 +364,9 @@
<minGenerationAge>26</minGenerationAge>
<backstoryFiltersOverride>
<li>
<categories>
<li>RatkinGuardener</li>
</categories>
<categories>
<li>RatkinGuardener</li>
</categories>
</li>
</backstoryFiltersOverride>
<apparelMoney>
Expand Down Expand Up @@ -400,7 +400,7 @@
<li>RK_Gaurdener</li>
<li>RK_Loadbearing</li>
</apparelTags>
<apparelAllowHeadgearChance>0.0</apparelAllowHeadgearChance>
<apparelAllowHeadgearChance>0.0</apparelAllowHeadgearChance>
<inventoryOptions>
<subOptionsChooseOne>
<li>
Expand All @@ -412,18 +412,18 @@
</countRange>
</li>
</subOptionsChooseOne>
</inventoryOptions>
</inventoryOptions>
<skills>
<li>
<skill>Shooting</skill>
<range>6~12</range>
</li>
</li>
<li>
<skill>Melee</skill>
<range>6~12</range>
</li>
</skills>

</PawnKindDef>
<!-- 랫킨 기사(근접 중보병) -->
<PawnKindDef ParentName="RKCombatantBase">
Expand All @@ -434,9 +434,9 @@
<minGenerationAge>24</minGenerationAge>
<backstoryFiltersOverride>
<li>
<categories>
<li>RatkinKnight</li>
</categories>
<categories>
<li>RatkinKnight</li>
</categories>
</li>
</backstoryFiltersOverride>
<apparelRequired>
Expand Down Expand Up @@ -468,7 +468,7 @@
<skill>Melee</skill>
<range>8~13</range>
</li>
</skills>
</skills>
</PawnKindDef>
<!-- 랫킨 정예 방패병(근접 중보병) -->
<PawnKindDef ParentName="RKCombatantBase">
Expand All @@ -479,9 +479,9 @@
<minGenerationAge>27</minGenerationAge>
<backstoryFiltersOverride>
<li>
<categories>
<li>RatkinEliteDefender</li>
</categories>
<categories>
<li>RatkinEliteDefender</li>
</categories>
</li>
</backstoryFiltersOverride>
<apparelRequired>
Expand All @@ -507,7 +507,7 @@
<apparelTags>
<li>RK_HeavyArmor</li>
</apparelTags>
<apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
<apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
<skills>
<li>
<skill>Melee</skill>
Expand All @@ -526,9 +526,9 @@
<minGenerationAge>21</minGenerationAge>
<backstoryFiltersOverride>
<li>
<categories>
<li>RatkinKnightCommander</li>
</categories>
<categories>
<li>RatkinKnightCommander</li>
</categories>
</li>
</backstoryFiltersOverride>
<apparelRequired>
Expand Down Expand Up @@ -580,9 +580,9 @@
</gearHealthRange>
<backstoryFiltersOverride>
<li>
<categories>
<li>RatkinSoldier</li>
</categories>
<categories>
<li>RatkinSoldier</li>
</categories>
</li>
</backstoryFiltersOverride>
<apparelMoney>
Expand Down Expand Up @@ -656,9 +656,9 @@
</gearHealthRange>
<backstoryFiltersOverride>
<li>
<categories>
<li>RatkinDemoman</li>
</categories>
<categories>
<li>RatkinDemoman</li>
</categories>
</li>
</backstoryFiltersOverride>
<apparelMoney>
Expand Down Expand Up @@ -738,9 +738,9 @@
<itemQuality>Poor</itemQuality>
<backstoryFiltersOverride>
<li>
<categories>
<li>RatkinThief</li>
</categories>
<categories>
<li>RatkinThief</li>
</categories>
</li>
</backstoryFiltersOverride>
<apparelRequired>
Expand Down Expand Up @@ -775,9 +775,9 @@
<aiAvoidCover>true</aiAvoidCover>
<backstoryFiltersOverride>
<li>
<categories>
<li>RatkinMurderer</li>
</categories>
<categories>
<li>RatkinMurderer</li>
</categories>
</li>
</backstoryFiltersOverride>
<techHediffsChance>0.25</techHediffsChance>
Expand Down Expand Up @@ -814,9 +814,9 @@
<isFighter>true</isFighter>
<backstoryFiltersOverride>
<li>
<categories>
<li>RatkinVagabond</li>
</categories>
<categories>
<li>RatkinVagabond</li>
</categories>
</li>
</backstoryFiltersOverride>
<apparelMoney>
Expand Down Expand Up @@ -920,9 +920,9 @@
<label>ratkin subject</label>
<backstoryFiltersOverride>
<li>
<categories>
<li>RatkinSubject</li>
</categories>
<categories>
<li>RatkinSubject</li>
</categories>
</li>
</backstoryFiltersOverride>
<combatPower>35</combatPower>
Expand Down Expand Up @@ -1020,4 +1020,4 @@
<li>RK_Loadbearing</li>
</apparelTags>
</PawnKindDef>
</Defs>
</Defs>
1 change: 0 additions & 1 deletion Mods/RatkinRaceHSK/Defs/PawnKindDef_Ratkin/PawnKinds_PlayerSK.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<xenotypeChances>
<Baseline_Ratkin MayRequire="Ludeon.RimWorld.Biotech">999</Baseline_Ratkin>
</xenotypeChances>

</xenotypeSet>
</PawnKindDef>

Expand Down

0 comments on commit 39218df

Please sign in to comment.