diff --git a/1.6/Defs/DamageDefs/Damages_Wula.xml b/1.6/Defs/DamageDefs/Damages_Wula.xml new file mode 100644 index 00000000..9c4de7c0 --- /dev/null +++ b/1.6/Defs/DamageDefs/Damages_Wula.xml @@ -0,0 +1,38 @@ + + + + Wula_Darm_Matter_Beam + true + + +
  • (0, 0)
    • +
  • (1, 0.5)
    • +     +     + + DamageWorker_AddInjury + true + {0} 被暗物质射流穿透而死。 + BeamWound + true + Bullet + Sharp + 0~0.7 + true + true + 10 + 0.85 + 1 + 1 + Explosion_Vaporize + +     +     diff --git a/1.6/Defs/Effects/Mote_Wula.xml b/1.6/Defs/Effects/Mote_Wula.xml new file mode 100644 index 00000000..7ee82d99 --- /dev/null +++ b/1.6/Defs/Effects/Mote_Wula.xml @@ -0,0 +1,57 @@ + + + + Mote_Wula_Dark_Matter_Beam + MoteDualAttached + MoteOverhead + + 0.1 + 0.1 + 0.1 + True + True + + true + + Wula/Mote/WULA_Bullet_Dark_Matter_Beam + Graphic_MoteWithAgeSecs + (255, 255, 255, 200) + MoteBeam + (1.5, 1) + + <_ExtraTexA>/Things/Mote/BeamSecondaryNoise_A + <_ExtraTexB>/Things/Mote/BeamSecondaryNoise_B + <_ScrollSpeedA>0 + <_ScrollSpeedB>0 + <_Intensity>2 + + + + + Mote_Wula_Dark_Matter_Beam_Bigger + MoteDualAttached + MoteOverhead + + 0.1 + 0.1 + 0.1 + True + True + + true + + Wula/Mote/WULA_Bullet_Dark_Matter_Beam + Graphic_MoteWithAgeSecs + (2.25, 1) + + MoteBeam + + <_ExtraTexA>/Things/Mote/BeamSecondaryNoise_A + <_ExtraTexB>/Things/Mote/BeamSecondaryNoise_B + <_ScrollSpeedA>0 + <_ScrollSpeedB>0 + <_Intensity>2 + + + + \ No newline at end of file diff --git a/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml b/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml index b2642814..14e13fa8 100644 --- a/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml +++ b/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml @@ -271,7 +271,7 @@ WULA_Energy_Furnace_DM_Engine 一台由暗物质作为能源驱动的合成人能源炉，拥有永不枯竭的动力，合成人安装后将不再需要充电。 - Install_WULA_Energy_Furnace_DM_Engine + Install_WULA_Energy_Furnace_DM_Engine 100 4 @@ -291,7 +291,7 @@ Install_WULA_Energy_Furnace_DM_Engine - 为合成人安装安装暗物质能源炉。 + 为合成人安装暗物质能源炉。 WULA_Energy_Furnace_DM_Engine WULA_Energy_Furnace_Hediff_DM_Engine @@ -320,6 +320,9 @@ WULA_Energy_Furnace_Hediff_DM_Engine Smith Recipe_Smith + +
  • WulaSpecies
    • +     @@ -368,7 +371,7 @@ Install_WULA_Energy_Furnace_DM_CPU - 为合成人安装安装暗物质处理器。 + 为合成人安装暗物质处理器。 WULA_Energy_Furnace_DM_CPU WULA_Energy_Furnace_Hediff_DM_CPU @@ -397,6 +400,96 @@ WULA_Energy_Furnace_Hediff_DM_CPU Smith Recipe_Smith + +
  • WulaSpecies
    • +     +     + + + + WULA_Skeleton_Hediff_Neutronium + + Hediff_Implant + 利用暗物质压缩而成的内嵌式中子装甲层和结构层，植入机械乌拉的体内时将使得她们获得强大的防御力。 + WULA_Skeleton_Neutronium + WULA_Skeleton_Neutronium + + + true + + +
  • + + + 0.5 + 0.5 + 0.5 + -0.3 + + +
  • + Consciousness + -0.1 +
    • + + +     +     + + WULA_Skeleton_Neutronium + + 利用暗物质压缩而成的内嵌式中子装甲层和结构层，植入机械乌拉的体内时将使得她们获得强大的防御力。 + Install_WULA_Energy_Furnace_DM_Engine + + 100 + 2 + +
  • RewardStandardMidFreq
    •  + + WULA_Synth_Addons_2_Technology + +
  • WULA_Cube_Productor_Energy
    • +     +     + + 0.3 + +     + + Install_WULA_Skeleton_Neutronium + + 为合成人安装零素骨架。 + + WULA_Skeleton_Neutronium + WULA_Skeleton_Hediff_Neutronium + + 安装零素骨架中 + + false + +
  • + + +
  • WULA_Skeleton_Neutronium
    • + + + 1 + +     + + +
  • WULA_Skeleton_Neutronium
    • +     +     + +
  • Torso
    • +     + +
  • WulaSpecies
    • +     + WULA_Skeleton_Hediff_Neutronium + Smith + Recipe_Smith     diff --git a/1.6/Defs/HediffDefs/Implants_RegenerateBackstory.xml b/1.6/Defs/HediffDefs/Implants_RegenerateBackstory.xml index 87893fd3..cacf5ea3 100644 --- a/1.6/Defs/HediffDefs/Implants_RegenerateBackstory.xml +++ b/1.6/Defs/HediffDefs/Implants_RegenerateBackstory.xml @@ -1,7 +1,11 @@ +<<<<<<< Updated upstream +======= + +>>>>>>> Stashed changes Wula_BackstoryRegeneratorImplant ThingWithComps diff --git a/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml b/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml index 75ee8938..3200e348 100644 --- a/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml +++ b/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml @@ -204,6 +204,18 @@
  • WULA_Synth_Weapon_2_Ranged_Technology
    • + + WULA_Synth_Weapon_4_DM_Base_Technology + 9.00 + 0.20 + + 开发供乌拉帝国合成人使用的暗物质驱动远程武器——乌拉帝国科技极致伟力的具象化。 + 4000 + +
  • WULA_Synth_Weapon_3_Bomb_Technology
    • +
  • WULA_Dark_Matter_Technology
    • +     +     WULA_Synth_Psi_Technology diff --git a/1.6/Defs/ThingDefs/WULA_Item.xml b/1.6/Defs/ThingDefs/WULA_Item.xml index 0469f70c..45c95380 100644 --- a/1.6/Defs/ThingDefs/WULA_Item.xml +++ b/1.6/Defs/ThingDefs/WULA_Item.xml @@ -144,6 +144,7 @@ 1000 0.01 + 30000
  • ResourcesRaw
    • @@ -197,7 +198,7 @@ 15000 - Things/Item/Special/MechSerumNeurotrainer + Wula/Item/WULA_Syhth_Trainer Graphic_Single diff --git a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml index 16ef18b4..e283cf9d 100644 --- a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml +++ b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml @@ -1715,6 +1715,142 @@     + + + WULA_RW_DM_AR + + 乌拉帝国一线部队所使用的由暗物质驱动的常规步枪，暗物质经由螺旋结构形成自旋极化光束，可以在远距离上洞穿敌人。 + Ultra + + + Wula/Weapon/WULA_RW_DM_AR + Graphic_Single + 1.2 + + 0.9 + Interact_ChargeRifle + + +
  • WULA_Cube_Productor_Energy
    • +     + WULA_Synth_Weapon_4_DM_Base_Technology + UnfinishedWeapon +     + + 400 + 200 + 4 + + + 40000 + 4.5 + 1 + 1 + 1 + 1 + 0.25 + + +
  • + Verb_Shoot + true + Bullet_WULA_RW_DM_AR + 0.1 + 35.9 + 1 + + Shot_BeamRepeater + GunTail_Medium + 0 + +
    • +     +     + + Bullet_WULA_RW_DM_AR + + Beam + + Things/Projectile/Bullet_Small + Graphic_Single + + + Wula_Darm_Matter_Beam + 50 + Mote_Wula_Dark_Matter_Beam_Bigger + 0.5 + 0.85 + + + + + WULA_RW_DM_Cannon + + 乌拉帝国一线部队携带的高射速反物质射线炮，射流掠过时一切如被漩涡吞噬般分崩离析，唯留尘埃飘散。 + Ultra + + + Wula/Weapon/WULA_RW_DM_Cannon + Graphic_Single + 1.5 + + 0.8 + Interact_ChargeRifle + + +
  • WULA_Cube_Productor_Energy
    • +     + WULA_Synth_Weapon_4_DM_Base_Technology + UnfinishedWeapon +     + + 500 + 300 + 6 + + + 50000 + 10 + 0.6 + 0.6 + 0.6 + 0.6 + 0.05 + + +
  • + Verb_Shoot + true + Bullet_WULA_RW_DM_Cannon + 0 + 42 + 1 + + Shot_HellsphereCannonGun + GunTail_Heavy + 8 + +
    • +     +     + + Bullet_WULA_RW_DM_Cannon + + Beam + + Things/Projectile/Bullet_Small + Graphic_Single + + + Wula_Darm_Matter_Beam + 30 + Mote_Wula_Dark_Matter_Beam + 0.5 + 0.85 + + + + WULA_WM_Panzer_Turret diff --git a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml index 8708c31a..115a9b91 100644 --- a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml +++ b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml @@ -378,7 +378,7 @@ BulletImpact_Metal 7200 - 3000 + 12000 50 4.5 1000 @@ -756,6 +756,7 @@ 6 + 0.001 0 diff --git a/Textures/Wula/Item/WULA_Syhth_Trainer.png b/Textures/Wula/Item/WULA_Syhth_Trainer.png new file mode 100644 index 00000000..c281d13b Binary files /dev/null and b/Textures/Wula/Item/WULA_Syhth_Trainer.png differ diff --git a/Textures/Wula/Mote/WULA_Bullet_Dark_Matter_Beam.png b/Textures/Wula/Mote/WULA_Bullet_Dark_Matter_Beam.png new file mode 100644 index 00000000..4d09a9d4 Binary files /dev/null and b/Textures/Wula/Mote/WULA_Bullet_Dark_Matter_Beam.png differ diff --git a/Textures/Wula/Weapon/WULA_RW_DM_AR.png b/Textures/Wula/Weapon/WULA_RW_DM_AR.png new file mode 100644 index 00000000..d7e62e81 Binary files /dev/null and b/Textures/Wula/Weapon/WULA_RW_DM_AR.png differ diff --git a/Textures/Wula/Weapon/WULA_RW_DM_Cannon.png b/Textures/Wula/Weapon/WULA_RW_DM_Cannon.png new file mode 100644 index 00000000..b39d9760 Binary files /dev/null and b/Textures/Wula/Weapon/WULA_RW_DM_Cannon.png differ diff --git a/美术与文本源文件/Wula/Item/WULA_Syhth_Trainer.sai2 b/美术与文本源文件/Wula/Item/WULA_Syhth_Trainer.sai2 new file mode 100644 index 00000000..024aaa63 Binary files /dev/null and b/美术与文本源文件/Wula/Item/WULA_Syhth_Trainer.sai2 differ diff --git a/美术与文本源文件/Wula/Mote/BeamSecondaryNoise_A.psd b/美术与文本源文件/Wula/Mote/BeamSecondaryNoise_A.psd new file mode 100644 index 00000000..91474849 Binary files /dev/null and b/美术与文本源文件/Wula/Mote/BeamSecondaryNoise_A.psd differ diff --git a/美术与文本源文件/Wula/Mote/BeamSecondaryNoise_B.psd b/美术与文本源文件/Wula/Mote/BeamSecondaryNoise_B.psd new file mode 100644 index 00000000..1a0a96a8 Binary files /dev/null and b/美术与文本源文件/Wula/Mote/BeamSecondaryNoise_B.psd differ diff --git a/美术与文本源文件/Wula/Mote/GraserBeam.psd b/美术与文本源文件/Wula/Mote/GraserBeam.psd new file mode 100644 index 00000000..f3201ac4 Binary files /dev/null and b/美术与文本源文件/Wula/Mote/GraserBeam.psd differ diff --git a/美术与文本源文件/Wula/Projectile/WULA_Bullet_Dark_Matter_Beam.png b/美术与文本源文件/Wula/Projectile/WULA_Bullet_Dark_Matter_Beam.png new file mode 100644 index 00000000..c92f8382 Binary files /dev/null and b/美术与文本源文件/Wula/Projectile/WULA_Bullet_Dark_Matter_Beam.png differ diff --git a/美术与文本源文件/Wula/Weapon/WULA_RW_DM_AR.png b/美术与文本源文件/Wula/Weapon/WULA_RW_DM_AR.png deleted file mode 100644 index e6a791c0..00000000 Binary files a/美术与文本源文件/Wula/Weapon/WULA_RW_DM_AR.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Weapon/WULA_RW_DM_AR.sai2 b/美术与文本源文件/Wula/Weapon/WULA_RW_DM_AR.sai2 index b00c5312..2daa602a 100644 Binary files a/美术与文本源文件/Wula/Weapon/WULA_RW_DM_AR.sai2 and b/美术与文本源文件/Wula/Weapon/WULA_RW_DM_AR.sai2 differ diff --git a/美术与文本源文件/Wula/Weapon/WULA_RW_DM_Cannon.sai2 b/美术与文本源文件/Wula/Weapon/WULA_RW_DM_Cannon.sai2 new file mode 100644 index 00000000..ae8f3dfa Binary files /dev/null and b/美术与文本源文件/Wula/Weapon/WULA_RW_DM_Cannon.sai2 differ diff --git a/美术与文本源文件/新建文本文档.txt b/美术与文本源文件/新建文本文档.txt index 6641d713..57af1b44 100644 --- a/美术与文本源文件/新建文本文档.txt +++ b/美术与文本源文件/新建文本文档.txt @@ -2,9 +2,9 @@ 暗物质动力炉true 情感抑制装置false 暗物质处理器true -零素骨架 +零素骨架true 暗物质炸弹猫猫 -能源步枪（连发武器，有单发狙击技能） +能源步枪（连发武器）true 暗物质护盾 铁十字（射线机械体，有个人盾） 骑士团线