From 0044c5c2e8e989e13eee1408f2aa06ad50fb909a Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Wed, 26 Dec 2018 09:04:28 +0000
Subject: [PATCH] Improve existing boar texture to make it less cartoony.

Add blendfile for the boar so that it can be reexported more easily in
the future.
Reduce the boar's max range so it attacks its enemies closer.
Add a feeding animation variant.

This was SVN commit r21947.
---
 .../mods/public/art/actors/fauna/boar.xml     |  26 ++-
 .../quadraped/animal_boar_attack_01.dae       |   3 +
 .../quadraped/animal_boar_death_01.dae        |   3 +
 .../quadraped/animal_boar_idle_01.dae         |   3 +
 .../quadraped/animal_boar_idle_02.dae         |   3 +
 .../quadraped/animal_boar_run_01.dae          |   3 +
 .../quadraped/animal_boar_walk_01.dae         |   3 +
 .../art/animation/quadraped/boar_death.dae    |   4 +-
 .../art/animation/quadraped/boar_idle_01.dae  |   4 +-
 .../art/animation/quadraped/boar_idle_02.dae  |   4 +-
 .../art/animation/quadraped/boar_run.dae      |   4 +-
 .../art/animation/quadraped/boar_walk.dae     |   4 +-
 .../art/meshes/skeletal/animal_boar.dae       |   3 +
 .../mods/public/art/meshes/skeletal/boar.dae  |   4 +-
 .../data/mods/public/art/skeletons/boar.xml   | 217 ++++++++++--------
 .../skins/skeletal/animal_boar_01.png         |   3 +
 .../simulation/templates/gaia/fauna_boar.xml  |   2 +-
 17 files changed, 178 insertions(+), 115 deletions(-)
 create mode 100644 binaries/data/mods/public/art/animation/quadraped/animal_boar_attack_01.dae
 create mode 100644 binaries/data/mods/public/art/animation/quadraped/animal_boar_death_01.dae
 create mode 100644 binaries/data/mods/public/art/animation/quadraped/animal_boar_idle_01.dae
 create mode 100644 binaries/data/mods/public/art/animation/quadraped/animal_boar_idle_02.dae
 create mode 100644 binaries/data/mods/public/art/animation/quadraped/animal_boar_run_01.dae
 create mode 100644 binaries/data/mods/public/art/animation/quadraped/animal_boar_walk_01.dae
 create mode 100644 binaries/data/mods/public/art/meshes/skeletal/animal_boar.dae
 create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/animal_boar_01.png

diff --git a/binaries/data/mods/public/art/actors/fauna/boar.xml b/binaries/data/mods/public/art/actors/fauna/boar.xml
index c39d6faa0d..3118ec7d0a 100644
--- a/binaries/data/mods/public/art/actors/fauna/boar.xml
+++ b/binaries/data/mods/public/art/actors/fauna/boar.xml
@@ -2,21 +2,26 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="100" name="Mesh">
+    <variant frequency="100" name="Boar">
       <animations>
-        <animation file="quadraped/boar_idle_01.dae" name="Idle" speed="15"/>
-        <animation file="quadraped/boar_idle_02.dae" name="Idle" speed="60"/>
-        <animation file="quadraped/boar_attack.dae" name="attack_melee" speed="120"/>
-        <animation file="quadraped/boar_walk.dae" name="Walk" speed="25"/>
-        <animation file="quadraped/boar_run.dae" name="Run" speed="8"/>
-        <animation file="quadraped/boar_death.dae" name="Death" speed="75"/>
+        <animation file="quadraped/animal_boar_idle_02.dae" name="Idle" speed="10"/>
+        <animation file="quadraped/animal_boar_attack_01.dae" name="attack_melee" speed="120"/>
+        <animation file="quadraped/animal_boar_walk_01.dae" name="Walk" speed="10"/>
+        <animation file="quadraped/animal_boar_run_01.dae" name="Run" speed="8"/>
+        <animation file="quadraped/animal_boar_death_01.dae" name="Death" speed="50"/>
       </animations>
-      <mesh>skeletal/boar.dae</mesh>
+      <mesh>skeletal/animal_boar.dae</mesh>
+      <textures>
+        <texture file="skeletal/animal_boar_01.png" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="texture">
-      <textures><texture file="skeletal/animal_boar.dds" name="baseTex"/></textures>
+    <variant frequency="100" name="normal"/>
+    <variant frequency="0" name="feeding">
+      <animations>
+        <animation file="quadraped/animal_boar_idle_01.dae" name="Idle" speed="10"/>
+      </animations>
     </variant>
   </group>
   <group>
@@ -27,4 +32,5 @@
       </props>
     </variant>
   </group>
+  <material>basic_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/animation/quadraped/animal_boar_attack_01.dae b/binaries/data/mods/public/art/animation/quadraped/animal_boar_attack_01.dae
new file mode 100644
index 0000000000..a01fae0cd0
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/quadraped/animal_boar_attack_01.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:21b162f92af47b29f3d21d079a2001f4873e0449e876b66ce1a6daddce997774
+size 188497
diff --git a/binaries/data/mods/public/art/animation/quadraped/animal_boar_death_01.dae b/binaries/data/mods/public/art/animation/quadraped/animal_boar_death_01.dae
new file mode 100644
index 0000000000..805cf729d5
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/quadraped/animal_boar_death_01.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23d1a228a9fc6c0a8876c2d5e6b739051eeb040ea14b2e029915f6d5caccec2f
+size 156738
diff --git a/binaries/data/mods/public/art/animation/quadraped/animal_boar_idle_01.dae b/binaries/data/mods/public/art/animation/quadraped/animal_boar_idle_01.dae
new file mode 100644
index 0000000000..5527bdfc40
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/quadraped/animal_boar_idle_01.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b290708c2a9618ce28b2258d2144e1480a6ea289e6991beac8c52d97d86938e
+size 147516
diff --git a/binaries/data/mods/public/art/animation/quadraped/animal_boar_idle_02.dae b/binaries/data/mods/public/art/animation/quadraped/animal_boar_idle_02.dae
new file mode 100644
index 0000000000..932c80d078
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/quadraped/animal_boar_idle_02.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7733eb055cd795c957333b5e92206f57ef31c1f878acd37967fd8d242c6895e3
+size 159924
diff --git a/binaries/data/mods/public/art/animation/quadraped/animal_boar_run_01.dae b/binaries/data/mods/public/art/animation/quadraped/animal_boar_run_01.dae
new file mode 100644
index 0000000000..2476b00afa
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/quadraped/animal_boar_run_01.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9916173d075ef527a03172e14ac1ed4adbd825d60742c4fc3f0e4b85aaec49b
+size 172556
diff --git a/binaries/data/mods/public/art/animation/quadraped/animal_boar_walk_01.dae b/binaries/data/mods/public/art/animation/quadraped/animal_boar_walk_01.dae
new file mode 100644
index 0000000000..2c8fd1b588
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/quadraped/animal_boar_walk_01.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8eaa00ef7733cfa78760fed6a4fc9077955fa645d7be7d1fd0ff290751214f75
+size 164524
diff --git a/binaries/data/mods/public/art/animation/quadraped/boar_death.dae b/binaries/data/mods/public/art/animation/quadraped/boar_death.dae
index 639774790a..8aa57d758c 100644
--- a/binaries/data/mods/public/art/animation/quadraped/boar_death.dae
+++ b/binaries/data/mods/public/art/animation/quadraped/boar_death.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a83b1ad1adcb6a21a98f43de2dda3ac1e956cb7040136215ff5bd6512c5e7c1
-size 634175
+oid sha256:aaefa8017cbb827a366bca0b4be4a2dfe176051691915992257d714c310b7cbe
+size 157475
diff --git a/binaries/data/mods/public/art/animation/quadraped/boar_idle_01.dae b/binaries/data/mods/public/art/animation/quadraped/boar_idle_01.dae
index 6829bcc228..0d548f356f 100644
--- a/binaries/data/mods/public/art/animation/quadraped/boar_idle_01.dae
+++ b/binaries/data/mods/public/art/animation/quadraped/boar_idle_01.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81b7c242aa80fc508fea0e5698812d43c0420601203ad2cfd729c0991c16f7c1
-size 626516
+oid sha256:383e735d997fcb69021b90c9f6286ec4f3b33a821986a43d08fd9b22c53f5761
+size 148544
diff --git a/binaries/data/mods/public/art/animation/quadraped/boar_idle_02.dae b/binaries/data/mods/public/art/animation/quadraped/boar_idle_02.dae
index 007ca562ed..905fdf2381 100644
--- a/binaries/data/mods/public/art/animation/quadraped/boar_idle_02.dae
+++ b/binaries/data/mods/public/art/animation/quadraped/boar_idle_02.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e6e78669cca7ddeb6908cbbca689f822e9116e680fa9a25e1682e791f885338
-size 636183
+oid sha256:c82b5b87ecb19d3f1052679938d69a8b38b8b1a8fd34219860060a6c3eacacf9
+size 160749
diff --git a/binaries/data/mods/public/art/animation/quadraped/boar_run.dae b/binaries/data/mods/public/art/animation/quadraped/boar_run.dae
index 2577a20654..e95c15b48c 100644
--- a/binaries/data/mods/public/art/animation/quadraped/boar_run.dae
+++ b/binaries/data/mods/public/art/animation/quadraped/boar_run.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a316bdb575baad83c9caa5ea5e93d13ee400f08ae822e9e605879d126b49ed6
-size 621579
+oid sha256:e7b6fb3a27edd5fb3b9e78cf8d3846efe49d5e8bf56b1aa4833fe8734b227b35
+size 173191
diff --git a/binaries/data/mods/public/art/animation/quadraped/boar_walk.dae b/binaries/data/mods/public/art/animation/quadraped/boar_walk.dae
index 372a00a7e9..4fe23a8110 100644
--- a/binaries/data/mods/public/art/animation/quadraped/boar_walk.dae
+++ b/binaries/data/mods/public/art/animation/quadraped/boar_walk.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7dcfd5427755c97cf84283ba4e8e758dec5ec1a43133f6db1282e625dbc97a9
-size 615621
+oid sha256:4facfebc39363d223d84ea23c29bf1cf28d1562cd4518c3e87ae024ec1f0be66
+size 165369
diff --git a/binaries/data/mods/public/art/meshes/skeletal/animal_boar.dae b/binaries/data/mods/public/art/meshes/skeletal/animal_boar.dae
new file mode 100644
index 0000000000..7bd4e0e31e
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/skeletal/animal_boar.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c89edec82ae5592afe86dde63e258da1afd27ba13ca3def28cda5919c963d37
+size 77762
diff --git a/binaries/data/mods/public/art/meshes/skeletal/boar.dae b/binaries/data/mods/public/art/meshes/skeletal/boar.dae
index 14587ddbfd..f192cc0cc8 100644
--- a/binaries/data/mods/public/art/meshes/skeletal/boar.dae
+++ b/binaries/data/mods/public/art/meshes/skeletal/boar.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b549abea551eea42c44b6e8a867eef1e433111a25dcd9db4f2744c7cf8d29392
-size 602630
+oid sha256:29e40fb4e5056269f8571fc66f50db8bb062df852e421e5d3db1d74e9a92cffe
+size 78124
diff --git a/binaries/data/mods/public/art/skeletons/boar.xml b/binaries/data/mods/public/art/skeletons/boar.xml
index 2201276a63..8756858cc1 100644
--- a/binaries/data/mods/public/art/skeletons/boar.xml
+++ b/binaries/data/mods/public/art/skeletons/boar.xml
@@ -1,94 +1,127 @@
+<?xml version='1.0' encoding='utf-8'?>
 <skeletons>
-	<standard_skeleton title="Boar" id="Boar">
-		<bone name="BoarArmature">
-			<bone name="Body">
-				<bone name="Body2">
-					<bone name="Rear">
-						<bone name="Tail" />
-						<bone name="Hip_Left">
-							<bone name="Back_Leg_Left">
-								<bone name="Shin_Left">
-									<bone name="Back_Foot_Left" />
-								</bone>
-							</bone>
-						</bone>
-						<bone name="Hip_Right">
-							<bone name="Back_Leg_Right">
-								<bone name="Shin_Right">
-									<bone name="Back_Foot_Right" />
-								</bone>
-							</bone>
-						</bone>
-					</bone>
-				</bone>
-			</bone>
-			<bone name="Neck">
-				<bone name="Head">
-					<bone name="Ear_Left" />
-					<bone name="Ear_Right" />
-				</bone>
-			</bone>
-			<bone name="Shoulder_Left">
-				<bone name="Front_Leg_Left">
-					<bone name="Forearm_Left">
-						<bone name="Front_Foot_Left" />
-					</bone>
-				</bone>
-			</bone>
-			<bone name="Shoulder_Right">
-				<bone name="Front_Leg_Right">
-					<bone name="Forearm_Right">
-						<bone name="Front_Foot_Right" />
-					</bone>
-				</bone>
-			</bone>
-		</bone>
-	</standard_skeleton>
-
-	<skeleton title="Boar" target="Boar">
-		<identifier><root>BoarArmature_</root></identifier>
-		<bone name="BoarArmature"><target>BoarArmature</target>
-			<bone name="Body"><target>Body</target>
-				<bone name="Body2"><target>Body2</target>
-					<bone name="Rear"><target>Rear</target>
-						<bone name="Tail"><target>Tail</target></bone>
-						<bone name="Hip_Left"><target>Hip_Left</target>
-							<bone name="Back_Leg_Left"><target>Back_Leg_Left</target>
-								<bone name="Shin_Left"><target>Shin_Left</target>
-									<bone name="Back_Foot_Left"><target>Back_Foot_Left</target></bone>
-								</bone>
-							</bone>
-						</bone>
-						<bone name="Hip_Right"><target>Hip_Right</target>
-							<bone name="Back_Leg_Right"><target>Back_Leg_Right</target>
-								<bone name="Shin_Right"><target>Shin_Right</target>
-									<bone name="Back_Foot_Right"><target>Back_Foot_Right</target></bone>
-								</bone>
-							</bone>
-						</bone>
-					</bone>
-				</bone>
-			</bone>
-			<bone name="Neck"><target>Neck</target>
-				<bone name="Head"><target>Head</target>
-					<bone name="Ear_Left"><target>Ear_Left</target></bone>
-					<bone name="Ear_Right"><target>Ear_Right</target></bone>
-				</bone>
-			</bone>
-			<bone name="Shoulder_Left"><target>Shoulder_Left</target>
-				<bone name="Front_Leg_Left"><target>Front_Leg_Left</target>
-					<bone name="Forearm_Left"><target>Forearm_Left</target>
-						<bone name="Front_Foot_Left"><target>Front_Foot_Left</target></bone>
-					</bone>
-				</bone>
-			</bone>
-			<bone name="Shoulder_Right"><target>Shoulder_Right</target>
-				<bone name="Front_Leg_Right"><target>Front_Leg_Right</target>
-					<bone name="Forearm_Right"><target>Forearm_Right</target>
-						<bone name="Front_Foot_Right"><target>Front_Foot_Right</target></bone>
-					</bone>
-				</bone>
-			</bone>
-		</bone>
-	</skeleton>
+  <standard_skeleton id="Boar_Armature" title="Boar Armature">
+    <bone name="Boar_Base">
+      <bone name="Body">
+        <bone name="Rear">
+          <bone name="Tail" />
+          <bone name="Hip_Left">
+            <bone name="Back_Leg_Left">
+              <bone name="Shin_Left">
+                <bone name="Back_Foot_Left" />
+              </bone>
+            </bone>
+          </bone>
+          <bone name="Hip_Right">
+            <bone name="Back_Leg_Right">
+              <bone name="Shin_Right">
+                <bone name="Back_Foot_Right" />
+              </bone>
+            </bone>
+          </bone>
+        </bone>
+      </bone>
+      <bone name="Neck">
+        <bone name="Head">
+          <bone name="Ear_Left" />
+          <bone name="Ear_Right" />
+          <bone name="Jaw" />
+        </bone>
+      </bone>
+      <bone name="Shoulder_Left">
+        <bone name="Front_Leg_Left">
+          <bone name="Forearm_Left">
+            <bone name="Front_Foot_Left" />
+          </bone>
+        </bone>
+      </bone>
+      <bone name="Shoulder_Right">
+        <bone name="Front_Leg_Right">
+          <bone name="Forearm_Right">
+            <bone name="Front_Foot_Right" />
+          </bone>
+        </bone>
+      </bone>
+    </bone>
+  </standard_skeleton>
+  <skeleton target="Boar_Armature" title="Boar Armature">
+    <identifier>
+      <root>Boar_Base</root>
+    </identifier>
+    <bone name="Boar_Base">
+      <target>Boar_Base</target>
+      <bone name="Body">
+        <target>Body</target>
+        <bone name="Rear">
+          <target>Rear</target>
+          <bone name="Tail">
+            <target>Tail</target>
+          </bone>
+          <bone name="Hip_Left">
+            <target>Hip_Left</target>
+            <bone name="Back_Leg_Left">
+              <target>Back_Leg_Left</target>
+              <bone name="Shin_Left">
+                <target>Shin_Left</target>
+                <bone name="Back_Foot_Left">
+                  <target>Back_Foot_Left</target>
+                </bone>
+              </bone>
+            </bone>
+          </bone>
+          <bone name="Hip_Right">
+            <target>Hip_Right</target>
+            <bone name="Back_Leg_Right">
+              <target>Back_Leg_Right</target>
+              <bone name="Shin_Right">
+                <target>Shin_Right</target>
+                <bone name="Back_Foot_Right">
+                  <target>Back_Foot_Right</target>
+                </bone>
+              </bone>
+            </bone>
+          </bone>
+        </bone>
+      </bone>
+      <bone name="Neck">
+        <target>Neck</target>
+        <bone name="Head">
+          <target>Head</target>
+          <bone name="Ear_Left">
+            <target>Ear_Left</target>
+          </bone>
+          <bone name="Ear_Right">
+            <target>Ear_Right</target>
+          </bone>
+          <bone name="Jaw">
+            <target>Jaw</target>
+          </bone>
+        </bone>
+      </bone>
+      <bone name="Shoulder_Left">
+        <target>Shoulder_Left</target>
+        <bone name="Front_Leg_Left">
+          <target>Front_Leg_Left</target>
+          <bone name="Forearm_Left">
+            <target>Forearm_Left</target>
+            <bone name="Front_Foot_Left">
+              <target>Front_Foot_Left</target>
+            </bone>
+          </bone>
+        </bone>
+      </bone>
+      <bone name="Shoulder_Right">
+        <target>Shoulder_Right</target>
+        <bone name="Front_Leg_Right">
+          <target>Front_Leg_Right</target>
+          <bone name="Forearm_Right">
+            <target>Forearm_Right</target>
+            <bone name="Front_Foot_Right">
+              <target>Front_Foot_Right</target>
+            </bone>
+          </bone>
+        </bone>
+      </bone>
+    </bone>
+  </skeleton>
 </skeletons>
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/animal_boar_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/animal_boar_01.png
new file mode 100644
index 0000000000..fad06a46b0
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/animal_boar_01.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:15af83e0d495cca57adf32b3a038d4ee83a5aca3016cd5893ccee4330fd064d9
+size 4202180
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
index 7c545635a6..6fdc412e61 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
@@ -5,7 +5,7 @@
       <Hack>12.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
-      <MaxRange>4.0</MaxRange>
+      <MaxRange>1.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>