diff --git a/1.6/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml b/1.6/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
index 2165e04a..4b63dd51 100644
--- a/1.6/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
+++ b/1.6/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
@@ -136,29 +136,6 @@
WULA_Base_Technology
-
- WULA_Synth_Weapon_2_Plasma_Technology
- 3.00
- 0.20
- 等离子武装套件
- 开发能够供乌拉帝国合成人的使用的等离子武器,以便进一步对抗强大的外部威胁。
- 600
-
- WULA_Synth_Weapon_Technology
-
-
-
- WULA_Synth_Weapon_Shield_Technology
- 2.00
- 1.20
- 护盾武装套件
- 开发能够保护乌拉帝国合成人的手持护盾,以抵抗来自敌方的猛烈攻击。
- 800
-
- WULA_Synth_Weapon_Technology
- WULA_Synth_Clothes_Technology
-
-
WULA_Synth_Weapon_2_Melee_Technology
短兵武装套件
@@ -169,7 +146,7 @@
Fabrication
WULA_Adv_WorkTable_Technology
- WULA_Synth_Weapon_2_Plasma_Technology
+ WULA_Synth_Weapon_Technology
@@ -186,28 +163,66 @@
- WULA_Synth_Weapon_2_Ranged_Technology
- 4.50
+ WULA_Synth_Weapon_2_Plasma_Technology
+ 2.00
0.20
+ 等离子武装套件
+ 开发能够供乌拉帝国合成人的使用的等离子武器,以便进一步对抗强大的外部威胁。
+ 600
+
+ WULA_Synth_Weapon_Technology
+
+
+
+
+ WULA_Synth_Weapon_2_Laser_Technology
+ 2.00
+ 1.00
+ 镭射武装套件
+ 开发能够供乌拉帝国合成人的使用的镭射武器,以便进一步对抗强大的外部威胁。
+ 600
+
+ WULA_Synth_Weapon_Technology
+
+
+
+
+ WULA_Synth_Weapon_Shield_Technology
+ 2.00
+ 2.50
+ 护盾武装套件
+ 开发能够保护乌拉帝国合成人的手持护盾,以抵抗来自敌方的猛烈攻击。
+ 800
+
+ WULA_Synth_Weapon_Technology
+ WULA_Synth_Clothes_Technology
+
+
+
+
+ WULA_Synth_Weapon_2_Ranged_Technology
+ 3.00
+ 1.00
远射武装套件
开发能够武装乌拉帝国合成人的远距离武器,旨在构建密集火力网消灭敌人。
2400
ChargedShot
WULA_Adv_WorkTable_Technology
- WULA_Synth_Weapon_2_Plasma_Technology
+ WULA_Synth_Weapon_2_Laser_Technology
WULA_Synth_Weapon_3_Bomb_Technology
- 5.50
+ 3.00
0.20
轰炸武装套件
开发能够武装乌拉帝国合成人的大范围杀伤性武器,用于对抗最难应付的敌人。
3200
- WULA_Synth_Weapon_2_Ranged_Technology
BeamWeapons
+ WULA_Adv_WorkTable_Technology
+ WULA_Synth_Weapon_2_Plasma_Technology
@@ -218,6 +233,7 @@
开发供乌拉帝国合成人使用的暗物质驱动远程武器——乌拉帝国科技极致伟力的具象化。
4000
+ WULA_Synth_Weapon_2_Ranged_Technology
WULA_Synth_Weapon_3_Bomb_Technology
WULA_Dark_Matter_Technology
diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Balistic_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Balistic_Weapon.xml
new file mode 100644
index 00000000..f64a3f0f
--- /dev/null
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Balistic_Weapon.xml
@@ -0,0 +1,217 @@
+
+
+
+ WULA_RW_Base_AR
+ DLa-1"页岩"
+ 乌拉帝国的旧式突击步枪,仍然使用落后的导气式结构驱动自动射击构件,通常被派发给炮灰战斗人员。
+ Normal
+ Spacer
+
+ Wula/Weapon/WULA_RW_Base_AR
+ Graphic_Single
+
+ Interact_Rifle
+
+
+ WULA_Cube_Productor_BIO
+ WULA_Cube_Productor_Energy
+
+ WULA_Synth_Weapon_Technology
+ UnfinishedWeapon
+
+
+ 1300
+
+ 3.5
+ 0.75
+ 0.75
+ 0.65
+ 0.45
+ 1.2
+
+
+
+ Verb_Shoot
+ true
+ Bullet_AssaultRifle
+ 1
+ 25
+ 4
+ 3
+ Shot_AssaultRifle
+ GunTail_Medium
+ 7
+
+
+
+ 60
+ 8
+
+
+ Wula_Weapon_Init
+
+
+ RewardStandardQualitySuper
+
+
+
+
+ WULA_RW_Fractal_RF
+ SLr-14"蓝锥"
+ 乌拉帝国的旧式猎枪,使用简易的磁轨结构发射钢针,射速较慢,但是强大的动能使其在击中第一个目标后仍能继续飞行,对路径上的多个敌人造成伤害。
+ Spacer
+
+ Wula/Weapon/WULA_RW_Fractal_RF
+ Graphic_Single
+
+
+
+ Interact_Rifle
+
+ LongShots
+ RangedHeavy
+
+
+
+
+ WULA_Cube_Productor_BIO
+ WULA_Cube_Productor_Energy
+
+ WULA_Synth_Weapon_Technology
+ UnfinishedWeapon
+
+
+ 1300
+ 3.5
+ 0.3
+ 0.8
+ 0.9
+ 0.8
+ 0.8
+
+
+ 120
+ 6
+
+
+
+ Verb_Shoot
+ true
+ Bullet_WULA_RW_Fractal_RF
+ 2
+ 38
+ 1
+ Shot_ChargeBlaster
+ GunTail_Medium
+ 9
+
+
+
+ Wula_Ranged_Weapon_T2
+
+
+ RewardStandardQualitySuper
+
+
+
+ Bullet_WULA_RW_Fractal_RF
+ 蓝锥钢针弹
+ WulaFallenEmpire.Projectile_WulaLineAttack
+
+
+ -1
+ 0
+ false
+ WULA_GunTail_Lighting
+
+
+
+ Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red
+ Graphic_Single
+ TransparentPostLight
+ 1.4
+
+
+ Bullet
+ 25
+ 130
+ 0.5
+ 5
+
+
+
+
+
+ WULA_RW_StarDrift_SG
+ DCs-7"黑曜石"
+ 乌拉帝国配发的近距离霰弹枪,以威力巨大的梭镖破甲弹为核心,专注于在短距离上的快速反应战斗和持续性压制能力
+ Ultra
+
+ Wula_Ranged_Weapon_T2
+
+
+
+ Wula/Weapon/WULA_RW_StarDrift_SG
+ Graphic_Single
+
+ Interact_ChargeRifle
+
+
+ WULA_Cube_Productor_BIO
+ WULA_Cube_Productor_Energy
+
+ WULA_Synth_Weapon_Technology
+ UnfinishedWeapon
+
+
+ 25000
+ 3.5
+ 1
+ 0.9
+ 0.5
+ 0.25
+ 1.4
+
+
+ 120
+ 6
+
+
+
+ WulaFallenEmpire.Verb_ShootShotgun
+ true
+ WULA_Bullet_StarDrift_Shotgun_Spear
+ 0.2
+ 18
+ 3
+ 3
+ Shot_BeamRepeater
+ GunTail_Medium
+ 7
+
+
+
+ RewardStandardQualitySuper
+
+
+
+ WULA_Bullet_StarDrift_Shotgun_Spear
+ 梭镖
+
+ Wula/Projectile/WULA_Bullet_StarDrift_Shotgun_Spear
+ Graphic_Single
+
+
+ Bullet
+ 8
+ 2.5
+ 0.65
+ 55
+
+
+
+ 3
+
+
+
+
\ No newline at end of file
diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Laser_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Laser_Weapon.xml
index a1d371c6..2d6d5a34 100644
--- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Laser_Weapon.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Laser_Weapon.xml
@@ -16,7 +16,7 @@
WULA_Cube_Productor_BIO
WULA_Cube_Productor_Energy
- WULA_Synth_Weapon_Technology
+ WULA_Synth_Weapon_2_Laser_Technology
UnfinishedWeapon
@@ -33,7 +33,7 @@
Verb_Shoot
true
- Bullet_WULA_RW_Penetrating_Beam_Base
+ Bullet_WULA_RW_Penetrating_Rifle
2
16
3
@@ -47,38 +47,42 @@
60
- 8
+ 4
+ 20
- Wula_Weapon_Init
+ Wula_Ranged_Weapon_T2
RewardStandardQualitySuper
-
- Bullet_WULA_RW_Penetrating_Beam_Base
+ Bullet_WULA_RW_Penetrating_Rifle
穿透光束
- WulaFallenEmpire.Projectile_WulaBeam
+ WulaFallenEmpire.Projectile_WulaLineAttack
-
- -1
- 0
- false
- Mote_WULA_RW_Penetrating_Beam
- 0.5
+
+ -1
+ 0
+ true
+ WULA_GunTail_Plasma
+ Normal
+ True
Things/Projectile/ChargeLanceShot
Graphic_Single
+ TransparentPostLight
+ 1.4
BeamBypassShields
5
- 0.8
+ 130
+ 0.9
1
@@ -110,8 +114,15 @@
120
6
+ 20
-
+
+
+ WULA_Cube_Productor_Energy
+
+ WULA_Synth_Weapon_2_Laser_Technology
+ UnfinishedWeapon
+
WulaFallenEmpire.Verb_ShootShotgun
@@ -129,7 +140,7 @@
- Wula_Weapon_Init
+ Wula_Ranged_Weapon_T2
RewardStandardQualitySuper
@@ -212,7 +223,7 @@
-1
0
- false
+ true
Mote_WULA_RW_Penetrating_Beam
0.5
@@ -240,7 +251,7 @@
-1
0
- false
+ true
Mote_WULA_RW_Penetrating_Beam
0.5
@@ -294,6 +305,86 @@
+
+
+ WULA_RW_Sphene_MG
+ FLm-43"榍石"
+ 乌拉帝国的通用机枪,负责在班组中提供如暴雨倾泻的高速连射光束流,产生的高温熔烧效果将融化一切敌人的装甲。
+ Ultra
+
+ Wula_Ranged_Weapon_T3
+
+
+
+ Wula/Weapon/WULA_RW_Sphene_MG
+ Graphic_Single
+
+ Interact_ChargeRifle
+
+
+ WULA_Cube_Productor_Energy
+
+ WULA_Synth_Weapon_2_Ranged_Technology
+ UnfinishedWeapon
+
+
+ 350
+ 200
+ 8
+
+
+ 40000
+ 4.5
+ 0.5
+ 0.5
+ 0.5
+ 0.4
+ 2
+
+
+
+ Verb_Shoot
+ true
+ Bullet_WULA_RW_Sphene_MG
+ 0.5
+ 33.9
+ 32
+ 6
+ Shot_ChargeRifle
+ GunTail_Medium
+ 9
+
+
+
+ RewardStandardQualitySuper
+
+
+
+ Bullet_WULA_RW_Sphene_MG
+ 榍石光束
+ WulaFallenEmpire.Projectile_WulaBeam
+
+ Things/Projectile/ChargeLanceShot
+ Graphic_Single
+
+
+ BeamBypassShields
+ 5
+ 0.5
+ 1.5
+ 1
+
+
+
+ -1
+ 0
+ true
+ Mote_WULA_RW_Penetrating_Beam
+ 0.5
+
+
+
+
WULA_RW_DM_AR
@@ -395,12 +486,6 @@
RewardStandardQualitySuper
-
-
- WULA_RW_DM_Cannon
- WULA_RW_DM_ARSwitchAbility
-
-
@@ -508,48 +593,5 @@
RewardStandardQualitySuper
-
-
- WULA_RW_DM_AR
- WULA_RW_DM_ARSwitchAbility
-
-
-
- WULA_RW_DM_ARSwitchAbility
- 武装解放 / 武装闭锁
- 控制聚能透镜档位,以决定DMa-8"陨硫"/DMc-65"铋晶"是否切换到扫射炮击模式。
- 601
- Wula/UI/Abilities/WULA_WeaponSwitchAbility
- false
- false
- false
- false
- false
-
-
-
-
-
- Verb_CastAbility
- 0
- false
- false
- false
-
- true
-
-
-
-
- WulaFallenEmpire.CompAbilityEffect_Switch
-
-
-
-
-
\ No newline at end of file
diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Plasma_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Plasma_Weapon.xml
index df4fdd5d..218216d5 100644
--- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Plasma_Weapon.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Plasma_Weapon.xml
@@ -45,14 +45,16 @@
7
Mote_BeamRepeater_Charge
1.07
+ 0.1
- 180
- 10
+ 60
+ 4
+ 20
- Wula_Weapon_Init
+ Wula_Ranged_Weapon_T2
RewardStandardQualitySuper
@@ -124,7 +126,7 @@
Damage_WULA_Plasma_Explosive
- 16
+ 6
0.9
Explosion_EMP
0.75
@@ -193,10 +195,9 @@
- WULA_Cube_Productor_BIO
WULA_Cube_Productor_Energy
- WULA_Synth_Weapon_Technology
+ WULA_Synth_Weapon_2_Plasma_Technology
UnfinishedWeapon
@@ -209,8 +210,8 @@
1.2
- 100
- 5
+ 120
+ 6
20
@@ -227,11 +228,11 @@
9
Mote_BeamRepeater_Charge
1.07
+ 1.1
- Wula_Weapon_Init
- HomingWeapon
+ Wula_Ranged_Weapon_T2
RewardStandardQualitySuper
@@ -253,20 +254,13 @@
Graphic_Single
1.4
- 1
Interact_Rifle
LongShots
RangedHeavy
-
-
- WULA_Cube_Productor_BIO
- WULA_Cube_Productor_Energy
-
- WULA_Synth_Weapon_Technology
- UnfinishedWeapon
-
+
+ 0
1500
3.0
@@ -295,11 +289,11 @@
9
Mote_BeamRepeater_Charge
1.07
+ 1.1
Wula_Weapon_Init
- HomingWeapon
RewardStandardQualitySuper
@@ -323,7 +317,9 @@
Damage_WULA_Plasma_Explosive
- 10
+ 6
+ 0.9
+ Explosion_EMP
0.75
55
@@ -333,13 +329,7 @@
WULA_GunTail_Plasma
- 2
-
-
-
- 0.9
- Damage_WULA_Plasma_Explosive
- Explosion_EMP
+ 3
@@ -355,8 +345,8 @@
Damage_WULA_Plasma_Explosive
- 20
- 2.1
+ 16
+ 2
Explosion_EMP
0.75
55
@@ -471,6 +461,7 @@
true
HellsphereCannon_Aiming
false
+ 1.1
diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
index b0dc083e..f2aab01b 100644
--- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
@@ -64,142 +64,7 @@
RewardStandardQualitySuper
-
- WULA_RW_Base_AR
- DLa-1"页岩"
- 乌拉帝国的旧式突击步枪,仍然使用落后的导气式结构驱动自动射击构件,通常被派发给炮灰战斗人员。
- Normal
- Spacer
-
- Wula/Weapon/WULA_RW_Base_AR
- Graphic_Single
-
- Interact_Rifle
-
-
- WULA_Cube_Productor_BIO
- WULA_Cube_Productor_Energy
-
- WULA_Synth_Weapon_Technology
- UnfinishedWeapon
-
-
- 1300
-
- 3.5
- 0.75
- 0.75
- 0.65
- 0.45
- 1.2
-
-
-
- Verb_Shoot
- true
- Bullet_AssaultRifle
- 1
- 25
- 4
- 3
- Shot_AssaultRifle
- GunTail_Medium
- 7
-
-
-
- 60
- 8
-
-
- Wula_Weapon_Init
-
-
- RewardStandardQualitySuper
-
-
-
- WULA_RW_Fractal_RF
- SLr-14"蓝锥"
- 乌拉帝国的旧式猎枪,使用简易的磁轨结构发射钢针,射速较慢,但是强大的动能使其在击中第一个目标后仍能继续飞行,对路径上的多个敌人造成伤害。
- Spacer
-
- Wula/Weapon/WULA_RW_Fractal_RF
- Graphic_Single
-
-
-
- Interact_Rifle
-
- LongShots
- RangedHeavy
-
-
-
-
- WULA_Cube_Productor_BIO
- WULA_Cube_Productor_Energy
-
- WULA_Synth_Weapon_Technology
- UnfinishedWeapon
-
-
- 1300
- 3.5
- 0.3
- 0.8
- 0.9
- 0.8
- 0.8
-
-
- 120
- 6
-
-
-
- Verb_Shoot
- true
- Bullet_WULA_RW_Fractal_RF
- 2
- 38
- 1
- Shot_ChargeBlaster
- GunTail_Medium
- 9
-
-
-
- Wula_Weapon_Init
-
- RewardStandardQualitySuper
-
-
- Bullet_WULA_RW_Fractal_RF
- 蓝锥钢针弹
- WulaFallenEmpire.Projectile_WulaLineAttack
-
-
- -1
- 0
- false
- WULA_GunTail_Lighting
-
-
-
- Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red
- Graphic_Single
- TransparentPostLight
- 1.4
-
-
- Bullet
- 25
- 130
- 0.5
- 5
-
-
+
WULA_MW_Constructor_Hammer
HAm-1"装修锤"
@@ -617,154 +482,6 @@
-
-
- WULA_RW_StarDrift_SG
- DCs-7"黑曜石"
- 乌拉帝国配发的近距离霰弹枪,以威力巨大的梭镖破甲弹为核心,专注于在短距离上的快速反应战斗和持续性压制能力
- Ultra
-
- Wula_Ranged_Weapon_T2
-
-
-
- Wula/Weapon/WULA_RW_StarDrift_SG
- Graphic_Single
-
- Interact_ChargeRifle
-
-
- WULA_Cube_Productor_Energy
-
- WULA_Synth_Weapon_2_Ranged_Technology
- UnfinishedWeapon
-
-
- 25000
- 3.5
- 1
- 0.9
- 0.5
- 0.25
- 1.4
-
-
- 120
- 50
- 4
-
-
-
- WulaFallenEmpire.Verb_ShootShotgun
- true
- WULA_Bullet_StarDrift_Shotgun_Spear
- 0.2
- 18
- 3
- 3
- Shot_BeamRepeater
- GunTail_Medium
- 7
-
-
-
- RewardStandardQualitySuper
-
-
-
- WULA_Bullet_StarDrift_Shotgun_Spear
- 梭镖
-
- Wula/Projectile/WULA_Bullet_StarDrift_Shotgun_Spear
- Graphic_Single
-
-
- Bullet
- 8
- 2.5
- 0.65
- 55
-
-
-
- 3
-
-
-
-
-
-
- WULA_RW_Sphene_MG
- FLm-43"榍石"
- 乌拉帝国的通用机枪,负责在班组中提供如暴雨倾泻的高速连射光束流,产生的高温熔烧效果将融化一切敌人的装甲。
- Ultra
-
- Wula_Ranged_Weapon_T2
-
-
-
- Wula/Weapon/WULA_RW_Sphene_MG
- Graphic_Single
-
- Interact_ChargeRifle
-
-
- WULA_Cube_Productor_Energy
-
- WULA_Synth_Weapon_2_Ranged_Technology
- UnfinishedWeapon
-
-
- 350
- 200
- 8
-
-
- 40000
- 4.5
- 0.5
- 0.5
- 0.5
- 0.4
- 2
-
-
-
- Verb_Shoot
- true
- Bullet_WULA_RW_Sphene_MG
- 0.5
- 33.9
- 32
- 2
- Shot_ChargeRifle
- GunTail_Medium
- 9
-
-
-
- RewardStandardQualitySuper
-
-
-
- Bullet_WULA_RW_Sphene_MG
- 榍石光束
- Beam
-
- Things/Projectile/ChargeLanceShot
- Graphic_Single
-
-
- Beam
- 5
- 0.5
- 1.5
- 1
- Mote_WULA_RW_Penetrating_Beam
-
-
-
-
WULA_RW_AutoCannon
@@ -937,7 +654,6 @@
-
WULA_MW_Lance