diff --git a/1.5/1.5/Defs/HediffDefs/DRM_Hediffs_Shield_mod.xml b/1.5/1.5/Defs/HediffDefs/DRM_Hediffs_Shield_mod.xml
index 5638168..e31e212 100644
--- a/1.5/1.5/Defs/HediffDefs/DRM_Hediffs_Shield_mod.xml
+++ b/1.5/1.5/Defs/HediffDefs/DRM_Hediffs_Shield_mod.xml
@@ -87,7 +87,7 @@
2
- ShieldBelt
+ DragonianShieldModule
FabricationBench
@@ -108,7 +108,7 @@
2
- ShieldBelt
+ DragonianShieldModule
FabricationBench
@@ -130,7 +130,7 @@
2
- ShieldBelt
+ DragonianShieldModule
FabricationBench
@@ -151,7 +151,7 @@
2
- ShieldBelt
+ DragonianShieldModule
FabricationBench
diff --git a/1.5/1.5/Defs/ResearchDefs/DRM_ResearchProjects.xml b/1.5/1.5/Defs/ResearchDefs/DRM_ResearchProjects.xml
new file mode 100644
index 0000000..cba3389
--- /dev/null
+++ b/1.5/1.5/Defs/ResearchDefs/DRM_ResearchProjects.xml
@@ -0,0 +1,156 @@
+
+
+
+
+ DragonianTech
+ Dragonian tech
+
+
+
+ DragonianStart
+
+
+
+ DragonianMeleeWeapon
+ Dragonian Melee Weapon
+ Dragonian Melee Weapon
+ DragonianTech
+ 100
+ Medieval
+
+ LongBlades
+
+ 0
+ 1
+
+
+
+ DragonianEnhancedWeapon
+ Dragonian Enhanced Weapon
+ Dragonian Enhanced Weapon
+ DragonianTech
+ 100
+ Medieval
+
+ DragonianMeleeWeapon
+
+ 1
+ 1
+
+
+
+ DragonianPersonaWeapon
+ Dragonian Persona Weapon
+ Dragonian Persona Weapon
+ DragonianTech
+ 100
+ Medieval
+
+ DragonianEnhancedWeapon
+
+ 1
+ 1
+
+
+
+ DragonianRangedWeapon
+ Dragonian Ranged Weapon
+ Dragonian Ranged Weapon
+ DragonianTech
+ 100
+ Medieval
+
+ Smithing
+
+ 0
+ 2
+
+
+
+ DragonianFireArmSmithing
+ Dragonian FireArm Smithing
+ Dragonian FireArm Smithing
+ DragonianTech
+ 100
+ Medieval
+
+ Gunsmithing
+
+ 2
+ 2
+
+
+
+ DragonianWandMagic
+ Dragonian Wand Magic
+ Dragonian Wand Magic
+ DragonianTech
+ 100
+ Medieval
+
+ DragonianMeleeWeapon
+
+ 1
+ 2
+
+
+
+ DragonianClothing
+ Dragonian clothing
+ Dragonian clothing
+ DragonianTech
+ 100
+ Medieval
+
+ ComplexClothing
+
+ 0
+ 3
+
+
+
+ DragonianArmorClothing
+ Dragonian Armor clothing
+ Dragonian Armor clothing
+ DragonianTech
+ 100
+ Medieval
+
+ DragonianClothing
+ PlateArmor
+
+ 1
+ 3
+
+
+
+ DragonianShieldModule
+ Dragonian Shield Module
+ Dragonian Shield Module
+ DragonianTech
+ 100
+ Medieval
+
+ DragonianBionics
+ ShieldBelt
+
+ 2
+ 4
+
+
+
+ DragonianBionics
+ Dragonian Bionics
+ Dragonian Bionics
+ DragonianTech
+ 100
+ Medieval
+
+ Bionics
+
+ 1
+ 4
+
+
+
+
\ No newline at end of file
diff --git a/1.5/1.5/Defs/ThingDefs/DRM_Apparel.xml b/1.5/1.5/Defs/ThingDefs/DRM_Apparel.xml
index 46fd9f3..4fad386 100644
--- a/1.5/1.5/Defs/ThingDefs/DRM_Apparel.xml
+++ b/1.5/1.5/Defs/ThingDefs/DRM_Apparel.xml
@@ -12,7 +12,9 @@
HandTailoringBench
UnfinishedApparel
- PlateArmor
+
+ DragonianArmorClothing
+
Dragonian/Apparel/Gear/drapparelF
@@ -78,7 +80,9 @@
HandTailoringBench
UnfinishedApparel
- PlateArmor
+
+ DragonianArmorClothing
+
Dragonian/Apparel/Gear/drahgA
diff --git a/1.5/1.5/Defs/ThingDefs/DRM_Items_BodyParts.xml b/1.5/1.5/Defs/ThingDefs/DRM_Items_BodyParts.xml
index d42cad3..28b1d20 100644
--- a/1.5/1.5/Defs/ThingDefs/DRM_Items_BodyParts.xml
+++ b/1.5/1.5/Defs/ThingDefs/DRM_Items_BodyParts.xml
@@ -39,6 +39,11 @@
Advanced
+
+
+ DragonianBionics
+
+
diff --git a/1.5/1.5/Defs/ThingDefs/DRM_Weapon.xml b/1.5/1.5/Defs/ThingDefs/DRM_Weapon.xml
index 996ddb1..5343e9b 100644
--- a/1.5/1.5/Defs/ThingDefs/DRM_Weapon.xml
+++ b/1.5/1.5/Defs/ThingDefs/DRM_Weapon.xml
@@ -26,7 +26,11 @@
5
- Electricity
+
+ DragonianMeleeWeapon
+ Electricity
+
+
10
@@ -235,6 +239,10 @@
10
+
+ DragonianMeleeWeapon
+ DragonianEnhancedWeapon
+
DR_BattleMace
diff --git a/1.5/1.5/Defs/ThingDefs/DRM_Weapon_Gun.xml b/1.5/1.5/Defs/ThingDefs/DRM_Weapon_Gun.xml
new file mode 100644
index 0000000..7e9a0d7
--- /dev/null
+++ b/1.5/1.5/Defs/ThingDefs/DRM_Weapon_Gun.xml
@@ -0,0 +1,94 @@
+
+
+
+
+ DRM_RifledFlintlock
+ Dragonian RifledFlintlock
+ An ancient pattern bolt-action rifle. With its long range, and low fire rate, it is unlikely to drive animals to revenge, which makes it a favorite weapon for hunting.
+
+ Dragonian/Things/Weapon/DRM_RifledFlintlock
+ Graphic_Single
+
+ Interact_Rifle
+
+ LongShots
+
+
+ 12000
+ 3.5
+ 0.65
+ 0.80
+ 0.90
+ 0.80
+ 0.4
+
+
+ 60
+ 3
+
+
+
+ 5
+
+ 415
+
+ DragonianFireArmSmithing
+
+
+
+
+ DragonianMix.Verb_ShootShotgun
+ true
+ DRM_Bullet_RifledFlintlock
+ 1.5
+ 36.9
+ 2
+ 16
+ Shot_Shotgun
+ GunTail_Heavy
+ 9
+
+
+
+
+ stock
+
+ Blunt
+
+ 9
+ 2
+
+
+ barrel
+
+ Blunt
+ Poke
+
+ 9
+ 2
+
+
+
+
+
+ DRM_Bullet_RifledFlintlock
+ Rifled-Flintlock bullet
+
+ Bullet
+ 5
+ 1.5
+ 70
+
+
+ Things/Projectile/Bullet_big
+ Graphic_Single
+
+
+
+ 5
+
+
+
+
+
+
\ No newline at end of file
diff --git a/1.5/1.5/Defs/ThingDefs/DRM_Weapon_Spear.xml b/1.5/1.5/Defs/ThingDefs/DRM_Weapon_Spear.xml
index 1ce45c7..884e706 100644
--- a/1.5/1.5/Defs/ThingDefs/DRM_Weapon_Spear.xml
+++ b/1.5/1.5/Defs/ThingDefs/DRM_Weapon_Spear.xml
@@ -38,6 +38,9 @@
10
+
+ DragonianRangedWeapon
+
@@ -107,6 +110,9 @@
10
+
+ DragonianRangedWeapon
+
@@ -178,6 +184,10 @@
10
+
+ DragonianRangedWeapon
+ DragonianEnhancedWeapon
+
@@ -249,6 +259,9 @@
10
+
+ DragonianRangedWeapon
+
@@ -320,6 +333,10 @@
10
+
+ DragonianRangedWeapon
+ DragonianEnhancedWeapon
+
diff --git a/1.5/1.5/Defs/ThingDefs/DRM_Weapon_Stuff.xml b/1.5/1.5/Defs/ThingDefs/DRM_Weapon_Stuff.xml
index 25e6661..cf37e09 100644
--- a/1.5/1.5/Defs/ThingDefs/DRM_Weapon_Stuff.xml
+++ b/1.5/1.5/Defs/ThingDefs/DRM_Weapon_Stuff.xml
@@ -35,6 +35,10 @@
10
+
+ DragonianMeleeWeapon
+ DragonianWandMagic
+
DR_BattleStaff_Air
@@ -136,6 +140,10 @@
10
+
+ DragonianMeleeWeapon
+ DragonianWandMagic
+
DR_BattleStaff_Ranged
@@ -238,6 +246,10 @@
10
+
+ DragonianMeleeWeapon
+ DragonianWandMagic
+
DR_BattleStaff_Fear
@@ -433,6 +445,10 @@
10
+
+ DragonianMeleeWeapon
+ DragonianWandMagic
+
DR_BattleStaff_Ranged
diff --git a/1.5/1.5/Languages/ChineseSimplified (简体中文)/Definjected/ResearchProjectDef/ResearchProjects.xml b/1.5/1.5/Languages/ChineseSimplified (简体中文)/Definjected/ResearchProjectDef/ResearchProjects.xml
new file mode 100644
index 0000000..1a8b220
--- /dev/null
+++ b/1.5/1.5/Languages/ChineseSimplified (简体中文)/Definjected/ResearchProjectDef/ResearchProjects.xml
@@ -0,0 +1,34 @@
+
+
+
+ 龙娘近战武器
+ 龙娘使用的最基本的近战武器。
+
+ 龙娘基本服装
+ 龙娘们所穿着的最基本的服装。
+
+ 龙娘装甲服装
+ 龙娘们为了保护自己所穿着的装甲服装。
+
+ 龙娘附魔武器
+ 龙娘们使用的经过附魔后的武器,拥有各种各样的伤害效果。
+
+ 龙娘人格武器
+ 龙娘们使用的人格化武器,有着最强大的战力。
+
+ 龙娘远程武器
+ 龙娘们为了保护自己所制造的远程武器。
+
+ 龙娘火器锻造
+ 龙娘们制造的具有古典风格和性能的枪械。
+
+ 龙娘法杖魔法
+ 龙娘们使用的法杖,魔法的效果与法杖的外形很难关联起来。
+
+ 龙娘护盾模块
+ 龙娘护盾龙珠所使用的增强模块。能够提升护盾的性能。
+
+ 龙娘仿生学部件
+ 神秘的龙娘博士所研发的仿生身体部件,能够完美代替龙娘们身体缺失的部分。
+
+
\ No newline at end of file
diff --git a/1.5/1.5/Languages/ChineseSimplified (简体中文)/Definjected/ResearchTabDef/ResearchProjects.xml b/1.5/1.5/Languages/ChineseSimplified (简体中文)/Definjected/ResearchTabDef/ResearchProjects.xml
new file mode 100644
index 0000000..e0dd18e
--- /dev/null
+++ b/1.5/1.5/Languages/ChineseSimplified (简体中文)/Definjected/ResearchTabDef/ResearchProjects.xml
@@ -0,0 +1,6 @@
+
+
+
+ 龙娘科技
+
+
\ No newline at end of file
diff --git a/1.5/1.5/Languages/ChineseSimplified (简体中文)/Definjected/ThingDef/ThingDefs_DRM_Weapon.xml b/1.5/1.5/Languages/ChineseSimplified (简体中文)/Definjected/ThingDef/ThingDefs_DRM_Weapon.xml
index 6e8d8db..cadccad 100644
--- a/1.5/1.5/Languages/ChineseSimplified (简体中文)/Definjected/ThingDef/ThingDefs_DRM_Weapon.xml
+++ b/1.5/1.5/Languages/ChineseSimplified (简体中文)/Definjected/ThingDef/ThingDefs_DRM_Weapon.xml
@@ -31,6 +31,9 @@
龙娘 酸雾法杖
龙娘使用的法杖。一个压缩的气体发射器。能够发射对环境有害的酸雾气团。
+ 龙娘 线膛燧发枪
+ 龙娘使用的枪械。具有古典的设计和性能。
+
龙娘 飞矛
龙娘使用的飞矛。她们能把这种沉重的近战武器轻松投送到极远处。
杆
diff --git a/1.5/1.5/Patches/DRM_Apparel_Patch.xml b/1.5/1.5/Patches/DRM_Apparel_Patch.xml
index 0f713c9..cd2d05c 100644
--- a/1.5/1.5/Patches/DRM_Apparel_Patch.xml
+++ b/1.5/1.5/Patches/DRM_Apparel_Patch.xml
@@ -1,12 +1,24 @@
+
+
+
+ Defs/ThingDef[@Name="DR_ApparelMakeableBase"]/recipeMaker
+
+
+ DragonianClothing
+
+
+
+
+
-
+
Defs/ThingDef[defName="DR_BattleDress"]/apparel/tags
-
+
Defs/ThingDef[defName="DR_BattleDress"]/apparel/tags
@@ -14,15 +26,24 @@
DR_BattleDress
+
+
+ Defs/ThingDef[defName="DR_BattleDress"]/recipeMaker/researchPrerequisite
+
+
+ DragonianArmorClothing
+
+
+
-
+
Defs/ThingDef[defName="DR_BattleHelmA"]/apparel/tags
-
+
Defs/ThingDef[defName="DR_BattleHelmA"]/apparel/tags
@@ -30,15 +51,23 @@
DR_BattleHelm
+
+ Defs/ThingDef[defName="DR_BattleHelmA"]/recipeMaker/researchPrerequisite
+
+
+ DragonianArmorClothing
+
+
+
-
+
Defs/ThingDef[defName="DR_ProtectionOrb"]/apparel/tags
-
+
Defs/ThingDef[defName="DR_ProtectionOrb"]/apparel/tags
@@ -46,16 +75,23 @@
DR_ProtectionOrb
-
+
+ Defs/ThingDef[defName="DR_ProtectionOrb"]/recipeMaker/researchPrerequisite
+
+
+ DragonianArmorClothing
+
+
+
-
+
Defs/ThingDef[defName="DR_PsychicDress"]/apparel/tags
-
+
Defs/ThingDef[defName="DR_PsychicDress"]/apparel/tags
@@ -63,16 +99,23 @@
DR_PsychicDress
-
+
+ Defs/ThingDef[defName="DR_PsychicDress"]/recipeMaker/researchPrerequisite
+
+
+ DragonianArmorClothing
+
+
+
-
+
Defs/ThingDef[defName="DR_PsychicHelm"]/apparel/tags
-
+
Defs/ThingDef[defName="DR_PsychicHelm"]/apparel/tags
@@ -80,6 +123,14 @@
DR_PsychicHelm
+
+ Defs/ThingDef[defName="DR_PsychicHelm"]/recipeMaker/researchPrerequisite
+
+
+ DragonianArmorClothing
+
+
+
diff --git a/1.5/1.5/Patches/DRM_Weapon_Patch.xml b/1.5/1.5/Patches/DRM_Weapon_Patch.xml
index 45a7b95..19afe8f 100644
--- a/1.5/1.5/Patches/DRM_Weapon_Patch.xml
+++ b/1.5/1.5/Patches/DRM_Weapon_Patch.xml
@@ -15,6 +15,14 @@
+
+ Defs/ThingDef[defName="DR_BattleMace"]/recipeMaker
+
+
+ DragonianMeleeWeapon
+
+
+
@@ -33,7 +41,14 @@
-
+
+ Defs/ThingDef[defName="DR_Battlesword"]/recipeMaker
+
+
+ DragonianMeleeWeapon
+
+
+
@@ -52,7 +67,14 @@
-
+
+ Defs/ThingDef[defName="DR_BattleStaff"]/recipeMaker
+
+
+ DragonianMeleeWeapon
+
+
+
diff --git a/1.5/Royal1.5/Defs/ThingDefs/DRM_WeaponBladelink_royal.xml b/1.5/Royal1.5/Defs/ThingDefs/DRM_WeaponBladelink_royal.xml
index d012d62..f53e584 100644
--- a/1.5/Royal1.5/Defs/ThingDefs/DRM_WeaponBladelink_royal.xml
+++ b/1.5/Royal1.5/Defs/ThingDefs/DRM_WeaponBladelink_royal.xml
@@ -92,7 +92,7 @@
Crafting
Smith
Recipe_Smith
- Electricity
+ DragonianPersonaWeapon
10
@@ -189,7 +189,7 @@
Crafting
Smith
Recipe_Smith
- Electricity
+ DragonianPersonaWeapon
10
diff --git a/Content/Textures/Dragonian/Things/Weapon/DRM_RifledFlintlock.png b/Content/Textures/Dragonian/Things/Weapon/DRM_RifledFlintlock.png
new file mode 100644
index 0000000..994d7b2
Binary files /dev/null and b/Content/Textures/Dragonian/Things/Weapon/DRM_RifledFlintlock.png differ