From 78834016424daf045fff65b289b16e33415bc13f Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Wed, 17 Apr 2019 09:05:39 -0300 Subject: Reapply Commit 2a99e649 authored 5 hours ago by Saulc properly. I'm greedy :< --- db/re/item_db.conf | 60 +++++++++++++++++++++++++++++++++++++++------------- npc/001-4/lilica.txt | 4 ++-- 2 files changed, 47 insertions(+), 17 deletions(-) diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 87853fe68..be69c6082 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -8931,17 +8931,21 @@ item_db: ( }, { Id: 2918 - AegisName: "EggshellHat" - Name: "Eggshell Hat" + AegisName: "BlueEggshellHat" + Name: "Blue Eggshell Hat" Type: "IT_ARMOR" - Buy: 1600 - Sell: 300 - Weight: 22 - Def: 3 + Buy: 16000 + Sell: 3000 + Weight: 460 + Def: 11 Loc: "EQP_HEAD_TOP" - EquipLv: 8 + EquipLv: 21 Refine: false - ViewSprite: 2918 + Script: <" + if ($EVENT$ == "Easter") { + bonus bDef,10; + } + "> }, { Id: 2919 @@ -9468,11 +9472,15 @@ item_db: ( Buy: 16000 Sell: 3000 Weight: 460 - Def: 12 + Def: 11 Loc: "EQP_HEAD_TOP" - EquipLv: 23 + EquipLv: 21 Refine: false - ViewSprite: 2985 + Script: <" + if ($EVENT$ == "Easter") { + bonus bDef,10; + } + "> }, { Id: 2986 @@ -9482,11 +9490,15 @@ item_db: ( Buy: 16000 Sell: 3000 Weight: 460 - Def: 10 + Def: 11 Loc: "EQP_HEAD_TOP" - EquipLv: 20 + EquipLv: 21 Refine: false - ViewSprite: 2986 + Script: <" + if ($EVENT$ == "Easter") { + bonus bDef,10; + } + "> }, { Id: 2987 @@ -9500,7 +9512,6 @@ item_db: ( Loc: "EQP_HEAD_TOP" EquipLv: 30 Refine: false - ViewSprite: 2987 //DropAnnounce: true Script: <" if ($EVENT$ == "Easter") { @@ -10050,6 +10061,25 @@ item_db: ( bonus bLuk,1; "> }, +{ + Id: 3017 + AegisName: "EggshellHat" + Name: "Eggshell Hat" + Type: "IT_ARMOR" + Buy: 16000 + Sell: 3000 + Weight: 460 + Def: 11 + Loc: "EQP_HEAD_TOP" + EquipLv: 21 + Refine: false + Script: <" + if ($EVENT$ == "Easter") { + bonus bDef,10; + } + "> +}, + // Neck Armor { Id: 3200 diff --git a/npc/001-4/lilica.txt b/npc/001-4/lilica.txt index 6e5cc1457..04c341978 100644 --- a/npc/001-4/lilica.txt +++ b/npc/001-4/lilica.txt @@ -44,7 +44,7 @@ L_Leader: close; L_Quest: - setarray .@Seasonal, EggshellHat, EggshellHat, GreenEggshellHat, OrangeEggshellHat, EggshellHat, EggshellHat; + setarray .@Seasonal, EggshellHat, EggshellHat, GreenEggshellHat, OrangeEggshellHat, BlueEggshellHat, EggshellHat; .@Hat=.@Seasonal[gettime(7)%6]; // Magically choose the hat from the array mesn; mesq l("Good choice! This year we're having a @@!", getitemlink(.@Hat)); @@ -122,7 +122,7 @@ OnPayFunds: OnInit: tradertype(NST_CUSTOM); - setarray .@Seasonal, EggshellHat, EggshellHat, GreenEggshellHat, OrangeEggshellHat, EggshellHat, EggshellHat; + setarray .@Seasonal, EggshellHat, EggshellHat, GreenEggshellHat, OrangeEggshellHat, BlueEggshellHat, EggshellHat; .Hat=.@Seasonal[(gettime(7)+1)%6]; // Magically choose the hat from the array .PrevHat=.@Seasonal[(gettime(7)-1)%6]; // Magically choose the hat from the array -- cgit v1.2.3-60-g2f50