Skip to content
Permalink
Browse files
Elemental Updates:
- Updated elemental_db, now in libconfig format.
(and its more configurable can add up to 7 more elemental each 4~10 level of SO_SUMMON_AGNI/AQUA/VENTUS/TERA)
- Updated elemental to official status formula.
- Updated elemental summoning to official behavior

Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
  • Loading branch information
malufett committed Apr 18, 2016
1 parent 7451cb5 commit 37f1da997c0c3b683d7fcc2eee9b8a6c8245de87
@@ -0,0 +1,135 @@
//================= RagEmu Database =======================================
//= ______ _____
//= | ___ \ | ___|
//= | |_/ /__ _ __ _| |__ _ __ ___ _ _
//= | // _` |/ _` | __| '_ ` _ \| | | |
//= | |\ \ (_| | (_| | |__| | | | | | |_| |
//= \_| \_\__,_|\__, \____/_| |_| |_|\__,_|
//= __/ |
//= |___/
//=
//================= License ===============================================
//= This file is part of RagEmu.
//= http://ragemu.org - https://github.com/RagEmu/Renewal
//=
//= Copyright (C) 2016 RagEmu Dev Team
//=
//= RagEmu is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
//= the Free Software Foundation, either version 3 of the License, or
//= (at your option) any later version.
//=
//= This program is distributed in the hope that it will be useful,
//= but WITHOUT ANY WARRANTY; without even the implied warranty of
//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
//= GNU General Public License for more details.
//=
//= You should have received a copy of the GNU General Public License
//= along with this program. If not, see <http://www.gnu.org/licenses/>.
//================= More Information =================
//
//================ Structure Example =================
/*
<Elemental Type>: { // Elemental Types (KIND_AGNI, KIND AQUA, KIND_VENTUS, KIND_TERA)
<Sprite Name>: { // Monster Sprite Name from `mob_db.conf` or `mob_db2.conf`
Scale: 1 // At what skill level does the elemental activate
// Note: to add more skill must increase MAX_EL_SKILL in `mmo.h`
// Note: Passive and Defensive options can't trigger offensive target type skill
Passive: {
<Skill_1 Name>: <Skill_1 Level> // Skill Names that can be found in `skill_db.txt`
<Skill_2 Name>: <Skill_2 Level> ...
}
Defensive: {
<Skill_1 Name>: <Skill_1 Level>
<Skill_2 Name>: <Skill_2 Level> ...
}
Offensive: {
<Skill_1 Name>: <Skill_1 Level>
<Skill_2 Name>: <Skill_2 Level> ...
}
}
}
*/
elemental: (
{
KIND_AGNI: {
EL_AGNI_S: {
Scale: 1
Passive: { EL_PYROTECHNIC:1 }
Defensive: { EL_CIRCLE_OF_FIRE:1 }
Offensive: { EL_FIRE_ARROW:1 }
}
EL_AGNI_M: {
Scale: 2
Passive: { EL_HEATER:1 }
Defensive: { EL_FIRE_CLOAK:1 }
Offensive: { EL_FIRE_BOMB:1 }
}
EL_AGNI_L: {
Scale: 3
Passive: { EL_TROPIC:1 }
Defensive: { EL_FIRE_MANTLE:1 }
Offensive: { EL_FIRE_WAVE:1 }
}
}
KIND_AQUA: {
EL_AQUA_S: {
Scale: 1
Passive: { EL_AQUAPLAY:1 }
Defensive: { EL_WATER_SCREEN:1 }
Offensive: { EL_ICE_NEEDLE:1 }
}
EL_AQUA_M: {
Scale: 2
Passive: { EL_COOLER:1 }
Defensive: { EL_WATER_DROP:1 }
Offensive: { EL_WATER_SCREW:1 }
}
EL_AQUA_L: {
Scale: 3
Passive: { EL_CHILLY_AIR:1 }
Defensive: { EL_WATER_BARRIER:1 }
Offensive: { EL_TIDAL_WEAPON:1 }
}
}
KIND_VENTUS: {
EL_VENTUS_S: {
Scale: 1
Passive: { EL_GUST:1 }
Defensive: { EL_WIND_STEP:1 }
Offensive: { EL_WIND_SLASH:1 }
}
EL_VENTUS_M: {
Scale: 2
Passive: { EL_BLAST:1 }
Defensive: { EL_WIND_CURTAIN:1 }
Offensive: { EL_HURRICANE:1 }
}
EL_VENTUS_L: {
Scale: 3
Passive: { EL_WILD_STORM:1 }
Defensive: { EL_ZEPHYR:1 }
Offensive: { EL_TYPOON_MIS:1 }
}
}
KIND_TERA: {
EL_TERA_S: {
Scale: 1
Passive: { EL_PETROLOGY:1 }
Defensive: { EL_SOLID_SKIN:1 }
Offensive: { EL_STONE_HAMMER:1 }
}
EL_TERA_M: {
Scale: 2
Passive: { EL_CURSED_SOIL:1 }
Defensive: { EL_STONE_SHIELD:1 }
Offensive: { EL_ROCK_CRUSHER:1 }
}
EL_TERA_L: {
Scale: 3
Passive: { EL_UPHEAVAL:1 }
Defensive: { EL_POWER_OF_GAIA:1 }
Offensive: { EL_STONE_RAIN:1 }
}
}
})

This file was deleted.

@@ -52038,7 +52038,7 @@ mob_db: (
}
},
// Sorcerer Elemental Spirits
/*{
{
Id: 2114
SpriteName: "EL_AGNI_S"
Name: "Agni"
@@ -52470,7 +52470,7 @@ mob_db: (
DamageMotion: 0
MvpExp: 0
},
{
/*{
Id: 2126
SpriteName: "M_ANOPHELES"
Name: "Anopheles"
@@ -1976,20 +1976,32 @@
8423,0,0,0,-1,0,0,-1
//-- EL_UPHEAVAL
8424,0,0,0,-1,0,0,-1
//-- EL_FIRE_ARROW
8425,0,0,0,0,0,10000,0
//-- EL_FIRE_BOMB
8426,0,0,0,0,0,10000,0
//-- EL_FIRE_WAVE
8428,0,0,0,0,0,10000,0
//-- EL_ICE_NEEDLE
8430,0,0,0,0,0,10000,0
//-- EL_WATER_SCREW
8431,0,0,0,0,0,10000,0
//-- EL_TIDAL_WEAPON
8433,0,0,0,-1,0,0,-1
8433,0,0,0,-1,0,10000,-1
//-- EL_WIND_SLASH
8434,1000,0,0,0,0,0,-1
8434,1000,0,0,0,0,10000,-1
//-- EL_HURRICANE
8435,1000,0,0,0,0,0,-1
8435,1000,0,0,0,0,10000,-1
//-- EL_TYPOON_MIS
8437,1000,0,0,15000,0,0,-1
8437,1000,0,0,15000,0,10000,-1
//-- EL_STONE_HAMMER
8439,0,0,0,5000,0,0,-1
8439,0,0,0,5000,0,10000,-1
//-- EL_ROCK_CRUSHER
8440,0,0,0,15000,0,0,-1
8440,0,0,0,15000,0,10000,-1
//-- EL_ROCK_CRUSHER_ATK
8441,0,0,0,15000,0,0,-1
//-- EL_STONE_RAIN
8442,0,0,0,0,0,10000,0
//==========================================

//===== Guild Skills =======================
@@ -777,7 +777,7 @@
2460,0,0,100:150:200,0,0,0,99,0,0,none,0,993,3,993,6,997,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_SUMMON_TERA#Summon Wind Spirit Tera#
2461,0,0,50,0,0,0,99,0,0,elementalspirit,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_EL_ACTION#Elemental Action#
2462,0,0,10:20,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_EL_ANALYSIS#Four Spirit Analysis#
2464,0,0,10,0,0,0,99,0,0,elementalspirit,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_EL_CURE#Spirit Recovery#
2464,0,0,0,-10,-10,0,99,0,0,elementalspirit,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_EL_CURE#Spirit Recovery#
2465,0,0,22:30:38,0,0,0,99,0,0,none,0,6360,1,6360,2,6360,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_FIRE_INSIGNIA#Fire Insignia#
2466,0,0,22:30:38,0,0,0,99,0,0,none,0,6361,1,6361,2,6361,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_WATER_INSIGNIA#Water Insignia#
2467,0,0,22:30:38,0,0,0,99,0,0,none,0,6362,1,6362,2,6362,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_WIND_INSIGNIA#Wind Insignia#
@@ -284,14 +284,13 @@ CREATE TABLE IF NOT EXISTS `charlog` (
CREATE TABLE IF NOT EXISTS `elemental` (
`ele_id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
`char_id` INT(11) NOT NULL,
`class` MEDIUMINT(9) UNSIGNED NOT NULL DEFAULT '0',
`mode` INT(11) UNSIGNED NOT NULL DEFAULT '1',
`kind` SMALLINT(1) NOT NULL,
`scale` SMALLINT(1) NOT NULL,
`hp` INT(12) NOT NULL DEFAULT '1',
`sp` INT(12) NOT NULL DEFAULT '1',
`max_hp` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
`max_sp` MEDIUMINT(6) UNSIGNED NOT NULL DEFAULT '0',
`atk1` MEDIUMINT(6) UNSIGNED NOT NULL DEFAULT '0',
`atk2` MEDIUMINT(6) UNSIGNED NOT NULL DEFAULT '0',
`atk` MEDIUMINT(6) UNSIGNED NOT NULL DEFAULT '0',
`matk` MEDIUMINT(6) UNSIGNED NOT NULL DEFAULT '0',
`aspd` SMALLINT(4) UNSIGNED NOT NULL DEFAULT '0',
`def` SMALLINT(4) UNSIGNED NOT NULL DEFAULT '0',
@@ -302,6 +301,24 @@ CREATE TABLE IF NOT EXISTS `elemental` (
PRIMARY KEY (`ele_id`)
) ENGINE=MyISAM;

--
-- Table structure for table `elemental_sc`
--

CREATE TABLE IF NOT EXISTS `elemental_sc` (
`ele_id` INT(11) UNSIGNED NOT NULL,
`char_id` INT(11) UNSIGNED NOT NULL,
`type` SMALLINT(11) UNSIGNED NOT NULL,
`tick` INT(11) NOT NULL,
`val1` INT(11) NOT NULL DEFAULT 0,
`val2` INT(11) NOT NULL DEFAULT 0,
`val3` INT(11) NOT NULL DEFAULT 0,
`val4` INT(11) NOT NULL DEFAULT 0,
KEY (`ele_id`),
KEY (`char_id`),
PRIMARY KEY (`ele_id`,`char_id`, `type`)
)ENGINE=MyISAM;

--
-- Table structure for table `friends`
--
@@ -0,0 +1,22 @@
#1429056000
ALTER TABLE `elemental`
CHANGE COLUMN `atk1` `atk` MEDIUMINT(6) UNSIGNED NOT NULL DEFAULT 0,
DROP COLUMN `atk2`,
CHANGE COLUMN `class` `kind` SMALLINT(1) NOT NULL,
CHANGE COLUMN `mode` `scale` SMALLINT(1) NOT NULL;

CREATE TABLE IF NOT EXISTS `elemental_sc` (
`ele_id` INT(11) UNSIGNED NOT NULL,
`char_id` INT(11) UNSIGNED NOT NULL,
`type` SMALLINT(11) UNSIGNED NOT NULL,
`tick` INT(11) NOT NULL,
`val1` INT(11) NOT NULL DEFAULT 0,
`val2` INT(11) NOT NULL DEFAULT 0,
`val3` INT(11) NOT NULL DEFAULT 0,
`val4` INT(11) NOT NULL DEFAULT 0,
KEY (`ele_id`),
KEY (`char_id`),
PRIMARY KEY (`ele_id`,`char_id`, `type`)
)ENGINE=MyISAM;

INSERT INTO `sql_updates` (`timestamp`) VALUES (1429056000);
@@ -94,6 +94,7 @@ char mercenary_db[256] = "mercenary";
char mercenary_owner_db[256] = "mercenary_owner";
char ragsrvinfo_db[256] = "ragsrvinfo";
char elemental_db[256] = "elemental";
char elemental_scdata_db[256] = "elemental_sc";
char account_data_db[256] = "account_data";
char acc_reg_num_db[32] = "acc_reg_num_db";
char acc_reg_str_db[32] = "acc_reg_str_db";
@@ -5419,8 +5420,10 @@ void char_sql_config_read(const char* cfgName)
safestrncpy(mercenary_owner_db,w2,sizeof(mercenary_owner_db));
else if(!strcmpi(w1,"ragsrvinfo_db"))
safestrncpy(ragsrvinfo_db,w2,sizeof(ragsrvinfo_db));
else if(!strcmpi(w1,"elemental_db"))
safestrncpy(elemental_db,w2,sizeof(elemental_db));
else if (!strcmpi(w1, "elemental_db"))
safestrncpy(elemental_db, w2, sizeof(elemental_db));
else if (!strcmpi(w1, "elemental_scdata_db"))
safestrncpy(elemental_scdata_db, w2, sizeof(elemental_db));
else if(!strcmpi(w1,"account_data_db"))
safestrncpy(account_data_db,w2,sizeof(account_data_db));
else if(!strcmpi(w1,"char_reg_num_db"))
@@ -309,6 +309,7 @@ extern char mercenary_db[256];
extern char mercenary_owner_db[256];
extern char ragsrvinfo_db[256];
extern char elemental_db[256];
extern char elemental_scdata_db[256];
extern char acc_reg_num_db[32];
extern char acc_reg_str_db[32];
extern char char_reg_str_db[32];

0 comments on commit 37f1da9

Please sign in to comment.