From 1445a11050723d2a0b8f7c7f874a9abfb84687f2 Mon Sep 17 00:00:00 2001 From: Micksha Date: Wed, 13 Feb 2019 09:37:09 +0000 Subject: Toams/rowboat + Micksha/galmatia --- db/constants.conf | 5 +- db/re/item_db.conf | 289 ++++++++++++++++++++++++++++++++++++++++++++ db/re/mob_db.conf | 194 +++++++++++++++++++++++++++++ db/re/mob_skill_db.conf | 2 +- db/re/mob_skill_db.txt | 2 +- maps/re/001-1.mcache | Bin 3062 -> 3191 bytes maps/re/008-2-17.mcache | Bin 131 -> 202 bytes maps/re/008-2-19.mcache | Bin 100 -> 147 bytes maps/re/008-2-23.mcache | Bin 89 -> 180 bytes maps/re/008-3-0.mcache | Bin 2590 -> 2584 bytes npc/001-1/_import.txt | 1 + npc/001-1/rowboat.txt | 42 +++++-- npc/001-1/rowboathelper.txt | 55 +++++++++ npc/001-3-0/_import.txt | 1 - npc/001-3-0/_warps.txt | 2 +- npc/008-1-1/_import.txt | 1 + npc/008-1-1/galimatia.txt | 20 +++ npc/008-1/_import.txt | 2 + npc/008-1/blossom.txt | 39 ++++++ npc/008-1/shop.txt | 55 +++++++++ npc/008-2-2/barron.txt | 1 + npc/008-2-2/melania.txt | 2 +- npc/008-2-2/melinda.txt | 14 ++- npc/008-2-2/shop.txt | 1 + 24 files changed, 713 insertions(+), 15 deletions(-) create mode 100644 npc/001-1/rowboathelper.txt create mode 100644 npc/008-1-1/galimatia.txt create mode 100644 npc/008-1/blossom.txt create mode 100644 npc/008-1/shop.txt diff --git a/db/constants.conf b/db/constants.conf index a4813353..5beb8db8 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -4121,7 +4121,10 @@ constants_db: { NPC_SOPHIALLA: 455 NPC_MUNDANE: 456 NPC_ROWBOAT_STAND_WE: 457 - + NPC_UNMOUNTROWBOAT: 458 + NPC_ROWBOATHELPER: 459 + NPC_BLOSSOM: 460 + NPC_GALIMATIA: 461 NPC_TEST1: 800 NPC_PLAYER: 801 diff --git a/db/re/item_db.conf b/db/re/item_db.conf index aef21302..bd75860f 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -1631,6 +1631,68 @@ item_db: ( bonus bStr,5; "> }, +{ + Id: 608 + AegisName: "FertilityPotion" + Name: "Fertility Potion" + Type: "IT_HEALING" + Buy: 25000 + Sell: 2750 + Weight: 25 + Atk: 0 + Matk: 0 + Def: 0 + Range: 0 + Slots: 0 + Job: { + All: true + } + Gender: "SEX_ANY" + WeaponLv: 0 + EquipLv: 0 + Refine: false + ViewSprite: 608 + BindOnEquip: false + BuyingStore: true + Delay: 1000 + Sprite: 0 + UseEffect: "EFFECT_HEAL" +}, +{ + Id: 609 + AegisName: "Honey" + Name: "Honey" + Type: "IT_HEALING" + Buy: 5000 + Sell: 325 + Weight: 250 + Atk: 0 + Matk: 0 + Def: 0 + Range: 0 + Slots: 0 + Job: { + All: true + } + Gender: "SEX_ANY" + WeaponLv: 0 + EquipLv: 0 + Refine: false + ViewSprite: 609 + BindOnEquip: false + BuyingStore: true + Delay: 100 + Sprite: 0 + UseEffect: "EFFECT_HEAL" + Script: <" + @min = 350; + @max = 500; + @delay = 10; + @type = 2; + doevent "rand_sc_heal::OnUse"; + bonus bMaxSP,20; + "> +}, { Id: 700 AegisName: "SmallTentacles" @@ -2885,6 +2947,206 @@ item_db: ( Delay: 0 Sprite: 0 }, +{ + Id: 748 + AegisName: "ARedRose" + Name: "Red Rose" + Type: "IT_ETC" + Buy: 1000 + Sell: 75 + Weight: 10 + Atk: 0 + Matk: 0 + Def: 0 + Range: 0 + Slots: 0 + Job: { + All: true + } + Gender: "SEX_ANY" + WeaponLv: 0 + EquipLv: 0 + Refine: false + BindOnEquip: false + BuyingStore: true + Delay: 0 + Sprite: 0 +}, +{ + Id: 749 + AegisName: "AWhiteRose" + Name: "White Rose" + Type: "IT_ETC" + Buy: 1000 + Sell: 75 + Weight: 10 + Atk: 0 + Matk: 0 + Def: 0 + Range: 0 + Slots: 0 + Job: { + All: true + } + Gender: "SEX_ANY" + WeaponLv: 0 + EquipLv: 0 + Refine: false + BindOnEquip: false + BuyingStore: true + Delay: 0 + Sprite: 0 +}, +{ + Id: 750 + AegisName: "AYellowRose" + Name: "Yellow Rose" + Type: "IT_ETC" + Buy: 1000 + Sell: 75 + Weight: 10 + Atk: 0 + Matk: 0 + Def: 0 + Range: 0 + Slots: 0 + Job: { + All: true + } + Gender: "SEX_ANY" + WeaponLv: 0 + EquipLv: 0 + Refine: false + BindOnEquip: false + BuyingStore: true + Delay: 0 + Sprite: 0 +}, +{ + Id: 751 + AegisName: "ABlueRose" + Name: "Blue Rose" + Type: "IT_ETC" + Buy: 2000 + Sell: 150 + Weight: 10 + Atk: 0 + Matk: 0 + Def: 0 + Range: 0 + Slots: 0 + Job: { + All: true + } + Gender: "SEX_ANY" + WeaponLv: 0 + EquipLv: 0 + Refine: false + BindOnEquip: false + BuyingStore: true + Delay: 0 + Sprite: 0 +}, +{ + Id: 752 + AegisName: "ARedTulip" + Name: "Red Tulip" + Type: "IT_ETC" + Buy: 800 + Sell: 65 + Weight: 10 + Atk: 0 + Matk: 0 + Def: 0 + Range: 0 + Slots: 0 + Job: { + All: true + } + Gender: "SEX_ANY" + WeaponLv: 0 + EquipLv: 0 + Refine: false + BindOnEquip: false + BuyingStore: true + Delay: 0 + Sprite: 0 +}, +{ + Id: 753 + AegisName: "AWhiteTulip" + Name: "White Tulip" + Type: "IT_ETC" + Buy: 800 + Sell: 65 + Weight: 10 + Atk: 0 + Matk: 0 + Def: 0 + Range: 0 + Slots: 0 + Job: { + All: true + } + Gender: "SEX_ANY" + WeaponLv: 0 + EquipLv: 0 + Refine: false + BindOnEquip: false + BuyingStore: true + Delay: 0 + Sprite: 0 +}, +{ + Id: 754 + AegisName: "AYellowTulip" + Name: "Yellow Tulip" + Type: "IT_ETC" + Buy: 800 + Sell: 65 + Weight: 10 + Atk: 0 + Matk: 0 + Def: 0 + Range: 0 + Slots: 0 + Job: { + All: true + } + Gender: "SEX_ANY" + WeaponLv: 0 + EquipLv: 0 + Refine: false + BindOnEquip: false + BuyingStore: true + Delay: 0 + Sprite: 0 +}, +{ + Id: 755 + AegisName: "ABlueTulip" + Name: "Blue Tulip" + Type: "IT_ETC" + Buy: 1600 + Sell: 130 + Weight: 10 + Atk: 0 + Matk: 0 + Def: 0 + Range: 0 + Slots: 0 + Job: { + All: true + } + Gender: "SEX_ANY" + WeaponLv: 0 + EquipLv: 0 + Refine: false + BindOnEquip: false + BuyingStore: true + Delay: 0 + Sprite: 0 +}, { Id: 800 AegisName: "DiamondShard" @@ -4241,6 +4503,33 @@ item_db: ( Delay: 0 Sprite: 0 }, +{ + Id: 2915 + AegisName: "Rosehat" + Name: "Rosehat" + Type: "IT_ARMOR" + Buy: 12000 + Sell: 4100 + Weight: 50 + Atk: 0 + Matk: 10 + Def: 10 + Range: 0 + Slots: 0 + Job: { + All: true + } + Gender: "SEX_ANY" + Loc: "EQP_HEAD_TOP" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 2915 + BindOnEquip: false + BuyingStore: true + Delay: 0 + Sprite: 0 +}, { Id: 3200 AegisName: "Shemagh" diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf index 87b64496..c7da6eff 100644 --- a/db/re/mob_db.conf +++ b/db/re/mob_db.conf @@ -2394,6 +2394,200 @@ mob_db: ( BugLeg: 5000 } }, +{ + Id: 1058 + SpriteName: "BadBee" + Name: "Bad Bee" + Lv: 25 + Hp: 850 + Sp: 0 + Exp: 40 + JExp: 0 + AttackRange: 1 + Attack: [350, 500] + Def: 25 + Mdef: 0 + WalkMask: "WALK_AIR" + Stats: { + Str: 25 + Agi: 25 + Vit: 15 + Int: 1 + Dex: 35 + Luk: 30 + } + ViewRange: 10 + ChaseRange: 20 + Size: 0 + Race: 2 + Element: (4, 1) + Mode: { + CanMove: true + CanAttack: true + ChangeChase: true + Assist: true + Angry: true + Aggressive: true + } + MoveSpeed: 85 + AttackDelay: 800 + AttackMotion: 500 + DamageMotion: 300 + MvpExp: 0 + Drops: { + } +}, +{ + Id: 1059 + SpriteName: "YellowTulip" + Name: "Yellow Tulip" + Lv: 1 + Hp: 1 + Sp: 0 + Exp: 1 + JExp: 0 + AttackRange: 1 + Attack: [0, 0] + Def: 1 + Mdef: 1 + Stats: { + Str: 1 + Agi: 1 + Vit: 1 + Int: 1 + Dex: 1 + Luk: 1 + } + ViewRange: 1 + ChaseRange: 1 + Size: 1 + Race: 3 + Element: (2, 1) + Mode: { + Plant: true + } + MoveSpeed: 1 + AttackDelay: 1 + AttackMotion: 1 + DamageMotion: 1000 + Drops: { + AYellowTulip: 500 + } +}, +{ + Id: 1060 + SpriteName: "YellowRose" + Name: "Yellow Rose" + Lv: 1 + Hp: 1 + Sp: 0 + Exp: 1 + JExp: 0 + AttackRange: 1 + Attack: [0, 0] + Def: 1 + Mdef: 1 + Stats: { + Str: 1 + Agi: 1 + Vit: 1 + Int: 1 + Dex: 1 + Luk: 1 + } + ViewRange: 1 + ChaseRange: 1 + Size: 1 + Race: 3 + Element: (2, 1) + Mode: { + Plant: true + } + MoveSpeed: 1 + AttackDelay: 1 + AttackMotion: 1 + DamageMotion: 1000 + Drops: { + AYellowRose: 500 + } +}, +{ + Id: 1061 + SpriteName: "BlueRose" + Name: "Blue Rose" + Lv: 1 + Hp: 1 + Sp: 0 + Exp: 1 + JExp: 0 + AttackRange: 1 + Attack: [0, 0] + Def: 1 + Mdef: 1 + Stats: { + Str: 1 + Agi: 1 + Vit: 1 + Int: 1 + Dex: 1 + Luk: 1 + } + ViewRange: 1 + ChaseRange: 1 + Size: 1 + Race: 3 + Element: (2, 1) + Mode: { + Plant: true + } + MoveSpeed: 1 + AttackDelay: 1 + AttackMotion: 1 + DamageMotion: 1000 + Drops: { + ABlueRose: 200 + ABlueRose: 50 + } +}, +{ + Id: 1062 + SpriteName: "RedRose" + Name: "Red Rose" + Lv: 1 + Hp: 1 + Sp: 0 + Exp: 1 + JExp: 0 + AttackRange: 1 + Attack: [0, 0] + Def: 1 + Mdef: 1 + Stats: { + Str: 1 + Agi: 1 + Vit: 1 + Int: 1 + Dex: 1 + Luk: 1 + } + ViewRange: 1 + ChaseRange: 1 + Size: 1 + Race: 3 + Element: (2, 1) + Mode: { + Plant: true + } + MoveSpeed: 1 + AttackDelay: 1 + AttackMotion: 1 + DamageMotion: 1000 + Drops: { + ARedRose: 500 + ARedRose: 100 + ARedRose: 50 + } +}, { Id: 1100 SpriteName: "PoisonSkull" diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf index 6c60c207..8e395099 100644 --- a/db/re/mob_skill_db.conf +++ b/db/re/mob_skill_db.conf @@ -220,7 +220,7 @@ mob_skill_db:( SkillTarget: "MST_SELF" CastCondition: "MSC_ALWAYS" ConditionData: 15 - val0: 1029 + val0: 1058 } } PoisonSkull: { diff --git a/db/re/mob_skill_db.txt b/db/re/mob_skill_db.txt index 1af2555e..4af6834b 100644 --- a/db/re/mob_skill_db.txt +++ b/db/re/mob_skill_db.txt @@ -70,5 +70,5 @@ 1016,Tipiou@NPC_SUMMONSLAVE,idle,196,2,7000,700,10000,no,self,slavele,4,1002,,,,,, 1024,Green Slime@NPC_SUMMONMONSTER,dead,209,2,10000,0,0,no,self,always,2,1025,,,,,, 1029,Bee@NPC_POISON,attack,176,20,1000,0,500,yes,anytarget,always,0,0,10,,,,, -1034,PinkFlower@NPC_SUMMONSLAVE,any,196,1,2000,1000,10000,no,self,slavelt,4,1029,,,,,, +1034,PinkFlower@NPC_SUMMONSLAVE,any,196,1,2000,1000,10000,no,self,slavelt,4,1058,,,,,, 1100,PoisonSkull@NPC_POISON,attack,176,20,2500,0,100,yes,target,always,0,,,,,,, diff --git a/maps/re/001-1.mcache b/maps/re/001-1.mcache index 81abdd29..7795236e 100644 Binary files a/maps/re/001-1.mcache and b/maps/re/001-1.mcache differ diff --git a/maps/re/008-2-17.mcache b/maps/re/008-2-17.mcache index 24999eff..29b25a3b 100644 Binary files a/maps/re/008-2-17.mcache and b/maps/re/008-2-17.mcache differ diff --git a/maps/re/008-2-19.mcache b/maps/re/008-2-19.mcache index b58aa4b7..7f97f4d9 100644 Binary files a/maps/re/008-2-19.mcache and b/maps/re/008-2-19.mcache differ diff --git a/maps/re/008-2-23.mcache b/maps/re/008-2-23.mcache index 2dcc5c43..0b25fe83 100644 Binary files a/maps/re/008-2-23.mcache and b/maps/re/008-2-23.mcache differ diff --git a/maps/re/008-3-0.mcache b/maps/re/008-3-0.mcache index d39f9fae..9e1e9179 100644 Binary files a/maps/re/008-3-0.mcache and b/maps/re/008-3-0.mcache differ diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt index 1b748d55..d8a08d54 100644 --- a/npc/001-1/_import.txt +++ b/npc/001-1/_import.txt @@ -30,6 +30,7 @@ "npc/001-1/qonan.txt", "npc/001-1/qpid.txt", "npc/001-1/rowboat.txt", +"npc/001-1/rowboathelper.txt", "npc/001-1/rumly.txt", "npc/001-1/salem.txt", "npc/001-1/shop.txt", diff --git a/npc/001-1/rowboat.txt b/npc/001-1/rowboat.txt index 8682ba0e..a5e158d3 100644 --- a/npc/001-1/rowboat.txt +++ b/npc/001-1/rowboat.txt @@ -1,20 +1,48 @@ // Evol scripts. // Author: -// Micksha +// Micksha, Toams // Description: // The rowboat, picking up the player on small beach in order to bring it to Koga. -// THIS IS A PLACEHOLDER! +// TODO: +// Check if the player who wants to enter the boat is the same as the one who called for the boat. +// Make the rowboat move back to the cave if the player doesnt enter in time. -001-1,203,64,0 script Rowboat NPC_ROWBOAT_STAND_WE,{ - speech +001-1,193,26,0 script #Rowboat NPC_ROWBOAT_STAND_WE,{ + + + speech S_LAST_BLANK_LINE | S_LAST_NEXT, l("Oh, hi."), - l("In case you don't have a commendatory letter from you-know-whom, I am just sitting here and observe the whales."); - l("Perhaps, and only perhaps, if you bring me the latter, I can bring you to a ship that will perhaps, and only perhaps, be able to bring you to Woodland."); + l("In case you don't have a commendatory letter from you-know-whom, I am just sitting here and observe the whales."), + l("Perhaps, and only perhaps, if you bring me the latter, I can bring you to a ship that will perhaps, and only perhaps, be able to bring you to Woodland."), + l("Do you have this commendatory letter?"); + closeclientdialog(); + if (askyesno() == 1) { + slide_or_warp("001-1", 204, 62); + movenpc("#Rowboat", 193, 26); + setmount 1; close; + } + +OnMoveToBeach: +firstmove; +end; + +OnTimer1000: + dographmovestep; OnInit: .sex = G_MALE; .distance = 3; - end; + .speed = 175; + + initmovegraph "Cave", 193, 26, + "CP1", 202, 27, + "CP2", 213, 58, + "Beach", 203, 64; + + setmovegraphcmd "Cave", "CP1", 1, "dir 4", + "CP1", "CP2", 1, "dir 4", + "CP2", "Beach", 1, "dir 4"; + initnpctimer; } diff --git a/npc/001-1/rowboathelper.txt b/npc/001-1/rowboathelper.txt new file mode 100644 index 00000000..8e16ee8b --- /dev/null +++ b/npc/001-1/rowboathelper.txt @@ -0,0 +1,55 @@ +// Evol scripts. +// Author: +// Toams +// Description: +// helper scripts for rowboat usage +// TODO: +// Check if mona's quest is done before being able to call the boat + +// calling the Rowboat +001-1,200,60,0 script Curious Hole NPC_NO_SPRITE,{ + +narrator(S_LAST_BLANK_LINE | S_LAST_NEXT, + l("You see a curious hole behind some rocks"), + l("'Hey anyone there?'"), + l("..."), + l("Altough you can't get rid of the feeling someone is listening on the other side, you don't get any replies"), + l("Now if only these lazy developers would write the missing parts of mona's quest so you would know the needed password."), + l("So for now just call the boat?")); + closeclientdialog(); + if (askyesno() == 1) { + doevent("#Rowboat::OnMoveToBeach"); + close; + } + +// Make sure to unmount the boat when player dies +OnPCDieEvent: + setmount 0; + +OnInit: + .distance = 1; +} + + +//unmounting the rowboat +001-1,202,62,0 script unmountrowboat NPC_HIDDEN,1,1,{ + +function UnMount { + narrator(S_LAST_BLANK_LINE | S_LAST_NEXT, + l("Do you want to leave the boat?")); + closeclientdialog(); + if (askyesno() == 1) { + slide_or_warp("001-1", 199, 62); + setmount 0; + close; + } +} + +OnTouch: + UnMount; + end; + +OnInit: + .sex = G_OTHER; + .distance = 1; +} diff --git a/npc/001-3-0/_import.txt b/npc/001-3-0/_import.txt index a4262ee3..5ead6439 100644 --- a/npc/001-3-0/_import.txt +++ b/npc/001-3-0/_import.txt @@ -1,6 +1,5 @@ // Map 001-3-0: Sewer // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/001-3-0/mundane.txt", "npc/001-3-0/_mobs.txt", "npc/001-3-0/_warps.txt", "npc/001-3-0/mundane.txt", diff --git a/npc/001-3-0/_warps.txt b/npc/001-3-0/_warps.txt index d192e4ef..65b56ff5 100644 --- a/npc/001-3-0/_warps.txt +++ b/npc/001-3-0/_warps.txt @@ -3,6 +3,6 @@ 001-3-0,196,35,0 warp #001-3-0_196_35 0,0,001-1,197,35 001-3-0,172,41,0 warp #001-3-0_172_41 0,0,001-3-1,34,58 001-3-0,162,40,0 warp #001-3-0_162_40 0,0,001-3-1,23,57 -001-3-0,198,60,0 warp #001-3-0_198_60 0,0,001-1,199,61 +001-3-0,198,61,0 warp #001-3-0_198_61 0,0,001-1,199,61 001-3-0,152,55,0 warp #001-3-0_152_55 0,0,001-1,152,51 001-3-0,85,130,0 warp #001-3-0_85_130 0,0,001-1,86,130 diff --git a/npc/008-1-1/_import.txt b/npc/008-1-1/_import.txt index b6807450..be748cf8 100644 --- a/npc/008-1-1/_import.txt +++ b/npc/008-1-1/_import.txt @@ -2,4 +2,5 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/008-1-1/_mobs.txt", "npc/008-1-1/_warps.txt", +"npc/008-1-1/galimatia.txt", "npc/008-1-1/koga.txt", diff --git a/npc/008-1-1/galimatia.txt b/npc/008-1-1/galimatia.txt new file mode 100644 index 00000000..a917397d --- /dev/null +++ b/npc/008-1-1/galimatia.txt @@ -0,0 +1,20 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Galmatia the beekeeper. +// THIS IS A PLACEHOLDER! + +008-1-1,113,59,0 script Galimatia NPC_GALIMATIA,{ + speech + l("Hello."), + l("If only someone could help me to make my flowers bloom again."), + l("I just dont know what to do. Perhaps all gets better when I stay here, whining and waiting. Please, leave me alone."); + + close; + +OnInit: + .sex = G_FEMALE; + .distance = 2; + end; +} diff --git a/npc/008-1/_import.txt b/npc/008-1/_import.txt index 31bb5966..96d03c46 100644 --- a/npc/008-1/_import.txt +++ b/npc/008-1/_import.txt @@ -4,6 +4,7 @@ "npc/008-1/_warps.txt", "npc/008-1/auldsbel.txt", "npc/008-1/banu.txt", +"npc/008-1/blossom.txt", "npc/008-1/confused-tree.txt", "npc/008-1/hinnak.txt", "npc/008-1/jack.txt", @@ -14,6 +15,7 @@ "npc/008-1/old-woman.txt", "npc/008-1/oscar.txt", "npc/008-1/sabine.txt", +"npc/008-1/shop.txt", "npc/008-1/snarfles.txt", "npc/008-1/soul-menhir.txt", "npc/008-1/voltain.txt", diff --git a/npc/008-1/blossom.txt b/npc/008-1/blossom.txt new file mode 100644 index 00000000..8cbae406 --- /dev/null +++ b/npc/008-1/blossom.txt @@ -0,0 +1,39 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Blossom the flower-seller girl. +// THIS IS A PLACEHOLDER! + +008-1,198,138,0 script Blossom#008-1 NPC_BLOSSOM,{ + speech + l("Hi, my name is Blossom."), + l("Strange, it seems I became younger lately."), + l("Are you in need of some flowers?"); + + switch (select(l("I love flowers! What do you have for sale?"), + l("Not now, thank you."), + l("Dont you know something about fertility? I heard rumors."))) + { + case 1: + closeclientdialog; + shop "#Invisible008-1"; + close; + case 2: + speech S_FIRST_BLANK_LINE, + l("Oh, ok. Come back later if you need something."); + close; + case 3: + speech S_FIRST_BLANK_LINE, + l("I heard something too. A girl named Galimatia seems to need help. If only those lazy developers could tell her what she needs."); + close; + } + + + close; + +OnInit: + .sex = G_FEMALE; + .distance = 2; + end; +} diff --git a/npc/008-1/shop.txt b/npc/008-1/shop.txt new file mode 100644 index 00000000..838062b6 --- /dev/null +++ b/npc/008-1/shop.txt @@ -0,0 +1,55 @@ +// Evol scripts. +// Authors: +// 4144 +// Micksha +// Reid +// toams +// Description: +// Blossom flower shop. + +008-1,201,136,0 trader #Invisible008-1 NPC_HIDDEN,{ + +OnInit: + tradertype(NST_MARKET); + + sellitem ARedRose, -1, 50; + sellitem AWhiteRose, -1, 50; + sellitem AYellowRose, -1, 50; + sellitem ABlueRose, -1, 20; + sellitem ARedTulip, -1, 50; + sellitem AWhiteTulip, -1, 50; + sellitem AYellowTulip, -1, 50; + sellitem ABlueTulip, -1, 20; + + .sex = G_OTHER; + .distance = 10; + end; + +OnClock0000: + restoreshopitem ARedRose, 10; + restoreshopitem AWhiteRose, 10; + restoreshopitem AYellowRose, 10; + restoreshopitem ABlueRose, 5; + restoreshopitem ARedTulip, 10; + restoreshopitem AWhiteTulip, 10; + restoreshopitem AYellowTulip, 10; + restoreshopitem ABlueTulip, 5; +OnClock0800: + restoreshopitem ARedRose, 10; + restoreshopitem AWhiteRose, 10; + restoreshopitem AYellowRose, 10; + restoreshopitem ABlueRose, 5; + restoreshopitem ARedTulip, 10; + restoreshopitem AWhiteTulip, 10; + restoreshopitem AYellowTulip, 10; + restoreshopitem ABlueTulip, 5; +OnClock1600: + restoreshopitem ARedRose, 10; + restoreshopitem AWhiteRose, 10; + restoreshopitem AYellowRose, 10; + restoreshopitem ABlueRose, 5; + restoreshopitem ARedTulip, 10; + restoreshopitem AWhiteTulip, 10; + restoreshopitem AYellowTulip, 10; + restoreshopitem ABlueTulip, 5; +} diff --git a/npc/008-2-2/barron.txt b/npc/008-2-2/barron.txt index c64efa40..3eb3baab 100644 --- a/npc/008-2-2/barron.txt +++ b/npc/008-2-2/barron.txt @@ -1,6 +1,7 @@ // Evol scripts. // Author: // Micksha +// toams // Description: // Barron, the bartender of the Rusty Pick. diff --git a/npc/008-2-2/melania.txt b/npc/008-2-2/melania.txt index 52efda05..9d9473f2 100644 --- a/npc/008-2-2/melania.txt +++ b/npc/008-2-2/melania.txt @@ -7,7 +7,7 @@ 008-2-2,28,27,0 script Melania NPC_AIRLIA,{ speech - l("Hello Sir."), + lg("Hello Sir.","Hello Miss."), l("Welcome to the Rusty Pick. Sorry, we have no room left today."), l("One advice: Don't take the things those drinkers say too serious. They are sitting here and drinking all day."), l("I wish you a beautiful day."); diff --git a/npc/008-2-2/melinda.txt b/npc/008-2-2/melinda.txt index a418b4e2..09fd9ff5 100644 --- a/npc/008-2-2/melinda.txt +++ b/npc/008-2-2/melinda.txt @@ -1,4 +1,3 @@ - // Evol scripts. // Authors: // Toams @@ -23,7 +22,17 @@ function StartConversation { @Hurns_Rusty_Pick_WaitressTick = .@tick; } } - + +function face_to_PC { + getmapxy(.@map$, .@cx, .@cy, 0); + @Melinda_ols_dir = .dir; + npc_turntoxy(.@cx, .@cy); + + return; + } + +npc_pausemove; +face_to_PC; mes ""; mesn; mesq l("Hi, sweetie! Want a fresh beer for 90 Florin?"); @@ -97,6 +106,7 @@ L_No: L_Close: initnpctimer; + npc_resumemove; close; L_TooMany: diff --git a/npc/008-2-2/shop.txt b/npc/008-2-2/shop.txt index 861843f7..8cd55f83 100644 --- a/npc/008-2-2/shop.txt +++ b/npc/008-2-2/shop.txt @@ -2,6 +2,7 @@ // Authors: // 4144 // Reid +// toams // Description: // Inn hidden shop. -- cgit v1.2.3-60-g2f50