summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2020-06-28 16:44:57 +0200
committerGitHub <noreply@github.com>2020-06-28 16:44:57 +0200
commit44e53924b3db97b515f9a2e032580be0d5ed433c (patch)
tree75457e95ce923ea8a39250dcb79885b1de58eba9 /db
parent8fdc97b3d38d938a610795b8477c2d49deea0f5c (diff)
parente3e1acb092a5ba8ddc4dcb116ec4bcf7686e140d (diff)
downloadhercules-44e53924b3db97b515f9a2e032580be0d5ed433c.tar.gz
hercules-44e53924b3db97b515f9a2e032580be0d5ed433c.tar.bz2
hercules-44e53924b3db97b515f9a2e032580be0d5ed433c.tar.xz
hercules-44e53924b3db97b515f9a2e032580be0d5ed433c.zip
Merge pull request #2778 from 4144/extendci
Extend ci with more checks and add different fixes
Diffstat (limited to 'db')
-rw-r--r--db/map_index.txt6
-rw-r--r--db/pre-re/item_db.conf5
-rw-r--r--db/pre-re/mob_db.conf46
3 files changed, 54 insertions, 3 deletions
diff --git a/db/map_index.txt b/db/map_index.txt
index fbbf4d25a..6e77cb838 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -642,9 +642,9 @@ ve_fild04
ve_fild05
ve_fild06
ve_fild07
-poring_c01
-poring_c02
-que_ng
+//poring_c01 628
+//poring_c02 629
+que_ng 630
nameless_i
nameless_n
nameless_in
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index cc7f5040d..c548209c8 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -98799,6 +98799,11 @@ item_db: (
Name: "Ein_1HMAGGER"
},
{
+ Id: 28900
+ AegisName: "Praetorian_Shield"
+ Name: "Praetorian Shield"
+},
+{
Id: 28922
AegisName: "Herald_Of_GOD_IL"
Name: "Herald_Of_GOD_IL"
diff --git a/db/pre-re/mob_db.conf b/db/pre-re/mob_db.conf
index 92fd149f3..eb0cf663b 100644
--- a/db/pre-re/mob_db.conf
+++ b/db/pre-re/mob_db.conf
@@ -50153,4 +50153,50 @@ mob_db: (
DamageMotion: 480
MvpExp: 0
},
+{
+ Id: 2248
+ SpriteName: "GOLDPORING"
+ Name: "Golden Poring"
+ Lv: 1
+ Hp: 15
+ Sp: 1
+ Exp: 0
+ JExp: 0
+ AttackRange: 0
+ Attack: [0, 0]
+ Def: 127
+ Mdef: 5
+ Stats: {
+ Str: 1
+ Agi: 1
+ Vit: 1
+ Int: 1
+ Dex: 999
+ Luk: 1
+ }
+ ViewRange: 10
+ ChaseRange: 12
+ Size: "Size_Medium"
+ Race: "RC_Plant"
+ Element: ("Ele_Water", 1)
+ Mode: {
+ CanMove: true
+ CanAttack: true
+ }
+ MoveSpeed: 400
+ AttackDelay: 1872
+ AttackMotion: 672
+ DamageMotion: 480
+ MvpExp: 0
+// Drops: {
+// Blue_Card_C: 4000
+// BlueCard_2: 4000
+// BlueCard_0: 4000
+// BlueCard_1: 4000
+// BlueCard_W: 4000
+// BlueCard_R: 4000
+// RWC_Cele_Fire: 10000
+// RWC_Cele_Fire2: 10000
+// }
+},
)