summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-02 00:56:15 +0000
committermasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-02 00:56:15 +0000
commit3c050fb20e6ef5329255b5600f3ce91c13928636 (patch)
tree030336977692b2816ad857c4285fd3ec59c83444
parent902ec73b47ca5a0521686be1e1fa2f08c075177d (diff)
downloadhercules-3c050fb20e6ef5329255b5600f3ce91c13928636.tar.gz
hercules-3c050fb20e6ef5329255b5600f3ce91c13928636.tar.bz2
hercules-3c050fb20e6ef5329255b5600f3ce91c13928636.tar.xz
hercules-3c050fb20e6ef5329255b5600f3ce91c13928636.zip
- Updated const.txt. bugreport:5177
- Fixed Rental NPC. bugreport:5178 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15351 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/const.txt100
-rw-r--r--npc/merchants/renters.txt6
2 files changed, 103 insertions, 3 deletions
diff --git a/db/const.txt b/db/const.txt
index 50232d074..82bd0ce87 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -96,6 +96,64 @@ Job_Star_Gladiator 4047
Job_Star_Gladiator2 4048
Job_Soul_Linker 4049
+Job_Rune_Knight 4054
+Job_Warlock 4055
+Job_Ranger 4056
+Job_Arch_Bishop 4057
+Job_Mechanic 4058
+Job_Guillotine_Cross 4059
+
+Job_Rune_Knight_T 4060
+Job_Warlock_T 4061
+Job_Ranger_T 4062
+Job_Arch_Bishop_T 4063
+Job_Mechanic_T 4064
+Job_Guillotine_Cross_T 4065
+
+Job_Royal_Guard 4066
+Job_Sorcerer 4067
+Job_Minstrel 4068
+Job_Wanderer 4069
+Job_Sura 4070
+Job_Genetic 4071
+Job_Shadow_Chaser 4072
+
+Job_Royal_Guard_T 4073
+Job_Sorcerer_T 4074
+Job_Minstrel_T 4075
+Job_Wanderer_T 4076
+Job_Sura_T 4077
+Job_Genetic_T 4078
+Job_Shadow_Chaser_T 4079
+
+Job_Rune_Knight2 4080
+Job_Rune_Knight_T2 4081
+Job_Royal_Guard2 4082
+Job_Royal_Guard_T2 4083
+Job_Ranger2 4084
+Job_Ranger_T2 4085
+Job_Mechanic2 4086
+Job_Mechanic_T2 4087
+
+Job_Baby_Rune 4096
+Job_Baby_Warlock 4097
+Job_Baby_Ranger 4098
+Job_Baby_Bishop 4099
+Job_Baby_Mechanic 4100
+Job_Baby_Cross 4101
+Job_Baby_Guard 4102
+Job_Baby_Sorcerer 4103
+Job_Baby_Minstrel 4104
+Job_Baby_Wanderer 4105
+Job_Baby_Sura 4106
+Job_Baby_Genetic 4107
+Job_Baby_Chaser 4108
+
+Job_Baby_Rune2 4109
+Job_Baby_Guard2 4110
+Job_Baby_Ranger2 4111
+Job_Baby_Mechanic2 4112
+
EAJL_2_1 0x100
EAJL_2_2 0x200
EAJL_2 0x300
@@ -180,6 +238,48 @@ EAJ_BABY_ALCHEMIST 0x2205
EAJ_BABY_ROGUE 0x2206
EAJ_BABY_SOUL_LINKER 0x2207
+EAJ_RUNE_KNIGHT 0x4101
+EAJ_WARLOCK 0x4102
+EAJ_RANGER 0x4103
+EAJ_ARCH_BISHOP 0x4104
+EAJ_MECHANIC 0x4105
+EAJ_GUILLOTINE_CROSS 0x4106
+
+EAJ_ROYAL_GUARD 0x4201
+EAJ_SORCERER 0x4202
+EAJ_MINSTRELWANDERER 0x4203
+EAJ_SURA 0x4204
+EAJ_GENETIC 0x4205
+EAJ_SHADOW_CHASER 0x4206
+
+EAJ_RUNE_KNIGHT_T 0x5101
+EAJ_WARLOCK_T 0x5102
+EAJ_RANGER_T 0x5103
+EAJ_ARCH_BISHOP_T 0x5104
+EAJ_MECHANIC_T 0x5105
+EAJ_GUILLOTINE_CROSS_T 0x5106
+
+EAJ_ROYAL_GUARD_T 0x5201
+EAJ_SORCERER_T 0x5202
+EAJ_MINSTRELWANDERER_T 0x5203
+EAJ_SURA_T 0x5204
+EAJ_GENETIC_T 0x5205
+EAJ_SHADOW_CHASER_T 0x5206
+
+EAJ_BABY_RUNE 0x6101
+EAJ_BABY_WARLOCK 0x6102
+EAJ_BABY_RANGER 0x6103
+EAJ_BABY_BISHOP 0x6104
+EAJ_BABY_MECHANIC 0x6105
+EAJ_BABY_CROSS 0x6106
+
+EAJ_BABY_GUARD 0x6201
+EAJ_BABY_SORCERER 0x6202
+EAJ_BABY_MINSTRELWANDERER 0x6203
+EAJ_BABY_SURA 0x6204
+EAJ_BABY_GENETIC 0x6205
+EAJ_BABY_CHASER 0x6206
+
Option_Wedding 0x1000
Option_Xmas 0x10000
Option_Summer 0x40000
diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt
index 5b2efc97a..317f27bca 100644
--- a/npc/merchants/renters.txt
+++ b/npc/merchants/renters.txt
@@ -206,7 +206,7 @@ hu_in01,381,304,5 script Falcon Breeder#hnt 105,{
/*
job3_rune01,88,62,5 script Dragon Breeder 105,{
mes "[Dragon Breeder]";
- if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_H || Class == Job_Baby_Rune) {
+ if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "Welcome. Would you like to rent a Dragon?";
next;
switch(select("Yes:No")) {
@@ -241,7 +241,7 @@ job3_rune01,88,62,5 script Dragon Breeder 105,{
// Dragon/Gryphon Master
prontera,130,213,5 script Riding Creature Master 105,{
mes "[Riding Creature Master]";
- if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_H || Class == Job_Baby_Rune) {
+ if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "Welcome. Would you like to rent a Dragon?";
next;
switch(select("Yes:No")) {
@@ -266,7 +266,7 @@ prontera,130,213,5 script Riding Creature Master 105,{
}
}
/*
- else if (Class == Job_Royal_Guard || Class == Job_Royal_Guard_H || Class == Job_Baby_Guard) {
+ else if (Class == Job_Royal_Guard || Class == Job_Royal_Guard_T || Class == Job_Baby_Guard) {
mes "Welcome. Would you like to rent a Gryphon?";
next;
switch(select("Yes:No")) {