diff --git a/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml b/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml index d66ac767..476fe52c 100644 --- a/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml +++ b/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml @@ -203,4 +203,40 @@ Explosion_EMP Damage_Bomb + + + Damage_WULA_Melta + true + + +
  • (0, 0)
    • +
  • (1, 0.5)
    • +     +     + + true + DamageWorker_AddInjury + true + {0} 被热熔武器融化了。 + true + Bullet + Burn + Heat + 0~0.7 + true + false + 150 + 1.2 + 1 + 1 + Explosion_Vaporize + +     diff --git a/1.6/1.6/Defs/EventDefs/EventDef_Examples.xml b/1.6/1.6/Defs/EventDefs/EventDef_Examples.xml index 78615cba..6534a0ad 100644 --- a/1.6/1.6/Defs/EventDefs/EventDef_Examples.xml +++ b/1.6/1.6/Defs/EventDefs/EventDef_Examples.xml @@ -8,14 +8,14 @@
  • -
  • - - Mechanoid -
    • - +
  • + + Mechanoid +
    • +
  • 来自乌拉帝国 大教堂的进攻 diff --git a/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml b/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml index 2d5dcdd2..1fcd9b7a 100644 --- a/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml +++ b/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml @@ -645,6 +645,19 @@
    • +
  • + + +
  • + +
  • + Wula_UI_Anisia_203 +
    • +
  • + +
    • + +
  • @@ -753,6 +766,86 @@
    • + + Wula_UI_Anisia_203 + + Wula/Events/Portraits/WULA_Anisia_3 + URa-1138「艾妮西娅」 + +
  • 这可是你们自己说的？\n\n最近有一批乌拉帝国的机械体被部署到边缘世界了，我可以略施小计，让它们当中最猛的家伙发狂揍一下你们的殖民地，如何？可别被一拳打死了噢。
    • +     + +
  • + + +
  • + +
  • + 陆行舰正在逼近 + 艾妮西娅按照要求，吸引了一艘乌拉帝国的陆行舰机械体攻击我们的殖民地！ + 100 + Mechanoid + ImmediateAttack + EdgeWalkIn + Combat + +
  • + Combat + 100 + + 100 + +
    • + + +
  • + +
    • + + +
  • + + +
  • + +
  • + 陆行舰正在逼近 + 艾妮西娅按照要求，吸引了一支乌拉帝国的陆行舰队攻击我们的殖民地！ + 100 + Mechanoid + ImmediateAttack + EdgeWalkIn + Combat + +
  • + Combat + 100 + + 10 + +
    • + + +
  • + +
    • + + +
  • + + +
  • + +
  • + Wula_UI_Anisia_1 +
    • +
  • + +
    • + + +     +     true - 1 + 6 500 - 3 - 8 + 21 + 6 + 3 Wula_Dark_Matter_Beam_Huge @@ -47,7 +54,7 @@ Mote_Wula_Dark_Matter_Beam GraserBeam_End - 0.35 + 0.85 0.6 @@ -71,28 +78,31 @@ true - 3 + 2 8 Wula_Dark_Matter_Flame - 200 + 3500 Explosion_Bomb 1 + +
  • Wula_Mech_Mobile_Factory_Main_Weapon
    • +     Wula_CR_Mobile_Factory_Turret - 由乌拉帝国的MFm-87"天秤"陆行舰所配备的炮塔之一，能够装填霰射炮弹处理靠近陆行舰的威胁。 + 由乌拉帝国的MFm-87"天秤"陆行舰所配备的炮塔之一，能够喷射穿透装甲的热熔束，处理靠近陆行舰的威胁。 None true - Wula/Weapon/WULA_WM_Panzer_Turret + Wula/Weapon/Wula_Mobile_Factory_Turret Graphic_Single - 0.3 + 0.5 - 3 + 2 2.6 0.65 @@ -102,39 +112,57 @@
  • - Verb_Shoot - Bullet_Wula_CR_Mobile_Factory_Turret + Verb_ArcSprayIncinerator + true 18 - 3 - Shot_Shotgun - GunTail_Heavy - 4 - 3 - Torso - true + 11 + 6 + 20 + false + true + 6 + 2 + Damage_WULA_Melta + GunTail_Medium + 9 + Flamethrower_Firing + Fleck_IncineratorBeamBurn + 0.32 + 0.5 + 0 + IncineratorBeam_End + 0.85 + 0.55~0.85 + .5 + true + true + true + true + true + Fleck_IncineratorBeamSmoke + (58, 225, 225) + (102, 200, 200) + + +
  • (0, 0)
    • +
  • (0.65, 0.02)
    • +
  • (1, .5)
    • + + + + true + + + +
  • (0.6, 0)
    • +
  • (0.7, 0.2)
    • +
  • (1.2, 0.8)
    • +     +     + Combat_RangedFlamethrower     - - Bullet_Wula_CR_Mobile_Factory_Turret - - - Wula/Projectile/WULA_Bullet_StarDrift_Shotgun_Spear - Graphic_Single - - - Bullet - 8 - 2.5 - 0.65 - 55 - - -
  • - 5 -
    • -     -     Wula_MR_Mobile_Factory_Turret @@ -142,11 +170,11 @@ None true - Wula/Weapon/WULA_WM_Panzer_Turret + Wula/Weapon/Wula_Mobile_Factory_Turret Graphic_Single - 0.3 + 0.5 - 3 + 2 2.6 1 @@ -155,59 +183,51 @@ 1 -
  • - WulaFallenEmpire.Verb_ShootMeltBeam - - +
  • + Verb_Shoot true + Bullet_Wula_MR_Mobile_Factory_Turret 36 + 8 5 - 20 - 5 - Wula_Dark_Matter_Beam - - - 12 - 5 - 0.8 - 0.7 - 0.5 - - - 0 - BeamGraser_Shooting - Fleck_BeamBurn - 0.32 - Mote_Wula_Dark_Matter_Beam - GraserBeam_End - - - true - 0.5 - 0.5 - 0.2~0.4 - - - true - false - - - - true - - - - true - 4 - 2.5 - Wula_Dark_Matter_Flame - 35 - Explosion_Bomb - 0.6 - 0.3 + 3 + 12 + Shot_BeamRepeater + GunTail_Medium + 7 + Mote_BeamRepeater_Charge + 1.07
    • + + Bullet_Wula_MR_Mobile_Factory_Turret + + WulaFallenEmpire.Projectile_WulaLineAttack + +
  • + -1 + 0 + true + WULA_GunTail_Plasma +
    • +     + Normal + True + + Things/Projectile/ChargeLanceShot + Graphic_Single + TransparentPostLight + (3,1) + + + BeamBypassShields + 5 + 130 + 0.9 + 1 + +     Wula_LR_Mobile_Factory_Turret @@ -215,11 +235,11 @@ None true - Wula/Weapon/WULA_WM_Panzer_Turret + Wula/Weapon/Wula_Mobile_Factory_Turret Graphic_Single - 0.3 + 0.75 - 3 + 1.5 2.6 0.3 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 f2aab01b..a9e48b69 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 @@ -1187,9 +1187,9 @@ 12.0 - 1500 - 600 - 300 + 500 + 20 + 100 100 diff --git a/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Materialist.xml b/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Materialist.xml index e614eb39..4bed17b5 100644 --- a/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Materialist.xml +++ b/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Materialist.xml @@ -481,7 +481,7 @@ - + Wula_Mech_Mobile_Factory Wula_Mech_Mobile_Factory @@ -506,4 +506,14 @@ 0.7 + + Wula_Mech_Mobile_Factory_1 + 1 + 1 + + + Wula_Mech_Mobile_Factory_10 + 1 + 10 + \ No newline at end of file diff --git a/Content/Textures/Wula/Weapon/WULA_RW_Beam_Base_AR.png b/Content/Textures/Wula/Weapon/WULA_RW_Beam_Base_AR.png new file mode 100644 index 00000000..e49298a6 Binary files /dev/null and b/Content/Textures/Wula/Weapon/WULA_RW_Beam_Base_AR.png differ diff --git a/Content/Textures/Wula/Weapon/WULA_RW_Penetrating_Beam_Rifle.png b/Content/Textures/Wula/Weapon/WULA_RW_Penetrating_Beam_Rifle.png new file mode 100644 index 00000000..419e9c17 Binary files /dev/null and b/Content/Textures/Wula/Weapon/WULA_RW_Penetrating_Beam_Rifle.png differ diff --git a/Content/Textures/Wula/Weapon/WULA_RW_Penetrating_Beam_Rifle_Ranged.png b/Content/Textures/Wula/Weapon/WULA_RW_Penetrating_Beam_Rifle_Ranged.png new file mode 100644 index 00000000..ef5963cb Binary files /dev/null and b/Content/Textures/Wula/Weapon/WULA_RW_Penetrating_Beam_Rifle_Ranged.png differ diff --git a/Content/Textures/Wula/Weapon/Wula_Mobile_Factory_Turret.png b/Content/Textures/Wula/Weapon/Wula_Mobile_Factory_Turret.png new file mode 100644 index 00000000..29048700 Binary files /dev/null and b/Content/Textures/Wula/Weapon/Wula_Mobile_Factory_Turret.png differ diff --git a/Source/美术与文本源文件/Wula/Things/新建画布1.sai2 b/Source/美术与文本源文件/Wula/Things/新建画布1.sai2 deleted file mode 100644 index 8ee0c255..00000000 Binary files a/Source/美术与文本源文件/Wula/Things/新建画布1.sai2 and /dev/null differ diff --git a/Source/美术与文本源文件/Wula/Weapon/WULA_RW_Beam_Base_AR.sai2 b/Source/美术与文本源文件/Wula/Weapon/WULA_RW_Beam_Base_AR.sai2 new file mode 100644 index 00000000..57310198 Binary files /dev/null and b/Source/美术与文本源文件/Wula/Weapon/WULA_RW_Beam_Base_AR.sai2 differ diff --git a/Source/美术与文本源文件/Wula/Weapon/WULA_RW_Penetrating_Beam_Rifle.sai2 b/Source/美术与文本源文件/Wula/Weapon/WULA_RW_Penetrating_Beam_Rifle.sai2 new file mode 100644 index 00000000..17c6c8b3 Binary files /dev/null and b/Source/美术与文本源文件/Wula/Weapon/WULA_RW_Penetrating_Beam_Rifle.sai2 differ diff --git a/Source/美术与文本源文件/Wula/Weapon/Wula_Mobile_Factory_Turret.sai2 b/Source/美术与文本源文件/Wula/Weapon/Wula_Mobile_Factory_Turret.sai2 new file mode 100644 index 00000000..4da803b5 Binary files /dev/null and b/Source/美术与文本源文件/Wula/Weapon/Wula_Mobile_Factory_Turret.sai2 differ