summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-06-19 19:07:12 -0300
committerJesusaves <cpntb1@ymail.com>2021-06-19 19:07:12 -0300
commit97fe707310f7858582a19d000c83563484048596 (patch)
treec36996d3cc1cedf978772f57271fdfa56e1bb2b6
parentb4be9224f1ed8e5751b7447198c984dc7da759ff (diff)
downloadserverdata-97fe707310f7858582a19d000c83563484048596.tar.gz
serverdata-97fe707310f7858582a19d000c83563484048596.tar.bz2
serverdata-97fe707310f7858582a19d000c83563484048596.tar.xz
serverdata-97fe707310f7858582a19d000c83563484048596.zip
Modify race constants to TMW Legacy race models
-rw-r--r--db/constants.conf22
-rw-r--r--db/job_db2.txt40
-rw-r--r--db/pre-re/job_db.conf46
-rw-r--r--db/pre-re/skill_tree.conf30
-rw-r--r--npc/048-2/sageNikolai.txt2
5 files changed, 27 insertions, 113 deletions
diff --git a/db/constants.conf b/db/constants.conf
index b2e6b20d..e61fa468 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -2896,25 +2896,19 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
G_OTHER: 3
comment__: "races"
- KaizeiTalpan: 0
- ArgaesTalpan: 1
- TonoriTalpan: 2
- CaveUkar: 3
- MountainUkar: 4
- SeaTritan: 5
- LakeTritan: 6
- LightRaijin: 7
- DarkRaijin: 8
- FireKralog: 9
- FrostKralog: 10
+ Talpan: 0
+ //Unused: 1
+ Tritan: 2
+ Ifriton: 3
+ Gispaan: 4
+ Sparron: 5
+ Skellie: 6
// DEPRECATED: Kept for compatibility
Human: 0
- Talpan: 0
Ukar: 3
- Tritan: 5
Raijin: 7
- Kralog: 9
+ Kralog: 8
comment__: "getraceflags"
GETRACE_RACE: 0
diff --git a/db/job_db2.txt b/db/job_db2.txt
index f4e8d006..52dc0798 100644
--- a/db/job_db2.txt
+++ b/db/job_db2.txt
@@ -16,49 +16,23 @@
//
// .:: HUMANS ::.
-// Kaizei Talpan
+// Talpan
0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
-// Argaes Talpan
+// Unused Talpan
1,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
-// Tonori Talpan
+// Tritan
2,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
-
-
-// .:: UKARS ::.
-// Cave Ukar
+// Ifriton
3,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
-// Mountain Ukar
+// Gispaan
4,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
-
-
-// .:: TRITANS ::.
-// Sea Tritan
+// Sparron
5,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
-// Lake Tritan
+// Skellie
6,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
-
-
-
-// .:: RAIJINS ::.
-// Light Raijin
-7,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
-
-// Dark Raijin
-8,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
-
-
-
-// .:: KRALOGS ::.
-// Fire Kralog
-9,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
-
-// Frost Kralog
-10,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
-
-
diff --git a/db/pre-re/job_db.conf b/db/pre-re/job_db.conf
index b6817940..98524555 100644
--- a/db/pre-re/job_db.conf
+++ b/db/pre-re/job_db.conf
@@ -101,71 +101,37 @@ Talpan: {
292, 294, 296, 298, 300, 302, 304, 306, 308, 310] // 141 - 150
}
-CaveUkar: {
+Tritan: {
BaseExpGroup: "EvolClasses"
JobExpGroup: "EvolClasses"
MoveSpeed: 150
Inherit: ( "Talpan" );
}
-FireKralog: {
+Ifriton: {
BaseExpGroup: "EvolClasses"
JobExpGroup: "EvolClasses"
MoveSpeed: 150
Inherit: ( "Talpan" );
}
-LightRaijin: {
+Gispaan: {
BaseExpGroup: "EvolClasses"
JobExpGroup: "EvolClasses"
MoveSpeed: 150
Inherit: ( "Talpan" );
}
-SeaTritan: {
+Sparron: {
BaseExpGroup: "EvolClasses"
JobExpGroup: "EvolClasses"
MoveSpeed: 150
Inherit: ( "Talpan" );
}
-FrostKralog: {
+Skellie: {
BaseExpGroup: "EvolClasses"
JobExpGroup: "EvolClasses"
MoveSpeed: 150
- Inherit: ( "FireKralog" ); // Base job from which this job will inherit its max weight, base ASPD set and HP/SP table.
+ Inherit: ( "Talpan" ); // Base job from which this job will inherit its max weight, base ASPD set and HP/SP table.
}
-DarkRaijin: {
- BaseExpGroup: "EvolClasses"
- JobExpGroup: "EvolClasses"
- MoveSpeed: 150
- Inherit: ( "LightRaijin" ); // Base job from which this job will inherit its max weight, base ASPD set and HP/SP table.
-}
-
-ArgaesTalpan: {
- BaseExpGroup: "EvolClasses"
- JobExpGroup: "EvolClasses"
- MoveSpeed: 150
- Inherit: ( "Talpan" );
-}
-
-TonoriTalpan: {
- BaseExpGroup: "EvolClasses"
- JobExpGroup: "EvolClasses"
- MoveSpeed: 150
- Inherit: ( "Talpan" );
-}
-
-LakeTritan: {
- BaseExpGroup: "EvolClasses"
- JobExpGroup: "EvolClasses"
- MoveSpeed: 150
- Inherit: ( "SeaTritan" );
-}
-
-MountainUkar: {
- BaseExpGroup: "EvolClasses"
- JobExpGroup: "EvolClasses"
- MoveSpeed: 150
- Inherit: ( "CaveUkar" );
-}
diff --git a/db/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf
index 21c83a65..69ef3502 100644
--- a/db/pre-re/skill_tree.conf
+++ b/db/pre-re/skill_tree.conf
@@ -108,43 +108,23 @@ Talpan: {
}
}
-CaveUkar: {
+Tritan: {
inherit: ( "Talpan" );
}
-FireKralog: {
+Ifriton: {
inherit: ( "Talpan" );
}
-LightRaijin: {
+Gispaan: {
inherit: ( "Talpan" );
}
-SeaTritan: {
+Sparron: {
inherit: ( "Talpan" );
}
-
-FrostKralog: {
- inherit: ( "FireKralog" );
-}
-
-DarkRaijin: {
- inherit: ( "LightRaijin" );
-}
-
-LakeTritan: {
- inherit: ( "SeaTritan" );
-}
-
-MountainUkar: {
- inherit: ( "CaveUkar" );
-}
-
-ArgaesTalpan: {
+Skellie: {
inherit: ( "Talpan" );
}
-TonoriTalpan: {
- inherit: ( "Talpan" );
-}
diff --git a/npc/048-2/sageNikolai.txt b/npc/048-2/sageNikolai.txt
index f5bb9919..1013db10 100644
--- a/npc/048-2/sageNikolai.txt
+++ b/npc/048-2/sageNikolai.txt
@@ -271,7 +271,7 @@ L_Full_Inv:
L_Done:
mesn;
mesq l("Thanks for all of your help.");
- if (get_nibble(##03_TMWQUEST, 0) == 2 &&
+ if ((get_nibble(##03_TMWQUEST, 0) == 2) &&
(##01_MLWORLD & MLP_TMW_YETIKING) &&
getvaultid()) goto L_VaultQuest;
goto L_close;