Merge pull request #1283 from TeamLapen/pages/dev

update 1.10 alpha wiki

blog/overview/changelogs/2023-11-13-changelog-1.10.md

@@ -0,0 +1,66 @@
+---
+slug: changelog - 1.10
+title: Changelog - 1.10
+authors: cheaterpaul
+tags: [vampirism, changelog]
+---
+WIP
+## Blocks / Items
+- Dark / Cursed Spruce Hanging Signs
+- refillable Arrow Clip for Tech Crossbow
+- garlic potions
+- new Dark Stone variants
+- ammunition selection for Crossbows with 'c'
+- faction items can no longer be used by other factions
+- Hunter Beacon
+- Crucifix
+- Bat Cage
+- Cured Cursed Spruce Logs
+- Fog Diffuser
+- Potted Sapling Blocks
+- Blood-Infused Iron Blocks
+
+## Recipes
+- Cursed Spruce Sapling can be created by interacting with a spruce sapling with pure blood in hand
+- reduce holy water quality reduction recipes
+
+## UI / UX
+- Hunter Table / Vampire Altars requirement improvements
+
+## Skills / Actions
+- skill cost different number of skill points
+- improved action select screen
+  - improved action reorder screen / shortcut assignment
+
+## World
+- new hunter outpost
+- new vampire hut
+- new vampire altar
+- new boss fight "Ancient Remains"
+
+## Textures / Models
+- updated and new textures and models
+- included alternative resourcepack with 2d models instead of 3d models
+
+## Other
+- Hwyla hides player level when disguised
+- Advanced Hunters now equip items instead of rendering them
+- collect resource task repairs equipment
+- fix Garlic Diffuser screen issues
+- Blood Containers and Blood Pedestals emit redstone comparator signal
+- decrease sanguinare time when using injection
+- add sound subtitles
+
+## Config / Datapack
+- add a config option to check for permissions
+- load convertibles from datapack
+- load sundamage biomes from datapack
+- tasks are now datagenerated objects
+
+## Contributor
+- Zinny
+- Fox Prince
+- Grid
+- Random
+- ThariCorvy
+- Zeyke

docs/data/convertibles.md

@@ -0,0 +1,79 @@
+---
+sidebar_position: 4
+title: Convertibles
+---
+
+Main article about Vampiric Creatures can be found [here](../wiki/content/entities/bitten_animal).
+
+By default, only vanilla animals can be converted to a vampiric version and Vampirism Integrations adds support for some other mods.
+But if you want to make your own modded creatures convertible, or you are a modpack creator who wants more compatibility you can easily create simple vampiric version of other creatures.
+
+## Prerequisites
+First of all the entity must have blood values configured for them to be convertible. See [Blood Values](bloodvalues.md) for more information.
+
+
+## Different converter
+There are two build-in converters available. Others can be added by other mods.
+
+### Default Converter
+The default converter can be used for any entity. It will create a vampiric version of the entity. The problem with this variant is that the converted entity acts as dummy entity, which does not support the interactions of the source entity.
+What this means is that if you convert a horse with this converter, you will no longer be able to ride it, access the inventory, etc ...
+
+```json title="data/<modid>/vampirism/converter/<entity-modid>/<entity-id-path>.json"
+{
+  "handler": {
+    "type": "vampirism:default"
+  }
+}
+```
+
+### Special Converter
+The special converter is used to convert an entity into a specific vampiric entity. This is used, for example, to convert a horse into a vampire horse with full functionality. But this requires a custom converted entity to be registered.
+```json title="data/<modid>/vampirism/converter/<entity-modid>/<entity-id-path>.json"
+{
+  "handler": {
+    "type": "vampirism:special",
+    "converted_type": "<converted-entity-id>"
+  }
+}
+```
+
+## Overlays
+
+Additionally, a converted entity requires an overlay texture to distinguish it from the original entity. This overlay texture is applied to the original entities texture and can be specified with the `overlay` property.
+
+```json title="data/<modid>/vampirism/converter/<entity-modid>/<entity-id-path>.json"
+{
+  "handler": {...},
+  "overlay": "<path-to-overlay-texture>"
+}
+```
+
+## Attribute modifiers
+If no attribute modifier are defined the following default modifiers will be applied to the converted entity:
+
+- Attack Damage: x1.3
+- Knockback Resistance: x1.3
+- Max Health: x1.5 
+- Movement Speed: x1.2
+
+They can be configured with the `attribute_helper` property. The following example shows how to configure the attack damage modifier.
+
+```json title="data/<modid>/vampirism/converter/<entity-modid>/<entity-id-path>.json"
+{
+  "handler": {
+    "type": ...,
+    "attribute_helper": [
+      {
+        "attribute": "minecraft:generic.attack_damage",
+        "fallback_base": 2.0,
+        "modifier": 1.3
+      }
+    ]
+  }
+}
+```
+
+- `attribute`: The attribute to modify. See [here](https://minecraft.fandom.com/wiki/Attribute) for all vanilla attributes.
+- `modifier`: The modifier to apply to the attribute. The final value will be `base * modifier`.
+- `fallback_base`: The base value to use if the entity does not have the attribute. This is useful for modded entities which do not have the vanilla attributes.

docs/data/lootconditions/_category_.json

@@ -1,6 +1,6 @@
 {
   "label": "Loot Conditions",
-  "position": 5,
+  "position": 7,
   "collapsed": true,
   "collapsible": true
 }

docs/data/lootfunctions/_category_.json

@@ -1,6 +1,6 @@
 {
   "label": "Loot Functions",
-  "position": 6,
+  "position": 8,
   "collapsed": true,
   "collapsible": true
 }

docs/data/recipes/_category_.json

@@ -1,6 +1,6 @@
 {
   "label": "Recipes",
-  "position": 4,
+  "position": 6,
   "collapsed": true,
   "collapsible": true
 }

docs/data/sundamage.md

@@ -0,0 +1,33 @@
+---
+sidebar_position: 5
+title: Disable Sun Damage
+---
+
+Biomes, Dimension and Levels can be configured to not apply sun damage to vampires. They can be configured in the API in the config options and via data packs.
+
+## No sun damage file
+
+```json title="data/<modid>/vampirism/no_sun_damage.json"
+{
+  "biomes": [
+    "#vampirism:has_faction/vampire"
+  ],
+  "dimensions": [
+    "minecraft:the_nether",
+    "minecraft:the_end"
+  ],
+  "levels": {
+    "damage": [
+      "minecraft:overworld"
+    ],
+    "no_damage": [
+      "vampirism:vampire_level"
+    ]
+  }
+}
+```
+
+- `biomes`: A list of biome is or biome tags that will not apply sun damage to vampires.
+- `dimensions`: A list of dimension ids or dimension tags that will not apply sun damage to vampires.
+- `levels/no_damage`: A list of level ids that will not apply sun damage to vampires.
+- `levels/damage`: A list of level ids that will apply sun damage to vampires regardless of dimension settings.

docs/wiki/assets/blocks/_blocks.mdx

@@ -90,7 +90,7 @@ import darkSprucePlanks from './dark_spruce_planks.png'
 import darkStrippedSpruceLog from './stripped_dark_spruce_log.png'
 import darkStrippedSpruceWood from './stripped_dark_spruce_wood.png'
 
-export const baseUrl = "https://raw.githubusercontent.com/TeamLapen/Vampirism/0a0cc4b5017ec2ec217740f0408633a6d28774cc/src/main/resources/assets/vampirism/textures/block/"
+export const baseUrl = "https://raw.githubusercontent.com/TeamLapen/Vampirism/c3accd4f5a45ee590a5e3f7539666493d56d4ba7/src/main/resources/assets/vampirism/textures/block/"
 
 export function blockImage(imageName) {
     return baseUrl + imageName;

docs/wiki/assets/images/_images.mdx

@@ -39,7 +39,7 @@ import crucifixNormal from './crucifix_normal.png'
 import crucifixEnhanced from './crucifix_enhanced.png'
 import crucifixUltimate from './crucifix_ultimate.png'
 
-export const baseUrl = "https://raw.githubusercontent.com/TeamLapen/Vampirism/0a0cc4b5017ec2ec217740f0408633a6d28774cc/src/main/resources/assets/vampirism/textures/item/"
+export const baseUrl = "https://raw.githubusercontent.com/TeamLapen/Vampirism/c3accd4f5a45ee590a5e3f7539666493d56d4ba7/src/main/resources/assets/vampirism/textures/item/"
 
 export function image(imageName) {
     return baseUrl + imageName;
@@ -259,7 +259,18 @@ export const crossbowArrowImages = [
         alt: "crossbow arrow teleport",
     }
 ]
-export const crossbowClipImage = image("tech_crossbow_ammo_package.png")
+export const crossbowClipImage0 = image("arrow_clip0.png")
+export const crossbowClipImage3 = image("arrow_clip3.png")
+export const crossbowClipImages = [
+    {
+        src: crossbowClipImage0,
+        alt: "crossbow clip empty",
+    },
+    {
+        src: crossbowClipImage3,
+        alt: "crossbow clip full",
+    }
+]
 export const feedingAdapterImage = image("feeding_adapter.png")
 export const garlicImage = image("garlic.png")
 export const garlicBreadImage = image("garlic_bread.png")

docs/wiki/commands/_category_.json

@@ -0,0 +1,6 @@
+{
+  "label": "Commands",
+  "position": 5,
+  "collapsed": true,
+  "collapsible": true
+}

docs/wiki/commands/arguments/_category_.json

@@ -0,0 +1,6 @@
+{
+  "label": "Command Arguments",
+  "position": 14,
+  "collapsed": true,
+  "collapsible": true
+}

docs/wiki/commands/arguments/minion_argument.md

@@ -0,0 +1,26 @@
+---
+title: Minion Argument
+---
+
+The minion argument is used to target a specific minion. 
+
+## Syntax
+### Short
+A short variant which does not specify the minion name, which might make it difficult to use in some cases.
+```
+<playername>:<minionid>
+```
+### Long
+
+A long variant which specifies the minion's name as well as the id. It is important to specify `"` quotation marks around the argument.
+```
+"<playername>:<minionid> | <minionname>"
+```
+
+## Arguments
+
+| Parameter  | Type      | Description              |
+|:-----------|:----------|:-------------------------|
+| playername | `string`  | The name of the player   |
+| minionid   | `integer` | The number of the minion |
+| minionname | `string`  | The name of the minion   |

docs/wiki/commands/bind_action.md

@@ -0,0 +1,30 @@
+---
+title: Bind Action
+sidebar_position: 7
+---
+
+There are some keybindings that can be used to quickly activate actions.
+You can bind a specific action to one of these keys with this command.  
+E.g. use `/vampirism bind-action 1 vampirism:bat` to bind the bat action to the first key.
+Use autocomplete to see all available action ids.
+
+## Syntax
+
+```
+/vampirism bind-action <slot> <action>
+```
+
+## Arguments
+
+| Parameter | Type      | Description                     |
+|:----------|:----------|:--------------------------------|
+| slot      | `Integer` | The shortcut id                 |
+| action    | `Action`  | The action that should be bound |
+
+## Permissions
+
+:::info
+
+Available to everyone
+
+:::

docs/wiki/commands/blood_bar.md

@@ -0,0 +1,29 @@
+---
+title: Blood Bar
+sidebar_position: 11
+---
+
+Manipulates the blood bar of given players or yourself if `<players>` is not given.
+
+## Syntax
+
+```
+/vampirism bloodBar <status> [<players>]
+/vampirism bloodBar set <amount> [<players>]
+```
+
+## Arguments
+
+| Parameter | Type              | Description              |
+|:----------|:------------------|:-------------------------|
+| status    | `empty / fill`    | empty the bar or fill it |
+| amount    | `integer`         | Blood amount             |
+| players   | `player_selector` | A player target selector |
+
+## Permissions
+
+:::info
+
+These commands can only be used with cheat permissions
+
+:::