From 49f15384104466c37115c88905ff77d2d4356994 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 26 Nov 2022 12:26:39 -0300 Subject: ScytheMob -> FlyingScythe --- world/map/db/const-aegis.txt | 6 +++--- world/map/db/mob_db.conf | 4 ++-- world/map/db/mob_db_80_99.txt | 2 +- world/map/npc/008-1/hinnak.txt | 18 +++++++++--------- world/map/npc/functions/evil_obelisk.txt | 2 +- world/map/npc/functions/mob_points.txt | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt index 3a969f88..e8b500b3 100644 --- a/world/map/db/const-aegis.txt +++ b/world/map/db/const-aegis.txt @@ -67,7 +67,7 @@ SimpleRing 4014 HeartNecklace 677 GuardianWings 5252 MageRing 5253 -ManaPearl 5269 +ManaPearl 5270 AssassinRing 5268 AssassinAmulet 5269 Boots 528 @@ -978,7 +978,7 @@ LeatherShield 603 BromenalShield 797 DragonShield 5285 PinkieScroll 6000 -DragonSword 589 +DragonSword 590 ImperialBow 609 Naftalin 5288 ArmorBreaker 5289 @@ -1087,7 +1087,7 @@ LadySkeleton 1044 Poltergeist 1047 GCMaggot 1059 VampireBat 1066 -ScytheMob 1069 +FlyingScythe 1069 BallLightning 1070 TheLost 1073 RedBone 1074 diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf index ec76c6be..c0a6664a 100644 --- a/world/map/db/mob_db.conf +++ b/world/map/db/mob_db.conf @@ -4771,8 +4771,8 @@ mob_db: ( }, { Id: 1069 - SpriteName: "ScytheMob" - Name: "Scythe" + SpriteName: "FlyingScythe" + Name: "Flying Scythe" Lv: 80 Hp: 3000 Sp: 0 diff --git a/world/map/db/mob_db_80_99.txt b/world/map/db/mob_db_80_99.txt index 4ddd6d5a..b22c1cf4 100644 --- a/world/map/db/mob_db_80_99.txt +++ b/world/map/db/mob_db_80_99.txt @@ -10,7 +10,7 @@ 1047, Poltergeist, Poltergeist, 90, 9000, 0, 4230, 1306, 3, 110, 150, 0, 15, 35, 0, 15, 15, 75, 50, 9, 10, 1, 0, 17, 137, 330, 740, 672, 400, 774, 1000, 703, 600, 703, 480, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 20 1059, GCMaggot, GCMaggot, 90, 2000, 0, 685, 102, 2, 60, 80, 2, 7, 10, 10, 2, 1, 22, 1, 2, 10, 1, 0, 21, 133, 1000, 1872, 672, 480, 727, 10000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 25 1066, VampireBat, VampireBat, 80, 800, 0, 245, 9, 1, 55, 150, 10, 8, 8, 8, 1, 4, 20, 4, 6, 10, 1, 3, 12, 129, 800, 1872, 672, 480, 501, 150, 518, 400, 533, 150, 521, 70, 522, 1, 5115, 3000, 754, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 -1069, ScytheMob, ScytheMob, 80, 3000, 0, 7042, 617, 1, 200, 350, 30, 10, 100, 250, 1, 1, 150, 90, 9, 10, 1, 0, 20, 133, 220, 700, 672, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +1069, FlyingScythe, FlyingScythe, 80, 3000, 0, 7042, 617, 1, 200, 350, 30, 10, 100, 250, 1, 1, 150, 90, 9, 10, 1, 0, 20, 133, 220, 700, 672, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1070, BallLightning, BallLightning, 80, 300, 0, 201, 1, 1, 5, 10, 40, 50, 1, 200, 1, 1, 1, 1, 9, 10, 1, 0, 27, 133, 110, 1500, 672, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1073, TheLost, TheLost, 83, 5000, 0, 8750, 2840, 5, 125, 150, 10, 60, 5, 40, 10, 70, 70, 40, 4, 10, 1, 1, 37, 173, 500, 2000, 672, 300, 5110, 500, 5110, 500, 631, 500, 566, 500, 778, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1074, RedBone, RedBone, 90, 8000, 0, 9750, 3434, 2, 100, 330, 24, 30, 35, 25, 3, 50, 80, 75, 2, 10, 1, 1, 17, 143, 340, 1800, 672, 950, 775, 75, 775, 115, 776, 135, 631, 4, 778, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20 diff --git a/world/map/npc/008-1/hinnak.txt b/world/map/npc/008-1/hinnak.txt index d16460c3..ffd1de1f 100644 --- a/world/map/npc/008-1/hinnak.txt +++ b/world/map/npc/008-1/hinnak.txt @@ -17,7 +17,7 @@ L_No_NohMask: if (@state == 1) goto L_Exchange; if (@state == 2) goto L_ThanksAgain; - if (getequipid(equip_head) == 751) goto L_Intro_Hat; + if (getequipid(equip_head) == PinkieHat) goto L_Intro_Hat; mes "[Farmer Hinnak]"; mes "\"Argh! I hate them! I @#$% hate them! I @#$% hate these @#$% pinkies!\""; @@ -66,7 +66,7 @@ L_Reward: goto L_Close; L_Exchange: - if (getequipid(equip_head) != 751) + if (getequipid(equip_head) != PinkieHat) goto L_Exchange_Start; mes "The farmer glares at your hat."; next; @@ -81,13 +81,13 @@ L_Exchange_Start: "Sure, here they are!", L_Exchange_Exchange; L_Exchange_Exchange: - if (countitem("PinkAntenna") < 10) + if (countitem(PinkAntenna) < 10) goto L_Exchange_Notenough; getinventorylist; - if (@inventorylist_count == 100 && countitem("PinkAntenna") > 10) + if (@inventorylist_count == 100 && countitem(PinkAntenna) > 10) goto L_Exchange_TooMany; - delitem "PinkAntenna", 10; - getitem "Scythe", 1; + delitem PinkAntenna, 10; + getitem Scythe, 1; set @state, 2; callsub S_Update_Mask; mes "[Farmer Hinnak]"; @@ -105,7 +105,7 @@ L_Exchange_TooMany: goto L_Close; L_ThanksAgain: - if (getequipid(equip_head) == 751) + if (getequipid(equip_head) == PinkieHat) goto L_ThanksHat; mes "[Farmer Hinnak]"; mes "\"Good to see you again, and thanks again for helping me with the pinkies!\""; @@ -147,9 +147,9 @@ L_Next2: "I don't have any.", L_NoBeer; L_GiveBeer: - if (countitem("Beer") < 1) + if (countitem(Beer) < 1) goto L_NoBeer; - delitem "Beer", 1; + delitem Beer, 1; mes "[Farmer Hinnak]"; mes "Hinnak takes a sip."; mes "\"Aaah! Nothing like a well-deserved beer after a long day of tending the crops!\""; diff --git a/world/map/npc/functions/evil_obelisk.txt b/world/map/npc/functions/evil_obelisk.txt index e2ba0bbe..34c917d5 100644 --- a/world/map/npc/functions/evil_obelisk.txt +++ b/world/map/npc/functions/evil_obelisk.txt @@ -78,7 +78,7 @@ L_GRAVEYARD2_1: if(@temp == 4) set @mob_id, Stalker; if(@temp == 5) - set @mob_id, Scythe; + set @mob_id, FlyingScythe; callsub S_Summon; goto L_GRAVEYARD2_1; diff --git a/world/map/npc/functions/mob_points.txt b/world/map/npc/functions/mob_points.txt index ecea5b82..9ac0e03e 100644 --- a/world/map/npc/functions/mob_points.txt +++ b/world/map/npc/functions/mob_points.txt @@ -74,7 +74,7 @@ function|script|MobPoints 30, // 1066 Vampire Bat 150, // 1067 Reaper2 100, // 1068 Reaper - 20, // 1069 Scythe + 20, // 1069 Flying Scythe 20, // 1070 Ball Lightning 60, // 1071 Ice Element 80, // 1072 Yeti -- cgit v1.2.3-60-g2f50