Kalospacer/dragonianmix-rimworld-mod
Kalospacer/dragonianmix-rimworld-mod
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Kalospacer:ab50b04c2253b400c400920dc12635c7c958459a
Branches Tags
Kalospacer:master
Kalospacer:develop
Kalospacer:stable
Kalospacer:1.4
..
compare: Kalospacer:9fde84de135d3947eb6f250033ea4e0c04788520
Branches Tags
Kalospacer:master
Kalospacer:develop
Kalospacer:stable
Kalospacer:1.4

No commits in common. "ab50b04c2253b400c400920dc12635c7c958459a" and "9fde84de135d3947eb6f250033ea4e0c04788520" have entirely different histories.
ab50b04c22 ... 9fde84de13

1 changed files with 0 additions and 88 deletions
Show Stats Expand all files Collapse all files

88
1.5/Defs/Dragonianlike/PawnKinds/PawnKinds_Dragonian_NPC.xml
View File

@ -732,94 +732,6 @@
<techHediffsTags>
<li>DragonianOrbAdvanced</li>
</techHediffsTags>
<<<<<<< HEAD
<techHediffsRequired>
<li>HyperhealDragonianOrb</li>
</techHediffsRequired>
<inventoryOptions>
<skipChance>0.70</skipChance>
<subOptionsChooseOne>
<li>
<choiceChance>90</choiceChance>
<thingDef>Silver</thingDef>
<countRange>30~100</countRange>
</li>
</subOptionsChooseOne>
</inventoryOptions>
</PawnKindDef>
<PawnKindDef ParentName="DRMDragonianBasePawnKind">
<defName>Dragonian_Necro_Warrier</defName>
<label>Dragonian necro Warrier</label>
<labelPlural>Dragonian necro Warrier</labelPlural>
<combatPower>40</combatPower>
<isFighter>true</isFighter>
<itemQuality>Normal</itemQuality>
<apparelTags>
<li>DR_Apparel</li>
<li>DR_BattleDress</li>
<li>DR_BattleHelm</li>
<li>RoyalCombatGear</li>
</apparelTags>
<gearHealthRange>1~1</gearHealthRange>
<apparelMoney>
<min>1500</min>
<max>2500</max>
</apparelMoney>
<apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
<specificApparelRequirements>
<li>
<bodyPartGroup>Torso</bodyPartGroup>
<requiredTag>DR_BattleDress</requiredTag>
</li>
<li>
<bodyPartGroup>UpperHead</bodyPartGroup>
<requiredTag>DR_BattleHelm</requiredTag>
</li>
<li>
<bodyPartGroup>Torso</bodyPartGroup>
<alternateTagChoices>
<li>
<tag>BeltDefenseNecro</tag>
<chance>1</chance>
</li>
</alternateTagChoices>
</li>
</specificApparelRequirements>
<apparelRequired>
<li>DR_BattleDress</li>
<li>DR_BattleHelmA</li>
</apparelRequired>
<weaponTags>
<li>DR_Battlesword</li>
</weaponTags>
<weaponMoney>
<min>850</min>
<max>1500</max>
</weaponMoney>
<backstoryFiltersOverride>
<li>
<categoriesChildhood>
<li>Dragonian_spawnCategoriesA</li>
</categoriesChildhood>
<categoriesAdulthood>
<li>Dragonian_Necromancer</li>
</categoriesAdulthood>
</li>
</backstoryFiltersOverride>
<techHediffsMoney>600~5500</techHediffsMoney>
<techHediffsTags>
<li>DragonianOrbAdvanced</li>
</techHediffsTags>
=======
>>>>>>> 7ad7ac28b2efb7a9afd330c984c5eb6851687ce7
<techHediffsRequired>
<li>HyperhealDragonianOrb</li>
</techHediffsRequired>