From 19758ee2206dd4d1183028e9f25c2b86f6716b73 Mon Sep 17 00:00:00 2001
From: malufett <malufett.eat.my.binaries@gmail.com>
Date: Fri, 29 Nov 2013 11:11:17 +0800
Subject: Update JOB_REBELLION 'job_db1.txt' to its official values and some
 mini adjustment.

Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
---
 conf/battle/battle.conf | 1 +
 conf/messages.conf      | 4 ++--
 db/re/job_db1.txt       | 5 +++--
 src/char/inter.c        | 5 ++++-
 src/map/pc.c            | 5 +++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/conf/battle/battle.conf b/conf/battle/battle.conf
index 70062a16e..5b72f5ff9 100644
--- a/conf/battle/battle.conf
+++ b/conf/battle/battle.conf
@@ -54,6 +54,7 @@ player_damage_delay_rate: 100
 undead_detect_type: 0
 
 // Does HP recover if hit by an attribute that's same as your own? (Note 1)
+// (Will not work in Renewal)
 attribute_recover: no
 
 // What is the minimum and maximum hitrate of normal attacks? 
diff --git a/conf/messages.conf b/conf/messages.conf
index aae0596af..ba63dc73a 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -621,7 +621,8 @@
 652: Expanded Super Baby
 653: Kagerou
 654: Oboro
-655: Unknown Job
+655: Rebellion
+656: Unknown Job
 
 // MvP Tomb
 // Added here so it can be easily translated
@@ -667,7 +668,6 @@
 691: Sura T
 692: Genetic T
 693: Shadow Chaser T
-694: Rebellion
 
 
 //------------------------------------
diff --git a/db/re/job_db1.txt b/db/re/job_db1.txt
index ff175592a..abc9d2bb8 100644
--- a/db/re/job_db1.txt
+++ b/db/re/job_db1.txt
@@ -52,7 +52,7 @@
 // Super Novice
 23,	20000,0    ,500  ,100  ,440  ,590  ,610  ,2000 ,2000 ,2000 ,540  ,2000 ,540  ,540  ,690  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,690  ,540  
 // Gunslinger
-24,	28000,88   ,0    ,450  ,540  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490  ,590  ,440  ,940  ,1040 ,2000 ,2000 ,600  
+24,	28000,88   ,0    ,450  ,540  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490  ,590  ,540  ,940  ,1040 ,2000 ,2000 ,600  
 // Ninja
 25,	26000,80   ,0    ,515  ,440  ,470  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590  ,2000 ,500  
 // Novice High
@@ -270,4 +270,5 @@
 // Oboro
 4212,	26000,80   ,  0  ,515  ,400  ,500  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 750 ,2000 ,500
 // Rebellion
-4215,	28000,88   ,  0  ,450  ,540  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490  ,590  ,440  ,940  ,1040 ,2000 ,2000 ,600  
+
+4215,	28000,88   ,  0  ,450  ,550  ,2000, 2000, 2000, 2000, 2000, 2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 520 , 620 , 570 ,970  ,1070 ,2000 ,2000 ,600
diff --git a/src/char/inter.c b/src/char/inter.c
index b213f1608..771b51602 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -341,8 +341,11 @@ const char* job_name(int class_) {
 		case JOB_OBORO:
 			return msg_txt(653 - JOB_KAGEROU+class_);
 
-		default:
+		case JOB_REBELLION:
 			return msg_txt(655);
+
+		default:
+			return msg_txt(656);
 	}
 }
 
diff --git a/src/map/pc.c b/src/map/pc.c
index 6120ba033..57433ea0d 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5759,11 +5759,12 @@ const char* job_name(int class_)
 	case JOB_KAGEROU:
 	case JOB_OBORO:
 		return msg_txt(653 - JOB_KAGEROU+class_);
+
 	case JOB_REBELLION:
-		return msg_txt(694);
+		return msg_txt(655);
 
 	default:
-		return msg_txt(655);
+		return msg_txt(656);
 	}
 }
 
-- 
cgit v1.2.3-60-g2f50