Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into update/skills_Spirit_Handler

Browse Source
This commit is contained in:
Atemo 2024-07-22 16:45:55 +02:00
commit 121c2d10f3
230 changed files with 26971 additions and 7008 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/analysis_codeql.yml vendored
View File

@ -38,11 +38,11 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
@ -74,7 +74,7 @@ jobs:
#- name: Autobuild
# uses: github/codeql-action/autobuild@v2
# ✏️ If the Autobuild fails above, remove it and uncomment the following
# ?? If the Autobuild fails above, remove it and uncomment the following
# three lines and modify them (or add more) to build your code if your
# project uses a compiled language
- name: Command - configure
@ -89,4 +89,4 @@ jobs:
run: make server
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3

2
.github/workflows/build_servers_clang.yml vendored
View File

@ -34,7 +34,7 @@ jobs:
clang: ['6.0', '7', '8', '9', '10', '11'] #, '12', '13']
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Clang
uses: egor-tensin/setup-clang@v1

2
.github/workflows/build_servers_cmake.yml vendored
View File

@ -34,7 +34,7 @@ jobs:
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
# Install latest CMake.
- uses: lukka/get-cmake@latest

14
.github/workflows/build_servers_gcc.yml vendored
View File

@ -31,10 +31,14 @@ jobs:
# Available: ubuntu-22.04, ubuntu-20.04
os: [ubuntu-latest]
# Older versions of GCC are not available via unaltered aptitude repo lists.
gcc: ['9', '10', '11', '12', '13']
gcc: ['9', '10', '11', '12']
# GCC 13 was removed from 22.04, include it as a separate job
include:
- os: ubuntu-24.04
gcc: 13
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Update & Install packages
# Ubuntu runners already have most of the packages rAthena requires to build.
@ -45,8 +49,10 @@ jobs:
- name: Command - configure
env:
CONFIGURE_FLAGS: 'CC=gcc-${{ matrix.gcc }} CXX=g++-${{ matrix.gcc }} --enable-buildbot=yes'
run: ./configure $CONFIGURE_FLAGS
CONFIGURE_FLAGS: 'CC=gcc-${{ matrix.gcc }} CXX=g++-${{ matrix.gcc }}'
# -Werror: to treat all warnings as errors
# -Wno-error=builtin-declaration-mismatch: otherwise ./configure checks fail
run: ./configure $CONFIGURE_FLAGS --enable-buildbot=yes CXXFLAGS='-Werror -Wno-error=builtin-declaration-mismatch'
- name: Command - make clean
run: make clean

2
.github/workflows/build_servers_modes.yml vendored
View File

@ -36,7 +36,7 @@ jobs:
mode: ['PRE','RE']
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
# A simple 'yes' and 'no' can be confusing, so we use names to display in the current job then convert them for use in the compiler.
- name: Variable Parsing - PRE

8
.github/workflows/build_servers_msbuild.yml vendored
View File

@ -34,15 +34,15 @@ jobs:
mode: ['PRE', 'RE']
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.1
uses: microsoft/setup-msbuild@v2
- name: Build solution in Debug
if: ${{ matrix.mode == 'PRE' }}
run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT%3BPRERE"
run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT%3BPRERE" /warnaserror
- name: Build solution in Debug
if: ${{ matrix.mode == 'RE' }}
run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT"
run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT" /warnaserror

2
.github/workflows/build_servers_packetversions.yml vendored
View File

@ -38,7 +38,7 @@ jobs:
packetver: ['20211103', '20200902', '20200401', '20180620', '20151104']
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
# A simple 'yes' and 'no' can be confusing, so we use names to display in the current job then convert them for use in the compiler.
- name: Variable Parsing - PRE

2
.github/workflows/build_servers_vip.yml vendored
View File

@ -36,7 +36,7 @@ jobs:
mode: ['PRE', 'RE']
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
# A simple 'yes' and 'no' can be confusing, so we use names to display in the current job then convert them for use in the compiler.
- name: Variable Parsing - PRE

2
.github/workflows/npc_db_validation.yml vendored
View File

@ -39,7 +39,7 @@ jobs:
mode: ['PRE', 'RE']
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
# A simple 'yes' and 'no' can be confusing, so we use names to display in the current job then convert them for use in the compiler.
- name: Variable Parsing - PRE

13
conf/battle/battle.conf
View File

@ -130,10 +130,19 @@ equip_self_break_rate: 100
// This affects the behaviour of skills like acid terror and meltdown
equip_skill_break_rate: 100
// Do weapon attacks have a attack speed delay before actual damage is applied? (Note 1)
// NOTE: The official setting is yes, even thought it degrades performance a bit.
// Should damage have a delay before it is applied? (Note 1)
// Some skills might not have a delay by default regardless of this setting.
// The official setting is yes, even thought it degrades performance a bit.
delay_battle_damage: yes
// Should the damage timing be synchronized between the client and server? (Note 1)
// This is not official behavior, but it should remove the position lag after being hit by a monster.
// This setting only affects normal monster attacks and takes priority over "delay_battle_damage".
// Many skills show their damage immediately, so setting "delay_battle_damage" to "no" at the same
// time might improve the experience further, but will not work for all skills.
// Tired of Dark Illusion hitting you 5 seconds too late? Then turn this on.
synchronize_damage: no
// Are arrows/ammo consumed when used on a bow/gun?
// 0 = No
// 1 = Yes

27
conf/battle/instance.conf Normal file
View File

@ -0,0 +1,27 @@
//--------------------------------------------------------------
// rAthena Battle Configuration File
// Originally Translated by Peter Kieser <pfak@telus.net>
// Made in to plainer English by Ancyker
//--------------------------------------------------------------
// Note 1: Value is a config switch (on/off, yes/no or 1/0)
// Note 2: Value is in percents (100 means 100%)
// Note 3: Value is a bit field. If no description is given,
// assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
//--------------------------------------------------------------
// Block leaving for parties, guilds or clans if they have an active instance?
// Default: yes (Official)
instance_block_leave: yes
// Block leader changes for parties or guilds if they have an active instance?
// Default: yes (Official)
instance_block_leaderchange: yes
// Block inviting for parties or guilds if they have an active instance?
// This also blocks joining parties, guilds or clans that have a running instance.
// Default: yes (Official)
instance_block_invite: yes
// Block expulsion for parties or guilds if they have an active instance?
// Default: yes (Official)
instance_block_expulsion: yes

8
conf/battle/items.conf
View File

@ -12,8 +12,10 @@
// The highest value at which an item can be sold via the merchant vend skill. (in zeny)
vending_max_value: 1000000000
// Whether to allow buying from vending chars that are at their max. zeny limit.
// If set to yes, the rest of the zeny above the char's capacity will disappear.
// Whether to allow placing items on a vending store when the player's zeny plus the total price
// of the items exceeds the maximum zeny allowed. (Note 1)
// If set to "yes", the items will be placed in the store but other players will not be able to buy them.
// Official behavior is "yes", but on some official servers the client doesn't allow this.
vending_over_max: yes
// Tax to apply to all vending transactions (eg: 10000 = 100%, 50 = 0.50%)
@ -93,7 +95,7 @@ allow_equip_restricted_item: yes
// Default on official servers: yes for Pre-renewal, no for Renewal
//item_enabled_npc: yes
// Allow map_flooritem to check if item is droppable? (Note 1)
// Allow map_addflooritem to check if item is droppable? (Note 1)
// If yes, undroppable items will be destroyed instead of appearing on the map when a player's inventory is full.
// Default: yes
item_flooritem_check: yes

14
conf/battle/misc.conf
View File

@ -183,3 +183,17 @@ mail_delay: 1000
// Hides items from the player's favorite tab from being sold to a NPC. (Note 1)
hide_fav_sell: no
// When searching for a random position on the map, how much of the border of the map shall not be considered?
// Officially the 15 tiles from the edge of the map on each side are not considered as target cells.
// On some maps like in Pyramids this causes there to be very few monsters in the outer areas. This also
// affects teleportation. Set this to 1 if you want it to be closer to the old emulator behavior.
// Valid values: 1-40
map_edge_size: 15
// When a player drops items, can they stack on the same cell? (Note 1)
// Officially there's no limit on how many items you can drop on the same cell.
// If you set this to "no", when you drop an item, it will only drop on a cell that has no item on it yet.
// A free cell will be searched for in eight directions. If no free cell could be found in those eight tries,
// then dropping the item will fail (the item stays in the player's inventory).
item_stacking: yes

9
conf/battle/monster.conf
View File

@ -163,6 +163,15 @@ no_spawn_on_player: 0
// map regardless of what the mob-spawn file says.
force_random_spawn: no
// Should each monster's center cell be randomized? (Note 1)
// Officially, at server start, each monster's center cell is set to a random cell in the spawn area.
// Each time the monster spawns it will spawn in an area around its center cell rather than the
// original center of the spawn definition. This results in a much larger total spawn area and a
// different experience each server start.
// Set this to "no" if you want all monsters of a spawn to spawn around the original center of the
// spawn definition, making the total spawn area much smaller (old eAthena behavior).
randomize_center_cell: yes
// Do summon slaves inherit the passive/aggressive traits of their master?
// 0: No, retain original mode.
// 1: Slaves are always aggressive.

4
conf/battle/pet.conf
View File

@ -41,6 +41,10 @@ pet_hungry_delay_rate: 100
// These bonuses are unofficial and found in the import/pet_db.yml
pet_equip_required: yes
// Should the pet equipment be destroyed if the owner doesn't have enough space in their inventory? (Note 1)
// Official behavior is "yes", setting this to "no" will leave the item equipped.
pet_unequip_destroy: yes
// When the master attacks a monster, whether or not the pet will also attack. (Note 1)
pet_attack_support: no

9
conf/battle/player.conf
View File

@ -298,12 +298,9 @@ trait_points_job_change: 7
// Official is 100.
max_trait_parameter: 100
// Max amount of RES/MRES to take into the resistance damage reduction formula.
// A setting of 625 means the max reduction of damage allowed is 50.0%.
// Formula is 100 - 100 * (5000 + RES) / (5000 + 10 * RES)
// Note: Best to leave this setting alone unless you know what your doing.
// Default: 625
max_res_mres_reduction: 625
// Max percent of RES/MRES that can be ignored by item bonus/skill.
// Default: 50
max_res_mres_ignored: 50
// Maximum AP
// Default: 1000

6
conf/battle/skill.conf
View File

@ -270,8 +270,10 @@ allow_skill_without_day: no
// Allow use of ES-type magic on players?
allow_es_magic_player: no
// Miracle of the Sun, Moon and Stars skill ratio (100% = 10000)
sg_miracle_skill_ratio: 2
// Miracle of the Sun, Moon and Stars skill ratio
// Valid values range from 1 (0.005% per hit) to 20000 (100% per hit)
// This chance is further reduced if AGI is above 46 (92 = halved chance)
sg_miracle_skill_ratio: 1
// Miracle of the Sun, Moon and Stars skill duration in milliseconds
sg_miracle_skill_duration: 3600000

27
conf/battle_athena.conf
View File

@ -8,6 +8,9 @@
//General battle-related settings.
import: conf/battle/battle.conf
//Battleground settings
import: conf/battle/battleground.conf
//Settings specific to the client.
import: conf/battle/client.conf
@ -17,14 +20,20 @@ import: conf/battle/drops.conf
//Experience rates, exp penalties, stats and max level settings.
import: conf/battle/exp.conf
//Feature control (on/off) settings
import: conf/battle/feature.conf
//GM levels, atcommands and hack-related configs.
import: conf/battle/gm.conf
//Guild and WoE settings
import: conf/battle/guild.conf
//Battleground settings
import: conf/battle/battleground.conf
//Homunc related configuration
import: conf/battle/homunc.conf
//Instance settings
import: conf/battle/instance.conf
//Item/card-specific and crafting related options.
import: conf/battle/items.conf
@ -32,15 +41,16 @@ import: conf/battle/items.conf
//Mob related configuration
import: conf/battle/monster.conf
// Anything else that didn't fit anywhere else.
// Includes duel, day/night, mute/manner, log settings.
import: conf/battle/misc.conf
//Party related configuration
import: conf/battle/party.conf
//Pet related configuration
import: conf/battle/pet.conf
//Homunc related configuration
import: conf/battle/homunc.conf
//Player specific settings
import: conf/battle/player.conf
@ -50,12 +60,5 @@ import: conf/battle/skill.conf
//Status change related settings
import: conf/battle/status.conf
//Feature control (on/off) settings
import: conf/battle/feature.conf
// Anything else that didn't fit anywhere else.
// Includes duel, day/night, mute/manner, log settings.
import: conf/battle/misc.conf
//Your custom config goes here.
import: conf/import/battle_conf.txt

4
conf/char_athena.conf
View File

@ -144,6 +144,10 @@ unknown_char_name: Unknown
// To log the character server?
log_char: yes
// Minimum length for a character name.
// Must be set to '4' unless your client uses the 'Remove 4/6 letter Character Name limit' diff patch.
char_name_min_length: 4
// Allow or not identical name for characters but with a different case (upper/lower):
// example: Test-test-TEST-TesT; Value: 0 not allowed (default), 1 allowed
name_ignoring_case: no

12
conf/login_athena.conf
View File

@ -55,9 +55,15 @@ console: off
// Note: This only works if client side password encryption is not enabled.
new_account: no
//If new_account is enabled, minimum length to userid and passwords should be 4?
//Must be 'Yes' unless your client uses both 'Disable 4 LetterUserID/Password' Diffs
new_acc_length_limit: yes
// If new_account is enabled, changes the minimum length for the account name.
// By default is set to '4' or '6' (depending on the new login UI).
// Don't change it unless your client uses the 'Remove 4/6 letter User Name limit' diff patch.
//acc_name_min_length: 6
// If new_account is enabled, changes the minimum length for the password.
// By default is set to '4' or '6' (depending on the new login UI).
// Don't change it unless your client uses the 'Remove 4/6 letter Password limit' diff patch.
//password_min_length: 6
// Account registration flood protection system
// allowed_regs is the number of registrations allowed in time_allowed (in seconds)

3
conf/maps_athena.conf
View File

@ -1634,5 +1634,8 @@ map: luna_sf1
map: luna_sf2
map: mbase_in
// Market place
map: prt_mk
//------------------------- Clone Maps ---------------------------
//------------------------- Extra Maps ---------------------------

2
conf/msg_conf/map_msg.conf
View File

@ -775,7 +775,7 @@
730: Character cannot be disguised while in monster form.
731: Transforming into monster is not allowed in Guild Wars.
732: Item cannot be opened when your inventory is full.
//732: Free
733: Please enter a NPC file name (usage: @reloadnpcfile <file name>).

2
conf/msg_conf/map_msg_idn.conf
View File

@ -765,7 +765,7 @@
730: Karakter tidak dapat disguise ketika sedang berwujud monster.
731: Perubahan menjadi monster tidak diizinkan dalam Guild Wars.
732: Item tidak dapat dibuka ketika inventory penuh.
//732: Free
//733 free

2
conf/msg_conf/map_msg_por.conf
View File

@ -779,7 +779,7 @@
730: O personagem não pode ser disfarçado enquanto estiver em forma de monstro.
731: Transformar em monstro não é permitido em GvG.
732: O item não pode ser aberto quando o seu inventário está cheio.
//732: Free
733: Por favor insira um nome de arquivo NPC (uso: @reloadnpcfile <nome do arquivo>).

2
conf/msg_conf/map_msg_spn.conf
View File

@ -775,7 +775,7 @@
730: El personaje no puede disfrazarse si está transformado en un monstruo.
731: No puedes transformarte en monstruo durante la guerra de clanes.
732: No puedes abrir el objeto porque tu inventario está lleno.
//732: libre
733: Introduce la ruta de archivo de un NPC (instrucciones: @reloadnpcfile <ruta>).

3
db/import-tmpl/mob_db.yml
View File

@ -56,6 +56,7 @@
# WalkSpeed Walk speed. (Default: DEFAULT_WALK_SPEED)
# AttackDelay Attack speed. (Default: 0)
# AttackMotion Attack animation speed. (Default: 0)
# ClientAttackMotion Client attack speed. (Default: AttackMotion)
# DamageMotion Damage animation speed. (Default: 0)
# DamageTaken Rate at which the monster will receive incoming damage. (Default: 100)
# Ai Aegis monster type AI behavior. (Default: 06)
@ -77,7 +78,7 @@
Header:
Type: MOB_DB
Version: 3
Version: 4
#Body:
# eAthena Dev Team

21
db/import-tmpl/mob_summon.yml
View File

@ -33,3 +33,24 @@ Header:
Type: MOB_SUMMONABLE_DB
Version: 1
#Body:
# Pre-re Brasilis
#=============================================================
# - Group: BLOODY_DEAD_BRANCH
# Summon:
# - Mob: BOITATA
# Rate: 1000000
# - Group: Branch_Of_Dead_Tree
# Summon:
# - Mob: IARA
# Rate: 71428
# - Mob: PIRANHA
# Rate: 71428
# - Mob: HEADLESS_MULE
# Rate: 71428
# - Mob: JAGUAR
# Rate: 71428
# - Mob: TOUCAN
# Rate: 71428
# - Mob: CURUPIRA
# Rate: 71428

BIN
db/map_cache.dat
View File

Binary file not shown.

1
db/map_index.txt
View File

@ -1260,6 +1260,7 @@ jor_tmple2
luna_sf1
luna_sf2
mbase_in
prt_mk
//======================================================================================
// - Other/Extra maps -

3
db/mob_db.yml
View File

@ -56,6 +56,7 @@
# WalkSpeed Walk speed. (Default: DEFAULT_WALK_SPEED)
# AttackDelay Attack speed. (Default: 0)
# AttackMotion Attack animation speed. (Default: 0)
# ClientAttackMotion Client attack speed. (Default: AttackMotion)
# DamageMotion Damage animation speed. (Default: 0)
# DamageTaken Rate at which the monster will receive incoming damage. (Default: 100)
# Ai Aegis monster type AI behavior. (Default: 06)
@ -77,7 +78,7 @@
Header:
Type: MOB_DB
Version: 3
Version: 4
Footer:
Imports:

6
db/pre-re/item_db_usable.yml
View File

@ -8637,21 +8637,21 @@ Body:
Type: Usable
Weight: 10
Script: |
searchstores 10,0;
searchstores 10, SEARCHSTORE_EFFECT_NORMAL;
- Id: 12581
AegisName: Vending_Search_Scroll2
Name: Universal Catalog Gold
Type: Usable
Weight: 10
Script: |
searchstores 10,1;
searchstores 10, SEARCHSTORE_EFFECT_REMOTE;
- Id: 12591
AegisName: Uni_Catalog_Bz
Name: Universal Catalog Bronze
Type: Usable
Weight: 10
Script: |
searchstores 10,1;
searchstores 10, SEARCHSTORE_EFFECT_REMOTE;
- Id: 12609
AegisName: Old_Ore_Box
Name: Old Ore Box

941
db/pre-re/mob_db.yml
View File

File diff suppressed because it is too large Load Diff

11
db/pre-re/pet_db.yml
View File

@ -866,3 +866,14 @@ Body:
bonus2 bSubEle,Ele_Fire,2;
bonus2 bAddEle,Ele_Fire,2;
}
- Mob: E_HYDRA
TameItem: Leaf_Cat_Ball
EggItem: Mystic_Leaf_Cat_Ball
Fullness: 0
HungryDelay: 0
IntimacyStart: 0
IntimacyFed: 0
IntimacyOverfed: 0
IntimacyOwnerDie: 0
CaptureRate: 50
SpecialPerformance: false

4
db/pre-re/skill_db.yml
View File

@ -7359,7 +7359,7 @@ Body:
Time: 1500
- Level: 5
Time: 1000
Duration2: 300000
Duration1: 300000
Requires:
SpCost: 1
Weapon:
@ -8538,6 +8538,7 @@ Body:
HitCount: 1
SplashArea: -1
AfterCastActDelay: 4000
Duration1: 15000
Duration2: 12000
Requires:
SpCost:
@ -8829,6 +8830,7 @@ Body:
HitCount: 1
SplashArea: -1
AfterCastActDelay: 4000
Duration1: 5000
Duration2: 5000
Requires:
SpCost:

2767
db/re/item_combos.yml
View File

File diff suppressed because it is too large Load Diff

9457
db/re/item_db_equip.yml
View File

File diff suppressed because it is too large Load Diff

910
db/re/item_db_etc.yml
View File

File diff suppressed because it is too large Load Diff

372
db/re/item_db_usable.yml
View File

@ -4371,6 +4371,38 @@ Body:
BuyingStore: true
# Script: |
# /* TODO */
- Id: 11636
AegisName: 24_S_Ev_Lime_Soda
Name: Lime Soda
Type: Healing
Weight: 1
EquipLevelMin: 90
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoGuildStorage: true
NoMail: true
NoAuction: true
Script: |
itemheal 1800,0; /* average value */
- Id: 11637
AegisName: 24_S_Ev_Berry_Soda
Name: Berry Soda
Type: Healing
Weight: 1
EquipLevelMin: 90
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoGuildStorage: true
NoMail: true
NoAuction: true
Script: |
itemheal 0,180; /* average value */
- Id: 11701
AegisName: Girl_Bunch_Of_Flower
Name: Girl's Bouquet
@ -5700,7 +5732,6 @@ Body:
AegisName: Tropical_Sograt
Name: Tropical Sograt
Type: Usable
Buy: 1000
Weight: 100
Flags:
BuyingStore: true
@ -5710,7 +5741,6 @@ Body:
AegisName: Vermilion_The_Beach
Name: Vermilion on the Beach
Type: Usable
Buy: 1000
Weight: 100
Flags:
BuyingStore: true
@ -9511,6 +9541,8 @@ Body:
NoGuildStorage: true
NoMail: true
NoAuction: true
Script: |
callfunc "F_CashSiegeTele2";
- Id: 12416
AegisName: Lucky_Egg_C3
Name: Lucky Egg C3
@ -11333,7 +11365,7 @@ Body:
Type: Usable
Weight: 10
Script: |
searchstores 10,0;
searchstores 10, SEARCHSTORE_EFFECT_NORMAL;
- Id: 12581
AegisName: Vending_Search_Scroll2
Name: Universal Catalog Gold
@ -11348,7 +11380,7 @@ Body:
NoMail: true
NoAuction: true
Script: |
searchstores 10,1;
searchstores 10, SEARCHSTORE_EFFECT_REMOTE;
- Id: 12582
AegisName: Siege_Supply_Box
Name: WoE Supply Box
@ -11492,7 +11524,7 @@ Body:
NoMail: true
NoAuction: true
Script: |
searchstores 10,1;
searchstores 10, SEARCHSTORE_EFFECT_REMOTE;
- Id: 12592
AegisName: Cyclops_Box1
Name: Cyclops Box1
@ -14443,14 +14475,15 @@ Body:
- Id: 12858
AegisName: Golden_Potion_RG
Name: RG Golden Potion
Type: Delayconsume
Type: Usable
Weight: 30
Delay:
Duration: 1000
Status: Reuse_Limit_F
Script: |
percentheal 100,100;
itemskill "PR_KYRIE",10;
sc_start SC_KYRIE,100000,10;
skilleffect "PR_KYRIE",0;
- Id: 12860
AegisName: Mommy_Day_Cake
Name: Mommy Day Cake
@ -51127,8 +51160,8 @@ Body:
NoGuildStorage: true
NoMail: true
NoAuction: true
# Script: |
# /* TODO */
Script: |
getitem 5464,1;
- Id: 17203
AegisName: Free_Pass_Box
Name: Free Pass Box
@ -51454,7 +51487,6 @@ Body:
Type: Usable
Buy: 10
Weight: 10
Defense: 4
Trade:
NoDrop: true
NoTrade: true
@ -60448,7 +60480,7 @@ Body:
getitem 526,100; /* Royal Jelly */
- Id: 23042
AegisName: Seed_Of_Yggdrasil_
Name: "[Not For Sale]Yggdrasil Seed"
Name: "[Not For Sale] Yggdrasil Seed"
Type: Healing
Weight: 300
Delay:
@ -63088,7 +63120,6 @@ Body:
AegisName: Vend_Arbeit1_1Lv
Name: "[1 Day] Consignment Merchant Envelope Lv1"
Type: Usable
Weight: 10
Flags:
Container: true
Script: |
@ -63097,7 +63128,6 @@ Body:
AegisName: Vend_Arbeit1_2Lv
Name: "[1 Day] Consignment Merchant Envelope Lv2"
Type: Usable
Weight: 10
Flags:
Container: true
Script: |
@ -63106,7 +63136,6 @@ Body:
AegisName: Vend_Arbeit1_3Lv
Name: "[1 Day] Consignment Merchant Envelope Lv3"
Type: Usable
Weight: 10
Flags:
Container: true
Script: |
@ -63115,7 +63144,6 @@ Body:
AegisName: Buy_Arbeit1_1Lv
Name: "[1 Day] Personal Shopper Envelope Lv1"
Type: Usable
Weight: 10
Flags:
Container: true
Script: |
@ -63124,7 +63152,6 @@ Body:
AegisName: Buy_Arbeit1_2Lv
Name: "[1 Day] Personal Shopper Envelope Lv2"
Type: Usable
Weight: 10
Flags:
Container: true
Script: |
@ -63133,7 +63160,6 @@ Body:
AegisName: Buy_Arbeit1_3Lv
Name: "[1 Day] Personal Shopper Envelope Lv3"
Type: Usable
Weight: 10
Flags:
Container: true
Script: |
@ -63232,7 +63258,6 @@ Body:
AegisName: Vend_Arbeit3_1Lv
Name: "[3 Day] Consignment Merchant Envelope Lv1"
Type: Usable
Weight: 10
Flags:
Container: true
Script: |
@ -63241,7 +63266,6 @@ Body:
AegisName: Vend_Arbeit3_2Lv
Name: Consignment Merchant Envelope
Type: Usable
Weight: 10
Flags:
Container: true
Script: |
@ -63250,7 +63274,6 @@ Body:
AegisName: Vend_Arbeit3_3Lv
Name: "[3 Day] Consignment Merchant Envelope Lv3"
Type: Usable
Weight: 10
Flags:
Container: true
Script: |
@ -63259,7 +63282,6 @@ Body:
AegisName: Buy_Arbeit3_1Lv
Name: "[3 Day] Personal Shopper Envelope Lv1"
Type: Usable
Weight: 10
Flags:
Container: true
Script: |
@ -63268,7 +63290,6 @@ Body:
AegisName: Buy_Arbeit3_2Lv
Name: Personal Shopper Envelope
Type: Usable
Weight: 10
Flags:
Container: true
Script: |
@ -63277,7 +63298,6 @@ Body:
AegisName: Buy_Arbeit3_3Lv
Name: "[3 Day] Personal Shopper Envelope Lv3"
Type: Usable
Weight: 10
Flags:
Container: true
Script: |
@ -63383,8 +63403,8 @@ Body:
Name: Special Shopper Catalog
Type: Usable
Weight: 10
# Script: |
# /* TODO */
Script: |
searchstores 3, SEARCHSTORE_EFFECT_NORMAL;
- Id: 23374
AegisName: Fire_Armor_S
Name: Fire Armor Scroll
@ -68474,8 +68494,8 @@ Body:
Weight: 10
Flags:
BuyingStore: true
# Script: |
# /* TODO */
Script: |
sc_start SC_EXPBOOST,900000,100;
- Id: 100352
AegisName: Real_Battle_Manual
Name: Real Combat Manual
@ -68483,8 +68503,9 @@ Body:
Weight: 10
Flags:
BuyingStore: true
# Script: |
# /* TODO */
Script: |
sc_start SC_EXPBOOST,3600000,100;
sc_start SC_SPEEDUP0,600000,25;
- Id: 100354
AegisName: Auto_Armor_Refine_Cube
Name: Automatic Armor +11 Refinement Cube
@ -70337,8 +70358,8 @@ Body:
Weight: 50
Flags:
BuyingStore: true
# Script: |
# /* TODO */
Script: |
pet 1198;
- Id: 100810
AegisName: BroadcastBox_
Name: Broadcast Box
@ -72633,8 +72654,8 @@ Body:
Name: Spring Regulator
Type: Usable
Weight: 10
# Script: |
# /* TODO */
Script: |
item_enchant(24);
- Id: 101100
AegisName: Poenetentia_Box3
Name: Poenitentia Two Swords Set Box
@ -73599,6 +73620,7 @@ Body:
Flags:
BuyingStore: true
Script: |
/* TODO : pet 21632; */
pet 1005;
- Id: 101336
AegisName: aegis_101336
@ -76678,23 +76700,31 @@ Body:
Script: |
item_reform();
- Id: 102128
AegisName: aegis_102128
AegisName: All_In_One_buff
Name: All-in-One Buff Potion # !todo check english name
Type: Usable
Weight: 10
Flags:
BuyingStore: true
# Script: |
# /* TODO */
Script: |
specialeffect2 EF_POTION_BERSERK;
sc_start SC_M_DEFSCROLL,3600000,0;
sc_start SC_LIMIT_POWER_BOOSTER,3600000,30;
sc_start SC_INFINITY_DRINK,3600000,0;
sc_start SC_SPEEDUP0,600000,25;
- Id: 102129
AegisName: aegis_102129
AegisName: All_In_One_Healing
Name: All-in-one Healing Potion # !todo check english name
Type: Usable
Weight: 10
Flags:
BuyingStore: true
# Script: |
# /* TODO */
Script: |
specialeffect2 EF_HEAL3;
sc_start2 SC_S_LIFEPOTION,3600000,-5,5;
sc_start2 SC_L_LIFEPOTION,3600000,-7,4;
sc_start2 SC_M_LIFEPOTION,3600000,-4,3;
sc_start SC_SPEEDUP0,600000,25;
- Id: 102193
AegisName: aegis_102193
Name: Costume Enchant Stone Box 30
@ -78644,6 +78674,103 @@ Body:
Name: Costume Enchant Stone Box 35
Type: Usable
Weight: 10
Flags:
Container: true
Script: |
getgroupitem(IG_ENCHANT_STONE_BOX35);
- Id: 103065
AegisName: 24_S_Ev_Noodle
Name: Summer Festival Noodle
Type: Usable
Weight: 10
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoGuildStorage: true
NoMail: true
NoAuction: true
- Id: 103066
AegisName: 24_S_Ev_Grilled
Name: Herb Calamari Barbecue
Type: Usable
Weight: 10
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoGuildStorage: true
NoMail: true
NoAuction: true
- Id: 103067
AegisName: 24_S_Ev_Podding
Name: Sweet Watermelon Pudding
Type: Usable
Weight: 10
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoGuildStorage: true
NoMail: true
NoAuction: true
- Id: 103068
AegisName: 24_S_Ev_Juice
Name: Cool Watermelon Juice
Type: Usable
Weight: 10
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoGuildStorage: true
NoMail: true
NoAuction: true
- Id: 103069
AegisName: 24_S_Ev_IceFlake
Name: Cool Red Beans Bingsu
Type: Usable
Weight: 10
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoGuildStorage: true
NoMail: true
NoAuction: true
- Id: 103070
AegisName: 24_S_Ev_Pop_Corn
Name: Gourmet Butter Popcorn
Type: Usable
Weight: 10
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoGuildStorage: true
NoMail: true
NoAuction: true
- Id: 103071
AegisName: 24_S_Ev_Ripe_Melon
Name: Ripe Golden Melon
Type: Usable
Weight: 50
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoGuildStorage: true
NoMail: true
NoAuction: true
Script: |
percentheal 100,100;
- Id: 103095
AegisName: Kr_B_Special10
Name: Love Cake
@ -78656,6 +78783,78 @@ Body:
NoGuildStorage: true
NoMail: true
NoAuction: true
- Id: 103106
AegisName: Stove_Channeling_Box_1
Name: Channeling Commemoration Box I
Type: Usable
Weight: 400
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoStorage: true
NoGuildStorage: true
NoMail: true
NoAuction: true
Script: |
getgroupitem(IG_STOVE_CHANNELING_BOX_1);
- Id: 103107
AegisName: Stove_Channeling_Box_2
Name: Channeling Commemoration Box II
Type: Usable
Weight: 400
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoStorage: true
NoGuildStorage: true
NoMail: true
NoAuction: true
Script: |
getgroupitem(IG_STOVE_CHANNELING_BOX_2);
- Id: 103108
AegisName: Stove_Channeling_Box_3
Name: Channeling Commemoration Box III
Type: Usable
Weight: 400
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoStorage: true
NoGuildStorage: true
NoMail: true
NoAuction: true
Script: |
getgroupitem(IG_STOVE_CHANNELING_BOX_3);
- Id: 103109
AegisName: Stove_Channeling_Box_4
Name: Channeling Commemoration Box IV
Type: Usable
Weight: 400
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoStorage: true
NoGuildStorage: true
NoMail: true
NoAuction: true
Script: |
getgroupitem(IG_STOVE_CHANNELING_BOX_4);
- Id: 200000
AegisName: IDTest_Cash
Name: IDTest Cash
@ -80783,6 +80982,8 @@ Body:
# Name: (Limited) Nyangvine Fruit Package I (Stone Box 35)
Name: (Limited) Nyangvine Fruit Package I (Stone Box 35
Type: Cash
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
@ -80792,12 +80993,14 @@ Body:
NoMail: true
NoAuction: true
Script: |
/* TODO */
getgroupitem(IG_LI_NYANGVINE_BOX1_35);
- Id: 200406
AegisName: LI_Nyangvine_Box2_35
# Name: (Limited) Nyangvine Fruit Package II (Stone Box 35)
Name: (Limited) Nyangvine Fruit Package II (Stone Box 3
Type: Cash
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
@ -80807,12 +81010,14 @@ Body:
NoMail: true
NoAuction: true
Script: |
/* TODO */
getgroupitem(IG_LI_NYANGVINE_BOX2_35);
- Id: 200407
AegisName: LI_Nyangvine_Box3_35
# Name: (Limited) Nyangvine Fruit Package III (Stone Box 35)
Name: (Limited) Nyangvine Fruit Package III (Stone Box
Type: Cash
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
@ -80822,12 +81027,14 @@ Body:
NoMail: true
NoAuction: true
Script: |
/* TODO */
getgroupitem(IG_LI_NYANGVINE_BOX3_35);
- Id: 200411
AegisName: A_Speed_Booster_Box
Name: Speed Booster Package
Type: Cash
Weight: 10
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
@ -80837,12 +81044,14 @@ Body:
NoMail: true
NoAuction: true
Script: |
/* TODO */
getgroupitem(IG_A_SPEED_BOOSTER_BOX);
- Id: 200412
AegisName: A_Speed_Booster_10_Box
Name: Speed Booster Package 10 Sets
Type: Cash
Weight: 10
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
@ -80852,11 +81061,13 @@ Body:
NoMail: true
NoAuction: true
Script: |
/* TODO */
getgroupitem(IG_A_SPEED_BOOSTER_10_BOX);
- Id: 200415
AegisName: L_Infinity_Power_Pack
Name: (Limited) Infinity Power Package
Type: Cash
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
@ -80866,11 +81077,13 @@ Body:
NoMail: true
NoAuction: true
Script: |
/* TODO */
getgroupitem(IG_L_INFINITY_POWER_PACK);
- Id: 200416
AegisName: L_All_Red_Pack
Name: (Limited) All Red Package
Type: Cash
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
@ -80880,11 +81093,13 @@ Body:
NoMail: true
NoAuction: true
Script: |
/* TODO */
getgroupitem(IG_L_ALL_RED_PACK);
- Id: 200417
AegisName: L_Defense_Potion_Pack
Name: (Limited) Defender Package
Type: Cash
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
@ -80894,11 +81109,13 @@ Body:
NoMail: true
NoAuction: true
Script: |
/* TODO */
getgroupitem(IG_L_DEFENSE_POTION_PACK);
- Id: 200418
AegisName: L_Speed_Force_Pack
Name: (Limited) Speed Force Package
Type: Cash
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
@ -80908,11 +81125,13 @@ Body:
NoMail: true
NoAuction: true
Script: |
/* TODO */
getgroupitem(IG_L_SPEED_FORCE_PACK);
- Id: 200419
AegisName: L_Special_Speed_Pack
Name: (Limited) Speed Booster Special Package
Type: Cash
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
@ -80922,11 +81141,13 @@ Body:
NoMail: true
NoAuction: true
Script: |
/* TODO */
getgroupitem(IG_L_SPECIAL_SPEED_PACK);
- Id: 200420
AegisName: L_Special_Force_Pack
Name: (Limited) Force Booster Special Package
Type: Cash
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
@ -80936,7 +81157,58 @@ Body:
NoMail: true
NoAuction: true
Script: |
/* TODO */
getgroupitem(IG_L_SPECIAL_FORCE_PACK);
- Id: 200425
AegisName: CostumeMilePack_35_1
# Name: Nyangvine Costume Mileage Package I (Stone Box 35)
Name: Nyangvine Costume Mileage Package I (Stone Box 35
Type: Cash
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoGuildStorage: true
NoMail: true
NoAuction: true
Script: |
getgroupitem(IG_COSTUMEMILEPACK_35_1);
- Id: 200426
AegisName: CostumeMilePack_35_2
# Name: Nyangvine Costume Mileage Package II (Stone Box 35)
Name: Nyangvine Costume Mileage Package II (Stone Box 3
Type: Cash
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoGuildStorage: true
NoMail: true
NoAuction: true
Script: |
getgroupitem(IG_COSTUMEMILEPACK_35_2);
- Id: 200427
AegisName: CostumeMilePack_35_3
# Name: Nyangvine Costume Mileage Package III (Stone Box 35)
Name: Nyangvine Costume Mileage Package III (Stone Box
Type: Cash
Flags:
Container: true
Trade:
NoDrop: true
NoTrade: true
NoSell: true
NoCart: true
NoGuildStorage: true
NoMail: true
NoAuction: true
Script: |
getgroupitem(IG_COSTUMEMILEPACK_35_3);
- Id: 1100000
AegisName: IDTest_heal
Name: IDTest heal

20
db/re/item_enchant.yml
View File

@ -32187,6 +32187,20 @@ Body:
Grimoire_Furious: true
Soul_Furious: true
SpiritStick_Furious: true
Lapier_Furious: true
SharpSword_Furious: true
WhiteSword_Furious: true
Stick_Furious: true
MetalVilolin_Furious: true
Harp_Furious: true
MetalWhip_Furious: true
Whip_Furious: true
Flame_Staff_Furious: true
Rifle_Furious: true
Gatling_Furious: true
Specter_Furious: true
GaleClaw_Furious: true
Exterminate_Furious: true
Reset:
Chance: 80000
Price: 500000
@ -32357,6 +32371,12 @@ Body:
FuriousCirclet_MT: true
FuriousCirclet_EM: true
FuriousCirclet_SOA: true
FuriousCirclet_TR: true
FuriousCirclet_BO: true
FuriousCirclet_HN: true
FuriousCirclet_AG: true
FuriousCirclet_IQ: true
FuriousCirclet_NW: true
Reset:
Chance: 80000
Price: 500000

472
db/re/item_group_db.yml
View File

@ -51768,7 +51768,7 @@ Body:
Item: aegis_19868
Rate: 50
- Index: 3
Item: aegis_410245
Item: C_Brother_Keen_Eye
Rate: 50
- Index: 4
Item: C_Foxtail
@ -51777,7 +51777,7 @@ Body:
Item: aegis_400496
Rate: 50
- Index: 6
Item: aegis_420242
Item: C_Fluttering_Haze
Rate: 50
- Index: 7
Item: C_Cat_Mouth
@ -92258,7 +92258,7 @@ Body:
Item: Hero_Token_SH
Rate: 10
- Index: 17
Item: aegis_490220
Item: Hero_Token_HN
Rate: 10
- Group: JANUARYGIFTBOX_
SubGroups:
@ -109579,7 +109579,7 @@ Body:
Item: Small_Mana_Potion
Amount: 250
- Index: 1
Item: aegis_420304
Item: C_NightSkyOfRutie
- Index: 2
Item: K_Secret_Key
Amount: 30
@ -112975,3 +112975,467 @@ Body:
Item: E_EXP_Drop_Up_7days
- Index: 2
Item: Comp_AID_Buff_Box
- Group: ENCHANT_STONE_BOX35
SubGroups:
- SubGroup: 1
List:
- Index: 0
Item: Range_Stone_Robe_D
Rate: 10
- Index: 1
Item: Melee_Stone_Robe_D
Rate: 10
- Index: 2
Item: Magic_Stone_Robe_D
Rate: 10
- Index: 3
Item: SmatkStone_Robe
Rate: 10
- Index: 4
Item: M_PATKStone_Robe
Rate: 10
- Index: 5
Item: R_PATKStone_Robe
Rate: 10
- Index: 6
Item: ResistDefStone_Robe
Rate: 10
- Index: 7
Item: StaminaWISStone_Robe_D
Rate: 10
- Index: 8
Item: POWStone_Robe_D
Rate: 10
- Index: 9
Item: SplStone_Robe_D
Rate: 10
- Index: 10
Item: ConStone_Robe_D
Rate: 10
- Index: 11
Item: CrtStone_Robe_D
Rate: 10
- Index: 12
Item: aegis_1001615
Rate: 10
- Index: 13
Item: BioloStone_Robe
Rate: 10
- Index: 14
Item: InquisitorStone_Robe
Rate: 10
- Index: 15
Item: SpiritHandlerStone_Robe
Rate: 10
- Index: 16
Item: ReloadStone_Robe_D
Rate: 10
- Index: 17
Item: CriticalStone_Robe_D
Rate: 10
- Index: 18
Item: DoubleAttack_Stone
Rate: 20
- Index: 19
Item: Critical_Stone_Robe
Rate: 20
- Index: 20
Item: CastStone_Robe_D
Rate: 40
- Index: 21
Item: SPdrainStone_Robe_D
Rate: 40
- Index: 22
Item: HPdrainStone_Robe_D
Rate: 80
- Index: 23
Item: ASPDStone_Robe_D
Rate: 80
- Index: 24
Item: CastStone_Robe
Rate: 80
- Index: 25
Item: GeneticStone_Top3
Rate: 80
- Index: 26
Item: GeneticStone_Middle3
Rate: 80
- Index: 27
Item: GeneticStone_Bottom3
Rate: 80
- Index: 28
Item: SuraStone_Top3
Rate: 80
- Index: 29
Item: SuraStone_Middle3
Rate: 80
- Index: 30
Item: SuraStone_Bottom3
Rate: 80
- Index: 31
Item: DoramStone_Top3
Rate: 80
- Index: 32
Item: DoramStone_Middle3
Rate: 80
- Index: 33
Item: DoramStone_Bottom3
Rate: 80
- Index: 34
Item: Stone_Robe_Box
Rate: 170
- Index: 35
Item: Stone_Robe3_Box
Rate: 170
- Index: 36
Item: Magic_Stone_Top
Rate: 200
- Index: 37
Item: Magic_Stone_Middle
Rate: 200
- Index: 38
Item: Magic_Stone_Bottom
Rate: 200
- Index: 39
Item: Range_Stone_Top
Rate: 200
- Index: 40
Item: Range_Stone
Rate: 200
- Index: 41
Item: Range_Stone_Bottom
Rate: 200
- Index: 42
Item: Melee_Stone_Top
Rate: 200
- Index: 43
Item: Melee_Stone_Middle
Rate: 200
- Index: 44
Item: Melee_Stone_Bottom
Rate: 200
- Index: 45
Item: DefenseStone_Top
Rate: 200
- Index: 46
Item: DefenseStone_Middle
Rate: 200
- Index: 47
Item: DefenseStone_Bottom
Rate: 200
- Index: 48
Item: ReloadStone_Top
Rate: 200
- Index: 49
Item: ReloadStone_Middle
Rate: 200
- Index: 50
Item: ReloadStone_Bottom
Rate: 200
- Index: 51
Item: EXPStone_Middle
Rate: 200
- Index: 52
Item: EXPStone_Bottom
Rate: 200
- Index: 53
Item: EXPStone_Top
Rate: 200
- Index: 54
Item: Stone_Top_Box
Rate: 400
- Index: 55
Item: Stone_Top2_Box
Rate: 400
- Index: 56
Item: Stone_Middle_Box
Rate: 400
- Index: 57
Item: Stone_Middle2_Box
Rate: 400
- Index: 58
Item: Stone_Bottom_Box
Rate: 400
- Index: 59
Item: Stone_Bottom2_Box
Rate: 400
- Index: 60
Item: CastingStone_Top
Rate: 400
- Index: 61
Item: CastingStone_Middle
Rate: 400
- Index: 62
Item: CastingStone_Bottom
Rate: 400
- Index: 63
Item: Critical_Stone
Rate: 400
- Index: 64
Item: Critical_Stone_Top
Rate: 400
- Index: 65
Item: Critical_Stone_Bottom
Rate: 400
- Group: STOVE_CHANNELING_BOX_1
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: Battle_Manual100
Amount: 5
- Index: 1
Item: E_Token_Of_Siegfried
Amount: 5
- Index: 2
Item: Comp_Kafra_Card
Amount: 10
- Index: 3
Item: World_Tour_Ticket
Amount: 10
- Group: STOVE_CHANNELING_BOX_2
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: Boarding_Halter_Box30_Z
- Index: 1
Item: Comp_Almighty
Amount: 10
- Index: 2
Item: E_Wing_Of_Fly_3Day_Box
Amount: 3
- Index: 3
Item: Buff_Scroll_Box
Amount: 3
- Group: STOVE_CHANNELING_BOX_3
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: E_Life_Potion_Pack
Amount: 2
- Index: 1
Item: Comp_Small_Mana_Potion
Amount: 20
- Index: 2
Item: E_Infinity_Drink
Amount: 10
- Index: 3
Item: Comp_Power_Booster
Amount: 10
- Group: STOVE_CHANNELING_BOX_4
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: All_In_One_buff_B
Amount: 10
- Index: 1
Item: All_In_One_Healing_B
Amount: 10
- Index: 2
Item: Cachua_Coupon
Amount: 10
- Index: 3
Item: Evt_Cos_Coin
Amount: 10
- Group: LI_NYANGVINE_BOX1_35
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: Nyangvine_Fruit
Amount: 100
- Index: 1
Item: Enchant_Stone_Box35
Amount: 2
- Index: 2
Item: Comp_Bubble_Gum
Amount: 3
- Group: LI_NYANGVINE_BOX2_35
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: Nyangvine_Fruit
Amount: 200
- Index: 1
Item: Battle_Manual100
Amount: 5
- Index: 2
Item: Enchant_Stone_Box35
Amount: 2
- Group: LI_NYANGVINE_BOX3_35
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: Nyangvine_Fruit
Amount: 400
- Index: 1
Item: Comp_Bubble_Gum
Amount: 10
- Index: 2
Item: Battle_Manual100
Amount: 5
- Index: 3
Item: Enchant_Stone_Box35
Amount: 5
- Group: A_SPEED_BOOSTER_BOX
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: Speed_Booster
Amount: 10
- Index: 1
Item: K_Secret_Key
- Group: A_SPEED_BOOSTER_10_BOX
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: Speed_Booster
Amount: 100
- Index: 1
Item: K_Secret_Key
Amount: 11
- Group: L_INFINITY_POWER_PACK
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: Limit_Power_Booster
Amount: 100
- Index: 1
Item: Infinity_Drink
Amount: 100
- Index: 2
Item: K_Secret_Key
Amount: 25
- Index: 3
Item: Cachua_Coupon
Amount: 5
- Group: L_ALL_RED_PACK
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: Almighty
Amount: 100
- Index: 1
Item: Red_Booster
Amount: 125
- Index: 2
Item: K_Secret_Key
Amount: 25
- Index: 3
Item: Cachua_Coupon
Amount: 5
- Group: L_DEFENSE_POTION_PACK
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: Small_Life_Potion
Amount: 200
- Index: 1
Item: Med_Life_Potion
Amount: 200
- Index: 2
Item: Mysterious_Water
Amount: 200
- Index: 3
Item: Small_Mana_Potion
Amount: 50
- Index: 4
Item: M_DEFScroll
Amount: 300
- Index: 5
Item: K_Secret_Key
Amount: 25
- Index: 6
Item: Cachua_Coupon
Amount: 5
- Group: L_SPEED_FORCE_PACK
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: Force_Booster
Amount: 100
- Index: 1
Item: Speed_Booster
Amount: 100
- Index: 2
Item: K_Secret_Key
Amount: 25
- Index: 3
Item: Cachua_Coupon
Amount: 5
- Group: L_SPECIAL_SPEED_PACK
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: Speed_Booster
Amount: 200
- Index: 1
Item: K_Secret_Key
Amount: 30
- Index: 2
Item: Cachua_Coupon
Amount: 10
- Group: L_SPECIAL_FORCE_PACK
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: Force_Booster
Amount: 200
- Index: 1
Item: K_Secret_Key
Amount: 30
- Index: 2
Item: Cachua_Coupon
Amount: 10
- Group: COSTUMEMILEPACK_35_1
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: Nyangvine_Fruit
Amount: 100
- Index: 1
Item: Evt_Cos_Coin
Amount: 12
- Index: 2
Item: Enchant_Stone_Box35
Amount: 3
- Group: COSTUMEMILEPACK_35_2
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: Nyangvine_Fruit
Amount: 200
- Index: 1
Item: Evt_Cos_Coin
Amount: 25
- Index: 2
Item: Enchant_Stone_Box35
Amount: 5
- Group: COSTUMEMILEPACK_35_3
SubGroups:
- SubGroup: 0
List:
- Index: 0
Item: Nyangvine_Fruit
Amount: 400
- Index: 1
Item: Evt_Cos_Coin
Amount: 50
- Index: 2
Item: Enchant_Stone_Box35
Amount: 10

524
db/re/item_reform.yml
View File

@ -9837,6 +9837,330 @@ Body:
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Snowflower_Armor
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Snowflower_Armor
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Snowflower_Manteau
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Snowflower_Manteau
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Snowflower_Boots
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Snowflower_Boots
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Snowflower_Pendant
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Snowflower_Pendant
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Snowflower_Necklace
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Snowflower_Necklace
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Snowflower_Robe
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Snowflower_Robe
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Snowflower_Muffler
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Snowflower_Muffler
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Snowflower_Shoes
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Snowflower_Shoes
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Snowflower_Ring
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Snowflower_Ring
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Snowflower_Earring
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Snowflower_Earring
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_T_Sword
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_T_Sword
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Lance
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Lance
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Sword
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Sword
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_B_Sword
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_B_Sword
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Spear
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Spear
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_T_Axe
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_T_Axe
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Axe
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Axe
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Mace
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Mace
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_M_Mace
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_M_Mace
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_R_Knife
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_R_Knife
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_B_Knife
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_B_Knife
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Knuckle
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Knuckle
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Katar
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Katar
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Bow
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Bow
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Violin
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Violin
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Whip
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Whip
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Humma
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Humma
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Book
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Book
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Wand
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Wand
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Staff
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Staff
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Foxtail
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Foxtail
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Revolver
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Revolver
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Rifle
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Rifle
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Shotgun
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Shotgun
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Gatling
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Gatling
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- BaseItem: Glacier_Launcher
Materials:
- Material: Imperfect_Rune
Amount: 10
ResultItem: R_Glacier_Launcher
ChangeRefine: -20
RandomOptionGroup: Group_0
ClearSlots: true
RemoveEnchantgrade: true
- Item: Season_H_Upgrade
BaseItems:
- BaseItem: Season_Hood_Spring
@ -10901,6 +11225,206 @@ Body:
Amount: 20
ResultItem: FuriousCirclet_SOA
ChangeRefine: 1
- BaseItem: FuriousCirclet_TR
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Ethernium
Amount: 10
- Material: Enriched_Ethernium
Amount: 20
ResultItem: FuriousCirclet_TR
ChangeRefine: 1
- BaseItem: FuriousCirclet_BO
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Ethernium
Amount: 10
- Material: Enriched_Ethernium
Amount: 20
ResultItem: FuriousCirclet_BO
ChangeRefine: 1
- BaseItem: FuriousCirclet_HN
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Ethernium
Amount: 10
- Material: Enriched_Ethernium
Amount: 20
ResultItem: FuriousCirclet_HN
ChangeRefine: 1
- BaseItem: Lapier_Furious
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Etherdeocon
Amount: 10
- Material: Enriched_Etherdeocon
Amount: 20
ResultItem: Lapier_Furious
ChangeRefine: 1
- BaseItem: SharpSword_Furious
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Etherdeocon
Amount: 10
- Material: Enriched_Etherdeocon
Amount: 20
ResultItem: SharpSword_Furious
ChangeRefine: 1
- BaseItem: WhiteSword_Furious
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Etherdeocon
Amount: 10
- Material: Enriched_Etherdeocon
Amount: 20
ResultItem: WhiteSword_Furious
ChangeRefine: 1
- BaseItem: Stick_Furious
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Etherdeocon
Amount: 10
- Material: Enriched_Etherdeocon
Amount: 20
ResultItem: Stick_Furious
ChangeRefine: 1
- BaseItem: MetalVilolin_Furious
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Etherdeocon
Amount: 10
- Material: Enriched_Etherdeocon
Amount: 20
ResultItem: MetalVilolin_Furious
ChangeRefine: 1
- BaseItem: Harp_Furious
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Etherdeocon
Amount: 10
- Material: Enriched_Etherdeocon
Amount: 20
ResultItem: Harp_Furious
ChangeRefine: 1
- BaseItem: MetalWhip_Furious
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Etherdeocon
Amount: 10
- Material: Enriched_Etherdeocon
Amount: 20
ResultItem: MetalWhip_Furious
ChangeRefine: 1
- BaseItem: Whip_Furious
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Etherdeocon
Amount: 10
- Material: Enriched_Etherdeocon
Amount: 20
ResultItem: Whip_Furious
ChangeRefine: 1
- BaseItem: Flame_Staff_Furious
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Etherdeocon
Amount: 10
- Material: Enriched_Etherdeocon
Amount: 20
ResultItem: Flame_Staff_Furious
ChangeRefine: 1
- BaseItem: Rifle_Furious
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Etherdeocon
Amount: 10
- Material: Enriched_Etherdeocon
Amount: 20
ResultItem: Rifle_Furious
ChangeRefine: 1
- BaseItem: Gatling_Furious
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Etherdeocon
Amount: 10
- Material: Enriched_Etherdeocon
Amount: 20
ResultItem: Gatling_Furious
ChangeRefine: 1
- BaseItem: Specter_Furious
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Etherdeocon
Amount: 10
- Material: Enriched_Etherdeocon
Amount: 20
ResultItem: Specter_Furious
ChangeRefine: 1
- BaseItem: GaleClaw_Furious
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Etherdeocon
Amount: 10
- Material: Enriched_Etherdeocon
Amount: 20
ResultItem: GaleClaw_Furious
ChangeRefine: 1
- BaseItem: Exterminate_Furious
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Etherdeocon
Amount: 10
- Material: Enriched_Etherdeocon
Amount: 20
ResultItem: Exterminate_Furious
ChangeRefine: 1
- BaseItem: FuriousCirclet_AG
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Ethernium
Amount: 10
- Material: Enriched_Ethernium
Amount: 20
ResultItem: FuriousCirclet_AG
ChangeRefine: 1
- BaseItem: FuriousCirclet_IQ
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Ethernium
Amount: 10
- Material: Enriched_Ethernium
Amount: 20
ResultItem: FuriousCirclet_IQ
ChangeRefine: 1
- BaseItem: FuriousCirclet_NW
MinimumRefine: 9
MaximumRefine: 11
Materials:
- Material: HD_Ethernium
Amount: 10
- Material: Enriched_Ethernium
Amount: 20
ResultItem: FuriousCirclet_NW
ChangeRefine: 1
- Item: Gaebolg_A_Hammer_1
BaseItems:
- BaseItem: Gaebolg_Armor

12
db/re/job_stats.yml
View File

@ -9213,7 +9213,7 @@ Body:
Vit: 1
Int: 1
- Level: 13
Agi: 1
Dex: 1
Spl: 1
- Level: 14
Sta: 1
@ -9229,7 +9229,7 @@ Body:
Int: 1
Dex: 1
- Level: 19
Dex: 1
Int: 1
- Level: 20
Vit: 1
Int: 1
@ -11154,7 +11154,6 @@ Body:
- Level: 2
Str: 1
Agi: 1
Sta: 1
- Level: 3
Vit: 1
Luk: 1
@ -11190,6 +11189,7 @@ Body:
Dex: 1
- Level: 15
Luk: 1
Sta: 1
- Level: 16
Vit: 1
Int: 1
@ -11230,13 +11230,13 @@ Body:
- Level: 30
Str: 1
Int: 1
Sta: 1
- Level: 31
Dex: 1
Con: 1
- Level: 32
Pow: 1
- Level: 33
Sta: 1
Crt: 1
- Level: 34
Crt: 1
@ -11251,7 +11251,10 @@ Body:
- Level: 40
Pow: 1
- Level: 41
Sta: 1
Con: 1
- Level: 42
Sta: 1
- Level: 43
Crt: 1
- Level: 44
@ -11260,6 +11263,7 @@ Body:
Con: 1
- Level: 46
Pow: 1
Sta: 1
- Level: 47
Con: 1
- Level: 48

2981
db/re/mob_db.yml
View File

File diff suppressed because it is too large Load Diff

106
db/re/mob_skill_db.txt
View File

@ -13105,6 +13105,108 @@
20280,G_ILL_WOOTAN_FIGHTER@KN_BRANDISHSPEAR,attack,57,5,2000,0,10000,yes,target,always,0,,,,,,6,
20280,G_ILL_WOOTAN_FIGHTER@NPC_FIREATTACK,attack,186,4,1000,0,5000,yes,target,always,0,,,,,,,
// Illusion of Teddy Bear
20255,ILL_TEDDY_BEAR_R@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
20255,ILL_TEDDY_BEAR_R@NPC_CURSEATTACK,chase,181,3,1000,500,5000,no,target,always,0,,,,,,2,
20255,ILL_TEDDY_BEAR_R@NPC_CRITICALSLASH,attack,170,1,1500,500,5000,no,target,always,0,,,,,,6,
20255,ILL_TEDDY_BEAR_R@NPC_FIREATTACK,attack,186,2,1000,0,5000,yes,target,always,0,,,,,,37,
20255,ILL_TEDDY_BEAR_R@BS_HAMMERFALL,attack,110,5,500,1500,5000,no,target,always,0,,,,,,8,
20256,ILL_TEDDY_BEAR_Y@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
20256,ILL_TEDDY_BEAR_Y@MG_LIGHTNINGBOLT,chase,20,2,1500,1000,5000,no,target,always,0,,,,,,,
20256,ILL_TEDDY_BEAR_Y@NPC_CURSEATTACK,chase,181,5,1000,500,5000,no,target,always,0,,,,,,2,
20256,ILL_TEDDY_BEAR_Y@WZ_VERMILION,attack,85,3,500,1500,10000,no,target,always,0,,,,,,6,
20256,ILL_TEDDY_BEAR_Y@WZ_STORMGUST,attack,89,3,1000,1500,10000,no,target,always,0,,,,,,37,
20256,ILL_TEDDY_BEAR_Y@HW_GANBANTEIN,attack,483,1,1000,0,5000,no,target,skillused,18,,,,,,8,
20256,ILL_TEDDY_BEAR_Y@MG_LIGHTNINGBOLT,attack,20,3,500,1500,10000,no,target,always,0,,,,,,,
20257,ILL_TEDDY_BEAR_G@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
20257,ILL_TEDDY_BEAR_G@NPC_BLOODDRAIN,chase,199,1,1500,0,5000,yes,target,always,0,,,,,,,
20257,ILL_TEDDY_BEAR_G@NPC_CLOUD_KILL,attack,739,3,500,1500,20000,no,target,always,0,,,,,,6,
20258,ILL_TEDDY_BEAR_W@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
20258,ILL_TEDDY_BEAR_W@NPC_CHEAL,chase,729,5,3000,500,3000,no,self,friendhpltmaxrate,99,,,,,,,
20258,ILL_TEDDY_BEAR_W@NPC_CHEAL,chase,729,5,3000,500,3000,no,self,myhpltmaxrate,99,,,,,,,
20258,ILL_TEDDY_BEAR_W@NPC_CHEAL,attack,729,5,1500,500,5000,no,self,always,0,,,,,,2,
20258,ILL_TEDDY_BEAR_W@AL_HEAL,attack,28,9,2000,0,2000,yes,friend,friendhpltmaxrate,99,,,,,,,
20258,ILL_TEDDY_BEAR_W@AL_HEAL,attack,28,9,2000,0,2000,yes,friend,myhpltmaxrate,99,,,,,,3,
20258,ILL_TEDDY_BEAR_W@AM_POTIONPITCHER,attack,231,4,5000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,,
20258,ILL_TEDDY_BEAR_W@AM_POTIONPITCHER,attack,231,4,5000,500,5000,no,friend,myhpltmaxrate,30,,,,,,5,
20258,ILL_TEDDY_BEAR_W@NPC_ALLHEAL,attack,687,1,10000,5000,30000,no,self,myhpltmaxrate,10,,,,,,6,
20258,ILL_TEDDY_BEAR_W@CR_HOLYCROSS,attack,253,5,500,0,5000,yes,target,always,0,,,,,,32,
20259,ILL_TEDDY_BEAR_B@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
20259,ILL_TEDDY_BEAR_B@MG_COLDBOLT,chase,14,2,1500,1000,5000,no,target,always,0,,,,,,23,
20259,ILL_TEDDY_BEAR_B@NPC_STORMGUST2,attack,723,1,500,1500,10000,no,target,always,0,,,,,,20,
20259,ILL_TEDDY_BEAR_B@NPC_WATERATTACK,attack,184,2,1500,0,5000,yes,target,always,0,,,,,,6,
20259,ILL_TEDDY_BEAR_B@MG_COLDBOLT,attack,14,3,500,1500,10000,no,target,always,0,,,,,,,
20260,ILL_TEDDY_BEAR_S@NPC_AGIUP,attack,350,1,5000,0,20000,yes,self,always,0,,,,,,,
20260,ILL_TEDDY_BEAR_S@NPC_BLEEDING2,attack,764,5,2000,500,10000,no,target,always,0,,,,,,,
20260,ILL_TEDDY_BEAR_S@NPC_CRITICALWOUND,attack,673,3,1000,500,20000,no,target,always,0,,,,,,,
20260,ILL_TEDDY_BEAR_S@NPC_WIDESIGHT,attack,669,1,10000,0,30000,yes,self,always,0,,,,,,,
20260,ILL_TEDDY_BEAR_S@NPC_WEAPONBRAKER,attack,343,1,10000,0,40000,yes,target,always,0,,,,,,,
20260,ILL_TEDDY_BEAR_S@NPC_DARKBREATH,attack,202,5,2000,3000,10000,no,target,myhpltmaxrate,60,,,,,,0,
20260,ILL_TEDDY_BEAR_S@CR_HOLYCROSS,attack,253,10,500,0,5000,yes,target,always,0,,,,,,32,
20260,ILL_TEDDY_BEAR_S@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
20260,ILL_TEDDY_BEAR_S@NPC_CALLSLAVE,idle,352,1,10000,0,10000,yes,self,always,0,,,,,,,
20260,ILL_TEDDY_BEAR_S@NPC_CALLSLAVE,chase,352,1,10000,0,5000,yes,self,always,0,,,,,,,
// 20260,ILL_TEDDY_BEAR_S@NPC_EARTHQUAKE_K,attack,750,5,1500,2000,20000,no,target,myhpltmaxrate,30,,,,,,,
20260,ILL_TEDDY_BEAR_S@NPC_EARTHQUAKE,attack,653,5,1500,2000,20000,no,target,myhpltmaxrate,30,,,,,,,
20260,ILL_TEDDY_BEAR_S@NPC_PULSESTRIKE,attack,661,5,3000,3000,20000,no,self,always,0,,,,,,,
20260,ILL_TEDDY_BEAR_S@NPC_SUMMONSLAVE,idle,196,1,10000,1000,30000,no,self,slavele,1,20255,20256,20257,20259,,,
20260,ILL_TEDDY_BEAR_S@NPC_SUMMONSLAVE,attack,196,1,5000,1000,30000,no,self,slavele,1,20255,20256,20257,20259,,,
20260,ILL_TEDDY_BEAR_S@NPC_POWERUP,attack,349,5,10000,0,60000,yes,self,myhpltmaxrate,20,,,,,,6,
20260,ILL_TEDDY_BEAR_S@NPC_GRANDDARKNESS,attack,339,10,3000,1000,5000,no,self,always,0,,,,,,,
20260,ILL_TEDDY_BEAR_S@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
20260,ILL_TEDDY_BEAR_S@AL_TELEPORT,walk,26,1,5000,0,10000,yes,self,rudeattacked,0,,,,,,,
20260,ILL_TEDDY_BEAR_S@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
20260,ILL_TEDDY_BEAR_S@SA_LANDPROTECTOR,attack,288,2,3000,1000,10000,no,target,groundattacked,0,,,,,,6,
20260,ILL_TEDDY_BEAR_S@AL_PNEUMA,attack,25,1,3000,0,5000,yes,target,longrangeattacked,0,,,,,,18,
20261,ILL_PITMAN@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
20261,ILL_PITMAN@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,mobnearbygt,4,,,,,,,
20261,ILL_PITMAN@NPC_SILENCEATTACK,chase,178,3,500,0,5000,no,target,always,0,,,,,,6,
20261,ILL_PITMAN@NPC_COMBOATTACK,attack,171,3,500,700,5000,no,target,always,0,,,,,,,
20261,ILL_PITMAN@TF_SPRINKLESAND,attack,149,1,500,0,5000,no,target,always,0,,,,,,6,
20261,ILL_PITMAN@SM_MAGNUM,attack,7,3,1000,0,20000,yes,self,always,0,,,,,,32,
20261,ILL_PITMAN@NPC_GUIDEDATTACK,attack,172,3,2000,0,15000,yes,target,always,0,,,,,,37,
20262,ILL_MINERAL@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
20262,ILL_MINERAL@AS_GRIMTOOTH,idle,137,3,5000,0,500,yes,target,mystatuson,0,,,,,,,
20262,ILL_MINERAL@AL_HEAL,idle,28,9,5000,0,1500,yes,friend,mystatuson,0,,,,,,18,
20262,ILL_MINERAL@TF_HIDING,chase,51,1,2000,0,10000,yes,self,always,0,,,,,,19,
20262,ILL_MINERAL@TF_HIDING,chase,51,1,10000,0,10000,yes,self,myhpltmaxrate,30,,,,,,19,
20262,ILL_MINERAL@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,mobnearbygt,4,,,,,,,
20262,ILL_MINERAL@NPC_COMBOATTACK,attack,171,3,500,700,5000,no,target,always,0,,,,,,,
20262,ILL_MINERAL@TF_SPRINKLESAND,attack,149,1,500,0,5000,no,target,always,0,,,,,,6,
20262,ILL_MINERAL@NPC_GUIDEDATTACK,attack,172,3,2000,0,15000,yes,target,always,0,,,,,,37,
20262,ILL_MINERAL@NPC_RANDOMATTACK,attack,183,2,1500,500,5000,yes,target,always,0,,,,,,,
20263,ILL_OBSIDIAN@TF_HIDING,idle,51,1,500,500,5000,yes,self,always,0,,,,,,19,
20263,ILL_OBSIDIAN@AS_GRIMTOOTH,idle,137,3,5000,0,500,yes,target,mystatuson,0,,,,,,,
20263,ILL_OBSIDIAN@WZ_EARTHSPIKE,chase,90,3,1500,500,5000,no,target,always,0,,,,,,,
20263,ILL_OBSIDIAN@CR_SHIELDCHARGE,attack,250,3,1000,1000,5000,no,target,always,0,,,,,,,
20263,ILL_OBSIDIAN@NPC_GROUNDATTACK,attack,185,2,500,500,5000,yes,target,always,0,,,,,,,
20263,ILL_OBSIDIAN@TF_HIDING,attack,51,1,500,500,50000,yes,self,always,0,,,,,,19,
20264,G_ILL_TEDDY_BEAR_R@NPC_CURSEATTACK,chase,181,3,1000,500,5000,no,target,always,0,,,,,,2,
20264,G_ILL_TEDDY_BEAR_R@NPC_CRITICALSLASH,attack,170,1,1500,500,5000,no,target,always,0,,,,,,6,
20264,G_ILL_TEDDY_BEAR_R@NPC_FIREATTACK,attack,186,5,1000,0,5000,yes,target,always,0,,,,,,37,
20264,G_ILL_TEDDY_BEAR_R@BS_HAMMERFALL,attack,110,5,500,1500,5000,no,target,always,0,,,,,,8,
20265,G_ILL_TEDDY_BEAR_Y@MG_LIGHTNINGBOLT,chase,20,2,1500,1000,5000,no,target,always,0,,,,,,,
20265,G_ILL_TEDDY_BEAR_Y@NPC_CURSEATTACK,chase,181,5,1000,500,5000,no,target,always,0,,,,,,2,
20265,G_ILL_TEDDY_BEAR_Y@WZ_VERMILION,attack,85,3,500,1500,10000,no,target,always,0,,,,,,6,
20265,G_ILL_TEDDY_BEAR_Y@WZ_STORMGUST,attack,89,3,1000,1500,10000,no,target,always,0,,,,,,37,
20265,G_ILL_TEDDY_BEAR_Y@HW_GANBANTEIN,attack,483,1,1000,0,5000,no,target,skillused,18,,,,,,8,
20265,G_ILL_TEDDY_BEAR_Y@MG_LIGHTNINGBOLT,attack,20,3,500,1500,10000,no,target,always,0,,,,,,,
20266,G_ILL_TEDDY_BEAR_G@NPC_BLOODDRAIN,chase,199,1,1500,0,5000,yes,target,always,0,,,,,,,
20266,G_ILL_TEDDY_BEAR_G@NPC_CLOUD_KILL,attack,739,3,500,1500,20000,no,target,always,0,,,,,,6,
20267,G_ILL_TEDDY_BEAR_W@NPC_CHEAL,chase,729,5,3000,500,3000,no,self,friendhpltmaxrate,99,,,,,,,
20267,G_ILL_TEDDY_BEAR_W@NPC_CHEAL,chase,729,5,3000,500,3000,no,self,myhpltmaxrate,99,,,,,,,
20267,G_ILL_TEDDY_BEAR_W@NPC_CHEAL,attack,729,5,1500,500,5000,no,self,always,0,,,,,,2,
20267,G_ILL_TEDDY_BEAR_W@AL_HEAL,attack,28,9,2000,0,2000,yes,friend,friendhpltmaxrate,99,,,,,,,
20267,G_ILL_TEDDY_BEAR_W@AL_HEAL,attack,28,9,2000,0,2000,yes,friend,myhpltmaxrate,99,,,,,,3,
20267,G_ILL_TEDDY_BEAR_W@AM_POTIONPITCHER,attack,231,4,5000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,,
20267,G_ILL_TEDDY_BEAR_W@AM_POTIONPITCHER,attack,231,4,5000,500,5000,no,friend,myhpltmaxrate,30,,,,,,5,
20267,G_ILL_TEDDY_BEAR_W@NPC_ALLHEAL,attack,687,1,10000,5000,30000,no,self,myhpltmaxrate,10,,,,,,6,
20267,G_ILL_TEDDY_BEAR_W@CR_HOLYCROSS,attack,253,5,500,0,5000,yes,target,always,0,,,,,,32,
20268,G_ILL_TEDDY_BEAR_B@MG_COLDBOLT,chase,14,2,1500,1000,5000,no,target,always,0,,,,,,23,
20268,G_ILL_TEDDY_BEAR_B@NPC_STORMGUST2,attack,723,1,500,1500,10000,no,target,always,0,,,,,,20,
20268,G_ILL_TEDDY_BEAR_B@NPC_WATERATTACK,attack,184,2,1500,0,5000,yes,target,always,0,,,,,,6,
20268,G_ILL_TEDDY_BEAR_B@MG_COLDBOLT,attack,14,3,500,1500,10000,no,target,always,0,,,,,,,
// Episode 17.1 - Illusion (custom) #!todo
20340,EL-A17T@NPC_AGIUP,chase,350,5,2000,0,60000,no,self,always,0,,,,,,6,
20340,EL-A17T@NPC_POWERUP,attack,349,5,2000,0,60000,no,self,always,0,,,,,,6,
@ -14673,7 +14775,7 @@
21360,EP18_MD_SCHULANG_L@NPC_TELEKINESISATTACK,attack,191,2,3000,0,5000,yes,target,always,0,,,,,,,
21360,EP18_MD_SCHULANG_L@NPC_POWERUP,attack,349,3,5000,0,30000,yes,self,always,0,,,,,,,
21360,EP18_MD_SCHULANG_L@NPC_DARKSTRIKE,chase,340,3,3000,200,15000,yes,target,always,0,,,,,,,
// 21360,EP18_MD_SCHULANG_L@NPC_DEADLYCURSE2,attack,779,5,5000,1000,30000,no,self,always,0,,,,,,55,
21360,EP18_MD_SCHULANG_L@NPC_DEADLYCURSE2,attack,779,5,5000,1000,30000,no,self,always,0,,,,,,55,
21360,EP18_MD_SCHULANG_L@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
21360,EP18_MD_SCHULANG_L@NPC_DARKSTRIKE,attack,340,3,3000,200,15000,yes,target,always,0,,,,,,,
21360,EP18_MD_SCHULANG_L@NPC_WIDESTONE2,attack,759,3,3000,500,30000,no,target,always,0,,,,,,,
@ -14698,6 +14800,6 @@
21361,EP18_MD_DEMI_FREYJA_L@NPC_HELLJUDGEMENT2,attack,768,5,1000,500,120000,yes,target,always,0,,,,,,,
21361,EP18_MD_DEMI_FREYJA_L@NPC_CHANGEDARKNESS,attack,168,1,1000,0,120000,yes,self,always,0,,,,,,,
21361,EP18_MD_DEMI_FREYJA_L@NPC_CHANGEHOLY,attack,167,1,3000,0,120000,yes,self,always,0,,,,,,,
// 21361,EP18_MD_DEMI_FREYJA_L@NPC_DEADLYCURSE2,attack,779,5,5000,1000,30000,no,self,always,0,,,,,,55,
21361,EP18_MD_DEMI_FREYJA_L@NPC_DEADLYCURSE2,attack,779,5,5000,1000,30000,no,self,always,0,,,,,,55,
21361,EP18_MD_DEMI_FREYJA_L@NPC_CANE_OF_EVIL_EYE,chase,780,3,8000,300,30000,no,target,always,0,,,,,,,
21361,EP18_MD_DEMI_FREYJA_L@NPC_CANE_OF_EVIL_EYE,attack,780,5,7000,300,30000,yes,target,always,0,,,,,,,

1304
db/re/pet_db.yml
View File

File diff suppressed because it is too large Load Diff

96
db/re/quest_db.yml
View File

@ -1404,21 +1404,21 @@ Body:
TimeLimit: 4h
- Id: 3455
Title: Illusion Investigation Team - Machoko
# - Id: 3456
# Title: Illusion of Teddy Bear 100 Kills
# Targets:
# - Id: 1
# Count: 100
# Location: ein_d02_i
# MapMobTargets:
# ILL_TEDDY_BEAR_B: true
# ILL_MINERAL: true
# ILL_PITMAN: true
# ILL_TEDDY_BEAR_R: true
# ILL_TEDDY_BEAR_Y: true
# ILL_TEDDY_BEAR_W: true
# ILL_OBSIDIAN: true
# ILL_TEDDY_BEAR_G: true
- Id: 3456
Title: Illusion of Teddy Bear 100 Kills
Targets:
- Id: 1
Count: 100
Location: ein_d02_i
MapMobTargets:
ILL_TEDDY_BEAR_B: true
ILL_MINERAL: true
ILL_PITMAN: true
ILL_TEDDY_BEAR_R: true
ILL_TEDDY_BEAR_Y: true
ILL_TEDDY_BEAR_W: true
ILL_OBSIDIAN: true
ILL_TEDDY_BEAR_G: true
- Id: 3457
Title: Illusion of Teddy Bear 100 Kills - Standby
TimeLimit: 4h
@ -8038,14 +8038,74 @@ Body:
- Id: 11555
Title: In search of the taste of hometown - Waiting
TimeLimit: 4h
- Id: 11556
Title: Missing Steven
- Id: 11557
Title: Missing Steven
- Id: 11558
Title: Missing Steven
- Id: 11559
Title: Missing Steven
- Id: 11560
Title: Missing Steven
- Id: 11561
Title: Missing Steven
- Id: 11562
Title: Missing Steven
- Id: 11563
Title: Nasarian Conspiracy
Targets:
- Mob: ILL_TEDDY_BEAR_R
Count: 10
- Mob: ILL_TEDDY_BEAR_Y
Count: 10
- Mob: ILL_TEDDY_BEAR_G
Count: 10
- Id: 11564
Title: Nasarian Conspiracy
Targets:
- Mob: ILL_TEDDY_BEAR_B
Count: 10
- Mob: ILL_TEDDY_BEAR_W
Count: 10
- Id: 11565
Title: RUN!
Targets:
- Mob: ILL_PITMAN
Count: 10
- Mob: ILL_MINERAL
Count: 10
- Mob: ILL_OBSIDIAN
Count: 10
- Id: 11566
Title: Escape!!!! - Wait
Title: RUN! - Pending
TimeLimit: 4h
- Id: 11567
Title: Things That Shouldn't Exist
Targets:
- Mob: ILL_TEDDY_BEAR_R
Count: 10
- Mob: ILL_TEDDY_BEAR_Y
Count: 10
- Mob: ILL_TEDDY_BEAR_G
Count: 10
- Id: 11568
Title: Things That Shouldn't Exist
Targets:
- Mob: ILL_TEDDY_BEAR_B
Count: 10
- Mob: ILL_TEDDY_BEAR_W
Count: 10
- Id: 11569
Title: Present not to exist-wait
Title: Things That Shouldn't Exist - Pending
TimeLimit: 4h
- Id: 11570
Title: Let the Light Devour the Darkness
Targets:
- Mob: ILL_TEDDY_BEAR_S
Count: 1
- Id: 11571
Title: Let the light consume the darkness - Wait
Title: Let the Light Devour the Darkness - Pending
TimeLimit: 4h
- Id: 11596
Title: Old Memories

63
db/re/skill_db.yml
View File

@ -7235,6 +7235,7 @@ Body:
TargetType: Self
DamageFlags:
IgnoreDefense: true
SimpleDefense: true
Range: 9
Hit: Single
HitCount: 1
@ -7663,8 +7664,8 @@ Body:
Type: Weapon
TargetType: Attack
DamageFlags:
IgnoreDefense: true
IgnoreFlee: true
SimpleDefense: true
Flags:
TargetTrap: true
Range: -2
@ -7698,7 +7699,6 @@ Body:
- Level: 5
Time: 1000
Duration1: 3000
Duration2: 300000
FixedCastTime:
- Level: 1
Time: 2000
@ -8878,6 +8878,7 @@ Body:
HitCount: 1
SplashArea: -1
AfterCastActDelay: 300
Duration1: 15000
Duration2: 27000
Cooldown: 4000
Requires:
@ -9135,6 +9136,7 @@ Body:
HitCount: 1
SplashArea: -1
AfterCastActDelay: 300
Duration1: 4500
Duration2: 4500
Cooldown: 4000
Requires:
@ -9453,6 +9455,7 @@ Body:
DamageFlags:
IgnoreAtkCard: true
IgnoreFlee: true
SimpleDefense: true
Flags:
IsNpc: true
TargetSelf: true
@ -18361,6 +18364,43 @@ Body:
HitCount: 1
Duration1: 60000
Status: Relieve_off
- Id: 776
Name: NPC_DEADLYCURSE
Description: Deadly Curse
MaxLevel: 1
TargetType: Attack
DamageFlags:
NoDamage: true
Flags:
IgnoreGtb: true
IsNpc: true
Range: 1
Duration1: 15000
Status: Deadly_Defeasance
- Id: 779
Name: NPC_DEADLYCURSE2
Description: Deadly Curse 2
MaxLevel: 5
TargetType: Self
DamageFlags:
NoDamage: true
Splash: true
Flags:
IgnoreGtb: true
IsNpc: true
SplashArea:
- Level: 1
Area: 2
- Level: 2
Area: 3
- Level: 3
Area: 4
- Level: 4
Area: 5
- Level: 5
Area: 6
Duration2: 30000
Status: Deadly_Defeasance
- Id: 780
Name: NPC_CANE_OF_EVIL_EYE
Description: Cane of evil eye
@ -19111,6 +19151,7 @@ Body:
DamageFlags:
Splash: true
IgnoreFlee: true
SimpleDefense: true
Flags:
TargetTrap: true
Range: 9
@ -22656,6 +22697,7 @@ Body:
DamageFlags:
Splash: true
IgnoreFlee: true
SimpleDefense: true
Flags:
AllowOnMado: true
Range: 9
@ -24520,7 +24562,7 @@ Body:
TargetType: Attack
Range: 1
Hit: Single
HitCount: 5
HitCount: -5
CopyFlags:
Skill:
Reproduce: true
@ -28790,6 +28832,7 @@ Body:
DamageFlags:
Splash: true
IgnoreFlee: true
SimpleDefense: true
Range:
- Level: 1
Size: 7
@ -29688,6 +29731,19 @@ Body:
- Level: 2
Amount: 100
Status: Odins_Power
- Id: 2543
Name: ALL_RAY_OF_PROTECTION
Description: Ray of Protection
MaxLevel: 1
Type: Magic
TargetType: Support
DamageFlags:
NoDamage: true
Range: 1
Hit: Single
HitCount: 1
Duration1: 60000
Status: Protection
- Id: 2544
Name: MC_CARTDECORATE
Description: Decorate Cart
@ -33146,6 +33202,7 @@ Body:
DamageFlags:
Splash: true
IgnoreFlee: true
SimpleDefense: true
Flags:
TargetTrap: true
Range: 9

37
db/re/status.yml
View File

@ -72,6 +72,7 @@ Body:
Stun: true
Sleep: true
Burning: true
Protection: true
EndOnStart:
Aeterna: true
EndReturn:
@ -125,6 +126,7 @@ Body:
Stun: true
Sleep: true
Burning: true
Protection: true
EndOnStart:
Aeterna: true
- Status: Stun
@ -144,6 +146,7 @@ Body:
Inspiration: true
Gvg_Stun: true
Stun: true
Protection: true
- Status: Sleep
DurationLookup: NPC_SLEEPATTACK
States:
@ -162,6 +165,7 @@ Body:
Inspiration: true
Gvg_Sleep: true
Sleep: true
Protection: true
- Status: Poison
DurationLookup: NPC_POISON
CalcFlags:
@ -180,6 +184,7 @@ Body:
Inspiration: true
Poison: true
Dpoison: true
Protection: true
- Status: Curse
DurationLookup: NPC_WIDECURSE
CalcFlags:
@ -198,6 +203,7 @@ Body:
Inspiration: true
Gvg_Curse: true
Curse: true
Protection: true
- Status: Silence
DurationLookup: NPC_SILENCEATTACK
States:
@ -214,6 +220,7 @@ Body:
Inspiration: true
Gvg_Silence: true
Silence: true
Protection: true
- Status: Confusion
DurationLookup: NPC_WIDECONFUSE
Flags:
@ -223,6 +230,7 @@ Body:
Fail:
Refresh: true
Inspiration: true
Protection: true
EndReturn:
Confusion: true
- Status: Blind
@ -242,6 +250,7 @@ Body:
Fear: true
Gvg_Blind: true
Blind: true
Protection: true
- Status: Bleeding
Icon: EFST_BLOODING
DurationLookup: NPC_BLEEDING
@ -259,6 +268,7 @@ Body:
Fail:
Refresh: true
Inspiration: true
Protection: true
- Status: Dpoison
DurationLookup: NPC_POISON
CalcFlags:
@ -999,6 +1009,7 @@ Body:
Flags:
SendOption: true
- Status: Extremityfist
Icon: EFST_EXTREMITYFIST
DurationLookup: MO_EXTREMITYFIST
CalcFlags:
Regen: true
@ -6107,14 +6118,6 @@ Body:
NoBanishingBuster: true
NoDispell: true
RemoveOnHermode: true
- Status: Extremityfist2
Icon: EFST_EXTREMITYFIST
DurationLookup: MO_EXTREMITYFIST
Flags:
NoRemoveOnDead: true
NoDispell: true
NoBanishingBuster: true
NoClearance: true
- Status: Mtf_Aspd2
Icon: EFST_MTF_ASPD2
CalcFlags:
@ -8927,6 +8930,24 @@ Body:
NoClearance: true
EndOnStart:
Decreaseagi: true
- Status: Protection
Icon: EFST_RAY_OF_PROTECTION
Flags:
NoClearbuff: true
NoDispell: true
NoBanishingBuster: true
NoClearance: true
EndOnStart:
Stun: true
Sleep: true
Curse: true
Stone: true
Poison: true
Blind: true
Silence: true
Bleeding: true
Confusion: true
Freeze: true
- Status: Hogogong
Icon: EFST_HOGOGONG
DurationLookup: SH_HOWLING_OF_CHUL_HO

16
doc/ea_job_system.txt
View File

@ -63,11 +63,12 @@ The eA Job System:
EAJL_2 0x300
- The third category is type. Classes can either be normal, rebirth/advanced,
adopted, or third class.
adopted, third class or fourth class.
EAJL_UPPER 0x1000
EAJL_BABY 0x2000
EAJL_THIRD 0x4000
EAJL_FOURTH 0x8000
So using these three categories, any job class can be constructed from the
others. Let's take a swordman, for example.
@ -143,6 +144,11 @@ EAJL_THIRD:
if(@eac&EAJL_THIRD)
mes "Wow, you've really grown!";
EAJL_FOURTH:
Checks if a class is a fourth job.
if(@eac&EAJL_FOURTH)
mes "Wow, you've really grown!";
EAJ_UPPERMASK:
The upper mask can be used to "strip" the upper/baby characteristics of a
class, used when you want to know if someone is a certain class regardless
@ -169,13 +175,19 @@ EAJ_BASEMASK:
check will always fail for the same reasons previously explained.
EAJ_THIRDMASK:
This mask strips 3rd class attributes. It will give the "normal" class of
This mask strips 3rd class attributes. It will give the "normal" class of
a third job, regardless of rebirth/adopted status. When used on non-third
class characters, it will return the second job, or, if that also doesn't
exist, the first.
if ((@eac&EAJ_THIRDMASK) == EAJ_WARLOCK_T)
mes "You've gone through rebirth, I see.";
EAJ_FOURTHMASK:
This mask strips 4th class attributes. Although currently there are none,
it is suggested to use this for checking.
if ((@eac&EAJ_FOURTHMASK) == EAJ_DRAGON_KNIGHT)
mes "Oh you are a Dragon Knight, I see.";
The script commands eaclass, roclass:
-------------------------------------------------------------------------------

2
doc/item_bonus.txt
View File

@ -31,7 +31,7 @@ This list contains all available constants referenced in the 'bonus' commands.
RC2_Bio5_Swordman_Thief, RC2_Bio5_Acolyte_Merchant, RC2_Bio5_Mage_Archer, RC2_Bio5_MVP,
RC2_Clocktower, RC2_Thanatos, RC2_Faceworm, RC2_Hearthunter, RC2_Rockridge, RC2_Werner_Lab,
RC2_Temple_Demon, RC2_Illusion_Vampire, RC2_Malangdo, RC2_EP172ALPHA, RC2_EP172BETA, RC2_EP172BATH,
RC2_Illusion_Turtle, RC2_Rachel_Sanctuary, RC2_Illusion_Luanda
RC2_Illusion_Turtle, RC2_Rachel_Sanctuary, RC2_Illusion_Luanda, RC2_Illusion_Frozen, RC2_Illusion_Moonlight
* Class (c)
Class_Normal, Class_Boss, Class_Guardian, Class_All

12
doc/mob_db.txt
View File

@ -204,6 +204,18 @@ AttackMotion: Attack animation motion. Low value means monster's attack will be
---------------------------------------
ClientAttackMotion: The time from the start of a normal attack until the damage frame shows on client. At the same time you also get stopped on the client.
This value is only needed if you use the "synchronize_damage" feature (battle/battle.conf).
If you created a custom sprite, you want to set this value to the timing of the damage frame in your *.act file.
In Act Editor you can set the damage frame by setting the frame sound to "atk". If you don't define a damage frame, it will default to the second to last
frame. Also keep in mind that the Act Editor displays slightly inaccurate speed. Every 25ms in Act Editor is 24ms in reality.
Example: Drops has a animation speed of 24ms per frame and the 13th frame (frame #12) is the damage frame. This means the damage shows after 12 frames.
That's why Drops has a ClientAttackMotion of 24*12 = 288.
---------------------------------------
DamageMotion: Damage animation motion, same as aMotion but used to display the "I am hit" animation. Coincidentally, this same value is used to determine how long it is before the monster/player can move again. Endure is dMotion = 0, obviously.
---------------------------------------

68
doc/permissions.txt
View File

@ -11,6 +11,12 @@
This file describes the functions of player group permissions,
configured in '/conf/groups.conf' under the "permissions" bracket.
The permission name used in '/conf/groups.conf' goes after the asterisk "*",
while the constant name used in scripts and src goes between the parentheses "()"
in the following format:
*permission_name (PC_PERM_CONSTANT_NAME)
To search for a permission, write "*" before its name.
The format of this file is as follows:
1. Basic Permissions
@ -22,20 +28,20 @@ The format of this file is as follows:
========================
---------------------------------------
*can_trade
*can_trade (PC_PERM_TRADE)
Allows player to distribute items, such as through trades, dropping,
vending, storage, mail, etc.
---------------------------------------
*can_party
*can_party (PC_PERM_PARTY)
Allows player to create and join parties.
---------------------------------------
*attendance
*attendance (PC_PERM_ATTENDANCE)
Allows player to use the daily attendance system.
@ -46,78 +52,78 @@ Allows player to use the daily attendance system.
===========================
---------------------------------------
*all_skill
*all_skill (PC_PERM_ALL_SKILL)
Grants player all available skills in the player's skill tree.
---------------------------------------
*all_equipment
*all_equipment (PC_PERM_USE_ALL_EQUIPMENT)
Allows player to equip any item, regardless of requirements (class, level,
etc.). Note that this can cause client errors if a sprite does not exist.
---------------------------------------
*skill_unconditional
*skill_unconditional (PC_PERM_SKILL_UNCONDITIONAL)
Allows player to use any skill, regardless of required conditions (SP,
items, etc.).
---------------------------------------
*join_chat
*join_chat (PC_PERM_JOIN_ALL_CHAT)
Allows player to join password-protected chatrooms.
---------------------------------------
*kick_chat
*kick_chat (PC_PERM_NO_CHAT_KICK)
Prevents player from being kicked from a chatroom.
---------------------------------------
*view_hpmeter
*view_hpmeter (PC_PERM_VIEW_HPMETER)
Allows player to see the HP bar of every player.
---------------------------------------
*view_equipment
*view_equipment (PC_PERM_VIEW_EQUIPMENT)
Allows player to view the equipment of every player, regardless of that
player's setting.
---------------------------------------
*hack_info
*hack_info (PC_PERM_RECEIVE_HACK_INFO)
Allows player to receive all information about players who try to hack,
spoof a name, etc.
---------------------------------------
*disable_pvm
*disable_pvm (PC_PERM_DISABLE_PVM)
Prevents player from attacking monsters.
---------------------------------------
*disable_pvp
*disable_pvp (PC_PERM_DISABLE_PVP)
Prevents player from attacking other players.
---------------------------------------
*can_trade_bounded
*can_trade_bounded (PC_PERM_TRADE_BOUNDED)
Allows player to do normal item actions with bounded items (drop, sell,
trade, etc.).
---------------------------------------
*item_unconditional
*item_unconditional (PC_PERM_ITEM_UNCONDITIONAL)
Allows player to consume any consumable item regardless the requirements
(bypass noitemconsumption mapflag, item's class, gender, status changes,
@ -125,7 +131,7 @@ item delay, etc).
---------------------------------------
*trade_unconditional
*trade_unconditional (PC_PERM_TRADE_UNCONDITIONAL)
Allows player to ignore the trade conditions of items (drop, trade, sell, cart, storage/gstorage, mail and auction).
@ -136,32 +142,32 @@ Allows player to ignore the trade conditions of items (drop, trade, sell, cart,
======================
---------------------------------------
*all_commands
*all_commands (PC_PERM_USE_ALL_COMMANDS)
Allows usage of all atcommands and charcommands.
---------------------------------------
*disable_commands_when_dead
*disable_commands_when_dead (PC_PERM_DISABLE_CMD_DEAD)
Disables usage of atcommands when player is dead.
---------------------------------------
*hide_session
*hide_session (PC_PERM_HIDE_SESSION)
Hides player session from being displayed by atcommands (@who, @whomap,
etc.).
---------------------------------------
*who_display_aid
*who_display_aid (PC_PERM_WHO_DISPLAY_AID)
Displays all GMs and character/account IDs in the @who command.
---------------------------------------
*any_warp
*any_warp (PC_PERM_WARP_ANYWHERE)
Allows player to bypass 'nowarp', 'nowarpto', 'noteleport', and 'nomemo'
mapflags in commands which modify a character's map or coordinates (@memo,
@ -169,63 +175,63 @@ mapflags in commands which modify a character's map or coordinates (@memo,
---------------------------------------
*receive_requests
*receive_requests (PC_PERM_RECEIVE_REQUESTS)
Allows player to receive requests through the @requests command.
---------------------------------------
*show_bossmobs
*show_bossmobs (PC_PERM_SHOW_BOSS)
Displays boss mobs in the @showmobs command.
---------------------------------------
*channel_admin
*channel_admin (PC_PERM_CHANNEL_ADMIN)
Allows player to modify #channel settings regardless of ownership and to
join password-protected channels without a password.
---------------------------------------
*use_check
*use_check (PC_PERM_USE_CHECK)
Allows player to use the client command /check (displays character status).
---------------------------------------
*use_changemaptype
*use_changemaptype (PC_PERM_USE_CHANGEMAPTYPE)
Allows player to use the client command /changemaptype.
---------------------------------------
*command_enable
*command_enable (PC_PERM_ENABLE_COMMAND)
Enable to use atcommand while talking with NPC.
---------------------------------------
*bypass_stat_onclone
*bypass_stat_onclone (PC_PERM_BYPASS_STAT_ONCLONE)
Bypass max parameter limit while using @clonestat
---------------------------------------
*bypass_max_stat
*bypass_max_stat (PC_PERM_BYPASS_MAX_STAT)
Allow to bypass the maximum stat parameter (at conf/player.conf) to
maximum value 32,767.
---------------------------------------
*macro_detect
*macro_detect (PC_PERM_MACRO_DETECT)
Allows player to use the client command /macro_detector.
---------------------------------------
*macro_register
*macro_register (PC_PERM_MACRO_REGISTER)
Allows player to use the client commands /macro_register (used to add new captcha) and /macro_preview (used to preview captcha by ID).

137
doc/script_commands.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Documentation================================
//===== rAthena Documentation================================
//= rAthena Script Commands
//===== By:==================================================
//= rAthena Dev Team
@ -135,11 +135,26 @@ and 'doc/mapflags.txt'.
<map name>{,<x>{,<y>{,<xs>{,<ys>}}}}%TAB%monster%TAB%<monster name>{,<monster level>}%TAB%<mob id>,<amount>{,<delay1>{,<delay2>{,<event>{,<mob size>{,<mob ai>}}}}}
Map name is the name of the map the monsters will spawn on. x,y are the
coordinates where the mob should spawn. If xs and ys are non-zero, they
specify the 'radius' of a spawn-rectangle area centered at x,y.
Putting zeros instead of these coordinates will spawn the monsters randomly.
coordinates where the mob should spawn. Putting zeros instead of these
coordinates will spawn the monsters randomly.
If the coordinates are non-zero and xs and ys are above 1, each monster will
spawn in a radius around x,y. At server start, each monster will get assigned
its own center cell adding or substracting up to (xs-1),(ys-1) from the given
x,y coordinates. Each time a monster respawns, it will spawn in a radius around
its personal center cell by adding or substracting up to (xs-1),(ys-1) again.
This results in a total possible spawn area over all monsters of the spawn line
of (xs,ys)*4-3, but with a strong bias towards the center of that area:
2,2 - 5x5
3,3 - 9x9
4,4 - 13x13
5,5 - 17x17
etc.
Note this is only the initial spawn zone, as mobs random-walk, they are free
to move away from their specified spawn region.
You can disable the picking of a random center cell for each monster in the
battle config. (See /conf/battle/monster.conf::randomize_center_cell.)
Monster name is the name the monsters will have on screen, and has no relation
whatsoever to their names anywhere else. It's the mob id that counts, which
@ -188,6 +203,8 @@ Natural enemies for AI monsters are normal monsters.
Alternately, a monster spawned using 'boss_monster' instead of 'monster' is able
to be detected on the map with the SC_BOSSMAPINFO status (used by Convex Mirror).
A boss monster spawn with fixed coordinates will always spawn at the given
coordinates, even if they are blocked (e.g. by Icewall).
** NPC names
@ -5677,22 +5694,35 @@ Example:
---------------------------------------
*searchstores <uses>,<effect>;
*searchstores <uses>,<effect>{,"<map name>"};
Invokes the store search window, which allows to search for both vending
and buying stores. Parameter uses indicates, how many searches can be
started, before the window has to be reopened. Effect value affects,
what happens, when a result item is double-clicked and can be one of the
following:
and buying stores.
0 = Shows the store's position on the mini-map and highlights the
shop sign with yellow color, when the store is on same map
as the invoking player.
1 = Directly opens the shop, regardless of distance.
Parameter <uses> indicates how many searches can be started
before the window has to be reopened.
Example:
// Item Universal_Catalog_Gold (10 uses, effect: open shop)
searchstores 10,1;
Parameter <effect> affects what happens when a result item is double-clicked
and can be one of the following:
SEARCHSTORE_EFFECT_NORMAL : Shows the store's position on the mini-map and highlights the
shop sign with yellow color, when the store is on same map
as the invoking player.
SEARCHSTORE_EFFECT_REMOTE : Directly opens the shop, regardless of distance.
Optional parameter <map name> indicates the name of map where the stores will be searched.
If not set, the search will be on the map the invoking character is currently on.
Special values for <map name> are:
"this" : Will search for stores on the map where the invoking character is currently on. (default)
"all" : Will search for stores on all maps.
Examples:
// Item Vending_Search_Scroll (10 uses, effect: show mark on minimap, current map)
searchstores 10, SEARCHSTORE_EFFECT_NORMAL;
// Search stores (1 use, effect: open shop, all maps on the server)
searchstores 1, SEARCHSTORE_EFFECT_REMOTE, "all";
---------------------------------------
@ -6591,7 +6621,8 @@ Available <type>:
PCBLOCK_COMMANDS Prevent the player from using atcommands/charcommands.
PCBLOCK_NPCCLICK Prevent the player from clicking/touching any NPC/shop/warp.
PCBLOCK_EMOTION Prevent the player from using emotions.
PCBLOCK_NPC Simulate NPC interaction. Useful for NPC with no mes window. Sum of PCBLOCK_MOVE|PCBLOCK_SKILL|PCBLOCK_USEITEM|PCBLOCK_COMMANDS|PCBLOCK_NPCCLICK.
PCBLOCK_EQUIP Prevent the player from replacing equipment.
PCBLOCK_NPC Simulate NPC interaction. Useful for NPC with no mes window. Sum of PCBLOCK_MOVE|PCBLOCK_SKILL|PCBLOCK_USEITEM|PCBLOCK_COMMANDS|PCBLOCK_NPCCLICK|PCBLOCK_EQUIP.
PCBLOCK_ALL Sum of all the flags.
Examples:
@ -6620,8 +6651,8 @@ Examples:
---------------------------------------
macro_detector({<account ID>});
macro_detector({"<character name>"});
*macro_detector({<account ID>});
*macro_detector({"<character name>"});
This command will display the captcha UI challenge onto the invoking character or the given <account ID>/<character name>.
@ -6642,6 +6673,46 @@ Example:
---------------------------------------
*permission_check(<permission>{,<char_id>});
This command will return true if the attached character has the specified permission, false otherwise.
If <char_id> is given, it will check the permission for that character instead.
A full list of the player permission constants (with the 'PC_PERM' prefix) along with the
full permissions documentation can be found in 'doc/permissions.txt'.
Example:
if (permission_check(PC_PERM_TRADE)) {
mes "You have permission to trade!";
}
else {
mes "You do not have permission to trade!";
}
end;
---------------------------------------
*permission_add(<permission>{,<char_id>});
*permission_remove(<permission>{,<char_id>});
These commands will temporarily add or remove the specified permission to the attached character,
or the given <char_id> until the player logs out.
A full list of the player permission constants (with the 'PC_PERM' prefix) along with the
full permissions documentation can be found in 'doc/permissions.txt'.
Examples:
// Adds the 'can_trade' permission to the attached character,
// allowing them to trade, drop, sell, store and mail items.
permission_add(PC_PERM_TRADE);
// Removes the 'can_party' permission from the attached character,
// preventing them from joining or creating parties.
permission_remove(PC_PERM_PARTY);
---------------------------------------
==================================
|5.- Mob / NPC -related commands.|
==================================
@ -7944,17 +8015,15 @@ Return values:
//
---------------------------------------
*npcspeed <speed value>;
*npcwalkto <x>,<y>;
*npcstop;
*npcspeed( <speed value> {,"<npc name>"} );
*npcwalkto( <x>,<y> {,"<npc name>"} } );
*npcstop( {"<npc name>", {"<flag>"}});
These commands will make the NPC object in question move around the map. As they
currently are, they are a bit buggy and are not useful for much more than making
an NPC move randomly around the map.
These commands will make the NPC object in question move around the map.
'npcspeed' will set the NPCs walking speed to a specified value. As in the
@speed GM command, 200 is the slowest possible speed while 0 is the fastest
possible (instant motion). 100 is the default character walking speed.
'npcspeed' will permanently set the NPCs walking speed to a specified value. As in the
@speed GM command, MAX_WALK_SPEED (1000) is the slowest possible speed while MIN_WALK_SPEED (20) is the fastest
possible (instant motion). DEFAULT_NPC_WALK_SPEED (200) is the default NPC walking speed.
'npcwalkto' will start the NPC sprite moving towards the specified coordinates
on the same map it is currently on. The script proceeds immediately after the
@ -7962,10 +8031,17 @@ NPC begins moving.
'npcstop' will stop the motion.
The <flag> value in npcstop affects how the unit is stopped. The following flags are bitwise values (can be combined using the pipe operator):
USW_NONE = Unit will keep walking to their original destination.
USW_FIXPOS = Issue a fixpos packet afterwards.
USW_MOVE_ONCE = Force the unit to move one cell if it hasn't yet.
USW_MOVE_FULL_CELL = Enable moving to the next cell when unit was already half-way there (may cause on-touch/place side-effects, such as a scripted map change).
USW_FORCE_STOP = Force stop moving.
Default: USW_FIXPOS | USW_MOVE_FULL_CELL | USW_FORCE_STOP
While in transit, the NPC will be clickable, but invoking it will cause it to
stop moving, which will make its coordinates different from what the client
computed based on the speed and motion coordinates. The effect is rather
unnerving.
computed based on the speed and motion coordinates.
Only a few NPC sprites have walking animations, and those that do, do not get
the animation invoked when moving the NPC, due to the problem in the NPC walking
@ -9780,6 +9856,7 @@ For details on the other parameters, see 'announce'.
This function checks if a party meets certain requirements, returning 1 if all
conditions are met and 0 otherwise. It will only check online characters.
The command returns 0 is the party ID does not exist.
amount - number of online party members (default is 1).
min - minimum level of all characters in the party (default is 1).

1
doc/skill_db.txt
View File

@ -58,6 +58,7 @@ IgnoreFlee - Skill ignores target's flee (Magic type always ignores)
IgnoreDefCard - Skill ignores target's defense cards.
IgnoreLongCard - Skill ignores caster's long range damage cards.
Critical - Skill can critical.
SimpleDefense - (Renewal-only) Physical damage is flatly reduced by DEF+DEF2. RES is ignored.
---------------------------------------

1
doc/yaml/db/mob_db.yml
View File

@ -39,6 +39,7 @@
# WalkSpeed Walk speed. (Default: DEFAULT_WALK_SPEED)
# AttackDelay Attack speed. (Default: 0)
# AttackMotion Attack animation speed. (Default: 0)
# ClientAttackMotion Client attack speed. (Default: AttackMotion)
# DamageMotion Damage animation speed. (Default: 0)
# DamageTaken Rate at which the monster will receive incoming damage. (Default: 100)
# Ai Aegis monster type AI behavior. (Default: 06)

19
npc/re/cities/brasilis.txt → npc/cities/brasilis.txt
View File

@ -1,26 +1,19 @@
//===== rAthena Script =======================================
//===== rAthena Script =======================================
//= Brasilis Town
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.4
//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
//===== Description: =========================================
//= [Official Conversion]
//= Brasilis Town Script
//===== Additional Comments: =================================
//= 1.0 First version. Transportation and Basic NPCs.
//===== Changelog: ===========================================
//= 1.0 First version. Transportation and Basic NPCs. [L0ne_W0lf]
//= 1.1 Fixed Zeny not being removed for payment. [Kisuka]
//= 1.2 Updated dialog, added Ice Cream Maker. [L0ne_W0lf]
//= 1.3 Moved Alberta NPC to pre-re/re paths. [Euphy]
//= 1.4 Added VIP features. [Euphy]
//============================================================
//============================================================
// Brasilis Transportation :: brasilis_trans
//============================================================
/* Pre-Renewal coordinates: alberta,247,115,3 */
alberta,246,82,3 script Crewman#bra2 100,{
- script ::Crewman_bra2 -1,{
mes "[Crewman]";
mes "Hey, have you heard of a place called Brasilis?";
mes "It's a tropical city that's hot like the desert but also rainy. It is a very mysterious place.";

23
npc/custom/jobmaster.txt
View File

@ -184,7 +184,28 @@ function Job_Options {
Job_Options(.@job_opt,roclass(.@eac|EAJL_THIRD)); // Expanded SN is "third" cls
}
}
// babies don't get to become 4th jobs
if (.FourthExpanded && .@eac == EAJ_REBELLION) {
Require_Level(.Req_Fourth[0], .Req_Fourth[1]);
Job_Options(.@job_opt, roclass(EAJ_NIGHT_WATCH));
}
if (.FourthExpanded && .@eac == EAJ_KAGEROUOBORO) {
Require_Level(.Req_Fourth[0], .Req_Fourth[1]);
Job_Options(.@job_opt, roclass(EAJ_SHINKIRO_SHIRANUI));
}
if (.FourthExpanded && .@eac == EAJ_SUPER_NOVICE_E) {
Require_Level(.Req_Fourth[0], .Req_Fourth[1]);
Job_Options(.@job_opt, roclass(EAJ_HYPER_NOVICE));
}
if (.FourthExpanded && .@eac == EAJ_SUMMONER) {
Require_Level(.Req_SHandler[0], .Req_SHandler[1]);
Job_Options(.@job_opt, roclass(EAJ_SPIRIT_HANDLER));
}
if (.SecondExpanded &&
((.@eac&(~EAJL_BABY)) == EAJ_NINJA || // is (Baby) Ninja
(.@eac&(~EAJL_BABY)) == EAJ_GUNSLINGER)) { // is (Baby) Gunslinger
@ -483,6 +504,7 @@ OnInit:
// Settings
.FourthClass = true; // Enable fourth classes?
.FourthExpanded = true; // Enable new expanded fourth classes: Ex. Hyper Novice, Rebellion, Shinkiro/Shiranui?
.ThirdClass = true; // Enable third classes?
.RebirthClass = true; // Enable rebirth classes?
.SecondExpanded = true; // Enable new expanded second classes: Ex. Super Novice, Kagerou/Oboro, Rebellion?
@ -504,6 +526,7 @@ OnInit:
setarray .Req_Fourth[0],200,70; // Minimum base level, job level to change to fourth class
setarray .Req_Exp_NJ_GS[0],99,70; // Minimum base level, job level to turn into Expanded Ninja and Gunslinger
setarray .Req_Exp_SNOVI[0],99,99; // Minimum base level, job level to turn into Expanded Super Novice
setarray .Req_SHandler[0],200,60; // Minimum base level, job level to turn into Spirit Handler
.SNovice = 45; // Minimum base level to turn into Super Novice
// Setting adjustments by PACKETVER

19
npc/custom/warper.txt
View File

@ -110,7 +110,18 @@ function Pick {
Go(.@map$,.@x,.@y);
}
function Restrict {
if ((getarg(0) == "RE" && !checkre(0)) || (getarg(0) == "Pre-RE" && checkre(0))) {
.@type$ = getarg(0);
if (.@type$ == "Brasilis") {
// If the official warper to Brasilis is enabled, meaning is either
// Renewal mode or Pre-renewal Brasilis is enabled, we lift the restriction
if (getnpcid(0, "Crewman_bra2"))
return;
// Otherwise we apply the renewal restriction
.@type$ = "RE";
}
if ((.@type$ == "RE" && !checkre(0)) || (.@type$ == "Pre-RE" && checkre(0))) {
if (getarg(1,0)) {
set @warp_block,0;
for (set .@i,1; .@i<getargcount(); set .@i,.@i+1)
@ -141,7 +152,7 @@ T2: Go("alberta",28,234);
T3: Go("aldebaran",140,131);
T4: Go("amatsu",198,84);
T5: Go("ayothaya",208,166);
T6: Restrict("RE");
T6: Restrict("Brasilis");
Go("brasilis",196,217);
T7: Go("comodo",209,143);
T8: Restrict("RE");
@ -218,7 +229,7 @@ F2: setarray @c[2],173,134,212,150;
F3: Restrict("RE");
setarray @c[2],193,220,220,187;
Disp("Bifrost Field",1,2); Pick("bif_fild");
F4: Restrict("RE");
F4: Restrict("Brasilis");
setarray @c[2],74,32;
Disp("Brasilis Field",1,1); Pick("bra_fild");
F5: Restrict("Pre-RE",5);
@ -343,7 +354,7 @@ D7: Restrict("RE");
D8: Restrict("RE",4,5);
setarray @c[2],150,288,150,18,140,134,244,52,100,202;
Disp("Bio Lab 1:Bio Lab 2:Bio Lab 3:Bio Lab 4:Tomb of the Fallen"); Pick("","lhz_dun01","lhz_dun02","lhz_dun03","lhz_dun04","lhz_dun_n");
D9: Restrict("RE");
D9: Restrict("Brasilis");
setarray @c[2],87,47,262,262;
Disp("Brasilis Dungeon",1,2); Pick("bra_dun");
D10: Restrict("RE",6);

11
npc/kafras/kafras.txt
View File

@ -59,7 +59,7 @@ aldeba_in,96,181,4 script Kafra Service 113,{
mes "seems that you don't";
mes "have the 20 zeny to pay";
mes "the Storage access fee...";
close;
close3;
}
mes "[Kafra Leilah]";
mes "Although this facility is";
@ -687,3 +687,12 @@ alb2trea,59,69,5 script Kafra Employee::kaf_alb2trea 117,{
savepoint "alb2trea",92,64,1,1;
callfunc "F_KafEnd",0,1,"at Sunken Ship";
}
// Brasilis
//============================================================
brasilis,197,221,4 script Kafra Employee::kaf_bra 4_F_KAFRA1,{
cutin "kafra_01",2;
callfunc "F_Kafra",0,3,0,80,700;
savepoint "brasilis",195,259,1,1;
callfunc "F_KafEnd",0,1,"in the city of Brasilis";
}

6
npc/mapflag/night.txt
View File

@ -298,6 +298,12 @@ man_fild02 mapflag nightenabled
splendide mapflag nightenabled
spl_fild01 mapflag nightenabled
//============================================================
// Brasilis
//============================================================
brasilis mapflag nightenabled
bra_fild01 mapflag nightenabled
//============================================================
// Events
//============================================================

6
npc/mapflag/nobranch.txt
View File

@ -371,6 +371,12 @@ splendide mapflag nobranch
spl_in01 mapflag nobranch
spl_in02 mapflag nobranch
//============================================================
// Brasilis
//============================================================
brasilis mapflag nobranch
bra_in01 mapflag nobranch
//============================================================
// RWC
//============================================================

7
npc/mapflag/nomemo.txt
View File

@ -731,6 +731,13 @@ spl_fild01 mapflag nomemo
spl_in01 mapflag nomemo
spl_in02 mapflag nomemo
//============================================================
// Brasilis
//============================================================
bra_in01 mapflag nomemo
bra_dun01 mapflag nomemo
bra_dun02 mapflag nomemo
//evt_zombie mapflag nomemo
//============================================================

2
npc/mapflag/nopenalty.txt
View File

@ -25,6 +25,8 @@ ama_in01 mapflag nopenalty
ama_in02 mapflag nopenalty
ama_test mapflag nopenalty
arena_room mapflag nopenalty
brasilis mapflag nopenalty
bra_in01 mapflag nopenalty
comodo mapflag nopenalty
cmd_in01 mapflag nopenalty
cmd_in02 mapflag nopenalty

2
npc/mapflag/nopvp.txt
View File

@ -58,6 +58,8 @@ aldebaran mapflag pvp off
ama_in01 mapflag pvp off
ama_in02 mapflag pvp off
amatsu mapflag pvp off
brasilis mapflag pvp off
bra_in01 mapflag pvp off
cmd_in01 mapflag pvp off
cmd_in02 mapflag pvp off
comodo mapflag pvp off

7
npc/mapflag/noteleport.txt
View File

@ -426,7 +426,7 @@ bat_a01 mapflag noteleport
bat_a02 mapflag noteleport
//============================================================
// Episode 13
// Episode 13.2
//============================================================
mid_campin mapflag noteleport
moc_fild22b mapflag noteleport
@ -438,6 +438,11 @@ man_in01 mapflag noteleport
spl_in01 mapflag noteleport
spl_in02 mapflag noteleport
//============================================================
// Brasilis
//============================================================
bra_in01 mapflag noteleport
//============================================================
// Orc's Memory
//============================================================

1
npc/mapflag/reset.txt
View File

@ -14,6 +14,7 @@ alberta mapflag reset
aldebaran mapflag reset
amatsu mapflag reset
ayothaya mapflag reset
brasilis mapflag reset
comodo mapflag reset
einbroch mapflag reset
einbech mapflag reset

1
npc/mapflag/town.txt
View File

@ -28,3 +28,4 @@ louyang mapflag town
hugel mapflag town
rachel mapflag town
veins mapflag town
brasilis mapflag town

4
npc/merchants/hair_style.txt
View File

@ -302,7 +302,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 862,{
mes "Oooh, there must";
mes "be some style that";
mes "you like, right? Hmmm...";
close;
close3;
}
}
mes "[Assistant Beautician]";
@ -353,7 +353,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 862,{
mes "me! Thank you for using";
mes "my service and come again~";
emotion ET_CHUP;
close;
close3;
case 2:
mes "[Assistant Beautician]";
mes "Huh? Oh no, you're";

41
npc/merchants/inn.txt
View File

@ -203,6 +203,47 @@ ve_in,157,219,5 script Inn Master#Receptionist 709,{
}
}
//======================== Brasilis =================================
bra_in01,27,24,3 script Hotel Keeper#bra1 478,{
mes "[Hotel Keeper]";
mes "Welcome to the beautiful Brasilis Hotel.";
next;
switch(select("Save:Rest -5000 zeny:Cancel")) {
case 1:
mes "[Hotel Keeper]";
mes "Do you want to save here at the Brasilis Hotel?";
next;
switch(select("No thank you.:Absolutely.")) {
case 1:
mes "[Hotel Keeper]";
mes "Ok then, enjoy your stay.";
close;
case 2:
mes "[Hotel Keeper]";
mes "Your respawn has been saved here at the hotel. I hope that you enjoy your stay here in Brasilis.";
savepoint "bra_in01",144,69,1,1;
close;
}
end;
case 2:
if (Zeny > 4999) {
mes "[Hotel Keeper]";
mes "I will show you a great room.";
close2;
if (Zeny < 5000)
end;
Zeny -= 5000;
percentheal 100,100;
warp "bra_in01",144,69;
end;
}
mes "[Hotel Keeper]";
mes "I'm sorry, but the service charge is 5,000 zeny per night.";
case 3:
close;
}
}
//======================= Inn Function ==============================
function script F_InnMaid {
.@npc_name$ = getarg(0);

20
npc/other/CashShop_Functions.txt
View File

@ -263,6 +263,26 @@ function script F_CashSiegeTele {
return;
}
// Siege Teleport Scroll 2 (WoE 1.5)
//============================================================
// - Warp player to selected guild castle.
// - No arguments.
function script F_CashSiegeTele2 {
switch(select("Mardoll (arug_cas01):Cyr (arug_cas02):Horn (arug_cas03):Gefn (arug_cas04):Badanis (arug_cas05):Himinn (schg_cas01):Andlangr (schg_cas02):Vidblainn (schg_cas03):Hljod (schg_cas04):Schatirnil (schg_cas05)")) {
case 1: warp "aru_gld",159,272; end;
case 2: warp "aru_gld",86,50; end;
case 3: warp "aru_gld",63,157; end;
case 4: warp "aru_gld",307,354; end;
case 5: warp "aru_gld",298,110; end;
case 6: warp "sch_gld",300,100; end;
case 7: warp "sch_gld",284,249; end;
case 8: warp "sch_gld",102,196; end;
case 9: warp "sch_gld",140,83; end;
case 10: warp "sch_gld",70,320; end;
}
return;
}
// Curious Snowball
//============================================================
// - You can get an effect of Restore, Endure, or Wing of Butterfly.

20
npc/pre-re/cities/brasilis.txt Normal file
View File

@ -0,0 +1,20 @@
//===== rAthena Script =======================================
//= Brasilis Town Pre-Renewal
//===== Description: =========================================
//= [Official Conversion based on bRO & jRO servers]
//= Brasilis town NPCs.
//
// Note:
// - Brasilis was introduced in Pre-Renewal only for bRO and
// jRO official servers with differences in monster stats,
// spawns and quests.
// It was added in Renewal for every other official server.
// Since we follow kRO this is disabled by default.
// You can enable it on npc/pre-re/scripts_athena.conf
//===== Changelog: ===========================================
//= 1.0 First Version [Daegaladh]
//============================================================
// Brasilis Transportation :: brasilis_trans
//============================================================
alberta,247,115,3 duplicate(Crewman_bra2) Crewman#bra2 100

77
npc/pre-re/guides/guides_brasilis.txt Normal file
View File

@ -0,0 +1,77 @@
//===== rAthena Script =======================================
//= Brasilis Guide
//===== Description: =========================================
//= [Official Conversion based on bRO & jRO servers]
//= Guide for the city of Brasilis.
//
// Note:
// - Brasilis was introduced in Pre-Renewal only for bRO and
// jRO official servers with differences in monster stats,
// spawns and quests.
// It was added in Renewal for every other official server.
// Since we follow kRO this is disabled by default.
// You can enable it on npc/pre-re/scripts_athena.conf
//===== Changelog: ===========================================
//= 1.0 First Version [Daegaladh]
//============================================================
brasilis,219,97,3 script Brasilis Guide 478,{
mes "[Brasilis Guide]";
mes "Welcome to ^8B4513Brasilis^000000, a country as passionate as the sun.";
mes "If you have any questions, please ask me.";
next;
switch(select("Ask about locations:Remove Marks from Mini-Map:Cancel")) {
case 1:
mes "[Brasilis Guide]";
mes "Where can I guide you?";
next;
switch(select("[ Hotel ]:[ Jungle Cable ]:[ Art Museum ]:[ Market ]:[ Verass Monument ]")) {
case 1:
mes "[Brasilis Guide]";
mes "The Brasilis Hotel is located just above, ^FF3355+^000000.";
mes "Is there anything else I can do for you?";
viewpoint 1,274,151,2,0xFF3355;
close;
case 2:
mes "[Brasilis Guide]";
mes "Do you want to go through the rough jungle? You can take a ";
mes "Jungle Cable here ^CE6300+^000000.";
mes "Is there anything else I can do for you?";
viewpoint 1,308,335,3,0xCE6300;
close;
case 3:
mes "[Brasilis Guide]";
mes "The pride of Brasilis, the world scale Art Museum is at ^A5BAAD+^000000.";
mes "Is there anything else I can do for you?";
viewpoint 1,137,167,4,0x00FF00;
close;
case 4:
mes "[Brasilis Guide]";
mes "You can buy items for hunting at the Market here ^55FF33+^000000.";
mes "Is there anything else I can do for you?";
viewpoint 1,254,248,5,0x55FF33;
close;
case 5:
mes "[Brasilis Guide]";
mes "The iconic monument of Brasilis, the Verass Monument stands at ^3355FF+^000000.";
mes "Is there anything else I can do for you?";
viewpoint 1,195,235,6,0x3355FF;
close;
}
end;
case 2:
mes "[Brasilis Guide]";
mes "I'll remove all marks from your mini-map.";
mes "Is there anything else I can do for you?";
viewpoint 0,274,151,2,0x00FF00;
viewpoint 0,308,335,3,0x00FF00;
viewpoint 0,137,167,4,0x00FF00;
viewpoint 0,254,248,5,0x00FF00;
viewpoint 0,195,235,6,0x00FF00;
close;
case 3:
mes "[Brasilis Guide]";
mes "Wandering on your own is always the best way to explore. Anyway, take care.";
close;
}
}

6
npc/pre-re/merchants/hair_style.txt
View File

@ -594,7 +594,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 122,{
mes "you can be more daring than";
mes "that! Be fashionably adventurous, you fashionable adventurer~";
emotion ET_THROB;
close;
close3;
}
}
else {
@ -917,7 +917,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 122,{
mes "I'll make you the best looking";
mes "person in the entire world!";
emotion ET_BEST;
close;
close3;
case 2:
mes "[Prince Shammi]";
mes "Oh, did you forget which";
@ -925,7 +925,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 122,{
mes "number? By all means, please";
mes "check again! Find the one that";
mes "is perfect just for you, okay?";
close;
close3;
}
}
break;

64
npc/pre-re/mobs/dungeons/bra_dun.txt Normal file
View File

@ -0,0 +1,64 @@
//===== rAthena Script =======================================
//= Brasilis Dungeon Monster Spawn Script
//===== Description: =========================================
//= [Official Conversion based on bRO & jRO servers]
//
// Note:
// - Brasilis was introduced in Pre-Renewal only for bRO and
// jRO official servers with differences in monster stats,
// spawns and quests.
// It was added in Renewal for every other official server.
// Since we follow kRO this is disabled by default.
// You can enable it on npc/pre-re/scripts_athena.conf
//===== Changelog: ===========================================
//= 1.0 First Version [Playtester]
//============================================================
//bRO Pre-Renewal spawns
//==================================================
// bra_dun01 - Behind the Waterfall
//==================================================
bra_dun01 monster Iara 2069,60,5000
bra_dun01 monster Piranha 2070,100,5000
bra_dun01 monster Hydra 1068,10,5000
bra_dun01 monster Plankton 1161,10,5000
bra_dun01 monster Marina 1141,10,5000
bra_dun01 monster Black Mushroom 1084,10,180000,90000
//==================================================
// bra_dun02 - Behind the Waterfall
//==================================================
bra_dun02 monster Iara 2069,120,5000
bra_dun02 monster Piranha 2070,80,5000
bra_dun02 monster Hydra 1068,20,5000
bra_dun02 monster Plankton 1161,20,5000
bra_dun02 monster Marina 1141,10,5000
bra_dun02 monster Black Mushroom 1084,10,180000,90000
bra_dun02 boss_monster Boitata 2068,1,7200000,600000,1
//jRO Pre-Renewal spawns
//==================================================
// bra_dun01 - Behind the Waterfall
//==================================================
//bra_dun01 monster Kukre 1070,40,5000
//bra_dun01 monster Hydra 1068,60,5000
//bra_dun01 monster Marina 1141,5,5000
//bra_dun01 monster Thara Frog 1034,40,5000
//bra_dun01 monster Piranha 2070,50,5000
//bra_dun01 monster Iara 2069,30,5000
//bra_dun01 monster Headless Mule 2071,10,5000
//bra_dun01 monster Black Mushroom 1084,5,120000,60000
//==================================================
// bra_dun02 - Behind the Waterfall
//==================================================
//bra_dun02 monster Hydra 1068,20,5000
//bra_dun02 monster Piranha 2070,60,5000
//bra_dun02 monster Iara 2069,40,5000
//bra_dun02 monster Headless Mule 2071,40,5000
//bra_dun02 monster Shining Plant 1083,1,1800000,900000
//bra_dun02 monster Red Mushroom 1084,5,120000,60000
//bra_dun02 boss_monster Boitata 2068,1,7200000,600000,1

48
npc/pre-re/mobs/fields/brasilis.txt Normal file
View File

@ -0,0 +1,48 @@
//===== rAthena Script =======================================
//= Brasilis Fields Monster Spawn Script
//===== Description: =========================================
//= [Official Conversion based on bRO & jRO servers]
//
// Note:
// - Brasilis was introduced in Pre-Renewal only for bRO and
// jRO official servers with differences in monster stats,
// spawns and quests.
// It was added in Renewal for every other official server.
// Since we follow kRO this is disabled by default.
// You can enable it on npc/pre-re/scripts_athena.conf
//===== Changelog: ===========================================
//= 1.0 First Version [Playtester]
//============================================================
//==================================================
// Brasilis, Strange Hydras
//==================================================
brasilis,283,88,6,6 monster Strange Hydra 2081,5,30000
brasilis,284,104,6,6 monster Strange Hydra 2081,4,30000
brasilis,215,80,6,6 monster Strange Hydra 2081,4,30000
brasilis,96,50,8,8 monster Strange Hydra 2081,5,30000
//bRO Pre-Renewal spawns
//==================================================
// bra_fild01 - Brasilis Field
//==================================================
bra_fild01 monster Headless Mule 2071,40,5000
bra_fild01 monster Curupira 2074,80,5000
bra_fild01 monster Dokebi 1110,20,5000
bra_fild01 monster Jaguar 2072,10,5000
bra_fild01 monster Savage 1166,20,5000
bra_fild01 monster Toucan 2073,10,5000
bra_fild01 monster Red Mushroom 1085,3,360000,180000
//jRO Pre-Renewal spawns
//==================================================
// bra_fild01
//==================================================
//bra_fild01 monster Savage 1166,10,5000
//bra_fild01 monster Dokebi 1110,20,5000
//bra_fild01 monster Curupira 2074,50,5000
//bra_fild01 monster Jaguar 2072,35,5000
//bra_fild01 monster Toucan 2073,40,5000
//bra_fild01 monster Red Mushroom 1085,5,120000,60000

31
npc/pre-re/scripts_athena.conf
View File

@ -98,3 +98,34 @@ npc: npc/pre-re/quests/quests_nameless.txt
npc: npc/pre-re/quests/quests_niflheim.txt
npc: npc/pre-re/quests/the_sign_quest.txt
npc: npc/pre-re/quests/quests_veins.txt
// - Disable Brasilis by default --------------------------------
// DO NOT COMMENT!!!
// Instead, follow the instructions below.
// --------------------------------------------------------------
delnpc: npc/cities/brasilis.txt
delnpc: npc/quests/quests_brasilis.txt
delnpc: npc/warps/cities/brasilis.txt
delnpc: npc/warps/dungeons/bra_dun.txt
delnpc: npc/warps/fields/bra_fild.txt
// -------------------- Pre-Renewal Brasilis --------------------
// Brasilis was introduced in Pre-Renewal only for bRO and
// jRO official servers with differences in monster stats,
// spawns and quests.
// It was added in Renewal for every other official server.
// Since we follow kRO this is disabled by default.
//
// Uncomment the following NPC scripts to enable bRO/jRO's
// Pre-Renewal version of Brasilis.
// You also need to uncomment the data from file
// mob_summon.yml in /db/import/ folder
//npc: npc/cities/brasilis.txt
//npc: npc/quests/quests_brasilis.txt
//npc: npc/warps/cities/brasilis.txt
//npc: npc/warps/dungeons/bra_dun.txt
//npc: npc/warps/fields/bra_fild.txt
//npc: npc/pre-re/cities/brasilis.txt
//npc: npc/pre-re/guides/guides_brasilis.txt
//npc: npc/pre-re/mobs/dungeons/bra_dun.txt
//npc: npc/pre-re/mobs/fields/brasilis.txt

90
npc/quests/bard_quest.txt
View File

@ -157,19 +157,19 @@ geffen,132,38,3 script Bard#2 51,{
next;
mes "[Errende]";
mes "I hope that you'll always remain honest and respectful towards other people, and that you continue to ignore greed for fortune or power.";
goto L_End;
close3;
} else if (gef_bard_q > 11 && gef_bard_q < 14) {
cutin "bard_eland02",2;
mes "[Errende]";
mes "It seems you haven't found it yet. Well, take your time, I can wait as long as you want. It doesn't really bore me, since waiting seems to be a part of my profession.";
goto L_End;
close3;
} else if (gef_bard_q == 11) {
cutin "bard_eland01",2;
mes "[Errende]";
mes "Mr. Skezti has a small book store on the book street at the right side of Mineta in Juno. If you show him the seal, he'll help you out.";
goto L_End;
close3;
} else if (gef_bard_q == 10) {
cutin "bard_eland01",2;
@ -199,7 +199,7 @@ geffen,132,38,3 script Bard#2 51,{
mes "show him the Seal of Friendship.";
mes "Good luck, now~";
set gef_bard_q,11;
goto L_End;
close3;
} else if (gef_bard_q == 20) {
cutin "bard_eland03",2;
@ -249,7 +249,7 @@ geffen,132,38,3 script Bard#2 51,{
mes "[Errende]";
mes "Waaah, wah~";
mes "You can't just ignore me like that! Where's your sense of merriment, your sense of romance?";
goto L_End;
close3;
}
} else if (gef_bard_q == 27) {
@ -295,7 +295,7 @@ geffen,132,38,3 script Bard#2 51,{
mes "I beseech you, if you meet him, please ask him of the 8th love and inform me of that lyric immediately~";
set gef_bard_q,22;
}
goto L_End;
close3;
} else if (gef_bard_q == 26) {
cutin "bard_eland01",2;
@ -349,17 +349,17 @@ geffen,132,38,3 script Bard#2 51,{
mes "in advance~";
set gef_bard_q,24;
}
goto L_End;
close3;
} else if (.@inputstr$ == "Gunther") {
mes "[Errende]";
mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that.";
goto L_End;
close3;
} else if (.@inputstr$ == "Gunther Doubleharmony") {
mes "[Errende]";
mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that.";
goto L_End;
close3;
} else if (.@inputstr$ == "Errende") {
cutin "bard_eland04",2;
@ -368,7 +368,7 @@ geffen,132,38,3 script Bard#2 51,{
mes "If I did, why would";
mes "I not know what";
mes "this song is about?";
goto L_End;
close3;
} else {
mes "[Errende]";
@ -381,7 +381,7 @@ geffen,132,38,3 script Bard#2 51,{
mes "How could I forget";
mes "the 8th love?";
set gef_bard_q,26;
goto L_End;
close3;
}
} else if (gef_bard_q == 25) {
@ -427,7 +427,7 @@ geffen,132,38,3 script Bard#2 51,{
mes "heart wrenching song.";
mes "But at what cost to your soul?^000000";
}
goto L_End;
close3;
} else {
cutin "bard_eland01",2;
@ -438,7 +438,7 @@ geffen,132,38,3 script Bard#2 51,{
mes "Noboooody looooves meee";
mes "Friends foooooor never...";
mes "Ooooooooh wah!^000000";
goto L_End;
close3;
}
} else if (gef_bard_q == 24) {
@ -464,7 +464,7 @@ geffen,132,38,3 script Bard#2 51,{
mes "Once again,";
mes "thank you so much";
mes "for your help.";
goto L_End;
close3;
} else if (gef_bard_q == 22) {
mes "[Errende]";
@ -480,7 +480,7 @@ geffen,132,38,3 script Bard#2 51,{
next;
mes "[Errende]";
mes "Please ask ^483D8BGunther^000000 about the ^483D8B8th love^000000 in ^483D8BAt One, I Fall in Love^000000. Thank you in advance.";
goto L_End;
close3;
} else if (gef_bard_q == 23) {
cutin "bard_eland02",2;
@ -570,19 +570,19 @@ geffen,132,38,3 script Bard#2 51,{
mes "in advance~";
set gef_bard_q,24;
}
goto L_End;
close3;
} else if (.@inputstr$ == "Gunther") {
mes "[Errende]";
mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that.";
set gef_bard_q,26;
goto L_End;
close3;
} else if (.@inputstr$ == "Gunther Doubleharmony") {
mes "[Errende]";
mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that.";
set gef_bard_q,26;
goto L_End;
close3;
} else if (.@inputstr$ == "Errende") {
cutin "bard_eland04",2;
@ -592,7 +592,7 @@ geffen,132,38,3 script Bard#2 51,{
mes "I not know what this";
mes "song is about?";
set gef_bard_q,26;
goto L_End;
close3;
} else {
mes "[Errende]";
@ -605,7 +605,7 @@ geffen,132,38,3 script Bard#2 51,{
mes "How could I forget";
mes "the 8th love?";
set gef_bard_q,26;
goto L_End;
close3;
}
} else if (gef_bard_q == 21) {
@ -655,7 +655,7 @@ geffen,132,38,3 script Bard#2 51,{
mes "I beseech you, if you meet him, please ask him of the 8th love and inform me of that lyric immediately~";
set gef_bard_q,2;
}
goto L_End;
close3;
} else if (gef_bard_q == 6) {
cutin "bard_eland04",2;
@ -699,23 +699,23 @@ geffen,132,38,3 script Bard#2 51,{
mes "I'll pay you back somehow! Thank you for your trouble in advance~";
set gef_bard_q,4;
}
goto L_End;
close3;
} else if (.@inputstr$ == "Gunther") {
mes "[Errende]";
mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that.";
goto L_End;
close3;
} else if (.@inputstr$ == "Gunther Doubleharmony") {
mes "[Errende]";
mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that.";
goto L_End;
close3;
} else if (.@inputstr$ == "Errende") {
cutin "bard_eland04",2;
mes "[Errende]";
mes "Surely you jest! If I did, why would I not know what this song is about?";
goto L_End;
close3;
} else {
mes "[Errende]";
@ -727,7 +727,7 @@ geffen,132,38,3 script Bard#2 51,{
mes "How could I forget";
mes "the 8th love?";
set gef_bard_q,6;
goto L_End;
close3;
}
} else if (gef_bard_q == 5) {
@ -764,7 +764,7 @@ geffen,132,38,3 script Bard#2 51,{
mes "heart wrenching song.";
mes "But at what cost to your soul?^000000";
}
goto L_End;
close3;
} else {
cutin "bard_eland01",2;
@ -775,7 +775,7 @@ geffen,132,38,3 script Bard#2 51,{
mes "Noboooody looooves meee";
mes "Friends foooooor never...";
mes "Ooooooooooh wah!^000000";
goto L_End;
close3;
}
} else if (gef_bard_q == 4) {
@ -800,7 +800,7 @@ geffen,132,38,3 script Bard#2 51,{
mes "Once again,";
mes "thank you so much";
mes "for your help.";
goto L_End;
close3;
} else if (gef_bard_q == 2) {
cutin "bard_eland04",2;
@ -813,7 +813,7 @@ geffen,132,38,3 script Bard#2 51,{
next;
mes "[Errende]";
mes "Please ask ^483D8BGunther^000000 about the ^483D8B8th love^000000 in ^483D8BAt One, I Fall in Love^000000. Thank you in advance.";
goto L_End;
close3;
} else if (gef_bard_q == 3) {
cutin "bard_eland02",2;
@ -898,27 +898,27 @@ geffen,132,38,3 script Bard#2 51,{
mes "I'll pay you back somehow! Thank you for your trouble in advance~";
set gef_bard_q,4;
}
goto L_End;
close3;
} else if (.@inputstr$ == "Gunther") {
mes "[Errende]";
mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that.";
set gef_bard_q,6;
goto L_End;
close3;
}
else if (.@inputstr$ == "Gunther Doubleharmony") {
mes "[Errende]";
mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that.";
set gef_bard_q,6;
goto L_End;
close3;
} else if (.@inputstr$ == "Errende") {
cutin "bard_eland04",2;
mes "[Errende]";
mes "Surely you jest! If I did, why would I not know what this song is about?";
set gef_bard_q,6;
goto L_End;
close3;
} else {
mes "[Errende]";
@ -930,7 +930,7 @@ geffen,132,38,3 script Bard#2 51,{
mes "How could I forget";
mes "the 8th love?";
set gef_bard_q,6;
goto L_End;
close3;
}
} else if (gef_bard_q == 1) {
@ -993,11 +993,7 @@ geffen,132,38,3 script Bard#2 51,{
}
}
L_End:
close2;
cutin "",255;
end;
close3;
// SubRoutine for 5 similiar dialogues of the quest
@ -1114,7 +1110,7 @@ S_StorySong:
mes "[Errende]";
mes "Oh, how disappointing. But promise me that you will drop by later, so that we can share stories and merriment.";
}
goto L_End;
close3;
case 2:
.@num = getarg(0);
@ -1149,7 +1145,7 @@ S_StorySong:
mes "My apologies,";
mes "But I cannot offer my services for free. Even a Bard needs zeny to live, wouldn't you agree?";
}
goto L_End;
close3;
case 2:
cutin "bard_eland03",2;
@ -1218,7 +1214,7 @@ S_StorySong:
mes "may never know";
mes "with certainty.";
}
goto L_End;
close3;
} else if (.@random == 2) {
@ -1321,7 +1317,7 @@ S_StorySong:
if(gef_bard_q==1) set gef_bard_q,7;
if(gef_bard_q==21) set gef_bard_q,27;
}
goto L_End;
close3;
}
mes "^483D8BA good Bard sings";
@ -1345,7 +1341,7 @@ S_StorySong:
mes "[Errende]";
mes "H-how can you say such a thing, "+ @name$ +"? Have you ever been a Bard before? It's difficult to come up with fresh, original melodies!";
}
goto L_End;
close3;
case 3:
cutin "bard_eland01",2;
@ -1355,7 +1351,7 @@ S_StorySong:
mes "enjoyed when you";
mes "are in the mood for it.";
mes "Please come again.";
goto L_End;
close3;
}
@ -1364,7 +1360,7 @@ S_StorySong:
mes "[Errende]";
mes "Hmm~?";
mes "Well, alright. Though, listening to a good story or cheerful song can really do you some good. Alright then, see you later.";
goto L_End;
close3;
}
}

2
npc/quests/cooking_quest.txt
View File

@ -61,7 +61,7 @@
mes "cooking when Novices";
mes "like yourself are running";
mes "around here like children.";
close;
close3;
}
cutin "orleans_1",0;
mes "[Charles Orleans]";

57
npc/re/quests/quests_brasilis.txt → npc/quests/quests_brasilis.txt
View File

@ -1,12 +1,6 @@
//===== rAthena Script =======================================
//= Brasilis Quests
//===== By ===================================================
//= L0ne_W0lf
//===== Version ==============================================
//= 1.3
//===== Compatible With ======================================
//= rAthena Project
//===== Description ==========================================
//===== Description: =========================================
//= [Official Conversion]
//= Lost Puppies (Repeatable, 24 hours.)
//= Suspicious Beach (Repeatable, 24 hours. iRO/cRO version.)
@ -14,13 +8,14 @@
//= Brasilis Water Lily Quest
//= Brasilis Dungeon Access Quest
//= Iara (Buff reward. Repeatable, 24 hours.)
//===== Comments =============================================
//= 1.0 First version.
//= 1.1 Hydra Ball (12408)
//===== Changelog: ===========================================
//= 1.0 First version. [L0ne_W0lf]
//= 1.1 Hydra Ball (12408). [og2]
//= 1.2 Optimization. [Euphy]
//= 1.2a Added 'consumeitem' command. [Euphy]
//= 1.3 Added VIP features and fixed some EXP values. [Euphy]
//= 1.3a Clean-up. [Capuche]
//= 1.4 Added pre-renewal differences [Daegaladh]
//============================================================
// Lost Puppies :: dogdog.sc
@ -59,10 +54,12 @@ brasilis,297,307,5 script Angelo#br 1_M_04,{
erasequest 9031;
setquest 9032;
specialeffect2 EF_ASSUMPTIO;
consumeitem 607; //Yggdrasilberry
.@rand = rand(1,10);
if (.@rand > 4 && .@rand < 9) getitem 504,2; //White_Potion
else if (.@rand > 8) getitem 608,1; //Seed_Of_Yggdrasil
if (checkre(0)) {
consumeitem 607; //Yggdrasilberry
.@rand = rand(1,10);
if (.@rand > 4 && .@rand < 9) getitem 504,2; //White_Potion
else if (.@rand > 8) getitem 608,1; //Seed_Of_Yggdrasil
}
close;
}
mes "[Angelo]";
@ -229,11 +226,15 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{
//recall_completequest 9029;
if (.@nQState2 > -1) erasequest 9029;
setquest 9029;
consumeitem 607; //Yggdrasilberry
if (checkre(0))
consumeitem 607; //Yggdrasilberry
consumeitem 12070; //Luk_Dish05
consumeitem 12055; //Vit_Dish05
consumeitem 12065; //Dex_Dish05
getitem 11502,3; //Light_Blue_Pot
if (checkre(0))
getitem 11502,3; //Light_Blue_Pot
else
getitem 505,5; //Blue_Potion
close;
}
else {
@ -410,10 +411,12 @@ brasilis,187,162,5 script Candy Maker 4_M_BRZ_MAN1,{
brazil_gua = 11;
completequest 2200;
getitem 12414,1; //Guarana_Candy
if (VIP_SCRIPT && vip_status(VIP_STATUS_ACTIVE))
getexp 105000,15000;
else
getexp 70000,10000;
if (checkre(0)) {
if (VIP_SCRIPT && vip_status(VIP_STATUS_ACTIVE))
getexp 105000,15000;
else
getexp 70000,10000;
}
close;
}
else if (brazil_gua == 11) {
@ -1030,9 +1033,9 @@ brasilis,203,286,3 script Botanist Karmen#bra 4_F_HUWOMAN,{
brazil_regia = 10;
completequest 2207;
if (VIP_SCRIPT && vip_status(VIP_STATUS_ACTIVE))
getexp 75000,15000;
getexp 75000, checkre(0)?15000:0;
else
getexp 50000,10000;
getexp 50000, checkre(0)?10000:0;
close;
}
else {
@ -2855,9 +2858,13 @@ bra_dun02,157,74,5 script Iara#nk 4_F_BRZ_WOMAN,2,2,{
mes "But... I think that the curse has been with me too long.";
mes "Get away from me quickly.";
delitem 11517,1; //Puri_Potion
percentheal 100,100;
sc_start SC_INCFLEE,3600000,20;
sc_start SC_INCCRI,3600000,10;
if (checkre(0)) {
percentheal 100,100;
sc_start SC_INCFLEE,3600000,20;
sc_start SC_INCCRI,3600000,10;
}
else
sc_start SC_INCCRI,3600000,7;
consumeitem 12043; //Str_Dish03
consumeitem 12063; //Dex_Dish03
consumeitem 12058; //Agi_Dish03

58
npc/quests/quests_rachel.txt
View File

@ -3816,7 +3816,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{
mes "wouldn't come here to pray...";
mes "Well, I hope you enjoy your";
mes "time here, adventurer.";
goto L_End;
close3;
}
mes "[Priestess Nemma]";
mes "Oh! I'm glad to see that";
@ -3869,7 +3869,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{
mes "all your journeys. May the";
mes "grace of the goddess always";
mes "support us in all that we do~";
goto L_End;
close3;
}
mes "[Priestess Nemma]";
mes "Great! How much would you";
@ -3898,7 +3898,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{
mes "protecting you, wherever you go~";
break;
}
goto L_End;
close3;
}
else {
cutin "ra_nemma03",2;
@ -3939,7 +3939,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{
mes "protecting you, wherever you go~";
break;
}
goto L_End;
close3;
case 2:
mes "[Priestess Nemma]";
mes "Oh! If you'd like some";
@ -3968,7 +3968,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{
mes "Oh, how sweet of you~";
break;
}
goto L_End;
close3;
}
}
else {
@ -3976,7 +3976,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{
cutin "ra_nemma01",2;
mes "[Priestess Nemma]";
mes "Welcome to our temple!";
goto L_End;
close3;
}
if (ra_tem_q < 1) {
mes "[Priestess Nemma]";
@ -4009,7 +4009,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{
mes "to go inside. ^333333*Sob*^000000 P-Panno!";
mes "Panno, I neeeed heeeeelp~!";
set ra_tem_q,1;
goto L_End;
close3;
}
else if ((ra_tem_q >= 1) && (ra_tem_q < 10)) {
mes "[Priestess Nemma]";
@ -4024,7 +4024,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{
mes "Panno would know";
mes "what to do... I think.";
mes "Ooh, Panno, help me!";
goto L_End;
close3;
}
else if (ra_tem_q == 10) {
cutin "ra_nemma04",2;
@ -4050,7 +4050,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{
mes "I'm outside. What if";
mes "the gate locks up again?";
mes "Oooh, what should I do?!";
goto L_End;
close3;
}
else if (ra_tem_q == 11) {
emotion ET_DELIGHT;
@ -4062,7 +4062,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{
mes "longer asking for donations,";
mes "but you can still redeem your";
mes "Lottery Tickets inside, okay?";
goto L_End;
close3;
}
else if (ra_tem_q == 12) {
mes "[Priestess Nemma]";
@ -4089,7 +4089,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{
mes "like, ^FF000020 of them^000000! Thank";
mes "you thank you thank you!";
set ra_tem_q,13;
goto L_End;
close3;
}
else if (ra_tem_q == 13) {
mes "[Priestess Nemma]";
@ -4124,7 +4124,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{
mes "to play! Hm, maybe";
mes "our pope would like";
mes "to see these too?";
goto L_End;
close3;
}
cutin "ra_nemma02",2;
mes "[Priestess Nemma]";
@ -4143,20 +4143,16 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{
mes "have much to pay you";
mes "back with, anyway~";
}
goto L_End;
close3;
}
else {
cutin "ra_nemma01",2;
mes "[Priestess Nemma]";
mes "Welcome to our temple!";
}
goto L_End;
close3;
}
L_End:
close2;
cutin "",255;
end;
close3;
S_Donate:
.@num = getarg(0);
@ -6329,7 +6325,7 @@ ra_temin,170,46,3 script Panno#rachel 920,{
mes "everything I know.";
mes "Remember to keep";
mes "quiet about what I said.";
goto L_End;
close3;
}
}
else if (ra_tem_q < 2) {
@ -6358,7 +6354,7 @@ ra_temin,170,46,3 script Panno#rachel 920,{
mes "time, so please visit";
mes "me at your leisure.";
mes "Go with Freya.";
goto L_End;
close3;
case 2:
cutin "ra_fano01",2;
@ -6397,14 +6393,14 @@ ra_temin,170,46,3 script Panno#rachel 920,{
mes "side of the hallway. However,";
mes "you can only enter if you've";
mes "been permitted beforehand.";
goto L_End;
close3;
case 3:
mes "[Priestess Panno]";
mes "......................";
mes "No chit-chat";
mes "inside the temple.";
goto L_End;
close3;
}
}
else if (ra_tem_q == 10) {
@ -6439,7 +6435,7 @@ ra_temin,170,46,3 script Panno#rachel 920,{
mes "time, so please visit";
mes "me at your leisure.";
mes "Go with Freya.";
goto L_End;
close3;
case 2:
cutin "ra_fano01",2;
@ -6478,7 +6474,7 @@ ra_temin,170,46,3 script Panno#rachel 920,{
mes "side of the hallway. However,";
mes "you can only enter if you've";
mes "been permitted beforehand.";
goto L_End;
close3;
case 3:
cutin "ra_fano02",2;
@ -6525,7 +6521,7 @@ ra_temin,170,46,3 script Panno#rachel 920,{
mes "[Priestess Panno]";
mes ".........";
set ra_tem_q,11;
goto L_End;
close3;
}
}
else if (ra_tem_q == 11) {
@ -6660,7 +6656,7 @@ ra_temin,170,46,3 script Panno#rachel 920,{
mes "Excuse me now, I need";
mes "to get back to work.";
set ra_tem_q,12;
goto L_End;
close3;
}
cutin "ra_fano02",2;
mes "[Priestess Panno]";
@ -6668,7 +6664,7 @@ ra_temin,170,46,3 script Panno#rachel 920,{
mes "Behave yourself, and";
mes "respect those who have";
mes "come here just to worship.";
goto L_End;
close3;
L_Lottery:
if(checkweight(607,1) == 0){
@ -6680,7 +6676,7 @@ L_Lottery:
mes "something large, unwieldy";
mes "and heavy? Put your junk";
mes "away in Storage first.";
goto L_End;
close3;
}
mes "[Priestess Panno]";
mes "Here we go";
@ -6716,7 +6712,7 @@ L_Lottery:
else if (.@bonus_donate > 5 && .@bonus_donate < 11) getitem 518,1; //Honey 5%
else if (.@bonus_donate > 0 && .@bonus_donate < 6) getitem 526,1; //Royal Jelly 5%
else getitem 547,1; //Condensed White Potion 39%
goto L_End;
close3;
}
mes "[Priestess Panno]";
mes "You...";
@ -6736,7 +6732,7 @@ L_Lottery:
cutin "ra_fano03",2;
mes "[Priestess Panno]";
mes "May Freya be with you.";
goto L_End;
close3;
L_End:
close2;

2
npc/quests/seals/mjolnir_seal.txt
View File

@ -284,7 +284,7 @@ prontera,124,297,3 script Tialfi 706,{
next;
mes "[Tialfi]";
mes "I think we'd better wait and see what's happening. Someone will deliver the news to us. Though, I am unsure of whether or not it will be good news or bad...";
close;
close3;
}
else if (BaseLevel < 70) {
cutin "god_tialpi02",2;

4
npc/quests/the_sign_quest.txt
View File

@ -3093,13 +3093,11 @@ OnTouch_:
end;
}
/* Currently broken.
prt_maze02,25,161,0 script #music -1,7,7,{
OnTouch_:
soundeffect "effect\\¼®¾çÀÇ ¾î½Ø½Å.wav",1;
soundeffect "effect\\석양의 어쌔신.wav",1;
end;
}
*/
prt_maze02,132,132,0 script #skill -1,{
OnEnable:

4
npc/re/cities/alberta.txt
View File

@ -21,6 +21,10 @@ alberta,246,74,3 duplicate(Sea_Captain_amatsu) Sea Captain#ama1 709
//============================================================
alberta,246,29,3 duplicate(Aibakthing_ayothaya) Aibakthing#ayo 843
// cities/brasilis.txt
//============================================================
alberta,246,82,3 duplicate(Crewman_bra2) Crewman#bra2 100
// cities/gonryun.txt
//============================================================
alberta,246,62,3 duplicate(Kunlun_Envoy_gonryun) Kunlun Envoy#gon 776

6
npc/re/cities/dicastes.txt
View File

@ -84,8 +84,8 @@ dicastes01,234,158,0 script Training Galten#a 450,{
mes "if I keep up with my training every day.";
close;
}
mes "ø¡ô¡ü ¡¡ø¡ô¡ü ¡ø";
mes "ô ¡ø";
mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø";
mes "¡ô ¡ø";
next;
mes "Don't know what it means.";
close;
@ -130,7 +130,7 @@ dicastes01,248,129,0 script Training Galten#d 450,{
close;
}
mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü";
mes "¡ø¡ô¡ü ¡ø¡ ø¡ô¡ü ¡ø";
mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø";
next;
mes "Don't know what it means.";
close;

2
npc/re/custom/lasagna/lasagna_npcs.txt
View File

@ -323,7 +323,7 @@ lasa_fild01,60,322,3 script Vigilante Aglio#doram02 4_DR_AGLIO,{
cutin "tutorial02.BMP",4;
mes "^4d4dff!- Notice -!^000000";
mes "^4d4dffCheck out the quest details by pressing the shortcut key [Alt+U],^000000 or through the Quest icon found in the menu tray.^000000";
close;
close3;
}
mes "[Vigilante Aglio]";
mes "Whoa, you're good!";

45
npc/re/custom/lasagna/warps.txt
View File

@ -1,45 +0,0 @@
//===== rAthena Script =======================================
//= Lasagna Warps
//===== Changelogs: ==========================================
//= 1.0 First Version. [Capuche]
//============================================================
lasa_fild02,348,244,0 warp lasa_fild02#lasa_dun01 1,1,lasa_dun01,24,143
lasa_dun01,18,143,0 warp lasa_dun01#lasa_fild02 1,1,lasa_fild02,344,243
lasa_dun_q,190,14,0 warp lasa_dun_q#lasa_dun01 1,1,lasa_dun01,152,98
lasa_dun01,157,98,0 warp lasa_dun01#lasa_dun02 1,1,lasa_dun02,22,171
lasa_dun02,18,171,0 warp lasa_dun02#lasa_dun01 1,1,lasa_dun01,153,98
lasa_dun02,146,58,0 warp lasa_dun02#lasa_dun03 1,1,lasa_dun03,190,18
lasa_dun03,190,15,0 warp lasa_dun03#lasa_dun02 1,1,lasa_dun02,146,54
lasa_fild01,134,381,0 warp lasa_fild01#lasagna_1 2,2,lasagna,153,58
lasagna,150,54,0 warp lasagna#lasa_fild01_1 2,2,lasa_fild01,131,378
lasa_fild01,341,375,0 warp lasa_fild01#lasagna_2 2,2,lasagna,327,56
lasagna,327,51,0 warp lasagna#lasa_fild01_2 2,2,lasa_fild01,344,371
lasagna,358,91,0 warp lasagna#lasa_fild02 2,2,lasa_fild02,20,98
lasa_fild02,16,98,0 warp lasa_fild02#lasagna 2,2,lasagna,355,92
lasa_in01,159,61,0 warp lasa_in01#lasagna 1,1,lasagna,68,202
// Boat
conch_in,60,61,0 warp2 warp_conch_in#out 1,1,lasagna,206,323
conch_in,51,60,0 warp2 warp_conch_in#A_B 1,1,conch_in,31,60
conch_in,34,60,0 warp2 warp_conch_in#B_A 1,1,conch_in,53,59
conch_in,63,53,0 warp2 warp_conch_in#C_D 1,1,conch_in,63,33
conch_in,63,35,0 warp2 warp_conch_in#D_C 1,1,conch_in,64,55
conch_in,64,66,0 warp2 warp_conch_in#E_F 1,1,conch_in,63,89
conch_in,63,87,0 warp2 warp_conch_in#F_E 1,1,conch_in,63,64
conch_in,101,53,0 warp2 warp_conch_in#G_H 1,1,conch_in,101,33
conch_in,101,35,0 warp2 warp_conch_in#H_G 1,1,conch_in,102,55
conch_in,101,66,0 warp2 warp_conch_in#I_J 1,1,conch_in,101,89
conch_in,102,87,0 warp2 warp_conch_in#J_I 1,1,conch_in,101,64
conch_in,137,53,0 warp2 warp_conch_in#K_L 1,1,conch_in,139,33
conch_in,139,35,0 warp2 warp_conch_in#L_K 1,1,conch_in,138,55
conch_in,137,66,0 warp2 warp_conch_in#M_N 1,1,conch_in,139,89
conch_in,140,87,0 warp2 warp_conch_in#N_M 1,1,conch_in,137,64
conch_in,142,60,0 warp2 warp_conch_in#O_P 1,1,conch_in,162,61
conch_in,159,61,0 warp2 warp_conch_in#P_O 1,1,conch_in,140,59

21
npc/re/guides/guides_brasilis.txt
View File

@ -1,19 +1,13 @@
//===== rAthena Script =======================================
//===== rAthena Script =======================================
//= Brasilis Guide
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.2
//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
//= [Official Conversion]
//===== Description: =========================================
//= [Official Conversion based on bRO & jRO servers]
//= Guide for the city of Brasilis.
//===== Additional Comments: =================================
//= 1.0 First Version, Renewal guide.
//= 1.1 Added a missing close.
//===== Changelog: ===========================================
//= 1.0 First Version, Renewal guide. [L0ne_W0lf]
//= 1.1 Added a missing close. [L0ne_W0lf]
//= 1.2 Navigation system update. [Euphy]
//============================================================
//============================================================
brasilis,219,97,3 script Brasilis Guide 478,{
mes "[Brasilis Guide]";
@ -59,6 +53,7 @@ brasilis,219,97,3 script Brasilis Guide 478,{
viewpoint 1,195,235,6,0x3355FF;
close;
}
end;
case 2:
mes "[Brasilis Guide]";
mes "I'll remove all marks from your mini-map.";

2
npc/re/guild3/agit_main_te.txt
View File

@ -438,7 +438,7 @@ function GuardianData;
if (select( "Fire","Cancel" ) == 2) {
mes "[ Hired Kafra Employee ]";
mes "I'll work hard for you... Thank you!";
close;
close3;
}
mes "[ Hired Kafra Employee ]";
mes "Oh, my goodness! This is nonsense!";

4
npc/re/instances/CharlestonCrisis.txt
View File

@ -727,11 +727,11 @@ OnTimer300:
}
1@mcd,141,214,5 script Charleston 2#1 4_F_CHARLESTON02,{
cutin "dalle01.bmp",2;
if (is_party_leader() == false) {
cutin "dalle01.bmp",2;
mes "[Charleston 1]";
mes "Please let me talk to your leader about the supplementation of the factory.";
close;
close3;
}
if ('ep15_1_mcd01 > 11)
end;

93
npc/re/instances/OldGlastHeim.txt
View File

@ -163,7 +163,7 @@ glast_01,204,273,5 script Hugin 4_M_SAGE_C,{
1@gl_k,206,79,0 warp #3Control2 2,2,1@gl_k,195,79
1@gl_k,227,216,0 warp #4Control 2,2,1@gl_k,215,216
1@gl_k,222,216,0 warp #4Control2 2,2,1@gl_k,233,216
1@gl_k,150,284,0 warp #2F Entrance 2,2,2@gl_k,150,46
// 1@gl_k,150,284,0 warp #2F Entrance 2,2,2@gl_k,150,46
2@gl_k,149,32,0 warp #1 Control 2,2,1@gl_k,150,270
2@gl_k,145,123,0 warp #22 Control 2,2,2@gl_k,126,123
2@gl_k,136,122,0 warp #22 Control2 2,2,2@gl_k,150,116
@ -188,8 +188,8 @@ glast_01,204,273,5 script Hugin 4_M_SAGE_C,{
next;
if (select( "Omit moderately.", "Appreciate everything." ) == 1) {
cutin "GL_BARMUND1.bmp",2;
mes "[Barmund]";
mes "Have I seen you " + strcharinfo(0) + "";
mes "[Varmundt]";
mes "I've seen you, " + strcharinfo(0) + ".";
mes "I'm sure I can trust you. Let's leave right away.";
close2;
cutin "",255;
@ -1073,8 +1073,13 @@ OnTimer5000:
close3;
}
// note: never hidden
1@gl_k,156,258,3 script Varmundt#2 4_M_BARMUND,{
if ('step < 6)
end;
if (checkweight(6607,1, 6608,1) == 0) {
mes "^ff0000It seems like you have too many types or weights of items. Please organize your inventory.^000000";
close;
}
cutin "gl_barmund1",2;
mes "[Varmundt]";
if (checkquest(12318,HUNTING) != 2) {
@ -1216,10 +1221,24 @@ OnMyMobDead:
enablenpc instance_npcname("Varmundt#21");
donpcevent instance_npcname("#ghmemorialmob05") + "::OnStart";
disablenpc instance_npcname("#ghmemorialmob04");
'step = 6;
}
end;
}
1@gl_k,150,284,0 script #2F Entrance WARPNPC,2,2,{
end;
OnTouch:
if (checkquest(12318,HUNTING) == 2) {
mes "^0000ffIt seems that you did not receive a reward for clearing the first floor. Talk to Varmundt and receive your reward.^000000";
close2;
warp 'map_name$[0],156,256;
end;
}
warp 'map_name$[1],150,46;
end;
}
// Floor 2
//============================================================
2@gl_k,148,67,1 script Heinrich#21 4_M_HEINRICH,{
@ -1246,9 +1265,9 @@ OnEffect:
2@gl_k,150,66,0 script #Servanton HIDDEN_WARP_NPC,7,7,{
end;
OnTouch_:
if ('step != 5)
if ('step != 6)
end;
'step = 6;
'step = 7;
disablenpc();
if ('mode == 1)
donpcevent instance_npcname("#talkinstance5") + "::OnStart";
@ -1372,16 +1391,18 @@ OnTouch_:
disablenpc();
.@hidden_name$ = strnpcinfo(2);
.@event_type = atoi( charat(.@hidden_name$,4) );
.@event_number = atoi( charat(.@hidden_name$,6) );
if (.@event_type == 2)
.@label$ = instance_npcname("#ghmemorialmob05") + "::OnMyMobDead";
.@event$ = instance_npcname("#ghmemorialmob05") + "::OnMyMobDead" + .@event_number; // left side
else
.@label$ = instance_npcname("#ghmemorialmob06") + "::OnMyMobDead";
.@event$ = instance_npcname("#ghmemorialmob06") + "::OnMyMobDead" + .@event_number; // right side
killmonster 'map_name$[1], .@event$;
getmapxy .@map$,.@x,.@y, BL_NPC;
monster .@map$,.@x,.@y, "Corrupted Palace Guard", 2468,1, .@label$;
monster .@map$,.@x,.@y, "Archer of Death", 2469,1, .@label$;
monster .@map$,.@x,.@y, "Corrupted Abysmal Knight", 2470,1, .@label$;
monster .@map$,.@x,.@y, "Suffered Khalitzburg", 2471,1, .@label$;
monster .@map$,.@x,.@y, "Bloody Knight", 2472,1, .@label$;
monster .@map$,.@x,.@y, "Corrupted Palace Guard", 2468,1, .@event$;
monster .@map$,.@x,.@y, "Archer of Death", 2469,1, .@event$;
monster .@map$,.@x,.@y, "Corrupted Abysmal Knight", 2470,1, .@event$;
monster .@map$,.@x,.@y, "Suffered Khalitzburg", 2471,1, .@event$;
monster .@map$,.@x,.@y, "Bloody Knight", 2472,1, .@event$;
initnpctimer;
end;
OnTimer30000:
@ -1417,7 +1438,13 @@ OnStart:
enablenpc instance_npcname("#ogh_2-" + .@i);
end;
OnMyMobDead:
OnMyMobDead1:
OnMyMobDead2:
OnMyMobDead3:
OnMyMobDead4:
OnMyMobDead5:
OnMyMobDead6:
OnMyMobDead7:
if (mobcount('map_name$[1], instance_npcname("#ghmemorialmob05") + "::OnBossDead") > 0) // Prevent boss re-spawn
end;
if ('mode == 2) // Higher (but unknown) spawn rate in fast mode
@ -1445,7 +1472,9 @@ OnBossDead:
for ( .@i = 1; .@i <= 7; .@i++ )
donpcevent instance_npcname("#ogh_2-" + .@i) + "::OnStop";
killmonster 'map_name$[1], instance_npcname("#ghmemorialmob05") + "::OnMyMobDead";
.@npc_name$ = instance_npcname("#ghmemorialmob05");
for ( .@i = 1; .@i <= 7; .@i++ )
killmonster 'map_name$[1], .@npc_name$ + "::OnMyMobDead" + .@i;
end;
}
@ -1506,6 +1535,13 @@ OnStart:
end;
OnMyMobDead:
OnMyMobDead1:
OnMyMobDead2:
OnMyMobDead3:
OnMyMobDead4:
OnMyMobDead5:
OnMyMobDead6:
OnMyMobDead7:
if (mobcount('map_name$[1], instance_npcname("#ghmemorialmob06") + "::OnBossDead") > 0) // Prevent boss re-spawn
end;
if ('mode == 2) // Higher (but unknown) spawn rate in fast mode
@ -1535,7 +1571,10 @@ OnBossDead:
for ( .@i = 1; .@i <= 7; .@i++ )
donpcevent instance_npcname("#ogh_3-" + .@i) + "::OnStop";
killmonster 'map_name$[1], instance_npcname("#ghmemorialmob06") + "::OnMyMobDead";
.@npc_name$ = instance_npcname("#ghmemorialmob06");
killmonster 'map_name$[1], .@npc_name$ + "::OnMyMobDead";
for ( .@i = 1; .@i <= 7; .@i++ )
killmonster 'map_name$[1], .@npc_name$ + "::OnMyMobDead" + .@i;
// Hidden mobs
setarray .@coord[0],
@ -1552,9 +1591,9 @@ OnBossDead:
2@gl_k,150,180,0 script #Geron HIDDEN_WARP_NPC,7,7,{
end;
OnTouch_:
if ('step != 6)
if ('step != 7)
end;
'step = 7;
'step = 8;
disablenpc instance_npcname("#Geron");
mapannounce 'map_name$[1], "???: Do not come here! It's a trap... Kkkkah!!!", bc_map,0xFF7777,FW_NORMAL,15;
enablenpc instance_npcname("Himelmez#22");
@ -1574,15 +1613,19 @@ OnTouch_:
else if (.@i == 3) .@mobs = 5;
else if (.@i < 7) .@mobs = 6;
else .@mobs = 7;
.@event$ = instance_npcname( strnpcinfo(0) ) + "::OnMobDead";
killmonster 'map_name$[1], .@event$;
getmapxy .@map$,.@x,.@y, BL_NPC;
specialeffect EF_VENOMDUST;
monster .@map$,.@x,.@y,"Maggot",2467,.@mobs;
monster .@map$,.@x,.@y,"Maggot",2467,.@mobs, .@event$;
initnpctimer;
end;
OnTimer45000:
enablenpc();
stopnpctimer;
end;
OnMobDead:
end;
}
2@gl_k,145,236,4 duplicate(Decomposed body#1) Decomposed body#2 4_M_DIEMAN,5,5
2@gl_k,141,222,2 duplicate(Decomposed body#1) Decomposed body#3 4_M_DIEMAN,5,5
@ -1646,9 +1689,9 @@ OnTimer45000:
mes "That is amazing ~ you made it all the way here. May I say thank you?";
close3;
OnTouch_:
if ('step != 7)
if ('step != 8)
end;
'step = 8;
'step = 9;
disablenpc();
if ('mode == 1)
donpcevent instance_npcname("#talkinstance7") + "::OnStart";
@ -1972,9 +2015,13 @@ OnTimer10000:
2@gl_k,158,241,1 script Hugin#21 4_M_SAGE_C,{
if ('step != 8)
if ('step != 9)
end;
if (checkquest(12319,HUNTING) == 2) {// note: complete hunting 'Corrupted Soul Hunt' prerequis
if (checkweight(6607,5, 6608,5) == 0) {
mes "^ff0000It seems like you have too many types or weights of items. Please organize your inventory.^000000";
close;
}
mes "[Hugin]";
mes "Hm, you are very well. First of all, let me give you some loot from Amdarais.";
erasequest 12319;
@ -2031,7 +2078,7 @@ OnTimer10000:
// Treasure Room
//============================================================
1@gl_k,165,136,3 script Strange crack#2 CLEAR_NPC,{
if ('step != 8)
if ('step != 9)
end;
if (isbegin_quest(12322) == 0) {// Space Distortion
mes "The crack looks suspicious but nothing more to check.";

11
npc/re/instances/SealedOs.txt
View File

@ -263,7 +263,6 @@ OnTouch:
1@os_b,137,139,0 duplicate(Thick Wire#171_os_0) Thick Wire#171_os_2 4_ENERGY_BLUE
1@os_b,122,212,5 script Dien#171_os_3 4_F_DIENE,{
OnTalk:
cutin "ep162_dn01",2;
mes "[Dien]";
mes "Oh!";
@ -281,8 +280,14 @@ OnTalk:
mes "It will take some time to break it~";
npctalk "Cotnes : Oh, is this gate too hard? It will take some time to break it.";
next;
doevent instance_npcname("Dien#171_os_3") + "::OnTalk";
close;
cutin "ep162_dn01",2;
mes "[Dien]";
mes "Oh!";
mes "If you go to the right, I think you can go back on the railroad without having to break the door.";
npctalk "Dien : Oh! If you go to the right, I think you can go back on the railroad without having to break the door";
if (!'unlocked)
donpcevent instance_npcname("#171_sealedos_control") + "::OnEvent04";
close3;
}
1@os_b,146,221,7 script Ridsh#171_os_2 4_F_LEEDSH,{

2
npc/re/jobs/2e/kagerou_oboro.txt
View File

@ -836,7 +836,7 @@ job_ko,81,124,4 script Kuuga Gai#ko 730,{
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,
26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50;
for (set .@i,getarraysize(.@n)-1; .@i>0; set .@i,.@i-1) {
set .@rand, rand(.@i);
set .@rand, rand(0,.@i);
set .@tmp, .@n[.@i];
set .@n[.@i], .@n[.@rand];
set .@n[.@rand], .@tmp;

2
npc/re/jobs/novice/academy.txt
View File

@ -5218,7 +5218,7 @@ new_1-3,99,169,3 script Friendly Poring#ac 4_PORING,{
next;
mes "[Poring]";
mes "It may fail, but keep trying to lure way those Little Porings!";
close;
close3;
}
} else if (isbegin_quest(2297) == 1) {
mes "[Poring]";

9
npc/re/kafras/kafras.txt
View File

@ -29,15 +29,6 @@
//= 1.7 Added Rock Ridge Kafra. [Capuche]
//============================================================
// Brasilis
//============================================================
brasilis,197,221,4 script Kafra Employee::kaf_bra 4_F_KAFRA1,{
cutin "kafra_01",2;
callfunc "F_Kafra",0,3,0,80,700;
savepoint "brasilis",195,259,1,1;
callfunc "F_KafEnd",0,1,"in the city of Brasilis";
}
// Dewata
//============================================================
dewata,202,184,6 script Kafra Employee::kaf_dewata 4_F_KAFRA1,{

4
npc/re/mapflag/night.txt
View File

@ -8,10 +8,8 @@
//============================================================
//============================================================
// Episode 13
// Episode 13.3
//============================================================
brasilis mapflag nightenabled
bra_fild01 mapflag nightenabled
dicastes01 mapflag nightenabled
dicastes02 mapflag nightenabled
dic_fild01 mapflag nightenabled

6
npc/re/mapflag/nobranch.txt
View File

@ -42,12 +42,6 @@ job3_war01 mapflag nobranch
job3_war02 mapflag nobranch
jupe_core2 mapflag nobranch
//============================================================
// Brasilis
//============================================================
brasilis mapflag nobranch
bra_in01 mapflag nobranch
//============================================================
// Episode 13.3
//============================================================

5
npc/re/mapflag/nomemo.txt
View File

@ -18,7 +18,7 @@
paramk mapflag nomemo
//============================================================
// Episode 13
// Episode 13.3
//============================================================
job3_arch01 mapflag nomemo
job3_arch02 mapflag nomemo
@ -37,9 +37,6 @@ job3_gen01 mapflag nomemo
job3_sha01 mapflag nomemo
jupe_core2 mapflag nomemo
s_atelier mapflag nomemo
bra_in01 mapflag nomemo
bra_dun01 mapflag nomemo
bra_dun02 mapflag nomemo
dicastes01 mapflag nomemo
dicastes02 mapflag nomemo
dic_in01 mapflag nomemo

2
npc/re/mapflag/nopenalty.txt
View File

@ -16,8 +16,6 @@ paramk mapflag nopenalty
//============================================================
// Municipality (Cities/Towns/Villages)
//============================================================
brasilis mapflag nopenalty
bra_in01 mapflag nopenalty
dicastes01 mapflag nopenalty
dicastes02 mapflag nopenalty
dic_in01 mapflag nopenalty

2
npc/re/mapflag/nopvp.txt
View File

@ -85,8 +85,6 @@ paramk mapflag pvp off
// Municipality (Cities/Towns/Villages)
//============================================================
moc_para01 mapflag pvp off
brasilis mapflag pvp off
bra_in01 mapflag pvp off
dicastes01 mapflag pvp off
dicastes02 mapflag pvp off
dic_in01 mapflag pvp off

3
npc/re/mapflag/noteleport.txt
View File

@ -26,10 +26,9 @@ paramk mapflag noteleport
moc_para01 mapflag noteleport
//============================================================
// Episode 13
// Episode 13.3
//============================================================
s_atelier mapflag noteleport
bra_in01 mapflag noteleport
dic_in01 mapflag noteleport
job3_gen01 mapflag noteleport
job3_sha01 mapflag noteleport

Some files were not shown because too many files have changed in this diff Show More