diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_MW_Lance.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_MW_Lance.xml deleted file mode 100644 index fc8b598e..00000000 --- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_MW_Lance.xml +++ /dev/null @@ -1,288 +0,0 @@ - - - - - WULA_MW_Lance - - 乌拉帝国骑士所喜爱的枪炮合一的重型近战武器，采用高强度纳米碳纤维复合材料内芯，外层覆盖着带有散热格栅和能量导流槽的记忆合金装甲板，既可以在近战中刺穿对手，也可以从远距离上发射暗物质射流打击敌军。 - -
  • Spear
    • -     - - Wula/Weapon/WULA_MW_Lance - Graphic_Single - CutoutComplex - 2 - - Spacer - 120 - 0 - -
  • Metallic
    • -     - - 150 - 2 - - - 20000 - 10 - 0.5 - 0.5 - 0.4 - 0.3 - 0 - - -
  • - - -
  • Blunt
    • -
  • Poke
    • - - 42 - 1.6 - - -
  • - Stun - 14 -
    • -     -     - -
  • - - -
  • Stab
    • - - 65 - 0.80 - 2.6 - -     - - -
  • WULA_Cube_Productor_Energy
    • -     - WULA_Synth_Weapon_4_DM_Base_Technology - - 7 - - 450 - UnfinishedWeapon -     - - - - -
  • RewardStandardQualitySuper
    • -     - -
  • - WULA_MW_Lance_Ranged - WULA_WULA_MW_Lance_WeaponSwitchAbility -
    • -     -     - - WULA_MW_Lance_Ranged - - 乌拉帝国骑士所喜爱的枪炮合一的重型近战武器，采用高强度纳米碳纤维复合材料内芯，外层覆盖着带有散热格栅和能量导流槽的记忆合金装甲板，既可以在近战中刺穿对手，也可以从远距离上发射暗物质射流打击敌军。 - - - - - Wula/Weapon/WULA_MW_Lance_Ranged - Graphic_Single - CutoutComplex - 2 - - Spacer - 120 - -
  • Metallic
    • -     - - 150 - 2 - - - 20000 - 10 - 1 - 1 - 1 - 1 - 0 - - -
  • - - -
  • Blunt
    • -
  • Poke
    • - - 42 - 1.6 - - -
  • - Stun - 14 -
    • -     -     - -
  • - - -
  • Stab
    • - - 65 - 0.80 - 2.6 - -     - - - - 0 - - - -
  • - WulaFallenEmpire.Verb_ShootBeamExplosive - - - true - 1 - 24 - 6 - 4 - Wula_Dark_Matter_Beam - - - 1000 - -1 - 0 - 0 - 0 - - - 0 - BeamGraser_Shooting - Fleck_BeamBurn - 0.32 - Mote_Wula_Dark_Matter_Beam - GraserBeam_End - - 0.35 - - - 0.6 - 0.6 - 0.25 - - - true - - -
  • (0, 0)
    • -
  • (0.65, 0.4)
    • -
  • (1, 0.75)
    • - - - - - - true - - - true - 3 - 0.25 - Wula_Dark_Matter_Flame - 15 - Explosion_Bomb - 0.6 - -     - -
  • RewardStandardQualitySuper
    • -     - -
  • - WULA_MW_Lance - WULA_WULA_MW_Lance_WeaponSwitchAbility -
    • -     -     - - - WULA_WULA_MW_Lance_WeaponSwitchAbility - - 控制暗物质能源炉的能量输出，以决定CMl-28"铳枪"是否可以发射暗物质射流 - 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_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml index 73f74dac..6d69bbb4 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 @@ -298,7 +298,7 @@ WULA_RW_Plasm_AR 乌拉帝国的旧式多用途突击步枪，搭载了一套用于发射等离子体的谐振器，可以射出高精度的等离子体，也可以在近距离搏斗上当成等离子喷枪来使用。 - Normal + Spacer Wula/Weapon/WULA_RW_Plasm_AR @@ -338,13 +338,49 @@ 7 + + 180 + 10 + + +
  • Wula_Weapon_Init
    • +     + +
  • RewardStandardQualitySuper
    • +     + +
  • + WULA_RW_Plasm_AR_Melee + WULA_RW_Plasm_AR_WeaponSwitchAbility +
    • +     + + + WULA_RW_Plasm_AR_Melee + + 乌拉帝国的旧式多用途突击步枪，搭载了一套用于发射等离子体的谐振器，可以射出高精度的等离子体，也可以在近距离搏斗上当成等离子喷枪来使用。 + + Spacer + + Wula/Weapon/WULA_RW_Plasm_AR_Melee + Graphic_Single + 1.4 + + Interact_Rifle + + 0 + + 7500 + + 3.5 +
  • Blunt
    • - 20 + 25 2 0.5 ChargeLance_Fire @@ -360,6 +396,12 @@
  • RewardStandardQualitySuper
    •  + +
  • + WULA_RW_Plasm_AR + WULA_RW_Plasm_AR_WeaponSwitchAbility +
    • +     Bullet_WULA_RW_Plasm_AR @@ -375,6 +417,44 @@ 55 + + WULA_RW_Plasm_AR_WeaponSwitchAbility + + 控制谐振器的等离子喷射方案，以决定PMa-72"磷叶"是否切换到近距离格斗模式 + 601 + Wula/UI/Abilities/WULA_WeaponSwitchAbility + false + false + false + false + false + + + + + + Verb_CastAbility + 0 + false + false + false + + true + + + +
  • + WulaFallenEmpire.CompAbilityEffect_Switch +
    • + + +     +     @@ -1288,6 +1368,289 @@
  • RewardStandardQualitySuper
    •  + + + WULA_MW_Lance + + 乌拉帝国骑士所喜爱的枪炮合一的重型近战武器，采用高强度纳米碳纤维复合材料内芯，外层覆盖着带有散热格栅和能量导流槽的记忆合金装甲板，既可以在近战中刺穿对手，也可以从远距离上发射暗物质射流打击敌军。 + +
  • Spear
    • +     + + Wula/Weapon/WULA_MW_Lance + Graphic_Single + CutoutComplex + 2 + + Spacer + 120 + 0 + +
  • Metallic
    • +     + + 150 + 2 + + + 20000 + 10 + 0.5 + 0.5 + 0.4 + 0.3 + 0 + + +
  • + + +
  • Blunt
    • +
  • Poke
    • + + 42 + 1.6 + + +
  • + Stun + 14 +
    • +     +     + +
  • + + +
  • Stab
    • + + 65 + 0.80 + 2.6 + +     + + +
  • WULA_Cube_Productor_Energy
    • +     + WULA_Synth_Weapon_4_DM_Base_Technology + + 7 + + 450 + UnfinishedWeapon +     + + + + +
  • RewardStandardQualitySuper
    • +     + +
  • + WULA_MW_Lance_Ranged + WULA_WULA_MW_Lance_WeaponSwitchAbility +
    • +     +     + + WULA_MW_Lance_Ranged + + 乌拉帝国骑士所喜爱的枪炮合一的重型近战武器，采用高强度纳米碳纤维复合材料内芯，外层覆盖着带有散热格栅和能量导流槽的记忆合金装甲板，既可以在近战中刺穿对手，也可以从远距离上发射暗物质射流打击敌军。 + + + + + Wula/Weapon/WULA_MW_Lance_Ranged + Graphic_Single + CutoutComplex + 2 + + Spacer + 120 + +
  • Metallic
    • +     + + 150 + 2 + + + 20000 + 10 + 1 + 1 + 1 + 1 + 0 + + +
  • + + +
  • Blunt
    • +
  • Poke
    • + + 42 + 1.6 + + +
  • + Stun + 14 +
    • +     +     + +
  • + + +
  • Stab
    • + + 65 + 0.80 + 2.6 + +     + + + + 0 + + + +
  • + WulaFallenEmpire.Verb_ShootBeamExplosive + + + true + 1 + 24 + 6 + 4 + Wula_Dark_Matter_Beam + + + 1000 + -1 + 0 + 0 + 0 + + + 0 + BeamGraser_Shooting + Fleck_BeamBurn + 0.32 + Mote_Wula_Dark_Matter_Beam + GraserBeam_End + + 0.35 + + + 0.6 + 0.6 + 0.25 + + + true + + +
  • (0, 0)
    • +
  • (0.65, 0.4)
    • +
  • (1, 0.75)
    • + + + + + + true + + + true + 3 + 0.25 + Wula_Dark_Matter_Flame + 15 + Explosion_Bomb + 0.6 + +     + +
  • RewardStandardQualitySuper
    • +     + +
  • + WULA_MW_Lance + WULA_WULA_MW_Lance_WeaponSwitchAbility +
    • +     +     + + WULA_WULA_MW_Lance_WeaponSwitchAbility + + 控制暗物质能源炉的能量输出，以决定CMl-28"铳枪"是否可以发射暗物质射流 + 601 + Wula/UI/Abilities/WULA_WeaponSwitchAbility + false + false + false + false + false + + + + + + Verb_CastAbility + 0 + false + false + false + + true + + + +
  • + WulaFallenEmpire.CompAbilityEffect_Switch +
    • + + +     +     + diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon_Penetrating.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon_Penetrating.xml index c6d234b2..640e6c83 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon_Penetrating.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon_Penetrating.xml @@ -11,6 +11,7 @@ Wula/Weapon/WULA_RW_Fractal_RF Graphic_Single     + 0 Interact_Rifle
  • LongShots
    • @@ -37,6 +38,7 @@ 120 6 +
  • Verb_Shoot @@ -55,7 +57,6 @@
  • RewardStandardQualitySuper
    • - Bullet_WULA_RW_Penetrating_Rifle diff --git a/Content/Textures/Wula/Weapon/WULA_MW_Glaive.png b/Content/Textures/Wula/Weapon/WULA_MW_Glaive.png index 024b2c88..c7806003 100644 Binary files a/Content/Textures/Wula/Weapon/WULA_MW_Glaive.png and b/Content/Textures/Wula/Weapon/WULA_MW_Glaive.png differ diff --git a/Content/Textures/Wula/Weapon/WULA_RW_Plasm_AR.png b/Content/Textures/Wula/Weapon/WULA_RW_Plasm_AR.png index 23355a0c..cbd9d22b 100644 Binary files a/Content/Textures/Wula/Weapon/WULA_RW_Plasm_AR.png and b/Content/Textures/Wula/Weapon/WULA_RW_Plasm_AR.png differ diff --git a/Content/Textures/Wula/Weapon/WULA_RW_Plasm_AR_Melee.png b/Content/Textures/Wula/Weapon/WULA_RW_Plasm_AR_Melee.png new file mode 100644 index 00000000..20033689 Binary files /dev/null and b/Content/Textures/Wula/Weapon/WULA_RW_Plasm_AR_Melee.png differ diff --git a/Source/美术与文本源文件/Wula/Weapon/WULA_MW_Glaive.png b/Source/美术与文本源文件/Wula/Weapon/WULA_MW_Glaive.png index 024b2c88..d1c7aca5 100644 Binary files a/Source/美术与文本源文件/Wula/Weapon/WULA_MW_Glaive.png and b/Source/美术与文本源文件/Wula/Weapon/WULA_MW_Glaive.png differ diff --git a/Source/美术与文本源文件/Wula/Weapon/WULA_MW_Glaive.sai2 b/Source/美术与文本源文件/Wula/Weapon/WULA_MW_Glaive.sai2 new file mode 100644 index 00000000..73f311ce Binary files /dev/null and b/Source/美术与文本源文件/Wula/Weapon/WULA_MW_Glaive.sai2 differ diff --git a/Source/美术与文本源文件/Wula/Weapon/WULA_MW_Lance.sai2 b/Source/美术与文本源文件/Wula/Weapon/WULA_MW_Lance.sai2 index e3a4ba5a..2283cb74 100644 Binary files a/Source/美术与文本源文件/Wula/Weapon/WULA_MW_Lance.sai2 and b/Source/美术与文本源文件/Wula/Weapon/WULA_MW_Lance.sai2 differ diff --git a/Source/美术与文本源文件/Wula/Weapon/WULA_RW_Plasm_AR.sai2 b/Source/美术与文本源文件/Wula/Weapon/WULA_RW_Plasm_AR.sai2 index 8e34190c..9a2fc35a 100644 Binary files a/Source/美术与文本源文件/Wula/Weapon/WULA_RW_Plasm_AR.sai2 and b/Source/美术与文本源文件/Wula/Weapon/WULA_RW_Plasm_AR.sai2 differ diff --git a/WeaponTweakData/WULA_MW_Breaker_Bar_tourswen.wulafallenempiretest.json b/WeaponTweakData/WULA_MW_Breaker_Bar_tourswen.wulafallenempiretest.json new file mode 100644 index 00000000..939ee79b --- /dev/null +++ b/WeaponTweakData/WULA_MW_Breaker_Bar_tourswen.wulafallenempiretest.json @@ -0,0 +1,12 @@ +{ + "TextureModID": "tourswen.wulafallenempiretest", + "ItemDefName": "WULA_MW_Breaker_Bar", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffY": 0.05747144, + "ScaleX": 1.35, + "ScaleY": 1.35, + "BladeStart": -0.385057122, + "BladeEnd": 0.5057473, + "MeleeWeaponType": 1 +} \ No newline at end of file diff --git a/WeaponTweakData/WULA_MW_ChainSword_tourswen.wulafallenempiretest.json b/WeaponTweakData/WULA_MW_ChainSword_tourswen.wulafallenempiretest.json new file mode 100644 index 00000000..7424f24f --- /dev/null +++ b/WeaponTweakData/WULA_MW_ChainSword_tourswen.wulafallenempiretest.json @@ -0,0 +1,12 @@ +{ + "TextureModID": "tourswen.wulafallenempiretest", + "ItemDefName": "WULA_MW_ChainSword", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.2557473, + "OffY": 0.198275864, + "HandsMode": 1, + "BladeStart": 0.543103456, + "BladeEnd": -0.112068966, + "MeleeWeaponType": 16 +} \ No newline at end of file diff --git a/WeaponTweakData/WULA_MW_Charge_Mace_tourswen.wulafallenempiretest.json b/WeaponTweakData/WULA_MW_Charge_Mace_tourswen.wulafallenempiretest.json new file mode 100644 index 00000000..1f9365bc --- /dev/null +++ b/WeaponTweakData/WULA_MW_Charge_Mace_tourswen.wulafallenempiretest.json @@ -0,0 +1,10 @@ +{ + "TextureModID": "tourswen.wulafallenempiretest", + "ItemDefName": "WULA_MW_Charge_Mace", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "HandsMode": 1, + "BladeStart": -0.298850238, + "BladeEnd": 0.362068951, + "MeleeWeaponType": 40 +} \ No newline at end of file diff --git a/WeaponTweakData/WULA_MW_Constructor_Hammer_tourswen.wulafallenempiretest.json b/WeaponTweakData/WULA_MW_Constructor_Hammer_tourswen.wulafallenempiretest.json new file mode 100644 index 00000000..489eec01 --- /dev/null +++ b/WeaponTweakData/WULA_MW_Constructor_Hammer_tourswen.wulafallenempiretest.json @@ -0,0 +1,11 @@ +{ + "TextureModID": "tourswen.wulafallenempiretest", + "ItemDefName": "WULA_MW_Constructor_Hammer", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": -0.07471229, + "HandsMode": 1, + "BladeStart": -0.3275862, + "BladeEnd": 0.264368, + "MeleeWeaponType": 8 +} \ No newline at end of file diff --git a/WeaponTweakData/WULA_MW_Glaive_tourswen.wulafallenempiretest.json b/WeaponTweakData/WULA_MW_Glaive_tourswen.wulafallenempiretest.json new file mode 100644 index 00000000..95b9aecd --- /dev/null +++ b/WeaponTweakData/WULA_MW_Glaive_tourswen.wulafallenempiretest.json @@ -0,0 +1,12 @@ +{ + "TextureModID": "tourswen.wulafallenempiretest", + "ItemDefName": "WULA_MW_Glaive", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.03160937, + "ScaleX": 2.0, + "ScaleY": 2.0, + "BladeStart": -0.928160548, + "BladeEnd": 0.8591956, + "MeleeWeaponType": 6 +} \ No newline at end of file diff --git a/WeaponTweakData/WULA_MW_Lance_tourswen.wulafallenempiretest.json b/WeaponTweakData/WULA_MW_Lance_tourswen.wulafallenempiretest.json new file mode 100644 index 00000000..66e193f5 --- /dev/null +++ b/WeaponTweakData/WULA_MW_Lance_tourswen.wulafallenempiretest.json @@ -0,0 +1,13 @@ +{ + "TextureModID": "tourswen.wulafallenempiretest", + "ItemDefName": "WULA_MW_Lance", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.5086207, + "OffY": -0.03284052, + "ScaleX": 2.0, + "ScaleY": 2.0, + "BladeStart": 1.29597735, + "BladeEnd": -0.428160578, + "MeleeWeaponType": 4 +} \ No newline at end of file diff --git a/WeaponTweakData/WULA_MW_Mace_tourswen.wulafallenempiretest.json b/WeaponTweakData/WULA_MW_Mace_tourswen.wulafallenempiretest.json new file mode 100644 index 00000000..0b4f1d09 --- /dev/null +++ b/WeaponTweakData/WULA_MW_Mace_tourswen.wulafallenempiretest.json @@ -0,0 +1,12 @@ +{ + "TextureModID": "tourswen.wulafallenempiretest", + "ItemDefName": "WULA_MW_Mace", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "ScaleX": 0.8, + "ScaleY": 0.8, + "HandsMode": 1, + "BladeStart": 0.31609267, + "BladeEnd": -0.318965524, + "MeleeWeaponType": 8 +} \ No newline at end of file diff --git a/WeaponTweakData/WULA_RW_Plasm_AR_Melee_tourswen.wulafallenempiretest.json b/WeaponTweakData/WULA_RW_Plasm_AR_Melee_tourswen.wulafallenempiretest.json new file mode 100644 index 00000000..d51b8e7d --- /dev/null +++ b/WeaponTweakData/WULA_RW_Plasm_AR_Melee_tourswen.wulafallenempiretest.json @@ -0,0 +1,13 @@ +{ + "TextureModID": "tourswen.wulafallenempiretest", + "ItemDefName": "WULA_RW_Plasm_AR_Melee", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.21839115, + "OffY": 0.235632539, + "ScaleX": 1.4, + "ScaleY": 1.4, + "BladeStart": -0.275862068, + "BladeEnd": 0.7298852, + "MeleeWeaponType": 6 +} \ No newline at end of file diff --git a/WeaponTweakData/tourswen.wulafallenempiretest.txt b/WeaponTweakData/tourswen.wulafallenempiretest.txt new file mode 100644 index 00000000..842f3187 --- /dev/null +++ b/WeaponTweakData/tourswen.wulafallenempiretest.txt @@ -0,0 +1 @@ +Wula Fallen Empire \ No newline at end of file