diff --git a/1.6/1.6/Defs/Effects/WulaFleckDefs.xml b/1.6/1.6/Defs/Effects/WulaFleckDefs.xml index b94e326e..8f47e1a3 100644 --- a/1.6/1.6/Defs/Effects/WulaFleckDefs.xml +++ b/1.6/1.6/Defs/Effects/WulaFleckDefs.xml @@ -9,7 +9,7 @@ Wula/Mote/WULA_GunTail_Plasma MoteGlow 1.25 - (3,189,243,155) + (218,255,200,155) @@ -49,7 +49,7 @@ Things/Mote/BlastEMP TransparentPostLight true - (0.1, 0.9, 0.1 , 0.5) + (0.9, 1 , 0.8 , 0.5) MoteOverhead 0 diff --git a/1.6/1.6/Defs/ThingDefs/WULA_Item.xml b/1.6/1.6/Defs/ThingDefs/WULA_Item.xml index 88b6e1f0..83d8f244 100644 --- a/1.6/1.6/Defs/ThingDefs/WULA_Item.xml +++ b/1.6/1.6/Defs/ThingDefs/WULA_Item.xml @@ -224,7 +224,7 @@ 1000 0.01 - 30000 + 50
  • ResourcesRaw
  • @@ -310,6 +310,79 @@ 50 + + + Wula_Organic_Precursor + + 一坨经过封包之后完全认不出原料的玩意,只能扔进乌拉帝国铸铁仪中加工为钢铁。 + + Wula/Item/WULA_Dark_Matter_Item + Graphic_Single + + Rare + false + false + false + + 60 + 6 + 1 + 0.1 + + +
  • ResourcesRaw
  • +
    +
    + + Make_Wula_Organic_Precursor + + 制造有机物前体以供乌拉帝国铸铁仪器使用 + 正在制造有机物前体。 + 450 + CookSpeed + Cook + Recipe_CookMeal + true + +
  • + + 有机物 + +
  • MeatRaw
  • +
  • AnimalProductRaw
  • +
  • PlantFoodRaw
  • + + +
  • Hay
  • +
  • WoodLog
  • +
    + + 30 + +
    + + 30 + + + +
  • FoodRaw
  • +
    + +
  • Hay
  • +
  • WoodLog
  • +
    +
    + + +
  • Foods
  • +
    + +
  • Hay
  • +
    +
    + Cooking +
    + diff --git a/1.6/1.6/Defs/ThingDefs_Buildings/Buildings_WULA.xml b/1.6/1.6/Defs/ThingDefs_Buildings/Buildings_WULA.xml index 3f5ba72c..bbde5337 100644 --- a/1.6/1.6/Defs/ThingDefs_Buildings/Buildings_WULA.xml +++ b/1.6/1.6/Defs/ThingDefs_Buildings/Buildings_WULA.xml @@ -277,7 +277,6 @@ WULA_Charging_Station_Synth Building_Bed - Normal 一台供乌拉帝国合成人进行机体充能和改装的检修站,当机械乌拉需要充电时会优先前往此处充电。 Normal @@ -836,4 +835,78 @@
  • PlaceWorker_PreventInteractionSpotOverlap
  • + + + + WULA_Steel_Assembler + + 一台来自于乌拉帝国的极其复杂的机器,无法在边缘世界建造。其可以将有机物转化通过分子重构转换为无机物钢铁,以辅助乌拉帝国殖民地的开拓进程。 + Building + MinifiedThing + + Things/Building/Production/FabricationBench + Graphic_Multi + (3.5, 1.5) + + Damage/Corner + Damage/Corner + Damage/Corner + Damage/Corner + + + Building + PassThroughOnly + 0.5 + 70 + true + +
  • BuildingsMisc
  • +
    + + 1000 + 0 + -15 + 20 + + Normal + (3,3) + + +
  • + CompPowerTrader + 100 +
  • +
  • + +
  • + 120000~120000 + +
  • + Steel + 100 +
  • + + true + + +
  • + steel + 有机物储量 + + +
  • Wula_Organic_Precursor
  • + + + 200 + 10 + true + 1 + false + true + true + +
  • + + Heavy + \ No newline at end of file diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml b/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml index e0461808..57570477 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml @@ -1541,6 +1541,7 @@ +
  • WULA_Cube_Productor_BIO
  • WULA_Cube_Productor_Energy
  • WULA_Synth_Weapon_2_Missile_Technology @@ -1638,7 +1639,6 @@ 60 120 - WULA_GunTail_Blue 1 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 index abc69348..78f90418 100644 --- 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 @@ -33,8 +33,7 @@
  • Verb_Shoot true - - Bullet_WULA_Weapon_Plasm_HomingExplosive + Bullet_AssaultRifle 1 25 1 diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Missile_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Missile_Weapon.xml index 4da651dc..746ad60b 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Missile_Weapon.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Missile_Weapon.xml @@ -90,7 +90,6 @@ 60 120 - WULA_GunTail_Blue 1
  • diff --git a/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml b/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml index d6313555..8fe4973c 100644 --- a/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml +++ b/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml @@ -1313,7 +1313,12 @@ - true + + + DeathActionWorker_Vanish + Filth_MachineBits + 1~2 + @@ -1372,7 +1377,12 @@ - true + + + DeathActionWorker_Vanish + Filth_MachineBits + 1~2 + - true + + + DeathActionWorker_Vanish + Filth_MachineBits + 1~2 + diff --git a/1.6/1.6/Patches/Patch.xml b/1.6/1.6/Patches/Patch.xml index 4552663d..a724c670 100644 --- a/1.6/1.6/Patches/Patch.xml +++ b/1.6/1.6/Patches/Patch.xml @@ -1,13 +1,23 @@ - - -
  • - */ThingDef[defName = "GravEngine"]/comps/li[@Class = "CompProperties_AffectedByFacilities"]/linkableFacilities - -
  • Wula_DarkEnergy_FuelTank
  • - - -
    -
    + + +
  • + */ThingDef[defName = "GravEngine"]/comps/li[@Class = "CompProperties_AffectedByFacilities"]/linkableFacilities + +
  • Wula_DarkEnergy_FuelTank
  • + + +
    +
    + + +
  • + */ThingDef[defName = "TableButcher"]/recipes + +
  • Make_Wula_Organic_Precursor
  • + + +
    +
    \ No newline at end of file diff --git a/1.6/Odyssey/Defs/ThingDefs_Buildings/Building_WULA_Shuttle.xml b/1.6/Odyssey/Defs/ThingDefs_Buildings/Building_WULA_Shuttle.xml index 459dac18..6dcd49c3 100644 --- a/1.6/Odyssey/Defs/ThingDefs_Buildings/Building_WULA_Shuttle.xml +++ b/1.6/Odyssey/Defs/ThingDefs_Buildings/Building_WULA_Shuttle.xml @@ -35,15 +35,7 @@ 0.65 Normal - WULA_Buildings 8 - - 300 - 200 - 8 - 2 - 1 - true 60 @@ -79,9 +71,9 @@
  • ITab_ContentsTransporter
  • ITab_Shells
  • - +
  • Ship_ArmedShuttle @@ -153,7 +145,7 @@ true PassThroughOnly 0.5 - (4,4) + (2,2) true (0.56, 0.62, 0.9) 1 @@ -161,10 +153,11 @@ Graphic_Multi Wula/Building/WULA_ArmedShuttle CutoutComplex - (4,4) + (3,3.25) + (0, 8, 0.8) - (1.4, 1, 1.3) - (-0.5, 0, -0.1) + (1, 1, 1) + (0, 0, -1.2) @@ -195,7 +188,7 @@ true true - (2, 0, 0) + (0, 1, 0) East true Light @@ -338,7 +331,7 @@ Ultra 0 - Wula/Weapon/WULA_WM_Panzer_Autocannon + Wula/Weapon/WULA_Weapon_Empty Graphic_Single 2 @@ -413,11 +406,12 @@ Graphic_Multi Wula/Building/WULA_ArmedShuttle CutoutComplex - (4,4) + (3,3.25) + (0, 8, 0.8) False - (4,4) + (2,2) Shuttle_Landing 250 @@ -455,11 +449,12 @@ Graphic_Multi Wula/Building/WULA_ArmedShuttle CutoutComplex - (4,4) + (3,3.25) + (0, 8, 0.8) False - (4,4) + (2,2) true Shuttle_Leaving @@ -490,15 +485,20 @@ - Ship_ArmedShuttle WULA_ArmedShuttle ArmedShuttleIncoming_WULA ArmedShuttleLeaving_WULA - PassengerShuttle + Wula_ArmedShuttle_Object true - + + Wula_ArmedShuttle_Object + + 一台正在飞行的乌拉帝国武装穿梭机。 + World/WorldObjects/Expanding/Wula_ArmedShuttle + 1 + \ No newline at end of file diff --git a/Content/Textures/Wula/Building/WULA_ArmedShuttle_east.png b/Content/Textures/Wula/Building/WULA_ArmedShuttle_east.png index 8ac25981..499592f1 100644 Binary files a/Content/Textures/Wula/Building/WULA_ArmedShuttle_east.png and b/Content/Textures/Wula/Building/WULA_ArmedShuttle_east.png differ diff --git a/Content/Textures/Wula/Building/WULA_ArmedShuttle_north.png b/Content/Textures/Wula/Building/WULA_ArmedShuttle_north.png index b82b0481..ff6558f6 100644 Binary files a/Content/Textures/Wula/Building/WULA_ArmedShuttle_north.png and b/Content/Textures/Wula/Building/WULA_ArmedShuttle_north.png differ diff --git a/Content/Textures/Wula/Building/WULA_ArmedShuttle_south.png b/Content/Textures/Wula/Building/WULA_ArmedShuttle_south.png index a17f1a9e..bf4eaab8 100644 Binary files a/Content/Textures/Wula/Building/WULA_ArmedShuttle_south.png and b/Content/Textures/Wula/Building/WULA_ArmedShuttle_south.png differ diff --git a/Content/Textures/Wula/Projectile/WULA_Bullet_Plasma.png b/Content/Textures/Wula/Projectile/WULA_Bullet_Plasma.png index a34c3326..1c66eb6f 100644 Binary files a/Content/Textures/Wula/Projectile/WULA_Bullet_Plasma.png and b/Content/Textures/Wula/Projectile/WULA_Bullet_Plasma.png differ diff --git a/Content/Textures/Wula/Projectile/WULA_Bullet_Plasma_Yellow.png b/Content/Textures/Wula/Projectile/WULA_Bullet_Plasma_Yellow.png index 473ed0e9..df9ba309 100644 Binary files a/Content/Textures/Wula/Projectile/WULA_Bullet_Plasma_Yellow.png and b/Content/Textures/Wula/Projectile/WULA_Bullet_Plasma_Yellow.png differ diff --git a/Content/Textures/Wula/World/WorldObjects/Expanding/Wula_ArmedShuttle.png b/Content/Textures/Wula/World/WorldObjects/Expanding/Wula_ArmedShuttle.png new file mode 100644 index 00000000..f77cf474 Binary files /dev/null and b/Content/Textures/Wula/World/WorldObjects/Expanding/Wula_ArmedShuttle.png differ