From dd770995e5e87a9c813761e66cb7254dfec3becc Mon Sep 17 00:00:00 2001 From: Zarbony Date: Sun, 5 Apr 2020 02:21:30 +0200 Subject: [PATCH 1/5] Added Warps to Lasagna --- npc/re/warps/cities/lasagna.txt | 57 +++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 npc/re/warps/cities/lasagna.txt diff --git a/npc/re/warps/cities/lasagna.txt b/npc/re/warps/cities/lasagna.txt new file mode 100644 index 00000000000..b386aabff94 --- /dev/null +++ b/npc/re/warps/cities/lasagna.txt @@ -0,0 +1,57 @@ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Zarbony +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Lasagna Warp Script +//================= Description =========================================== +//= Warp Points for Lasagna & Lasagna Boat +//================= Current Version ======================================= +//= 1.0 +//========================================================================= + + +lasagna,150,54,0 warp lasagna#lasa_fild01_1 2,2,lasa_fild01,131,378 +lasagna,327,51,0 warp lasagna#lasa_fild01_2 2,2,lasa_fild01,344,371 +lasagna,358,91,0 warp lasagna#lasa_fild02 2,2,lasa_fild02,20,98 +lasa_in01,159,61,0 warp lasa_in01#lasagna 1,1,lasagna,68,202 + +// Boat +conch_in,60,61,0 warp2 warp_conch_in#out 1,1,lasagna,206,323 +conch_in,51,60,0 warp2 warp_conch_in#A_B 1,1,conch_in,31,60 +conch_in,34,60,0 warp2 warp_conch_in#B_A 1,1,conch_in,53,59 +conch_in,63,53,0 warp2 warp_conch_in#C_D 1,1,conch_in,63,33 +conch_in,63,35,0 warp2 warp_conch_in#D_C 1,1,conch_in,64,55 +conch_in,64,66,0 warp2 warp_conch_in#E_F 1,1,conch_in,63,89 +conch_in,63,87,0 warp2 warp_conch_in#F_E 1,1,conch_in,63,64 +conch_in,101,53,0 warp2 warp_conch_in#G_H 1,1,conch_in,101,33 +conch_in,101,35,0 warp2 warp_conch_in#H_G 1,1,conch_in,102,55 +conch_in,101,66,0 warp2 warp_conch_in#I_J 1,1,conch_in,101,89 +conch_in,102,87,0 warp2 warp_conch_in#J_I 1,1,conch_in,101,64 +conch_in,137,53,0 warp2 warp_conch_in#K_L 1,1,conch_in,139,33 +conch_in,139,35,0 warp2 warp_conch_in#L_K 1,1,conch_in,138,55 +conch_in,137,66,0 warp2 warp_conch_in#M_N 1,1,conch_in,139,89 +conch_in,140,87,0 warp2 warp_conch_in#N_M 1,1,conch_in,137,64 +conch_in,142,60,0 warp2 warp_conch_in#O_P 1,1,conch_in,162,61 +conch_in,159,61,0 warp2 warp_conch_in#P_O 1,1,conch_in,140,59 From ee411e85f1997fc8d6b74cbfad28eb13fca675a9 Mon Sep 17 00:00:00 2001 From: Zarbony Date: Sun, 5 Apr 2020 02:22:38 +0200 Subject: [PATCH 2/5] Added Dungeon Warps to Lasagna Dungeon 01, 02 & 03 and Add Exit to Lasagna Fild 02 --- npc/re/warps/dungeons/lasa_dun.txt | 43 ++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 npc/re/warps/dungeons/lasa_dun.txt diff --git a/npc/re/warps/dungeons/lasa_dun.txt b/npc/re/warps/dungeons/lasa_dun.txt new file mode 100644 index 00000000000..740b00db508 --- /dev/null +++ b/npc/re/warps/dungeons/lasa_dun.txt @@ -0,0 +1,43 @@ +//================= Hercules Script ======================================= +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Zarbony +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Lasagna Dungeon Warp Script +//================= Description =========================================== +//= Warp Points for Lasagna Dungeon +//================= Current Version ======================================= +//= 1.0 +//========================================================================= + +lasa_dun_q,190,14,0 warp lasa_dun_q#lasa_dun01 1,1,lasa_dun01,152,98 + +lasa_dun01,18,143,0 warp lasa_dun01#lasa_fild02 1,1,lasa_fild02,344,243 +lasa_dun01,157,98,0 warp lasa_dun01#lasa_dun02 1,1,lasa_dun02,22,171 + +lasa_dun02,18,171,0 warp lasa_dun02#lasa_dun01 1,1,lasa_dun01,153,98 +lasa_dun02,146,58,0 warp lasa_dun02#lasa_dun03 1,1,lasa_dun03,190,18 + +lasa_dun03,190,15,0 warp lasa_dun03#lasa_dun02 1,1,lasa_dun02,146,54 From 886ce9a490ad5f25592b8a9ff427db3f37db6655 Mon Sep 17 00:00:00 2001 From: Zarbony Date: Sun, 5 Apr 2020 02:23:28 +0200 Subject: [PATCH 3/5] Added Warps to Lasagna Fild 01 & 02, Add Entrance to Lasagna Dungeon from Lasagna Fild 02 --- npc/re/warps/fields/lasa_fild.txt | 39 +++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 npc/re/warps/fields/lasa_fild.txt diff --git a/npc/re/warps/fields/lasa_fild.txt b/npc/re/warps/fields/lasa_fild.txt new file mode 100644 index 00000000000..1f4835f05ce --- /dev/null +++ b/npc/re/warps/fields/lasa_fild.txt @@ -0,0 +1,39 @@ +//================= Hercules Script ======================================= +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Zarbony +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Lasagna Fild Warp Script +//================= Description =========================================== +//= Warp Points for Lasagna Fild +//================= Current Version ======================================= +//= 1.0 +//========================================================================= + +lasa_fild01,134,381,0 warp lasa_fild01#lasagna_1 2,2,lasagna,153,58 +lasa_fild01,341,375,0 warp lasa_fild01#lasagna_2 2,2,lasagna,327,56 + +lasa_fild02,16,98,0 warp lasa_fild02#lasagna 2,2,lasagna,355,92 +lasa_fild02,348,244,0 warp lasa_fild02#lasa_dun01 1,1,lasa_dun01,24,143 From b9bcccf0e3296782b18ebce06aee41c50bb69fdf Mon Sep 17 00:00:00 2001 From: Zarbony Date: Sun, 5 Apr 2020 02:24:04 +0200 Subject: [PATCH 4/5] Preperation for Lasagna Mob Skills here only for Dr Big Eggring, there some missing data for the other Skills --- db/re/mob_skill_db.conf | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf index 4d06ebef458..e937ffc8c45 100644 --- a/db/re/mob_skill_db.conf +++ b/db/re/mob_skill_db.conf @@ -100663,5 +100663,29 @@ mob_skill_db:( val0: 2917 } } + DR_BIG_EGGRING: { + NPC_SUMMONSLAVE: { + SkillState: "MSS_BERSERK" + SkillLevel: 4 + Rate: 10000 + CastTime: 2000 + Delay: 10000 + SkillTarget: "MST_SELF" + CastCondition: "MSC_SLAVELE" + ConditionData: 3 + val0: 3508 + } + NPC_SUMMONSLAVE: { + SkillState: "MSS_IDLE" + SkillLevel: 4 + Rate: 10000 + CastTime: 2000 + Delay: 10000 + SkillTarget: "MST_SELF" + CastCondition: "MSC_SLAVELE" + ConditionData: 3 + val0: 3508 + } + } } ) From 7f520949880ed1b0b1aee856348e71a53d2abb52 Mon Sep 17 00:00:00 2001 From: Zarbony Date: Tue, 7 Apr 2020 23:20:35 +0200 Subject: [PATCH 5/5] Adding Lasagna Map to @go ACMD with Number 36, Insert into Mapindex and Insert an Entry in Alias "lasa" --- src/common/mapindex.h | 1 + src/map/atcommand.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/common/mapindex.h b/src/common/mapindex.h index 27cbc5e3742..4cfe498288e 100644 --- a/src/common/mapindex.h +++ b/src/common/mapindex.h @@ -74,6 +74,7 @@ struct DBMap; // common/db.h #define MAP_MALAYA "malaya" #define MAP_ECLAGE "eclage" #define MAP_ECLAGE_IN "ecl_in01" +#define MAP_LASAGNA "lasagna" #define mapindex_id2name(n) mapindex->id2name((n),__FILE__, __LINE__, __func__) #define mapindex_exists(n) ( mapindex->list[(n)].name[0] != '\0' ) diff --git a/src/map/atcommand.c b/src/map/atcommand.c index a9bbff7bd28..07cfa596beb 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -1988,6 +1988,7 @@ ACMD(go) { MAP_MALANGDO, 140, 114, 5 }, // 33 = Malangdo Island { MAP_MALAYA, 242, 211, 5 }, // 34 = Malaya Port { MAP_ECLAGE, 110, 39, 3 }, // 35 = Eclage + { MAP_LASAGNA, 193, 182, 3 }, // 36 = Lasagna }; memset(map_name, '\0', sizeof(map_name)); @@ -2048,6 +2049,9 @@ ACMD(go) } else if (strncmpi(map_name, "rael", 3) == 0) { // Original town name for 'rachel' town = 23; } + else if (strncmpi(map_name, "lasa", 3) == 0) { // Original town name for 'lasagna' + town = 36; + } } if (town >= 0 && town < ARRAYLENGTH(data)) {