This repository has been archived by the owner on Apr 29, 2020. It is now read-only.
Bcnmcrap merge to master #5923
Merged
Bcnmcrap merge to master #5923
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
semicolon destruction removed onEventFinish check for csid 565 moved AhtUrganStatus variable to csid 564
…nZoneIn func., I'm gonna start from the beginning of the AU missions and check on all the zone scripts because these kinds of things are occuring in more zone scripts than this one (I just fixed the onZoneIn func. of this one so that ToAU Mission 30 could work correctly)
Was rewarding traits without the required points.
* Style fix for mobskills * Added Status require to Princess_Pudding.lua and Armoury_Crate.lua
Everyone's Rancor
"True Strength" NM: Huu Xalmo the Savage
add mobmod IS_NM, fix removing Temp items, ALWAYS_AGGRO always agros
* Removed leading space in Qutrub.lua
updating table name from accounts_ip_record to account_ip_record to prevent error when attempting to delete a character
updating table name account_ip_record
Fix BLU trait calculation
-- Fixed indent of end line of Caedarva Mire prevZone statement
* Tested pet restore code * v:setPos to player:setPos
style edit
order by skill id
add tools for DB updating and 1st time setup
Goblin Jeweler King Buffalo Tabar Beak Will-O'-The-Wykes
Missing mob drops rescued from from closed PR #5722.
Augments Shield Bash is Damage +50 (https://www.bg-wiki.com/bg/Fenian%20Ring).
Add Shield Bash MOD to Fenian Ring
Information based on POL Utils.
Fix incorrect item_basic flags
remove extra column
Remove incorrect requirements to open Brass Door in Castle O.
Earthbreaker and Venom Storm have a 40 yalm radius
Update casting time for songs adjusted from single-target to AOE
Fix duration Perfect Dodge
Fix itemid typo (grotto coffer key)
Correct Slendlix Spindlethumb modelid
# Conflicts: # scripts/globals/bcnm.lua # scripts/globals/settings.lua # scripts/zones/Balgas_Dais/bcnms/saintly_invitation.lua # scripts/zones/Bearclaw_Pinnacle/bcnms/flames_for_the_dead.lua # scripts/zones/Boneyard_Gully/bcnms/head_wind.lua # scripts/zones/Chamber_of_Oracles/bcnms/through_the_quicksand_caves.lua # scripts/zones/Cloister_of_Flames/bcnms/sugar-coated_directive.lua # scripts/zones/Cloister_of_Flames/bcnms/trial_by_fire.lua # scripts/zones/Cloister_of_Frost/bcnms/sugar-coated_directive.lua # scripts/zones/Cloister_of_Frost/bcnms/trial_by_ice.lua # scripts/zones/Cloister_of_Gales/bcnms/sugar-coated_directive.lua # scripts/zones/Cloister_of_Gales/bcnms/trial_by_wind.lua # scripts/zones/Cloister_of_Gales/npcs/Wind_Protocrystal.lua # scripts/zones/Cloister_of_Storms/bcnms/sugar-coated_directive.lua # scripts/zones/Cloister_of_Storms/bcnms/trial-size_trial_by_lightning.lua # scripts/zones/Cloister_of_Storms/bcnms/trial_by_lightning.lua # scripts/zones/Cloister_of_Tides/bcnms/sugar-coated_directive.lua # scripts/zones/Cloister_of_Tides/bcnms/trial-size_trial_by_water.lua # scripts/zones/Cloister_of_Tides/bcnms/trial_by_water.lua # scripts/zones/Cloister_of_Tremors/bcnms/sugar-coated_directive.lua # scripts/zones/Cloister_of_Tremors/bcnms/trial_by_earth.lua # scripts/zones/Dynamis-Bastok/mobs/GiPha_Manameister.lua # scripts/zones/Dynamis-Bastok/mobs/GuDha_Effigy.lua # scripts/zones/Dynamis-Bastok/mobs/GuNhi_Noondozer.lua # scripts/zones/Dynamis-Bastok/mobs/KoDho_Cannonball.lua # scripts/zones/Dynamis-Bastok/mobs/Vanguard_Mason.lua # scripts/zones/Dynamis-Bastok/mobs/Vanguard_Undertaker.lua # scripts/zones/Dynamis-Bastok/mobs/ZeVho_Fallsplitter.lua # scripts/zones/Dynamis-Beaucedine/mobs/BeZhe_Keeprazer.lua # scripts/zones/Dynamis-Beaucedine/mobs/Deathcaller_Bidfbid.lua # scripts/zones/Dynamis-Beaucedine/mobs/Galkarider_Retzpratz.lua # scripts/zones/Dynamis-Beaucedine/mobs/GuKhu_Dukesniper.lua # scripts/zones/Dynamis-Beaucedine/mobs/Hydra_Ranger.lua # scripts/zones/Dynamis-Beaucedine/mobs/Hydra_Summoner.lua # scripts/zones/Dynamis-Beaucedine/mobs/Morblox_Chubbychin.lua # scripts/zones/Dynamis-Beaucedine/mobs/Puu_Timu_the_Phantasmal.lua # scripts/zones/Dynamis-Beaucedine/mobs/Slinkix_Trufflesniff.lua # scripts/zones/Dynamis-Beaucedine/mobs/Vanguard_Ambusher.lua # scripts/zones/Dynamis-Beaucedine/mobs/Vanguard_Dollmaster.lua # scripts/zones/Dynamis-Beaucedine/mobs/Vanguard_Mason.lua # scripts/zones/Dynamis-Beaucedine/mobs/Vanguard_Necromancer.lua # scripts/zones/Dynamis-Beaucedine/mobs/Vanguard_Oracle.lua # scripts/zones/Dynamis-Beaucedine/mobs/Vanguard_Predator.lua # scripts/zones/Dynamis-Beaucedine/mobs/Vanguard_Salvager.lua # scripts/zones/Dynamis-Beaucedine/mobs/Vanguard_Undertaker.lua # scripts/zones/Dynamis-Buburimu/mobs/Vanguard_Ambusher.lua # scripts/zones/Dynamis-Buburimu/mobs/Vanguard_Dollmaster.lua # scripts/zones/Dynamis-Buburimu/mobs/Vanguard_Mason.lua # scripts/zones/Dynamis-Buburimu/mobs/Vanguard_Necromancer.lua # scripts/zones/Dynamis-Buburimu/mobs/Vanguard_Oracle.lua # scripts/zones/Dynamis-Buburimu/mobs/Vanguard_Predator.lua # scripts/zones/Dynamis-Buburimu/mobs/Vanguard_Salvager.lua # scripts/zones/Dynamis-Buburimu/mobs/Vanguard_Undertaker.lua # scripts/zones/Dynamis-Jeuno/mobs/Lurklox_Dhalmelneck.lua # scripts/zones/Dynamis-Jeuno/mobs/Morgmox_Moldnoggin.lua # scripts/zones/Dynamis-Jeuno/mobs/Mortilox_Wartpaws.lua # scripts/zones/Dynamis-Jeuno/mobs/Prowlox_Barrelbelly.lua # scripts/zones/Dynamis-Jeuno/mobs/Vanguard_Ambusher.lua # scripts/zones/Dynamis-Jeuno/mobs/Vanguard_Necromancer.lua # scripts/zones/Dynamis-Qufim/mobs/Vanguard_Ambusher.lua # scripts/zones/Dynamis-Qufim/mobs/Vanguard_Dollmaster.lua # scripts/zones/Dynamis-Qufim/mobs/Vanguard_Mason.lua # scripts/zones/Dynamis-Qufim/mobs/Vanguard_Necromancer.lua # scripts/zones/Dynamis-Qufim/mobs/Vanguard_Oracle.lua # scripts/zones/Dynamis-Qufim/mobs/Vanguard_Predator.lua # scripts/zones/Dynamis-Qufim/mobs/Vanguard_Salvager.lua # scripts/zones/Dynamis-Qufim/mobs/Vanguard_Undertaker.lua # scripts/zones/Dynamis-San_dOria/mobs/Overlords_Tombstone.lua # scripts/zones/Dynamis-San_dOria/mobs/Reapertongue_Gadgquok.lua # scripts/zones/Dynamis-San_dOria/mobs/Vanguard_Amputator.lua # scripts/zones/Dynamis-San_dOria/mobs/Vanguard_Backstabber.lua # scripts/zones/Dynamis-San_dOria/mobs/Vanguard_Bugler.lua # scripts/zones/Dynamis-San_dOria/mobs/Vanguard_Dollmaster.lua # scripts/zones/Dynamis-San_dOria/mobs/Vanguard_Footsoldier.lua # scripts/zones/Dynamis-San_dOria/mobs/Vanguard_Grappler.lua # scripts/zones/Dynamis-San_dOria/mobs/Vanguard_Gutslasher.lua # scripts/zones/Dynamis-San_dOria/mobs/Vanguard_Hawker.lua # scripts/zones/Dynamis-San_dOria/mobs/Vanguard_Impaler.lua # scripts/zones/Dynamis-San_dOria/mobs/Vanguard_Mesmerizer.lua # scripts/zones/Dynamis-San_dOria/mobs/Vanguard_Neckchopper.lua # scripts/zones/Dynamis-San_dOria/mobs/Vanguard_Pillager.lua # scripts/zones/Dynamis-San_dOria/mobs/Vanguard_Predator.lua # scripts/zones/Dynamis-San_dOria/mobs/Vanguard_Trooper.lua # scripts/zones/Dynamis-San_dOria/mobs/Vanguard_Vexer.lua # scripts/zones/Dynamis-San_dOria/mobs/Voidstreaker_Butchnotch.lua # scripts/zones/Dynamis-San_dOria/mobs/Wyrmgnasher_Bjakdek.lua # scripts/zones/Dynamis-Valkurm/IDs.lua # scripts/zones/Dynamis-Valkurm/mobs/Adamantking_Image.lua # scripts/zones/Dynamis-Valkurm/mobs/Avatar_Idol.lua # scripts/zones/Dynamis-Valkurm/mobs/Goblin_Statue.lua # scripts/zones/Dynamis-Valkurm/mobs/Vanguard_Ambusher.lua # scripts/zones/Dynamis-Valkurm/mobs/Vanguard_Dollmaster.lua # scripts/zones/Dynamis-Valkurm/mobs/Vanguard_Mason.lua # scripts/zones/Dynamis-Valkurm/mobs/Vanguard_Necromancer.lua # scripts/zones/Dynamis-Valkurm/mobs/Vanguard_Oracle.lua # scripts/zones/Dynamis-Valkurm/mobs/Vanguard_Predator.lua # scripts/zones/Dynamis-Valkurm/mobs/Vanguard_Salvager.lua # scripts/zones/Dynamis-Valkurm/mobs/Vanguard_Undertaker.lua # scripts/zones/Dynamis-Valkurm/mobs/Warchief_Tombstone.lua # scripts/zones/Dynamis-Windurst/mobs/Haa_Pevi_the_Stentorian.lua # scripts/zones/Dynamis-Windurst/mobs/Loo_Hepe_the_Eyepiercer.lua # scripts/zones/Dynamis-Windurst/mobs/Tzee_Xicu_Idol.lua # scripts/zones/Dynamis-Windurst/mobs/Vanguard_Assassin.lua # scripts/zones/Dynamis-Windurst/mobs/Vanguard_Chanter.lua # scripts/zones/Dynamis-Windurst/mobs/Vanguard_Exemplar.lua # scripts/zones/Dynamis-Windurst/mobs/Vanguard_Inciter.lua # scripts/zones/Dynamis-Windurst/mobs/Vanguard_Liberator.lua # scripts/zones/Dynamis-Windurst/mobs/Vanguard_Ogresoother.lua # scripts/zones/Dynamis-Windurst/mobs/Vanguard_Oracle.lua # scripts/zones/Dynamis-Windurst/mobs/Vanguard_Partisan.lua # scripts/zones/Dynamis-Windurst/mobs/Vanguard_Persecutor.lua # scripts/zones/Dynamis-Windurst/mobs/Vanguard_Prelate.lua # scripts/zones/Dynamis-Windurst/mobs/Vanguard_Priest.lua # scripts/zones/Dynamis-Windurst/mobs/Vanguard_Salvager.lua # scripts/zones/Dynamis-Windurst/mobs/Vanguard_Sentinel.lua # scripts/zones/Dynamis-Windurst/mobs/Vanguard_Skirmisher.lua # scripts/zones/Dynamis-Windurst/mobs/Vanguard_Visionary.lua # scripts/zones/Dynamis-Windurst/mobs/Wuu_Qoho_the_Razorclaw.lua # scripts/zones/Dynamis-Windurst/mobs/Xoo_Kaza_the_Solemn.lua # scripts/zones/Dynamis-Xarcabard/mobs/Count_Raum.lua # scripts/zones/Dynamis-Xarcabard/mobs/Count_Vine.lua # scripts/zones/Dynamis-Xarcabard/mobs/Count_Zaebos.lua # scripts/zones/Dynamis-Xarcabard/mobs/Duke_Berith.lua # scripts/zones/Dynamis-Xarcabard/mobs/Duke_Gomory.lua # scripts/zones/Dynamis-Xarcabard/mobs/Duke_Scox.lua # scripts/zones/Dynamis-Xarcabard/mobs/Kindred_Ranger.lua # scripts/zones/Dynamis-Xarcabard/mobs/Kindred_Summoner.lua # scripts/zones/Dynamis-Xarcabard/mobs/King_Zagan.lua # scripts/zones/Dynamis-Xarcabard/mobs/Marquis_Andras.lua # scripts/zones/Dynamis-Xarcabard/mobs/Marquis_Cimeries.lua # scripts/zones/Dynamis-Xarcabard/mobs/Marquis_Decarabia.lua # scripts/zones/Dynamis-Xarcabard/mobs/Marquis_Gamygyn.lua # scripts/zones/Dynamis-Xarcabard/mobs/Marquis_Nebiros.lua # scripts/zones/Dynamis-Xarcabard/mobs/Marquis_Orias.lua # scripts/zones/Dynamis-Xarcabard/mobs/Marquis_Sabnak.lua # scripts/zones/Dynamis-Xarcabard/mobs/Prince_Seere.lua # scripts/zones/Empyreal_Paradox/bcnms/dawn.lua # scripts/zones/Full_Moon_Fountain/bcnms/moonlit_path.lua # scripts/zones/Ghelsba_Outpost/bcnms/holy_crest.lua # scripts/zones/Ghelsba_Outpost/bcnms/save_the_children.lua # scripts/zones/Horlais_Peak/bcnms/the_secret_weapon.lua # scripts/zones/Jade_Sepulcher/bcnms/puppet_in_peril.lua # scripts/zones/Konschtat_Highlands/npcs/Dimensional_Portal.lua # scripts/zones/LaLoff_Amphitheater/bcnms/ark_angels_1.lua # scripts/zones/LaLoff_Amphitheater/bcnms/ark_angels_2.lua # scripts/zones/LaLoff_Amphitheater/bcnms/ark_angels_3.lua # scripts/zones/LaLoff_Amphitheater/bcnms/ark_angels_4.lua # scripts/zones/LaLoff_Amphitheater/bcnms/ark_angels_5.lua # scripts/zones/LaLoff_Amphitheater/bcnms/divine_might.lua # scripts/zones/La_Theine_Plateau/npcs/Dimensional_Portal.lua # scripts/zones/Mine_Shaft_2716/bcnms/century_of_hardship.lua # scripts/zones/Mine_Shaft_2716/npcs/_0d0.lua # scripts/zones/Monarch_Linn/bcnms/ancient_vows.lua # scripts/zones/Monarch_Linn/bcnms/savage.lua # scripts/zones/Navukgo_Execution_Chamber/bcnms/shield_of_diplomacy.lua # scripts/zones/QuBia_Arena/bcnms/heir_to_the_light.lua # scripts/zones/QuBia_Arena/bcnms/those_who_lurk_in_shadows.lua # scripts/zones/Riverne-Site_B01/bcnms/storms_of_fate.lua # scripts/zones/Riverne-Site_B01/npcs/Spatial_Displacement.lua # scripts/zones/Riverne-Site_B01/npcs/Unstable_Displacement.lua # scripts/zones/Sacrificial_Chamber/bcnms/temple_of_uggalepih.lua # scripts/zones/Sealions_Den/bcnms/one_to_be_feared.lua # scripts/zones/Sealions_Den/bcnms/warriors_path.lua # scripts/zones/Sealions_Den/npcs/_0w0.lua # scripts/zones/Spire_of_Dem/bcnms/ancient_flames_beckon.lua # scripts/zones/Spire_of_Holla/bcnms/ancient_flames_beckon.lua # scripts/zones/Spire_of_Mea/bcnms/ancient_flames_backon.lua # scripts/zones/Spire_of_Vahzl/bcnms/desires_of_emptiness.lua # scripts/zones/Stellar_Fulcrum/bcnms/return_to_delkfutts_tower.lua # scripts/zones/Tahrongi_Canyon/npcs/Dimensional_Portal.lua # scripts/zones/Talacca_Cove/bcnms/legacy_of_the_lost.lua # scripts/zones/The_Celestial_Nexus/bcnms/celestial_nexus.lua # scripts/zones/The_Garden_of_RuHmet/bcnms/when_angels_fall.lua # scripts/zones/The_Garden_of_RuHmet/npcs/_0z0.lua # scripts/zones/The_Shrouded_Maw/bcnms/darkness_named.lua # scripts/zones/Throne_Room/bcnms/where_two_paths_converge.lua # scripts/zones/Valkurm_Dunes/npcs/Hieroglyphics.lua # scripts/zones/Waughroon_Shrine/bcnms/on_my_way.lua # sql/mob_groups.sql # sql/mob_pools.sql # sql/mob_spawn_points.sql # src/map/entities/baseentity.h # src/map/packet_system.cpp # src/map/status_effect.h # src/map/utils/battlefieldutils.cpp
|
Oh wow, big changes time... |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
had to shift mob_groups from 11369-11447 to 11530-12949 and move mob_pools from 5757-5774 to 6050-6067