* Added "Play with Baby Cats" to Malangdo quests.
* Updated quest_db with all remaining Malangdo entries. * Temporariliy added new coordinates to Warlock job quest to match new Morroc map. (tid:80650) * Fixed some misplaced 'close2' commands in El Dicastes quests (incl. bugreport:7431). * Moved equip index constants in pc.h so that equip_index no longer needs to updating. (follow-up r17221, Hercules ea42e92) * Minor changes to script_commands.txt. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17224 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
euphyy
parent
9b076614e1
commit
1acf0192fc
119
db/quest_db.txt
119
db/quest_db.txt
@ -40,7 +40,7 @@
|
||||
1149,0,0,0,0,0,0,0,"Help the poor cat"
|
||||
1150,0,0,0,0,0,0,0,"Help the poor cat"
|
||||
1151,0,0,0,0,0,0,0,"Help the poor cat"
|
||||
1152,86400,0,0,0,0,0,0,"Help the poor cat"
|
||||
1152,82800,0,0,0,0,0,0,"Help the poor cat"
|
||||
1153,0,0,0,0,0,0,0,"Help the poor cat"
|
||||
1154,0,2197,20,0,0,0,0,"Help the poor cat"
|
||||
1155,0,0,0,0,0,0,0,"Help the poor cat"
|
||||
@ -546,32 +546,42 @@
|
||||
5052,0,0,0,0,0,0,0,"Traditional Weapon"
|
||||
5053,0,0,0,0,0,0,0,"Traditional Weapon"
|
||||
5054,0,0,0,0,0,0,0,"Traditional Weapon"
|
||||
5058,0,0,0,0,0,0,0,"State of mind-(1)"
|
||||
5059,0,0,0,0,0,0,0,"State of mind-(1)"
|
||||
|
||||
5058,0,0,0,0,0,0,0,"The mood of the players-(1)"
|
||||
5059,0,0,0,0,0,0,0,"The mood of the players-(2)"
|
||||
5060,180,0,0,0,0,0,0,"Cat Shock"
|
||||
5061,0,0,0,0,0,0,0,"State of mind-(1)"
|
||||
5062,0,0,0,0,0,0,0,"State of mind-(1)"
|
||||
5063,0,0,0,0,0,0,0,"State of mind-(1)"
|
||||
5064,0,0,0,0,0,0,0,"State of mind-(1)"
|
||||
5065,0,0,0,0,0,0,0,"State of mind-(1)"
|
||||
5066,0,0,0,0,0,0,0,"State of mind-(1)"
|
||||
5067,0,0,0,0,0,0,0,"State of mind-(1)"
|
||||
5068,72000,0,0,0,0,0,0,"State of mind-(1)"
|
||||
5069,3600,0,0,0,0,0,0,"State of mind-(1)"
|
||||
5061,0,0,0,0,0,0,0,"Am I scared?"
|
||||
5062,0,0,0,0,0,0,0,"I met Eryu."
|
||||
5063,0,0,0,0,0,0,0,"I met Stew."
|
||||
5064,0,0,0,0,0,0,0,"I met Ketchup."
|
||||
5065,0,0,0,0,0,0,0,"I met Eff."
|
||||
5066,0,0,0,0,0,0,0,"Scary image-(1)"
|
||||
5067,0,0,0,0,0,0,0,"Scary image-(2)"
|
||||
5068,72000,0,0,0,0,0,0,"Collecting complaint"
|
||||
5069,3600,0,0,0,0,0,0,"Token of honor"
|
||||
5070,86400,0,0,0,0,0,0,"Rock Paper Scissors"
|
||||
5071,86400,0,0,0,0,0,0,"Chamchamcham"
|
||||
5072,86400,0,0,0,0,0,0,"Kkongnyangkkong"
|
||||
5073,86400,0,0,0,0,0,0,"Sub Quest Games"
|
||||
5074,0,0,0,0,0,0,0,"Sub Quest Games"
|
||||
5075,0,0,0,0,0,0,0,"Sub Quest Games"
|
||||
5076,0,1282,30,0,0,0,0,"Sub Quest Games"
|
||||
5077,0,1209,10,0,0,0,0,"Sub Quest Games"
|
||||
5078,0,1019,50,0,0,0,0,"Sub Quest Games"
|
||||
5079,0,0,0,0,0,0,0,"Sub Quest Games"
|
||||
5080,0,0,0,0,0,0,0,"Sub Quest Games"
|
||||
5081,0,0,0,0,0,0,0,"Sub Quest Games"
|
||||
5082,0,0,0,0,0,0,0,"Sub Quest Games"
|
||||
5091,0,0,0,0,0,0,0,"Malang Road"
|
||||
5073,86400,0,0,0,0,0,0,"Challenging of flag wave"
|
||||
5074,0,1158,30,0,0,0,0,"Cat's Meal"
|
||||
5075,0,1144,50,0,0,0,0,"Health food"
|
||||
5076,0,1282,30,0,0,0,0,"Enemies"
|
||||
5077,0,1209,10,0,0,0,0,"Reaction Training"
|
||||
5078,0,1019,50,0,0,0,0,"Light bird food"
|
||||
5079,0,0,0,0,0,0,0,"How to stabilize the mind"
|
||||
5080,0,0,0,0,0,0,0,"Lack of Snack"
|
||||
5081,0,0,0,0,0,0,0,"Banned foods"
|
||||
5082,0,0,0,0,0,0,0,"Cool food"
|
||||
5083,0,0,0,0,0,0,0,"Please come back Eryu-(1)"
|
||||
5084,0,0,0,0,0,0,0,"Please come back Eryu-(2)"
|
||||
5085,0,0,0,0,0,0,0,"Please come back Stew-(1)"
|
||||
5086,0,0,0,0,0,0,0,"Please come back Stew-(2)"
|
||||
5087,0,0,0,0,0,0,0,"Please come back Ketchup-(1)"
|
||||
5088,0,0,0,0,0,0,0,"Please come back Ketchup-(2)"
|
||||
5089,0,0,0,0,0,0,0,"Please come back Eff-(1)"
|
||||
5090,0,0,0,0,0,0,0,"Please come back Eff-(2)"
|
||||
5091,0,0,0,0,0,0,0,"Go Malangdo"
|
||||
|
||||
5092,0,0,0,0,0,0,0,"Unlocking the Ultimate Mediocrity"
|
||||
5093,0,0,0,0,0,0,0,"Unlocking the Ultimate Mediocrity"
|
||||
5094,0,1002,1000,0,0,0,0,"Unlocking the Ultimate Mediocrity"
|
||||
@ -581,6 +591,7 @@
|
||||
5098,0,0,0,0,0,0,0,"Unlocking the Ultimate Mediocrity"
|
||||
5099,0,0,0,0,0,0,0,"Unlocking the Ultimate Mediocrity"
|
||||
5100,0,0,0,0,0,0,0,"Unlocking the Ultimate Mediocrity"
|
||||
|
||||
5109,0,0,0,0,0,0,0,"Light but Unconfirmed Rumor"
|
||||
5110,0,0,0,0,0,0,0,"The Rumored Character"
|
||||
5111,0,0,0,0,0,0,0,"To the Lab..."
|
||||
@ -879,16 +890,33 @@
|
||||
7239,0,0,0,0,0,0,0,"Toren's Errands (Normal)"
|
||||
7240,0,0,0,0,0,0,0,"Strengthening Equipment"
|
||||
7241,86400,0,0,0,0,0,0,"Toren's Errands - Tomorrow"
|
||||
|
||||
7260,0,0,0,0,0,0,0,"Occurrence of insect origin"
|
||||
7242,0,0,0,0,0,0,0,"Play with the baby cat"
|
||||
7243,0,0,0,0,0,0,0,"Nyadventure-Duruduru Compass"
|
||||
7244,180,0,0,0,0,0,0,"Nyadventure-Duruduru Race"
|
||||
7245,180,0,0,0,0,0,0,"Nyadventure-Duruduru Race"
|
||||
7246,0,0,0,0,0,0,0,"Nyadventure-I'm coming now."
|
||||
7247,0,0,0,0,0,0,0,"Nyadventure-Stop the Bang!"
|
||||
//7248,0,0,0,0,0,0,0,""
|
||||
7249,86400,0,0,0,0,0,0,"Nyadventure-Bang! See you next time"
|
||||
7250,0,0,0,0,0,0,0,"Nyadventure-Hidden Treasure?"
|
||||
7251,0,0,0,0,0,0,0,"Nyadventure-The First piece of Painting"
|
||||
7252,0,0,0,0,0,0,0,"Nyadventure-The Second piece of Painting"
|
||||
7253,0,0,0,0,0,0,0,"Nyadventure-The Third piece of Painting"
|
||||
7254,0,0,0,0,0,0,0,"Nyadventure-The Fourth piece of Painting"
|
||||
7255,0,0,0,0,0,0,0,"Nyadventure-The Fifth piece of Painting"
|
||||
7256,0,0,0,0,0,0,0,"Nyadventure-The Sixth piece of Painting"
|
||||
7257,86400,0,0,0,0,0,0,"Nyadventure-Race, Come back tomorrow!"
|
||||
7258,0,0,0,0,0,0,0,"Nyadventure-Painting completed"
|
||||
7259,0,0,0,0,0,0,0,"Gift from the Mew Bravery Team"
|
||||
7260,0,0,0,0,0,0,0,"The origin of Bugs"
|
||||
7261,0,0,0,0,0,0,0,"Cat Biscuits - Table"
|
||||
7262,0,0,0,0,0,0,0,"Cat Biscuits - Mattress"
|
||||
7263,0,0,0,0,0,0,0,"Cat Biscuits - Grill"
|
||||
7264,0,0,0,0,0,0,0,"Cat Chef"
|
||||
7265,0,0,0,0,0,0,0,"Cat Chef Anger"
|
||||
7266,0,0,0,0,0,0,0,"Cat Chef Intentions"
|
||||
7267,86400,0,0,0,0,0,0,"Cleanyang's meow and appointment time"
|
||||
7268,0,0,0,0,0,0,0,"Find the cat biscuits!"
|
||||
7264,0,0,0,0,0,0,0,"To Chef Nyas"
|
||||
7265,0,0,0,0,0,0,0,"Rage of Chef Nyas"
|
||||
7266,0,0,0,0,0,0,0,"Declaration of Chef Nyas"
|
||||
7267,86400,0,0,0,0,0,0,"Appointed time with Cleanyang"
|
||||
7268,0,0,0,0,0,0,0,"Find the Cat's hard biscuits!"
|
||||
7269,0,0,0,0,0,0,0,"Cat Biscuits - Resting Place"
|
||||
7270,0,0,0,0,0,0,0,"Cat Biscuits - Sand"
|
||||
7271,0,0,0,0,0,0,0,"Cat Biscuits - Bottom of the Stairs"
|
||||
@ -896,7 +924,7 @@
|
||||
7273,0,0,0,0,0,0,0,"Cat Biscuits - Locker"
|
||||
7274,0,0,0,0,0,0,0,"Cat Biscuits - Foothold"
|
||||
7275,0,0,0,0,0,0,0,"Cat Biscuits - Sand"
|
||||
7276,86400,0,0,0,0,0,0,"Food delivery promise"
|
||||
7276,86400,0,0,0,0,0,0,"Promise to deliver more food"
|
||||
7281,0,0,0,0,0,0,0,"List of Errands"
|
||||
7282,0,0,0,0,0,0,0,"List of Errands"
|
||||
7283,0,0,0,0,0,0,0,"List of Errands"
|
||||
@ -1711,11 +1739,13 @@
|
||||
11236,0,0,0,0,0,0,0,"Repair of cracks"
|
||||
11237,0,0,0,0,0,0,0,"Repair of cracks"
|
||||
11238,0,0,0,0,0,0,0,"Malangdo Fruits"
|
||||
11239,86400,0,0,0,0,0,0,"Malangdo Fruits"
|
||||
11239,82800,0,0,0,0,0,0,"Malangdo Fruits"
|
||||
11240,0,0,0,0,0,0,0,"Repair of cracks"
|
||||
11241,0,0,0,0,0,0,0,"Repair of cracks"
|
||||
11242,0,0,0,0,0,0,0,"Repair of cracks"
|
||||
11243,86400,0,0,0,0,0,0,"Repair of cracks"
|
||||
11243,82800,0,0,0,0,0,0,"Repair of cracks"
|
||||
11244,0,0,0,0,0,0,0,"Soft Jelly"
|
||||
11245,82800,0,0,0,0,0,0,"Soft Jelly"
|
||||
|
||||
11284,0,0,0,0,0,0,0,"Nurse at Port Malaya-1"
|
||||
11285,0,0,0,0,0,0,0,"Nurse at Port Malaya-2"
|
||||
@ -1988,6 +2018,29 @@
|
||||
12252,0,0,0,0,0,0,0,"Missing Information on Tuale"
|
||||
12253,82800,0,0,0,0,0,0,"Missing Person Search Time Limit"
|
||||
|
||||
// Malangdo Culverts
|
||||
12254,3600,0,0,0,0,0,0,"Now it's cleaning"
|
||||
12255,0,2176,20,0,0,0,0,"Hunt deep sea crab"
|
||||
12256,0,2175,20,0,0,0,0,"Hunt deep sea squid"
|
||||
12257,0,2174,20,0,0,0,0,"Hunt Ancient crustacean"
|
||||
12258,0,2178,20,0,0,0,0,"Hunt deep sea shell"
|
||||
12259,0,2179,20,0,0,0,0,"Hunt ancient kukre"
|
||||
12260,0,2177,20,0,0,0,0,"Hunt deep sea conch"
|
||||
12261,0,2182,30,0,0,0,0,"Hunt deep sea horse"
|
||||
12262,0,2181,30,0,0,0,0,"Hunt ancient sword fish"
|
||||
12263,0,2180,30,0,0,0,0,"Hunt ancient sea god"
|
||||
12264,0,2183,30,0,0,0,0,"Hunt mutation anolian"
|
||||
12265,0,2184,30,0,0,0,0,"Hunt deep sea mermaid"
|
||||
12266,0,2185,30,0,0,0,0,"Hunt transformable kapha"
|
||||
12267,0,2188,1,0,0,0,0,"Hunt weird coelacanth"
|
||||
12268,0,2187,1,0,0,0,0,"Hunt dark coelacanth"
|
||||
12269,0,2190,1,0,0,0,0,"Hunt Cruel coelacanth"
|
||||
12270,0,2189,1,0,0,0,0,"Hunt mutation coelacanth"
|
||||
12271,82800,0,0,0,0,0,0,"In progress general culvert single day service"
|
||||
12272,82800,0,0,0,0,0,0,"In progress hard culvert single day service"
|
||||
12273,579600,0,0,0,0,0,0,"In progress general culvert weekly service"
|
||||
12274,579600,0,0,0,0,0,0,"In progress hard culvert weekly service"
|
||||
|
||||
12278,0,0,0,0,0,0,0,"Towards Bakonawa Lake..."
|
||||
12279,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
|
||||
|
||||
|
||||
@ -2450,19 +2450,19 @@ specified on the invoking character. If nothing is equipped there, it returns -1
|
||||
Valid equipment slots are:
|
||||
|
||||
EQI_HEAD_TOP (1) - Upper Headear
|
||||
EQI_ARMOR (2) - Armor (Where you keep your Jackets and Robes)
|
||||
EQI_HAND_L (3) - What is in your Left hand.
|
||||
EQI_HAND_R (4) - What is in your Right hand.
|
||||
EQI_GARMENT (5) - The garment slot (Mufflers, Hoods, Manteaus)
|
||||
EQI_SHOES (6) - What foot gear the player has on.
|
||||
EQI_ACC_L (7) - Accessory 1.
|
||||
EQI_ACC_R (8) - Accessory 2.
|
||||
EQI_HEAD_MID (9) - Middle Headgear (masks and glasses)
|
||||
EQI_ARMOR (2) - Armor (jackets, robes)
|
||||
EQI_HAND_L (3) - Left hand (weapons, shields)
|
||||
EQI_HAND_R (4) - Right hand (weapons)
|
||||
EQI_GARMENT (5) - Garment (mufflers, hoods, manteaus)
|
||||
EQI_SHOES (6) - Footgear (shoes, boots)
|
||||
EQI_ACC_L (7) - Accessory 1
|
||||
EQI_ACC_R (8) - Accessory 2
|
||||
EQI_HEAD_MID (9) - Middle Headgear (masks, glasses)
|
||||
EQI_HEAD_LOW (10) - Lower Headgear (beards, some masks)
|
||||
EQI_COSTUME_HEAD_LOW (11) - Lower Costume Headgear
|
||||
EQI_COSTUME_HEAD_MID (12) - Middle Costume Headgear
|
||||
EQI_COSTUME_HEAD_TOP (13) - Upper Costume Headgear
|
||||
EQI_COSTUME_GARMENT (14) - Costume Garment
|
||||
EQI_COSTUME_GARMENT (14) - Costume Garment
|
||||
|
||||
Notice that a few items occupy several equipment slots, and if the character is
|
||||
wearing such an item, 'getequipid' will return it's ID number for either slot.
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
//===== By: ==================================================
|
||||
//= Muad_Dib, Gepard & L0ne_W0lf
|
||||
//===== Current Version: =====================================
|
||||
//= 1.3
|
||||
//= 1.3a
|
||||
//===== Compatible With: =====================================
|
||||
//= rAthena SVN
|
||||
//===== Description: =========================================
|
||||
@ -14,12 +14,13 @@
|
||||
//= 1.1 Fixed some conversion mistakes, replaced numbers with
|
||||
//= constants, added item names in comments.
|
||||
//= 1.2 Fixed the problem where NPC are not enabled and chamber
|
||||
//= will never open for the second try or use.
|
||||
//= will never open for the second try or use.
|
||||
//= 1.2a Fixed a typo. [Euphy]
|
||||
//= 1.3 Updated script, optimized. [Euphy]
|
||||
//= 1.3a Added temporary coordinate fix #distorted_space_1-1. [Euphy]
|
||||
//============================================================
|
||||
|
||||
morocc,103,144,0 script #distorted_space_1 139,1,1,{
|
||||
- script #distorted_space_ -1,{
|
||||
OnTouch:
|
||||
if (job_wl > 1) {
|
||||
mes " - There is a strange distortion here - ";
|
||||
@ -65,7 +66,11 @@ OnTouch:
|
||||
}
|
||||
end;
|
||||
}
|
||||
splendide,141,284,0 duplicate(#distorted_space_1) #distorted_space_2 139,1,1
|
||||
morocc,103,144,0 duplicate(#distorted_space_) #distorted_space_1 139,1,1
|
||||
splendide,141,284,0 duplicate(#distorted_space_) #distorted_space_2 139,1,1
|
||||
|
||||
// This is a temporary fix until new official coordinates are found.
|
||||
morocc,98,144,0 duplicate(#distorted_space_) #distorted_space_1-1 139,1,1
|
||||
|
||||
function script F_Warlock {
|
||||
mes "[Assistant]";
|
||||
|
||||
@ -309,7 +309,7 @@ OnTouch:
|
||||
donpcevent "Suspicious Guy#ep133_::OnDisable";
|
||||
mes "The guy in all black disappeared suddenly.";
|
||||
mes "Who was that?";
|
||||
close2;
|
||||
close;
|
||||
}
|
||||
end;
|
||||
}
|
||||
@ -340,7 +340,7 @@ OnEnable:
|
||||
mes "[Capital City Guard]";
|
||||
mes "Access to the city is restricted from other races without permits.";
|
||||
mes "Please go back.";
|
||||
close2;
|
||||
close;
|
||||
}
|
||||
else if (ep13_3_invite == 5) {
|
||||
mes "[Capital City Guard]";
|
||||
@ -384,7 +384,7 @@ OnEnable:
|
||||
mes "[Capital City Guard]";
|
||||
mes "Unknown situation occurred. Case " + strnpcinfo(2);
|
||||
mes "Please inquiry with a GM.";
|
||||
close2;
|
||||
close;
|
||||
}
|
||||
dic_fild01,146,281,5 duplicate(Guard#ep133_11) Capital City Guard#1 492
|
||||
dic_fild01,153,281,3 duplicate(Guard#ep133_11) Capital City Guard#2 450
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
44
src/map/pc.h
44
src/map/pc.h
@ -24,6 +24,27 @@
|
||||
#define MAX_PC_SKILL_REQUIRE 5
|
||||
#define MAX_PC_FEELHATE 3
|
||||
|
||||
//Equip indexes constants. (eg: sd->equip_index[EQI_AMMO] returns the index
|
||||
//where the arrows are equipped)
|
||||
enum equip_index {
|
||||
EQI_ACC_L = 0,
|
||||
EQI_ACC_R,
|
||||
EQI_SHOES,
|
||||
EQI_GARMENT,
|
||||
EQI_HEAD_LOW,
|
||||
EQI_HEAD_MID,
|
||||
EQI_HEAD_TOP,
|
||||
EQI_ARMOR,
|
||||
EQI_HAND_L,
|
||||
EQI_HAND_R,
|
||||
EQI_COSTUME_TOP,
|
||||
EQI_COSTUME_MID,
|
||||
EQI_COSTUME_LOW,
|
||||
EQI_COSTUME_GARMENT,
|
||||
EQI_AMMO,
|
||||
EQI_MAX
|
||||
};
|
||||
|
||||
struct weapon_data {
|
||||
int atkmods[3];
|
||||
// all the variables except atkmods get zero'ed in each call of status_calc_pc
|
||||
@ -167,7 +188,7 @@ struct map_session_data {
|
||||
struct registry save_reg;
|
||||
|
||||
struct item_data* inventory_data[MAX_INVENTORY]; // direct pointers to itemdb entries (faster than doing item_id lookups)
|
||||
short equip_index[15];
|
||||
short equip_index[EQI_MAX];
|
||||
unsigned int weight,max_weight;
|
||||
int cart_weight,cart_num,cart_weight_max;
|
||||
int fd;
|
||||
@ -575,27 +596,6 @@ enum equip_pos {
|
||||
#define EQP_VISIBLE (EQP_HELM|EQP_GARMENT|EQP_COSTUME)
|
||||
#endif
|
||||
|
||||
//Equip indexes constants. (eg: sd->equip_index[EQI_AMMO] returns the index
|
||||
//where the arrows are equipped)
|
||||
enum equip_index {
|
||||
EQI_ACC_L = 0,
|
||||
EQI_ACC_R,
|
||||
EQI_SHOES,
|
||||
EQI_GARMENT,
|
||||
EQI_HEAD_LOW,
|
||||
EQI_HEAD_MID,
|
||||
EQI_HEAD_TOP,
|
||||
EQI_ARMOR,
|
||||
EQI_HAND_L,
|
||||
EQI_HAND_R,
|
||||
EQI_COSTUME_TOP,
|
||||
EQI_COSTUME_MID,
|
||||
EQI_COSTUME_LOW,
|
||||
EQI_COSTUME_GARMENT,
|
||||
EQI_AMMO,
|
||||
EQI_MAX
|
||||
};
|
||||
|
||||
#define pc_setdead(sd) ( (sd)->state.dead_sit = (sd)->vd.dead_sit = 1 )
|
||||
#define pc_setsit(sd) ( (sd)->state.dead_sit = (sd)->vd.dead_sit = 2 )
|
||||
#define pc_isdead(sd) ( (sd)->state.dead_sit == 1 )
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user