Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Preperation for Implement Lasagna #2679

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Preperation for Implement Lasagna #2679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dd77099
Added Warps to Lasagna
Zarbony Apr 5, 2020
ee411e8
Added Dungeon Warps to Lasagna Dungeon 01, 02 & 03 and Add Exit to La…
Zarbony Apr 5, 2020
886ce9a
Added Warps to Lasagna Fild 01 & 02, Add Entrance to Lasagna Dungeon …
Zarbony Apr 5, 2020
b9bcccf
Preperation for Lasagna Mob Skills here only for Dr Big Eggring, ther…
Zarbony Apr 5, 2020
7f52094
Adding Lasagna Map to @go ACMD with Number 36, Insert into Mapindex a…
Zarbony Apr 7, 2020
b9bca8c
Merge pull request #1 from HerculesWS/master
Zarbony Jul 30, 2020
b60c5ea
Merge branch 'master' of https://github.com/Zarbony/Hercules into las…
Zarbony Jul 30, 2020
6fd80e0
Merge pull request #2 from HerculesWS/master
Zarbony Mar 17, 2021
c9d0109
Merge branch 'master' into lasagna
Zarbony Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions db/re/mob_skill_db.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100728,5 +100728,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
}
}
}
)
57 changes: 57 additions & 0 deletions npc/re/warps/cities/lasagna.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <http://www.gnu.org/licenses/>.
//=========================================================================
//= 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
43 changes: 43 additions & 0 deletions npc/re/warps/dungeons/lasa_dun.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <http://www.gnu.org/licenses/>.
//=========================================================================
//= 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
39 changes: 39 additions & 0 deletions npc/re/warps/fields/lasa_fild.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <http://www.gnu.org/licenses/>.
//=========================================================================
//= 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
1 change: 1 addition & 0 deletions src/common/mapindex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,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' )
Expand Down
4 changes: 4 additions & 0 deletions src/map/atcommand.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1975,6 +1975,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));
Expand Down Expand Up @@ -2035,6 +2036,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)) {
Expand Down