mmo-ref/landsandboat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
17801 commits 75 branches 0 tags 1.3 GiB
Commit graph

711 commits

Author SHA1 Message Date
TeoTwawki
bba50c11f4 Merge branch 'master' of https://github.com/DarkstarProject/darkstar into bcnmcrap 2019-06-01 15:15:42 -04:00
Zynjec
64cc8c4f3e
Merge pull request #6026 from wrenffxi/remove-and-assign-groups 
remove or assign some groupids that related to 0 rows in mob_spawn_points
 2019-06-01 14:10:30 -04:00
TeoTwawki
02aee152b6 Merge branch 'master' of https://github.com/DarkstarProject/darkstar into bcnmcrap 
# Resolved Conflicts:
#	sql/mob_pools.sql

# Huh..
#       Teo Expected more brokenness that this.
 2019-05-26 15:50:26 -04:00
whasf
ee95dfd8b4
Merge pull request #5987 from isotor/detector_level 
Add mod to Defender and Detector mod to prevent experience gain
 2019-05-25 11:30:00 -05:00
wrenffxi
1a5c7009d2 remove some unused mob groups 
assign some mob groups
remove one redundant mob pool
 2019-05-23 12:48:17 -04:00
wrenffxi
03ec37d25e Krakens (fished vs. non-fished vs. NM) 2019-05-18 15:22:58 -04:00
isotor
c77414ecdd revert level changes, instead set mobmod for no exp reward 2019-05-08 15:19:59 +03:00
isotor
826f06fcd2 reduce level range detector and defender mobs 2019-05-08 10:20:27 +03:00
TeoTwawki
eae65587ef Merge branch 'master' of https://github.com/DarkstarProject/darkstar into bcnmcrap 
# Resolved Conflicts:
#	sql/mob_pools.sql
 2019-05-07 20:24:28 -04:00
isotor
bafda057bc Correct level range bark tarantula (Boyahda Tree) 2019-05-07 12:02:55 +03:00
David Norris
616569e80d reserve future ids for bcnm branch 2019-05-03 14:27:14 -05:00
David Norris
5aeb498929 Merge remote-tracking branch 'remotes/Darkstar/master' into merge_bcnm 
# 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
 2019-05-03 10:25:51 -05:00
wrenffxi
e334b50cc7 Goblin Archaeologist 
Goblin Jeweler
King Buffalo
Tabar Beak
Will-O'-The-Wykes
 2019-04-28 11:27:29 -04:00
Zach Toogood
ba5b0db2c5 Give aura sculpture own drops, separate from aura statue 2019-04-17 22:26:01 +03:00
ValentineXI
c66ae0296d Create unique poolid for Seaboard Vulture (#5812) 
Fixes issue #5808. Also added Tragopan dropid to Seaboard Vulture group as shares similar pool (bird feather and bird egg).

Bonus content: deleted that annoying blank line in mob_pools.sql that's been driving me nuts.
 2019-03-31 09:05:44 -04:00
TeoTwawki
c4275b9bf8
Merge pull request #5510 from KnowOne134/Excavation_Duty 
Add Assault Excavation Duty
 2019-03-30 16:41:50 -04:00
David Norris
c0c37c5d73 updated to master, resolved conflicts 2019-03-19 18:33:00 -05:00
wrenffxi
639f5f4e8d Big Jaw (three pools: fished, spawned normally but non-aggro, spawned normally and aggro) 2019-03-14 02:07:46 -04:00
wrenffxi
43e59452d8 [wendigo] split horutoto into WAR and BLM dropids -- TODO: retail capture of these wendigo jobs -- and remove a few unused groupids 2019-03-14 01:57:20 -04:00
wrenffxi
b8de7d25b8 mobs whose mobid-derived zoneid does match the zoneid of their given groupid 2019-03-14 01:57:20 -04:00
wrenffxi
ef974286a4 mobs in mob_spawn_points with a groupid that doesn't exist in mob_groups 2019-03-14 01:57:19 -04:00
TeoTwawki
3428c492d7
Merge pull request #5773 from wrenffxi/nms 
NMs
 2019-03-11 15:27:55 -05:00
jskeld
bf70e8c1cd TODO: 
* Verify pet restore on teleport
* Balance chariot family TP moves and stats
* Qiqirn pathing with navmeshes enabled
* Add proper family immunities
 2019-03-04 09:49:50 -06:00
wrenffxi
3676f9ff75 Huu Xalmo the Savage 2019-02-28 22:20:36 -05:00
wrenffxi
344d5182a1 Herensugue (triple attack, regain, drops, skills, hp) 2019-02-27 22:17:34 -05:00
wrenffxi
6338137a0e Coquecigrue 2019-02-27 21:56:26 -05:00
wrenffxi
90fab885e7 Barbaric Weapon 2019-02-27 21:25:16 -05:00
wrenffxi
e07767b061 Ravenous Crawler 2019-02-21 14:28:07 -05:00
wrenffxi
50a1486e8d Qoofim 2019-02-21 14:19:55 -05:00
wrenffxi
e7d66a30b5 Donggu 2019-02-21 14:11:21 -05:00
wrenffxi
5bd072b012 Muq Shabeel 2019-02-21 13:56:16 -05:00
wrenffxi
94d527e1c6 Lesath 2019-02-21 13:45:00 -05:00
wrenffxi
5f1041aaf3 Gloombound Lurker (and support for AE: Curse) 2019-02-21 13:28:59 -05:00
wrenffxi
db340ff05d Euryale 
Frogamander
Killer Jonny
Marquis Naberius
Sabotender Corrido
 2019-02-21 00:52:52 -05:00
wrenffxi
108de34fde Rogue Receptacle 2019-02-18 14:45:56 -05:00
wrenffxi
382048ff6b Sarcopsylla 2019-02-18 14:26:13 -05:00
wrenffxi
5e66e4d5f5 mobType and HP for "Not Meant To Be" Quest NMs 
order Lamia mobskills
 2019-02-18 14:06:59 -05:00
wrenffxi
a1f7560db0 Jobs and specials for Ru'Aern (PM8-1) 2019-02-18 06:55:56 -05:00
TeoTwawki
9812714126
Merge pull request #5734 from isotor/patch-1 
Adjusted level range Ose
 2019-02-14 18:54:39 -06:00
wrenffxi
ca42dc1962 added missing lottery nm coords to nm_spawn_points 2019-02-12 15:15:30 -05:00
isotor
f22db67a5a
Adjusted level range Ose 
https://ffxiclopedia.fandom.com/wiki/Ose
 2019-02-12 16:18:33 +03:00
KnowOne134
3889604a8a
Merge branch 'master' into Excavation_Duty 2019-02-08 20:08:33 -05:00
whasf
cc038b2c09
Merge pull request #5623 from bkesecker/master 
Implementation of Over The Hills And Far Away
 2019-02-07 19:35:46 -06:00
KnowOne134
86d1b951ad
Merge branch 'master' into pirates 2019-02-05 20:18:40 -05:00
David Norris
0dd391c1a3 add Pirate zones 2019-02-05 19:10:05 -06:00
wrenffxi
8d36d0b33f Goaftrap 2019-02-05 04:51:40 -05:00
wrenffxi
486f90d84e Death from Above 2019-02-04 01:42:56 -05:00
wrenffxi
f720e660a0 Wurr the Sandcomber 2019-02-04 01:22:57 -05:00
wrenffxi
2b342a3bf5 Yarr the Pearleyed 2019-02-04 01:13:33 -05:00
wrenffxi
1960877b88 Abyss Sahagin 2019-02-04 00:55:10 -05:00