From 0f2b14f82adb359049d8820ece29029a95949a5f Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 5 Jul 2021 15:47:14 -0300 Subject: Fix minor stuff --- .gitlab-ci.yml | 12 ++++++------ items/equip-1hand.xml | 4 ++-- items/equip-charm.xml | 10 ++++++++++ items/equip-head.xml | 6 +++++- items/equip-torso.xml | 10 ---------- 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08438466..a1da9b0d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ stages: - test -- deploy - documentation +- deploy image: debian:stable before_script: @@ -44,6 +44,11 @@ newlines: when: always expire_in: 3 week +licensecheck: + stage: documentation + script: + - ./.tools/licensecheck.sh + pages: stage: deploy script: @@ -55,8 +60,3 @@ pages: only: - master -licensecheck: - stage: documentation - script: - - ./.tools/licensecheck.sh - diff --git a/items/equip-1hand.xml b/items/equip-1hand.xml index 88339d28..fa9ab68a 100644 --- a/items/equip-1hand.xml +++ b/items/equip-1hand.xml @@ -85,7 +85,7 @@ name="Short Sword" description="A small but sharp sword." type="equip-1hand" - attack="100" + attack="90" attack-action="attack" attack-range="2" weight="2000"> @@ -121,7 +121,7 @@ image="equipment/weapon/dagger-setzer.png" name="Setzer" description="A sharp knife, named after a famous gambler." - attack="110" + attack="100" type="equip-1hand" attack-action="attack" attack-range="2" diff --git a/items/equip-charm.xml b/items/equip-charm.xml index 0a37d05e..0c834e55 100644 --- a/items/equip-charm.xml +++ b/items/equip-charm.xml @@ -85,4 +85,14 @@ type="equip-charm" weight="40" sellProtected="true" /> + + graphics/particles/dark-talisman.xml + diff --git a/items/equip-head.xml b/items/equip-head.xml index b0281388..3e118eed 100644 --- a/items/equip-head.xml +++ b/items/equip-head.xml @@ -1415,7 +1415,7 @@ name="Underworld Mask" description="Surely, you don't think I jest." effect="0 Int" - attack-range="3" + attack-range="2" dex="2" agi="2" type="equip-head" @@ -2647,6 +2647,10 @@ image="equipment/head/overlord-helm.png" name="Overlord's Helmet" description="Worn by the greatest warriors." + mdefense="-50" + str="-2" + agi="-2" + dex="-2" type="equip-head" defense="50" weight="45"> diff --git a/items/equip-torso.xml b/items/equip-torso.xml index c27c7da4..e5a54bed 100644 --- a/items/equip-torso.xml +++ b/items/equip-torso.xml @@ -83,16 +83,6 @@ equipment/chest/cotton.xml|#a4b2b2,ffffff equipment/chest/cotton-female.xml|#a4b2b2,ffffff - - graphics/particles/dark-talisman.xml -