diff options
| -rwxr-xr-x | char-server | bin | 2044416 -> 2044416 bytes | |||
| -rw-r--r-- | db/pre-re/item_db.conf | 43 | ||||
| -rw-r--r-- | db/pre-re/item_group.conf | 23 | ||||
| -rw-r--r-- | db/pre-re/pet_db.conf | 4 | ||||
| -rwxr-xr-x | login-server | bin | 1104736 -> 1104736 bytes | |||
| -rwxr-xr-x | map-server | bin | 12529736 -> 12529488 bytes | |||
| -rw-r--r-- | npc/functions/main.txt | 10 |
7 files changed, 45 insertions, 35 deletions
diff --git a/char-server b/char-server Binary files differindex 63a70f68..a7910aa9 100755 --- a/char-server +++ b/char-server diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index d8a41473..9c31d7a7 100644 --- a/db/pre-re/item_db.conf +++ b/db/pre-re/item_db.conf @@ -179,7 +179,7 @@ item_db: ( Refine: false ViewSprite: 529 BindOnEquip: false - Delay: 0 + Subtype: "A_ARROW" OnEquipScript: <" set @AmmoType, AMMO_BOW; callfunc "CheckAmmo"; @@ -204,7 +204,7 @@ item_db: ( Refine: false ViewSprite: 1 BindOnEquip: false - Delay: 0 + Subtype: "W_BOW" OnEquipScript: <" set @LauncherType, AMMO_BOW; callfunc "CheckLauncher"; @@ -562,6 +562,7 @@ item_db: ( Refine: false ViewSprite: 1 BindOnEquip: false + Subtype: "W_HUUMA" OnEquipScript: <" callfunc "UnreleasedItem"; "> @@ -920,7 +921,7 @@ item_db: ( Refine: false ViewSprite: 762 BindOnEquip: false - Delay: 0 + Subtype: "A_ARROW" OnEquipScript: <" bonus bCritical, 20; set @AmmoType, AMMO_BOW; @@ -1026,7 +1027,7 @@ item_db: ( Refine: false ViewSprite: 904 BindOnEquip: false - Delay: 0 + Subtype: "A_SHELL" OnEquipScript: <" set @AmmoType, AMMO_SLING; callfunc "CheckAmmo"; @@ -1049,9 +1050,8 @@ item_db: ( WeaponLv: 1 EquipLv: 1 Refine: false - ViewSprite: 1 BindOnEquip: false - Subtype: "W_FIST" + Subtype: "W_HUUMA" }, { Id: 1199 @@ -1069,7 +1069,7 @@ item_db: ( Refine: false ViewSprite: 1199 BindOnEquip: false - Delay: 0 + Subtype: "A_ARROW" OnEquipScript: <" set @AmmoType, AMMO_BOW; callfunc "CheckAmmo"; @@ -1158,7 +1158,7 @@ item_db: ( Refine: false ViewSprite: 1282 BindOnEquip: false - Delay: 0 + Subtype: "A_ARROW" OnEquipScript: <" bonus bCritical, 1; set @AmmoType, AMMO_BOW; @@ -1181,7 +1181,7 @@ item_db: ( Refine: false ViewSprite: 5260 BindOnEquip: false - Delay: 0 + Subtype: "A_SHELL" OnEquipScript: <" set @AmmoType, AMMO_XMAS; callfunc "CheckAmmo"; @@ -16842,4 +16842,29 @@ item_db: ( BindOnEquip: false Delay: 0 }, + +// +// Pets +{ + Id: 6000 + AegisName: "PiouEgg" + Name: "Piou Egg" + Type: "IT_PETEGG" + Buy: 30000 + Sell: 1000 + Weight: 300 + KeepAfterUse: true + Trade: { + partneroverride: true + notrade: true + nodrop: true + nogstorage: true + nomail: true + noauction: true + noselltonpc: true + } + Script: <" + bpet; + "> +}, ) diff --git a/db/pre-re/item_group.conf b/db/pre-re/item_group.conf index 1266d345..09f10ba0 100644 --- a/db/pre-re/item_group.conf +++ b/db/pre-re/item_group.conf @@ -18,26 +18,3 @@ ) */ -BasicSilkDyes: ( -) - -ExtendedSilkDyes: ( -) - -BasicCottonDyes: ( -) - -CrudeGems: ( -) - -Gems: ( - "Diamond", - "Ruby", - "Emerald", - "Sapphire", - "Topaz", - "Amethyst", -) - -Runestones: ( -) diff --git a/db/pre-re/pet_db.conf b/db/pre-re/pet_db.conf index 636512e6..42746ff6 100644 --- a/db/pre-re/pet_db.conf +++ b/db/pre-re/pet_db.conf @@ -74,9 +74,9 @@ pet_db:( Id: 1002 SpriteName: "Piou" Name: "Piou" - TamingItem: "PiouFeathers" + TamingItem: "Iten" EggItem: "PiouEgg" - FoodItem: "Piberries" + FoodItem: "Acorn" FoodEffectiveness: 80 HungerDelay: 60 Intimacy: { diff --git a/login-server b/login-server Binary files differBinary files differindex 2dfd50fc..936c73cd 100755 --- a/login-server +++ b/login-server diff --git a/npc/functions/main.txt b/npc/functions/main.txt index ab7dac8e..cb25afbe 100644 --- a/npc/functions/main.txt +++ b/npc/functions/main.txt @@ -557,7 +557,15 @@ function script if_then_else { function script misceffect { // or SELF + something - return specialeffect(getarg(0), AREA, getarg(1, strnpcinfo(0)); + return specialeffect(getarg(0), AREA, getarg(1, strnpcinfo(0))); +} + +function script fakenpcname { + if (getargcount() > 2) + setnpcdisplay(getarg(0), getarg(1), getarg(2)); + else + setnpcdisplay(getarg(0), getarg(1)); + return; } ////////////////////////////////////////////////////////////////////// |