diff --git a/1.2/Defs/RaceDefs/ReviaRace.xml b/1.2/Defs/RaceDefs/ReviaRace.xml index 2dd4e66..a0edb92 100644 --- a/1.2/Defs/RaceDefs/ReviaRace.xml +++ b/1.2/Defs/RaceDefs/ReviaRace.xml @@ -162,8 +162,8 @@ Things/Tails/Tail5 Things/Tails/Tail6 Things/Tails/Tail7 - Things/Tails/Tail7 - Things/Tails/Tail7 + Things/Tails/Tail8 + Things/Tails/Tail9 @@ -211,8 +211,8 @@ - (-0.43, 0.65) - (-0.43, 0.65) + (-0.475, 0.57) + (-0.475, 0.57) (0, 0) @@ -222,8 +222,8 @@ - (0, 0.9) - (0, 0.9) + (0.05, 0.9) + (0.05, 0.9) (0, 0) @@ -233,8 +233,8 @@ - (-0.36, 0.63) - (-0.36, 0.63) + (-0.375, 0.57) + (-0.375, 0.57) (0, 0) @@ -265,8 +265,8 @@ - (0, 0.9) - (0, 0.9) + (-0.05, 0.9) + (-0.05, 0.9) (0, 0) diff --git a/About/preview.png b/About/preview.png index 30e4038..311456d 100644 Binary files a/About/preview.png and b/About/preview.png differ diff --git a/Defs/FactionDefs/ReviaMarauders.xml b/Defs/FactionDefs/ReviaMarauders.xml index 8a1c57f..b439d22 100644 --- a/Defs/FactionDefs/ReviaMarauders.xml +++ b/Defs/FactionDefs/ReviaMarauders.xml @@ -14,7 +14,7 @@ true Skullshatterer World/ReviaEmblem - World/ReviaEmblem + World/WorldObjects/DefaultSettlement
  • (0.60, 0.60, 0.05)
  • (0.85, 0.65, 0.05)
    • diff --git a/Defs/FactionDefs/ReviaPlayerFaction.xml b/Defs/FactionDefs/ReviaPlayerFaction.xml index 0479cbe..a1bb77d 100644 --- a/Defs/FactionDefs/ReviaPlayerFaction.xml +++ b/Defs/FactionDefs/ReviaPlayerFaction.xml @@ -14,7 +14,7 @@
  • ReviaRaceBackstory
    • World/ReviaEmblem - World/ReviaEmblem + World/WorldObjects/DefaultSettlement
  • (0, 0.75, 0.85)
  • (0, 0.70, 0.85
    • diff --git a/Defs/FactionDefs/ReviaTemplars.xml b/Defs/FactionDefs/ReviaTemplars.xml index 471b273..ac4b96f 100644 --- a/Defs/FactionDefs/ReviaTemplars.xml +++ b/Defs/FactionDefs/ReviaTemplars.xml @@ -13,7 +13,7 @@ true High Templar World/ReviaEmblem - World/ReviaEmblem + World/WorldObjects/DefaultSettlement
  • (0.20, 0.20, 0.85)
  • (0.15, 0.15, 0.40)
    • diff --git a/Defs/PawnKindDefs/ReviaMarauder/ReviaBerserker.xml b/Defs/PawnKindDefs/ReviaMarauder/ReviaBerserker.xml index fa6a781..d86c328 100644 --- a/Defs/PawnKindDefs/ReviaMarauder/ReviaBerserker.xml +++ b/Defs/PawnKindDefs/ReviaMarauder/ReviaBerserker.xml @@ -29,7 +29,7 @@
  • 50 MedicineHerbal - 1~3 + 0~1
  • 50 diff --git a/Defs/PawnKindDefs/ReviaMarauder/ReviaMarauder.xml b/Defs/PawnKindDefs/ReviaMarauder/ReviaMarauder.xml index eedcd73..ad5c381 100644 --- a/Defs/PawnKindDefs/ReviaMarauder/ReviaMarauder.xml +++ b/Defs/PawnKindDefs/ReviaMarauder/ReviaMarauder.xml @@ -29,19 +29,14 @@ 0
  • - 60 + 30 MedicineHerbal - 1~3 + 0~1
  • - 20 - MedicineIndustrial - 1~1 -
    • -
  • - 20 + 30 Silver - 40~100 + 10~50
    • diff --git a/Defs/PawnKindDefs/ReviaMarauder/ReviaRaider.xml b/Defs/PawnKindDefs/ReviaMarauder/ReviaRaider.xml index b6d280e..a8f5a40 100644 --- a/Defs/PawnKindDefs/ReviaMarauder/ReviaRaider.xml +++ b/Defs/PawnKindDefs/ReviaMarauder/ReviaRaider.xml @@ -25,14 +25,14 @@ 0
  • - 60 + 20 MedicineHerbal - 1~1 + 0~1
  • - 20 + 60 Silver - 10~15 + 0~10
    • diff --git a/Source/ReviaRaceMod.cs b/Source/ReviaRaceMod.cs index b1924f4..3d265e8 100644 --- a/Source/ReviaRaceMod.cs +++ b/Source/ReviaRaceMod.cs @@ -1,6 +1,7 @@ using ReviaRace.Comps; using ReviaRace.Helpers; using ReviaRace.PersistentData; +using RimWorld; using System; using System.Collections.Generic; using System.Linq; @@ -31,6 +32,8 @@ public override string SettingsCategory() public override void DoSettingsWindowContents(Rect inRect) { + FactionDef + var headerState = new GUIStyleState { textColor = new Color(1.0f, 0.9f, 0.25f, 1.0f), diff --git a/Source/TextureMasters/AboutImage.kra b/Source/TextureMasters/AboutImage.kra new file mode 100644 index 0000000..d4ee059 Binary files /dev/null and b/Source/TextureMasters/AboutImage.kra differ diff --git a/Source/TextureMasters/Tails/TailEast.kra b/Source/TextureMasters/Tails/TailEast.kra new file mode 100644 index 0000000..52b5200 Binary files /dev/null and b/Source/TextureMasters/Tails/TailEast.kra differ diff --git a/Source/TextureMasters/Tails/TailNorth.kra b/Source/TextureMasters/Tails/TailNorth.kra new file mode 100644 index 0000000..75f3a47 Binary files /dev/null and b/Source/TextureMasters/Tails/TailNorth.kra differ diff --git a/Source/TextureMasters/Tails/TailSouth.kra b/Source/TextureMasters/Tails/TailSouth.kra new file mode 100644 index 0000000..3de6f0d Binary files /dev/null and b/Source/TextureMasters/Tails/TailSouth.kra differ diff --git a/Source/TextureMasters/World/ReviaMapIcon.kra b/Source/TextureMasters/World/ReviaMapIcon.kra new file mode 100644 index 0000000..ceb8dba Binary files /dev/null and b/Source/TextureMasters/World/ReviaMapIcon.kra differ diff --git a/Textures/Things/Tails/Tail1_east.png b/Textures/Things/Tails/Tail1_east.png index 325fc54..a378114 100644 Binary files a/Textures/Things/Tails/Tail1_east.png and b/Textures/Things/Tails/Tail1_east.png differ diff --git a/Textures/Things/Tails/Tail1_eastm.png b/Textures/Things/Tails/Tail1_eastm.png index 8b3c441..c7ba0e1 100644 Binary files a/Textures/Things/Tails/Tail1_eastm.png and b/Textures/Things/Tails/Tail1_eastm.png differ diff --git a/Textures/Things/Tails/Tail1_north.png b/Textures/Things/Tails/Tail1_north.png index f80e2a0..6224f84 100644 Binary files a/Textures/Things/Tails/Tail1_north.png and b/Textures/Things/Tails/Tail1_north.png differ diff --git a/Textures/Things/Tails/Tail1_northm.png b/Textures/Things/Tails/Tail1_northm.png index ad0a4fb..15060cd 100644 Binary files a/Textures/Things/Tails/Tail1_northm.png and b/Textures/Things/Tails/Tail1_northm.png differ diff --git a/Textures/Things/Tails/Tail1_south.png b/Textures/Things/Tails/Tail1_south.png index 81e2249..06ea99b 100644 Binary files a/Textures/Things/Tails/Tail1_south.png and b/Textures/Things/Tails/Tail1_south.png differ diff --git a/Textures/Things/Tails/Tail1_southm.png b/Textures/Things/Tails/Tail1_southm.png index f1fa143..2beb191 100644 Binary files a/Textures/Things/Tails/Tail1_southm.png and b/Textures/Things/Tails/Tail1_southm.png differ diff --git a/Textures/Things/Tails/Tail2_east.png b/Textures/Things/Tails/Tail2_east.png index 5ba8b64..76b6151 100644 Binary files a/Textures/Things/Tails/Tail2_east.png and b/Textures/Things/Tails/Tail2_east.png differ diff --git a/Textures/Things/Tails/Tail2_eastm.png b/Textures/Things/Tails/Tail2_eastm.png index c052bfe..96c67e0 100644 Binary files a/Textures/Things/Tails/Tail2_eastm.png and b/Textures/Things/Tails/Tail2_eastm.png differ diff --git a/Textures/Things/Tails/Tail2_north.png b/Textures/Things/Tails/Tail2_north.png index 1e83bc1..18050b5 100644 Binary files a/Textures/Things/Tails/Tail2_north.png and b/Textures/Things/Tails/Tail2_north.png differ diff --git a/Textures/Things/Tails/Tail2_northm.png b/Textures/Things/Tails/Tail2_northm.png index 657a84b..42a0e40 100644 Binary files a/Textures/Things/Tails/Tail2_northm.png and b/Textures/Things/Tails/Tail2_northm.png differ diff --git a/Textures/Things/Tails/Tail2_south.png b/Textures/Things/Tails/Tail2_south.png index 416f0b3..f76c178 100644 Binary files a/Textures/Things/Tails/Tail2_south.png and b/Textures/Things/Tails/Tail2_south.png differ diff --git a/Textures/Things/Tails/Tail2_southm.png b/Textures/Things/Tails/Tail2_southm.png index 09ad847..e6a546a 100644 Binary files a/Textures/Things/Tails/Tail2_southm.png and b/Textures/Things/Tails/Tail2_southm.png differ diff --git a/Textures/Things/Tails/Tail3_east.png b/Textures/Things/Tails/Tail3_east.png index 5ba8b64..76b6151 100644 Binary files a/Textures/Things/Tails/Tail3_east.png and b/Textures/Things/Tails/Tail3_east.png differ diff --git a/Textures/Things/Tails/Tail3_eastm.png b/Textures/Things/Tails/Tail3_eastm.png index c052bfe..96c67e0 100644 Binary files a/Textures/Things/Tails/Tail3_eastm.png and b/Textures/Things/Tails/Tail3_eastm.png differ diff --git a/Textures/Things/Tails/Tail3_north.png b/Textures/Things/Tails/Tail3_north.png index 2f99dac..4b816b1 100644 Binary files a/Textures/Things/Tails/Tail3_north.png and b/Textures/Things/Tails/Tail3_north.png differ diff --git a/Textures/Things/Tails/Tail3_northm.png b/Textures/Things/Tails/Tail3_northm.png index f4c255c..81f6645 100644 Binary files a/Textures/Things/Tails/Tail3_northm.png and b/Textures/Things/Tails/Tail3_northm.png differ diff --git a/Textures/Things/Tails/Tail3_south.png b/Textures/Things/Tails/Tail3_south.png index 3774900..d839c0f 100644 Binary files a/Textures/Things/Tails/Tail3_south.png and b/Textures/Things/Tails/Tail3_south.png differ diff --git a/Textures/Things/Tails/Tail3_southm.png b/Textures/Things/Tails/Tail3_southm.png index 54fc568..e222763 100644 Binary files a/Textures/Things/Tails/Tail3_southm.png and b/Textures/Things/Tails/Tail3_southm.png differ diff --git a/Textures/Things/Tails/Tail4_east.png b/Textures/Things/Tails/Tail4_east.png index 5ba8b64..1ee4486 100644 Binary files a/Textures/Things/Tails/Tail4_east.png and b/Textures/Things/Tails/Tail4_east.png differ diff --git a/Textures/Things/Tails/Tail4_eastm.png b/Textures/Things/Tails/Tail4_eastm.png index c052bfe..a00fcba 100644 Binary files a/Textures/Things/Tails/Tail4_eastm.png and b/Textures/Things/Tails/Tail4_eastm.png differ diff --git a/Textures/Things/Tails/Tail4_north.png b/Textures/Things/Tails/Tail4_north.png index bc4eb9b..ffe6558 100644 Binary files a/Textures/Things/Tails/Tail4_north.png and b/Textures/Things/Tails/Tail4_north.png differ diff --git a/Textures/Things/Tails/Tail4_northm.png b/Textures/Things/Tails/Tail4_northm.png index e980fa3..613a801 100644 Binary files a/Textures/Things/Tails/Tail4_northm.png and b/Textures/Things/Tails/Tail4_northm.png differ diff --git a/Textures/Things/Tails/Tail4_south.png b/Textures/Things/Tails/Tail4_south.png index b4826a1..4fc1220 100644 Binary files a/Textures/Things/Tails/Tail4_south.png and b/Textures/Things/Tails/Tail4_south.png differ diff --git a/Textures/Things/Tails/Tail4_southm.png b/Textures/Things/Tails/Tail4_southm.png index 6a6d6f2..4dfd392 100644 Binary files a/Textures/Things/Tails/Tail4_southm.png and b/Textures/Things/Tails/Tail4_southm.png differ diff --git a/Textures/Things/Tails/Tail5_east.png b/Textures/Things/Tails/Tail5_east.png index e0e9c49..1ee4486 100644 Binary files a/Textures/Things/Tails/Tail5_east.png and b/Textures/Things/Tails/Tail5_east.png differ diff --git a/Textures/Things/Tails/Tail5_eastm.png b/Textures/Things/Tails/Tail5_eastm.png index 6761783..a00fcba 100644 Binary files a/Textures/Things/Tails/Tail5_eastm.png and b/Textures/Things/Tails/Tail5_eastm.png differ diff --git a/Textures/Things/Tails/Tail5_north.png b/Textures/Things/Tails/Tail5_north.png index bc36b68..8ddee78 100644 Binary files a/Textures/Things/Tails/Tail5_north.png and b/Textures/Things/Tails/Tail5_north.png differ diff --git a/Textures/Things/Tails/Tail5_northm.png b/Textures/Things/Tails/Tail5_northm.png index 53957d8..5a53870 100644 Binary files a/Textures/Things/Tails/Tail5_northm.png and b/Textures/Things/Tails/Tail5_northm.png differ diff --git a/Textures/Things/Tails/Tail5_south.png b/Textures/Things/Tails/Tail5_south.png index 8027c87..e4a5dd3 100644 Binary files a/Textures/Things/Tails/Tail5_south.png and b/Textures/Things/Tails/Tail5_south.png differ diff --git a/Textures/Things/Tails/Tail5_southm.png b/Textures/Things/Tails/Tail5_southm.png index a6198cf..a80b6c7 100644 Binary files a/Textures/Things/Tails/Tail5_southm.png and b/Textures/Things/Tails/Tail5_southm.png differ diff --git a/Textures/Things/Tails/Tail6_east.png b/Textures/Things/Tails/Tail6_east.png index e0e9c49..add9aaa 100644 Binary files a/Textures/Things/Tails/Tail6_east.png and b/Textures/Things/Tails/Tail6_east.png differ diff --git a/Textures/Things/Tails/Tail6_eastm.png b/Textures/Things/Tails/Tail6_eastm.png index 6761783..c0a7f9b 100644 Binary files a/Textures/Things/Tails/Tail6_eastm.png and b/Textures/Things/Tails/Tail6_eastm.png differ diff --git a/Textures/Things/Tails/Tail6_north.png b/Textures/Things/Tails/Tail6_north.png index 0e492dd..a1509ef 100644 Binary files a/Textures/Things/Tails/Tail6_north.png and b/Textures/Things/Tails/Tail6_north.png differ diff --git a/Textures/Things/Tails/Tail6_northm.png b/Textures/Things/Tails/Tail6_northm.png index 31e86f6..3b9baf2 100644 Binary files a/Textures/Things/Tails/Tail6_northm.png and b/Textures/Things/Tails/Tail6_northm.png differ diff --git a/Textures/Things/Tails/Tail6_south.png b/Textures/Things/Tails/Tail6_south.png index 806c68a..62d32e8 100644 Binary files a/Textures/Things/Tails/Tail6_south.png and b/Textures/Things/Tails/Tail6_south.png differ diff --git a/Textures/Things/Tails/Tail6_southm.png b/Textures/Things/Tails/Tail6_southm.png index ffaae4b..80e5f5f 100644 Binary files a/Textures/Things/Tails/Tail6_southm.png and b/Textures/Things/Tails/Tail6_southm.png differ diff --git a/Textures/Things/Tails/Tail7_east.png b/Textures/Things/Tails/Tail7_east.png index e0e9c49..add9aaa 100644 Binary files a/Textures/Things/Tails/Tail7_east.png and b/Textures/Things/Tails/Tail7_east.png differ diff --git a/Textures/Things/Tails/Tail7_eastm.png b/Textures/Things/Tails/Tail7_eastm.png index 6761783..c0a7f9b 100644 Binary files a/Textures/Things/Tails/Tail7_eastm.png and b/Textures/Things/Tails/Tail7_eastm.png differ diff --git a/Textures/Things/Tails/Tail7_north.png b/Textures/Things/Tails/Tail7_north.png index 11338d1..33f25d3 100644 Binary files a/Textures/Things/Tails/Tail7_north.png and b/Textures/Things/Tails/Tail7_north.png differ diff --git a/Textures/Things/Tails/Tail7_northm.png b/Textures/Things/Tails/Tail7_northm.png index 392abe0..82c3535 100644 Binary files a/Textures/Things/Tails/Tail7_northm.png and b/Textures/Things/Tails/Tail7_northm.png differ diff --git a/Textures/Things/Tails/Tail7_south.png b/Textures/Things/Tails/Tail7_south.png index 05a1cd8..08cd0ad 100644 Binary files a/Textures/Things/Tails/Tail7_south.png and b/Textures/Things/Tails/Tail7_south.png differ diff --git a/Textures/Things/Tails/Tail7_southm.png b/Textures/Things/Tails/Tail7_southm.png index 487879a..8945225 100644 Binary files a/Textures/Things/Tails/Tail7_southm.png and b/Textures/Things/Tails/Tail7_southm.png differ diff --git a/Textures/Things/Tails/Tail8_east.png b/Textures/Things/Tails/Tail8_east.png new file mode 100644 index 0000000..9302f4d Binary files /dev/null and b/Textures/Things/Tails/Tail8_east.png differ diff --git a/Textures/Things/Tails/Tail8_eastm.png b/Textures/Things/Tails/Tail8_eastm.png new file mode 100644 index 0000000..5be9748 Binary files /dev/null and b/Textures/Things/Tails/Tail8_eastm.png differ diff --git a/Textures/Things/Tails/Tail8_north.png b/Textures/Things/Tails/Tail8_north.png new file mode 100644 index 0000000..16f6055 Binary files /dev/null and b/Textures/Things/Tails/Tail8_north.png differ diff --git a/Textures/Things/Tails/Tail8_northm.png b/Textures/Things/Tails/Tail8_northm.png new file mode 100644 index 0000000..26565e2 Binary files /dev/null and b/Textures/Things/Tails/Tail8_northm.png differ diff --git a/Textures/Things/Tails/Tail8_south.png b/Textures/Things/Tails/Tail8_south.png new file mode 100644 index 0000000..cb76d6a Binary files /dev/null and b/Textures/Things/Tails/Tail8_south.png differ diff --git a/Textures/Things/Tails/Tail8_southm.png b/Textures/Things/Tails/Tail8_southm.png new file mode 100644 index 0000000..75c6925 Binary files /dev/null and b/Textures/Things/Tails/Tail8_southm.png differ diff --git a/Textures/Things/Tails/Tail9_east.png b/Textures/Things/Tails/Tail9_east.png new file mode 100644 index 0000000..9302f4d Binary files /dev/null and b/Textures/Things/Tails/Tail9_east.png differ diff --git a/Textures/Things/Tails/Tail9_eastm.png b/Textures/Things/Tails/Tail9_eastm.png new file mode 100644 index 0000000..5be9748 Binary files /dev/null and b/Textures/Things/Tails/Tail9_eastm.png differ diff --git a/Textures/Things/Tails/Tail9_north.png b/Textures/Things/Tails/Tail9_north.png new file mode 100644 index 0000000..019f2d8 Binary files /dev/null and b/Textures/Things/Tails/Tail9_north.png differ diff --git a/Textures/Things/Tails/Tail9_northm.png b/Textures/Things/Tails/Tail9_northm.png new file mode 100644 index 0000000..0d2a951 Binary files /dev/null and b/Textures/Things/Tails/Tail9_northm.png differ diff --git a/Textures/Things/Tails/Tail9_south.png b/Textures/Things/Tails/Tail9_south.png new file mode 100644 index 0000000..3c7a09b Binary files /dev/null and b/Textures/Things/Tails/Tail9_south.png differ diff --git a/Textures/Things/Tails/Tail9_southm.png b/Textures/Things/Tails/Tail9_southm.png new file mode 100644 index 0000000..75c6925 Binary files /dev/null and b/Textures/Things/Tails/Tail9_southm.png differ diff --git a/Textures/World/ReviaEmblem.png b/Textures/World/ReviaEmblem.png index 03f45d3..718b3bc 100644 Binary files a/Textures/World/ReviaEmblem.png and b/Textures/World/ReviaEmblem.png differ