Merge branch 'snowram/new-npcs' into 'master'

Snowram/new npcs

See merge request veloren/veloren!1896

assets/common/abilities/unique/theropodbasic/dash.ron

@@ -0,0 +1,19 @@
+DashMelee(
+    energy_cost: 0,
+    base_damage: 150,
+    scaled_damage: 40,
+    base_poise_damage: 0,
+    scaled_poise_damage: 0,
+    base_knockback: 8.0,
+    scaled_knockback: 17.0,
+    range: 4.0,
+    angle: 45.0,
+    energy_drain: 0,
+    forward_speed: 2.0,
+    buildup_duration: 0.5,
+    charge_duration: 1.2,
+    swing_duration: 0.1,
+    recover_duration: 1.1,
+    infinite_charge: true,
+    is_interruptible: false,
+)

assets/common/abilities/weapon_ability_manifest.ron

@@ -184,6 +184,11 @@
         secondary: "common.abilities.unique.theropodbird.triplestrike",
         abilities: [],
     ),
+    Unique(TheropodCharge): (
+        primary: "common.abilities.unique.theropodbird.triplestrike",
+        secondary: "common.abilities.unique.theropodbasic.dash",
+        abilities: [],
+    ),
     Unique(ObjectTurret): (
         primary: "common.abilities.unique.turret.arrows",
         secondary: "common.abilities.unique.turret.arrows",

assets/common/items/npc_weapons/axe/oni_blue_axe.ron

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Blue Oni Axe",
+    description: "Placeholder",
+    kind: Tool((
+        kind: AxeSimple,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.5,
+            power: 1.6,
+            poise_strength: 1.0,
+            speed: 1.1,
+            crit_chance: 0.18,
+            crit_mult: 2.8,
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_weapons/hammer/oni_red_hammer.ron

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Red Oni Hammer",
+    description: "Placeholder",
+    kind: Tool((
+        kind: HammerSimple,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.5,
+            power: 1.0,
+            poise_strength: 1.0,
+            speed: 1.0,
+            crit_chance: 0.1,
+            crit_mult: 2.0,
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_weapons/unique/theropodcharge.ron

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Theropod Charge",
+    description: "testing123",
+    kind: Tool((
+        kind: Unique(TheropodCharge),
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.01,
+            power: 1.0,
+            poise_strength: 1.0,
+            speed: 1.0,
+            crit_chance: 0.1,
+            crit_mult: 2.0,
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/npc_names.ron

@@ -534,6 +534,18 @@
             bear: (
                 keyword: "bear",
                 generic: "Bear"
+            ),
+            dreadhorn: (
+                keyword: "dreadhorn",
+                generic: "Dreadhorn"
+            ),
+            moose: (
+                keyword: "moose",
+                generic: "Moose"
+            ),
+            snowleopard: (
+                keyword: "snowleopard",
+                generic: "Snow Leopard"
             )
         )
     ),
@@ -749,6 +761,10 @@
             dog: (
                 keyword: "dog",
                 generic: "Dog"
+            ),
+            goat: (
+                keyword: "goat",
+                generic: "Goat"
             )
         )
     ),
@@ -857,7 +873,15 @@
             harvester: (
                 keyword: "harvester",
                 generic: "Harvester"
-            )
+            ),
+            oni_blue: (
+                keyword: "oni_blue",
+                generic: "Blue Oni"
+            ),
+            oni_red: (
+                keyword: "oni_red",
+                generic: "Red Oni"
+            ),
         )
     ),
     golem: (
@@ -913,6 +937,14 @@
             sunlizard: (
                 keyword: "sunlizard",
                 generic: "Sun Lizard"
+            ),
+            yale: (
+                keyword: "yale",
+                generic: "Yale"
+            ),
+            ntouka: (
+                keyword: "ntouka",
+                generic: "Ntouka"
             )
         )
     ),
@@ -1016,6 +1048,10 @@
             marlin: (
                 keyword: "marlin",
                 generic: "Marlin"
+            ),
+            icepike: (
+                keyword: "icepike",
+                generic: "Icepike"
             )
         )
     ),

assets/voxygen/voxel/biped_large_central_manifest.ron

@@ -728,4 +728,108 @@
             central: ("armor.empty"),
         )
     ),
+    (Blueoni, Male): (
+        head: (
+            offset: (-7.5, -1.0, -9.0),
+            central: ("npc.oni_blue.male.head"),
+        ),
+        torso_upper: (
+            offset: (-8.5, -12.0, -10.0),
+            central: ("npc.oni_blue.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.5, -5.5, -13.0),
+            central: ("npc.oni_blue.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (-5.5, 0.0, -8.0),
+            central: ("npc.oni_blue.male.jaw"),
+        ),
+        tail: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        )
+    ),
+    (Blueoni, Female): (
+        head: (
+            offset: (-7.5, -1.0, -9.0),
+            central: ("npc.oni_blue.male.head"),
+        ),
+        torso_upper: (
+            offset: (-8.5, -12.0, -10.0),
+            central: ("npc.oni_blue.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.5, -5.5, -13.0),
+            central: ("npc.oni_blue.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (-5.5, 0.0, -8.0),
+            central: ("npc.oni_blue.male.jaw"),
+        ),
+        tail: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        )
+    ),
+    (Redoni, Male): (
+        head: (
+            offset: (-7.5, -1.0, -9.0),
+            central: ("npc.oni_red.male.head"),
+        ),
+        torso_upper: (
+            offset: (-8.5, -12.0, -10.0),
+            central: ("npc.oni_red.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.5, -5.5, -13.0),
+            central: ("npc.oni_red.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (-5.5, 0.0, -8.0),
+            central: ("npc.oni_red.male.jaw"),
+        ),
+        tail: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        )
+    ),
+    (Redoni, Female): (
+        head: (
+            offset: (-7.5, -1.0, -9.0),
+            central: ("npc.oni_red.male.head"),
+        ),
+        torso_upper: (
+            offset: (-8.5, -12.0, -10.0),
+            central: ("npc.oni_red.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.5, -5.5, -13.0),
+            central: ("npc.oni_red.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (-5.5, 0.0, -8.0),
+            central: ("npc.oni_red.male.jaw"),
+        ),
+        tail: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        )
+    ),
 })

assets/voxygen/voxel/biped_large_lateral_manifest.ron

@@ -951,4 +951,140 @@
             lateral: ("npc.harvester.male.foot_r"),
         )
     ),
+    (Blueoni, Male): (
+        shoulder_l: (
+            offset: (-4.0, -4.5, -5.0),
+            lateral: ("npc.oni_blue.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-4.0, -4.5, -5.0),
+            lateral: ("npc.oni_blue.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-4.5, -4.0, -12.0),
+            lateral: ("npc.oni_blue.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-4.5, -4.0, -12.0),
+            lateral: ("npc.oni_blue.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.5, -4.0, -3.5),
+            lateral: ("npc.oni_blue.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.5, -4.0, -3.5),
+            lateral: ("npc.oni_blue.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.0, -5.0, -4.5),
+            lateral: ("npc.oni_blue.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-3.0, -5.0, -4.5),
+            lateral: ("npc.oni_blue.male.foot_r"),
+        )
+    ),
+    (Blueoni, Female): (
+        shoulder_l: (
+            offset: (-4.0, -4.5, -5.0),
+            lateral: ("npc.oni_blue.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-4.0, -4.5, -5.0),
+            lateral: ("npc.oni_blue.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-4.5, -4.0, -12.0),
+            lateral: ("npc.oni_blue.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-4.5, -4.0, -12.0),
+            lateral: ("npc.oni_blue.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.5, -4.0, -3.5),
+            lateral: ("npc.oni_blue.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.5, -4.0, -3.5),
+            lateral: ("npc.oni_blue.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.0, -5.0, -4.5),
+            lateral: ("npc.oni_blue.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-3.0, -5.0, -4.5),
+            lateral: ("npc.oni_blue.male.foot_r"),
+        )
+    ),
+    (Redoni, Male): (
+        shoulder_l: (
+            offset: (-4.0, -4.5, -5.0),
+            lateral: ("npc.oni_red.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-4.0, -4.5, -5.0),
+            lateral: ("npc.oni_red.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-4.5, -4.0, -12.0),
+            lateral: ("npc.oni_red.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-4.5, -4.0, -12.0),
+            lateral: ("npc.oni_red.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.5, -4.0, -3.5),
+            lateral: ("npc.oni_red.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.5, -4.0, -3.5),
+            lateral: ("npc.oni_red.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.0, -5.0, -4.5),
+            lateral: ("npc.oni_red.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-3.0, -5.0, -4.5),
+            lateral: ("npc.oni_red.male.foot_r"),
+        )
+    ),
+    (Redoni, Female): (
+        shoulder_l: (
+            offset: (-4.0, -4.5, -5.0),
+            lateral: ("npc.oni_red.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-4.0, -4.5, -5.0),
+            lateral: ("npc.oni_red.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-4.5, -4.0, -12.0),
+            lateral: ("npc.oni_red.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-4.5, -4.0, -12.0),
+            lateral: ("npc.oni_red.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.5, -4.0, -3.5),
+            lateral: ("npc.oni_red.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.5, -4.0, -3.5),
+            lateral: ("npc.oni_red.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.0, -5.0, -4.5),
+            lateral: ("npc.oni_red.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-3.0, -5.0, -4.5),
+            lateral: ("npc.oni_red.male.foot_r"),
+        )
+    ),
 })

assets/voxygen/voxel/biped_weapon_manifest.ron

@@ -989,6 +989,14 @@
         vox_spec: ("weapon.hammer.2hhammer_harvester", (-1.5, -7.5, -6.0)),
         color: None
     ),
+    "common.items.npc_weapons.axe.oni_blue_axe": (
+        vox_spec: ("weapon.axe.2haxe_oni_blue", (-1.5, -2.0, -12.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.hammer.oni_red_hammer": (
+        vox_spec: ("weapon.hammer.2hhammer_oni_red", (-3.0, -4.5, -12.0)),
+        color: None
+    ),
     //BIPEDSMALL
     "common.items.npc_weapons.biped_small.adlet.adlet_bow": (
         vox_spec: ("weapon.biped_small.bow.adlet", (-1.5, -3.0, -5.0)),

assets/voxygen/voxel/bird_medium_central_manifest.ron

@@ -29,29 +29,29 @@
     ),
     (Chicken, Male): (
         head: (
-            offset: (-1.5, -2.0, -3.5),
+            offset: (-1.5, -3.0, -3.0),
             central: ("npc.chicken.male.head"),
         ),
         torso: (
-            offset: (-2.5, -3.0, -2.0),
+            offset: (-2.5, -4.5, -3.5),
             central: ("npc.chicken.male.torso"),
         ),
         tail: (
-            offset: (-1.5, -2.5, -3.5),
+            offset: (-1.5, -2.0, -3.0),
             central: ("npc.chicken.male.tail"),
         )
     ),
     (Chicken, Female): (
         head: (
-            offset: (-1.5, -2.0, -2.5),
+            offset: (-1.5, -3.0, -4.0),
             central: ("npc.chicken.female.head"),
         ),
         torso: (
-            offset: (-2.5, -3.0, -2.0),
+            offset: (-2.5, -5.0, -3.5),
             central: ("npc.chicken.female.torso"),
         ),
         tail: (
-            offset: (-1.5, -0.5, -2.5),
+            offset: (-1.5, -3.5, -3.5),
             central: ("npc.chicken.female.tail"),
         )
     ),

assets/voxygen/voxel/bird_medium_lateral_manifest.ron

@@ -37,37 +37,37 @@
     ),
     (Chicken, Male): (
         wing_l: (
-            offset: (-0.5, -2.5, -3.0),
+            offset: (-0.5, -2.5, -4.0),
             lateral: ("npc.chicken.male.wing"),
         ),
         wing_r: (
-            offset: (-0.5, -2.5, -3.0),
+            offset: (-0.5, -2.5, -4.0),
             lateral: ("npc.chicken.male.wing"),
         ),
         foot_l: (
-            offset: (-1.0, 0.0, -4.0),
+            offset: (-1.5, -2.5, -6.0),
             lateral: ("npc.chicken.male.leg_r"),
         ),
         foot_r: (
-            offset: (-1.0, 0.0, -4.0),
+            offset: (-1.5, -2.5, -6.0),
             lateral: ("npc.chicken.male.leg_r"),
         )
     ),
     (Chicken, Female): (
         wing_l: (
-            offset: (-0.5, -2.5, -3.0),
+            offset: (-0.5, -2.5, -4.0),
             lateral: ("npc.chicken.female.wing"),
         ),
         wing_r: (
-            offset: (-0.5, -2.5, -3.0),
+            offset: (-0.5, -2.5, -4.0),
             lateral: ("npc.chicken.female.wing"),
         ),
         foot_l: (
-            offset: (-1.0, 0.0, -4.0),
+            offset: (-1.5, -2.5, -6.0),
             lateral: ("npc.chicken.female.leg_r"),
         ),
         foot_r: (
-            offset: (-1.0, 0.0, -4.0),
+            offset: (-1.5, -2.5, -6.0),
             lateral: ("npc.chicken.female.leg_r"),
         )
     ),

assets/voxygen/voxel/fish_medium_central_manifest.ron

@@ -43,4 +43,48 @@
             central: ("npc.marlin.male.tail"),
         ),
     ),
+    (Icepike, Male): (
+        head: (
+            offset: (-2.5, 0.0, -6.0),
+            central: ("npc.icepike.male.head"),
+        ),
+        jaw: (
+            offset: (-1.5, 0.0, -4.0),
+            central: ("npc.icepike.male.jaw"),
+        ),
+        chest_front: (
+            offset: (-2.5, -4.0, -7.0),
+            central: ("npc.icepike.male.chest_front"),
+        ),
+        chest_back: (
+            offset: (-1.5, -1.5, -3.0),
+            central: ("npc.icepike.male.chest_back"),
+        ),
+		tail: (
+            offset: (-0.5, -10.0, -4.5),
+            central: ("npc.icepike.male.tail"),
+        ),
+    ),
+    (Icepike, Female): (
+        head: (
+            offset: (-2.5, 0.0, -6.0),
+            central: ("npc.icepike.male.head"),
+        ),
+        jaw: (
+            offset: (-1.5, 0.0, -4.0),
+            central: ("npc.icepike.male.jaw"),
+        ),
+        chest_front: (
+            offset: (-2.5, -4.0, -7.0),
+            central: ("npc.icepike.male.chest_front"),
+        ),
+        chest_back: (
+            offset: (-1.5, -1.5, -3.0),
+            central: ("npc.icepike.male.chest_back"),
+        ),
+		tail: (
+            offset: (-0.5, -10.0, -4.5),
+            central: ("npc.icepike.male.tail"),
+        ),
+    ),
 })

assets/voxygen/voxel/fish_medium_lateral_manifest.ron

@@ -19,4 +19,24 @@
             lateral: ("npc.marlin.male.fin_r"),
         ),
     ),
+    (Icepike, Male): (
+        fin_l: (
+            offset: (-1.0, -7.0, -3.0),
+            lateral: ("npc.icepike.male.fin_r"),
+        ),
+        fin_r: (
+            offset: (-1.0, -7.0, -3.0),
+            lateral: ("npc.icepike.male.fin_r"),
+        ),
+    ),
+    (Icepike, Female): (
+        fin_l: (
+            offset: (-1.0, -7.0, -3.0),
+            lateral: ("npc.icepike.male.fin_r"),
+        ),
+        fin_r: (
+            offset: (-1.0, -7.0, -3.0),
+            lateral: ("npc.icepike.male.fin_r"),
+        ),
+    ),
 })