diff options
| -rw-r--r-- | db/constants.conf | 1 | ||||
| -rw-r--r-- | db/re/item_db.conf | 18 | ||||
| -rw-r--r-- | maps/re/008-1-1.mcache | bin | 2001 -> 358 bytes | |||
| -rw-r--r-- | npc/008-1-1/_import.txt | 1 | ||||
| -rw-r--r-- | npc/008-1-1/_warps.txt | 3 | ||||
| -rw-r--r-- | npc/008-1/_warps.txt | 1 | ||||
| -rw-r--r-- | npc/008-2-2/_import.txt | 1 | ||||
| -rw-r--r-- | npc/008-2-2/melinda.txt | 22 |
8 files changed, 33 insertions, 14 deletions
diff --git a/db/constants.conf b/db/constants.conf index c29903db..7b38651b 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -4078,6 +4078,7 @@ constants_db: { NPC_DEVIS_ARTIS: 448 NPC_MOUBOO: 449 NPC_MONA: 450 + NPC_MELINDA: 451 NPC_TEST1: 800 NPC_PLAYER: 801 diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 6d722276..7428287d 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -2656,8 +2656,8 @@ item_db: ( Buy: 10000 Sell: 400 Weight: 50 - Atk: 0 - Matk: 0 + Atk: 5 + Matk: 25 Def: 0 Range: 0 Slots: 1 @@ -2667,7 +2667,7 @@ item_db: ( Gender: "SEX_ANY" Loc: "EQP_ACC_L" WeaponLv: 0 - EquipLv: 1 + EquipLv: 10 Refine: false ViewSprite: 1000 BindOnEquip: false @@ -4484,7 +4484,7 @@ item_db: ( bonus bLuk, 2; bonus bDex, -1; "> - Loc: "EQP_ACC" + Loc: ["EQP_ACC_L"] }, { Id: 5029 @@ -4498,7 +4498,7 @@ item_db: ( bonus bStr, 2; bonus bAgi, -1; "> - Loc: "EQP_ACC" + Loc: ["EQP_ACC_L"] }, { Id: 5030 @@ -4512,7 +4512,7 @@ item_db: ( bonus bDex, 2; bonus bVit, -1; "> - Loc: "EQP_ACC" + Loc: ["EQP_ACC_L"] }, { Id: 5031 @@ -4526,7 +4526,7 @@ item_db: ( bonus bInt, 2; bonus bVit, -1; "> - Loc: "EQP_ACC" + Loc: ["EQP_ACC_L"] }, { Id: 5032 @@ -4540,7 +4540,7 @@ item_db: ( bonus bVit, 2; bonus bLuk, -1; "> - Loc: "EQP_ACC" + Loc: ["EQP_ACC_L"] }, { Id: 5033 @@ -4554,7 +4554,7 @@ item_db: ( bonus bAgi, 2; bonus bStr, -1; "> - Loc: "EQP_ACC" + Loc: ["EQP_ACC_L"] }, { Id: 6000 diff --git a/maps/re/008-1-1.mcache b/maps/re/008-1-1.mcache Binary files differindex 757d18ee..6365fa18 100644 --- a/maps/re/008-1-1.mcache +++ b/maps/re/008-1-1.mcache diff --git a/npc/008-1-1/_import.txt b/npc/008-1-1/_import.txt index ea6fd468..7063c99e 100644 --- a/npc/008-1-1/_import.txt +++ b/npc/008-1-1/_import.txt @@ -1,3 +1,2 @@ // Map 008-1-1: Woodland // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/008-1-1/_warps.txt", diff --git a/npc/008-1-1/_warps.txt b/npc/008-1-1/_warps.txt deleted file mode 100644 index 8dc1e0b5..00000000 --- a/npc/008-1-1/_warps.txt +++ /dev/null @@ -1,3 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-1-1: Woodland warps -008-1-1,247,85,0 warp #008-1-1_247_85 0,1,008-1,21,85 diff --git a/npc/008-1/_warps.txt b/npc/008-1/_warps.txt index 46e9891d..ab1728ed 100644 --- a/npc/008-1/_warps.txt +++ b/npc/008-1/_warps.txt @@ -24,4 +24,3 @@ 008-1,257,130,0 warp #008-1_257_130 0,0,008-2-28,25,31 008-1,233,131,0 warp #008-1_233_131 0,0,008-2-29,36,24 008-1,287,133,0 warp #008-1_287_133 0,0,008-2-30,52,39 -008-1,20,85,0 warp #008-1_20_85 0,1,008-1-1,246,85 diff --git a/npc/008-2-2/_import.txt b/npc/008-2-2/_import.txt index 5a896da0..f93e2ae3 100644 --- a/npc/008-2-2/_import.txt +++ b/npc/008-2-2/_import.txt @@ -2,3 +2,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/008-2-2/_warps.txt", "npc/008-2-2/mapflags.txt", +"npc/008-2-2/melinda.txt", diff --git a/npc/008-2-2/melinda.txt b/npc/008-2-2/melinda.txt new file mode 100644 index 00000000..445cfeae --- /dev/null +++ b/npc/008-2-2/melinda.txt @@ -0,0 +1,22 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Melinda, waitress in Hurns` Rusty Pick. + +008-2-2,40,29,0 script Melinda#008-2-2 NPC_MELINDA,1,1,{ + + speech + l("Oh hey!"), + l("I would like to serve you a beer or a sandwich, or even a shot (alcohol is bad, remember)."), + l("But I am afraid we need Tomminator to teach me this."), + lg("So, see you later."); + + close; + +OnInit: + .sex = G_FEMALE; + .distance = 2; + end; +} + |