Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V0.9.280 #1653

Merged
merged 145 commits into from
May 26, 2024
Merged

V0.9.280 #1653

merged 145 commits into from
May 26, 2024

Conversation

LtRipley36706
Copy link
Member

No description provided.

TectonicRifts and others added 30 commits April 23, 2024 11:26
Adjusting critical multiplier and frequency on the SB staff for a closer match to retail.

Based on a retail video of Berek fighting Aerbax, with pierce vul 8, the average on normal hits was 1317 (based on 66 shots). The critical average was 4432 (based on 11 shots). This is with pierce vul 8.

Without pierce vul (only on the staff's pierce rend), the normal hit average is 1031 (total 40 shots) and 3506 on criticals (total 10 shots).

Either way, criticals are about 3.5 more damage than normal hits. Also, out of the 149 shots in the video, 25 were criticals, which is a .1677 rate. Subtracting 1% for eye of remorseless aug, and rounding down to be more conservative, gives 15% chance to critical.
* Update Floating City

Update the Floating City to end of retail.

Also made minor adjustments to the skills of the creatures found here based on the pcaps. These creatures are also found in other old quests (e.g., Mage Academy) updated around the same time.

Added missing attributes and rebalanced skills for Banderling Smasher (including that found on Olthoi Island).

https://asheron.fandom.com/wiki/Floating_City_Quest

* Create 73170 Random Portal Generator.sql

Added missing random portal generator.
…2678, 0089 (#1648)

Database/Patches/6 LandBlockExtendedData/0089.sql (Cells of the Black Book Surface Portal)
Database/Patches/9 WeenieDefaults/Portal/Portal/32674 Cells of the Black Book.sql
Database/Patches/9 WeenieDefaults/Portal/Portal/32675 Cells of the Black Book.sql
Database/Patches/9 WeenieDefaults/Portal/Portal/32676 Cells of the Black Book.sql
Database/Patches/9 WeenieDefaults/Portal/Portal/32677 Cells of the Black Book.sql
Database/Patches/9 WeenieDefaults/Portal/Portal/32678 Surface.sql (Cells of the Black Book Surface Portal)

32674, 32675, 32676, 32677 Cells of the Black Book Portal drops
Updated portal destinations for Cells of the Black Book portals to match Landblocks Google Sheets PCAPS.

PCAP Data (from Landblocks Google Sheet) shows four entrances
Cells of the Black Book (Entrance 1) - 32674
0x008902DC 0 -200 -0.087583 0.707107 0 0 -0.707107
Cells of the Black Book (Entrance 2) - 32675
0x008902F5 200 -420 -0.375722 1 0 0 0
Cells of the Black Book (Entrance 3) - 32676
0x008902FF 220 0 0 0 0 0 -1
Cells of the Black Book (Entrance 4) - 32677
0x00890318 420 -220 0 -0.707107 0 0 -0.707107

Previously all portals were mistakenly set to the same drop point (North side)
Now updated to 4 different drops W, S, N, E.

--
Updated 0089.sql Add 4th Surface Portal to Cells of the Black Book
@teleloc 0x00890113 [67.000122 -240 -12] 1 0 0 0

From vloc2loc data (0089)
Surface - @teleloc 0x00890150 [180 -67 -12] 1 0 0 0
Surface - @teleloc 0x008901E7 [240 -353 -12] 1 0 0 0
Surface - @teleloc 0x00890224 [352.999878 -180 -12] 1 0 0 0
(MISSING) Surface - @teleloc 0x00890113 [67.000122 -240 -12] 1 0 0 0

From world_objects (landcell '89%')
37576	14	890150		-101.2	7.37	-0.05	Surface (10.3S, 50.3E).
37826	14	89010000000	-100.95	6.18	-0.05	Surface (10.3S, 50.3E).
37854	14	890224		-100.48	6.9	-0.05	Surface	(10.3S, 50.3E).
(MISSING) 38026	14	890113	-101.67	6.65	-0.05	Surface (10.3S, 50.3E).

--
32678 Cells of the Black Book Surface Portal NOT YET IMPLEMENTED
Update Cells of the Black Book Surface Portal(s) to deposit you outside the bunker.
/* @teleloc  0xBE720015 [60.000000 107.998047 6.006000] 1 0 0 0 */
/* this matches world_objects exit portal data for landcell 89.. that shows "Surface (10.3S, 50.3E)"

From world_objects (landcell '89%')
37576	14	890150		-101.2	7.37	-0.05	Surface (10.3S, 50.3E).
37826	14	89010000000	-100.95	6.18	-0.05	Surface (10.3S, 50.3E).
37854	14	890224		-100.48	6.9	-0.05	Surface	(10.3S, 50.3E).
38026	14	890113		-101.67	6.65	-0.05	Surface (10.3S, 50.3E).
…ented' (#1649)

Database/Patches/9 WeenieDefaults/Portal/Portal/43118 Forgotten Tunnels.sql
Database/Patches/9 WeenieDefaults/Portal/Portal/43119 Forgotten Tunnels.sql
Database/Patches/9 WeenieDefaults/Portal/Portal/43120 Forgotten Tunnels.sql

-- Set Destinations according to Landblock Google Sheet PCAP data

43118 Source: 93.1S, 56.9W
@teleloc 0x380B0102 [60.0445 20.7545 -5.663] -0.999965 0 0 0.008334
-- Set Destination:
@teleloc 0x8B02026b [0 -20 18.004999160767] 0.70710700750351 0 0 -0.70710700750351
-- W side of dungeon

43119 Source 92.9S, 56.4W
@teleloc 0x380B0106 [179.998 69.0345 -5.663] -0.999579 0 0 -0.028995
-- Set Destination:
@teleloc 0x8B020282 [130 -200 18.004999160767] 1 0 0 0
-- S side of dungeon

43120 Source 93.6S, 56.6W
@teleloc 0x380A0102 [132.106 92.8269 -5.663] 0.999826 0 0 0.018646
-- Set Destination:
@teleloc 0x8B020292 [260 -20 18.004999160767] -0.70710700750351 0 0 -0.70710700750351
-- E side of dungeon
…1650)

Database/Patches/9 WeenieDefaults/Portal/Portal/43536 Passage to Olthoi Island.sql
Database/Patches/9 WeenieDefaults/Portal/Portal/43580 Passage to Olthoi Island.sql

43536-43580 Passage to Olthoi Island - portal ID 43536 & 43580 not yet implemented!
-- https://asheron.fandom.com/wiki/Passage_to_Olthoi_Island?so=search

43580
-- Portal 1 source 63.1N, 76.4E
-- Portal 1 drops at 66.3N, 84.2E
world_objects db confirms destination as
34257	14	DECE003B	76.37	63.12	0.01	Passage to Olthoi Island	Passage to Olthoi Island (66.3N, 84.2E).
-- @teleloc 0xE8D2002B [132 60 42.006001] 1 0 0 0

43536
-- Portal 2 source 63.7N, 75.6E
-- Portal 2 drops at 69.6N, 80.7E
world_objects db shows this
34256	14	DDCF0039	75.58	63.7	0.01	Passage to Olthoi Island	Passage to Olthoi Island (69.6N, 80.7E).
@teleloc 0xE4D60014 [60 83.996094 8.006001] 1 0 0 0
…561) (#1651)

Database/Patches/9 WeenieDefaults/Portal/Portal/43559 Olthoi Tunnel.sql
Database/Patches/9 WeenieDefaults/Portal/Portal/43705 Olthoi Tunnel.sql
Database/Patches/6 LandBlockExtendedData/F65D.sql (43561 Olthoi Tunnel)

43559 43705 Olthoi Tunnel not yet implemented
43561 Olthoi Tunnel is missing (from F65D)
 https://asheron.fandom.com/wiki/Olthoi_Island
(See portals section)

Candeth Keep	87.8S, 65.1W	Olthoi Island	68.5N 79.7E

43559 Olthoi Tunnel (Candeth Keep)
Source: @teleloc 0x2E110107 [11.9795 164.794 50.337] 1 0 0 0
-- Destination is not yet implemented
vloc2loc E3D5 shows this
Olthoi Tunnel - @teleloc 0xE3D50001 [8.941406 11.824219 0] 1 0 0 0

Dark Isle	85.4N, 57.3E	Olthoi Island	69.4N 80.3E

43705 Olthoi Tunnel (Dark Isle)
Source: @teleloc 0xC7EA0102 [11.9171 45.1593 -5.663] 1 0 0 0
-- Destination is not yet implemented
vloc2loc E3D6 shows this
Olthoi Tunnel - @teleloc 0xE3D60032 [157.371094 37.128906 0] 1 0 0 0

Tou-Tou		26.8S, 94.9E	Olthoi Island	67.5N, 79.8E

F65D.sql 43561 Olthoi Tunnel  (From Tou-Tou)
-- Source Should be set as 0xF65D0102 0xF65D0102 11.9689 189.212 14.337 1 0 0 0
to match PCAPS Data found in Landblock google sheet
Destination: @teleloc 0xE3D3000F [38.476501 146.798004 6.005000] -0.999920 0 0 -0.012664
Database/Patches/9 WeenieDefaults/Creature/Shadow/30834 Shadow Lugian Portal.sql

Updated 30834 Shadow Lugian Portal (Balor's Rescue Quest)

The "Shadow Lugian Portal" creature was missing the portal spell to cast upon death.
Add back in the portal spell on death (from core py16 version)
30844	portalshadowlugianstrongholdendroom (aka Purple Portal Template)

Aligns with wiki information about Shadow Lugian behavior upon death
https://asheron.fandom.com/wiki/Shadow_Lugian_Portal?so=search
"Casts portal upon death"

https://asheron.fandom.com/wiki/Balor%27s_Rescue
"Kill the Shadow Lugian Portal, and a portal will spawn
Enter, and you will see a NPC Shadow Lugian, called Shadow."

https://asheron.fandom.com/wiki/Inner_Stronghold
see the Inner Stronghold map, bottom left
Portal goes to small room
aka ("shadow lugian strong hold endroom")
* Update 35038 Bur Catacombs.sql

35038 'Bur Catacombs' Portal not yet implemented

-- Set destination portal of Bur Catacombs per PCAPS to
/teleloc 0x00D40535 [120.000000 -210.000000 -11.985000] 1.000000 0.000000 0.000000 0.000000
-- Southern Catacombs

* Update 33035 Surface.sql

Database/Patches/9 WeenieDefaults/Portal/Portal/33035 Surface.sql (Ancient Masonry)

33035 Surface Portal (2 instances) in Ancient Masonry not yet implemented
- Ancient Masonry Surface Portal destination for portal ID 33035 not yet implemented!
-- https://asheron.fandom.com/wiki/Ancient_Masonry
-- Source1 @teleloc 0x008B0190 [110.000000 -150.000000 -0.063000] -0.707107 0.000000 0.000000 -0.707107
-- Source2 @teleloc 0x008B01BC [130.000000 -150.000000 -0.063000] 0.707107 0.000000 0.000000 -0.707107

-- Set Destination to 88.1N, 47.6E (matches virindi world objects db query for landbcell 8B0190 & 8B01BC
-- @teleloc 0xBAED003D [187.038147 114.089066 26.528265] -0.100658 0.000000 0.000000 0.994921
This location is outside near the Entrance Portal to the dungeon.

* Update 87641 Surface.sql - Tanada House of Storms Exit Portal

Update the Tanada House of Storms Exit Portal to deposit the adventurer outside the entrance portal rather than keeping them stuck in the same dungeon.

world_objects portaldest for landcell 007B011E (id=37608) shows "Surface (67.9S, 45.4E)"
as does Tanada House of Breath, Tanada House of Wind and Enlightened Master's Chambers.
/* @teleloc 0xB82A0013 [60.539062 57.126953 0.000000] 1.000000 0.000000 0.000000 0.000000 */

* Update 009D.sql Swamp Temple Cavern Exit

Update Swamp Temple Cavern Exit portal(s) source to match known data

vloc2loc 009D shows 2 'Cavern Exit' portals
Cavern Exit - @teleloc 0x009D0147 [99.999390 -70.000000 -30.000000] 1.000000 0.000000 0.000000 0.000000
Cavern Exit - @teleloc 0x009D02D2 [78.621826 -68.693359 0.000000] 1.000000 0.000000 0.000000 0.000000

world_objects db shows 2 portals as well.
9D0147	-101.53	23.36	-0.13	Cavern Exit	Cavern Exit
9D02D2	-101.62	23.36	0	Cavern Exit	Cavern Exit

* Update 0030.sql Renegade Incursion with Fort Tethana Portal

Database/Patches/6 LandBlockExtendedData/0030.sql (Renegade Incursion Change Exit Portal to Fort Tethana)

Within the Renegade Incursion Dungeon (x0030), the final portal should be to Fort Tethana, rather than an additional Surface Portal.
The wiki indicates the theme of this incursion
https://asheron.fandom.com/wiki/Renegade_Incursion?so=search

The portal is supported by the following data.

vloc2loc shows
Fort Tethana Portal - @teleloc 0x00300186 [122.671509 -2.612305 -6.000000] 1.000000 0.000000 0.000000 0.000000

world objects db shows
28808	14	300186	-101.44	-63.56	-0.03	Fort Tethana Portal	Fort Tethana Portal (1.7N, 71.2W)

* Update 0043.sql Master_Vaserio's_Dig surface portals

Database/Patches/6 LandBlockExtendedData/0043.sql (Master_Vaserio's_Dig Surface Portal)

0043 Master_Vaserio's_Dig surface portals not visible
Link_Child was incorrectly set to 'True' for the 2 Surface Portals: 32240
yet they were not listed in the 'landblock_instance_link' section.
This indicates a typo.
Setting the Link_Child to 'False' for the two portals allows them to show up correctly

Also tweak actual locations to match vloc2loc data
previous
@teleloc 0x00430101 [0.085737 -325.252014 -18.062700] -0.999718 0.000000 0.000000 -0.023732
@teleloc 0x0043031B [249.938004 -7.587890 -0.062694] 0.999583 0.000000 0.000000 0.028871

correct vloc2loc data
Surface - @teleloc 0x00430101 [0 -328.000977 -18] 1 0 0 0
Surface - @teleloc 0x0043031B [249.999390 -8.000977 0] 1 0 0 0

* Update 0049.sql Camp Entemarre Surface Portal

Database/Patches/6 LandBlockExtendedData/0049.sql (Camp Entemarre Surface Portal)

0049 Surface Portal for Camp Entemarre
Add missing Surface Portal to x004901AF

vloc2loc 0049 shows 2 Surface portals
Surface - @teleloc 0x00490105 [120.000000 -297.000000 -24.000000] 1.000000 0.000000 0.000000 0.000000
Surface - @teleloc 0x004901AF [49.998779 -0.000977 0.000000] 1.000000 0.000000 0.000000 0.000000

world_objects datbase confirms 2 surface portals as well
490105	-101.45	-44.79	-0.1	Surface	Surface (61.4S, 83.0W).
4901AF	-101.74	-43.55	0	Surface	Surface (61.4S, 83.0W).

* Update 0030.sql

oops. forgot to update last_modified date on previous checkin

* Update 004D.sql Temple of N'cthail Portals in Eastern/Western Temple Catacombs

Database/Patches/6 LandBlockExtendedData/004D.sql (Temple Catacacombs Temple of N'cthail Portals)

Missing 3 Temple of N'cthail Portals (33295)

vloc2loc shows 4 portals (for 004D)
Temple of N'cthail - @teleloc 0x004D06E5 [90.064087 -253.351562 0.000000] 1.000000 0.000000 0.000000 0.000000
(exists)
Temple of N'cthail - @teleloc 0x004D03D6 [61.631470 -58.274414 -18.000000] 1.000000 0.000000 0.000000 0.000000
(missing Eastern Temple Catacombs)
Temple of N'cthail - @teleloc 0x004D049E [90.000000 -360.000000 -18.000000] 1.000000 0.000000 0.000000 0.000000
(missing Western Temple Catacombs near Drop)
Temple of N'cthail - @teleloc 0x004D0131 [79.425659 -319.461914 -78.000000] 1.000000 0.000000 0.000000 0.000000
(missing Western Temple Catacombs near End)

world_objects db also shows 4 portal (in x004D)
38644	14	4D06E5	-101.57	-41.41	0	Temple of N'cthail	Temple of N'cthail (79.7N, 54.4E).
38645	14	4D03D6	-101.69	-40.59	-0.08	Temple of N'cthail	Temple of N'cthail (79.7N, 54.4E).
38646	14	4D049E	-101.58	-41.85	-0.08	Temple of N'cthail	Temple of N'cthail (79.7N, 54.4E).
38641	14	4D0131	-101.62	-41.68	-0.33	Temple of N'cthail	Temple of N'cthail (79.7N, 54.4E).
* Assassin's Roost Quest

* Updated Assassin's Edge to match Wiki, adjusted bottle/etc health

* fixed crit rate on assassin's edge
This reverts commit ef47ead.
* Assassin's Roost Quest

* Updated Assassin's Edge to match Wiki, adjusted bottle/etc health

* fixed crit rate on assassin's edge

* Added ES files for several NPCs. Changed CreatureType on some Viamontians
TectonicRifts and others added 27 commits May 23, 2024 00:20
Adds outdoor mukkir spawns (seen in the pcap and Loud Lou retail video).
Corrects flavor text on the totem.
Adjusts respawn time.
Removes unnecessary controller and event gen.
Adds on the hook animations to Pack Harbinger, Aerbax, and Tthuun (cast spell and dead).
Adds pcapped dolls that were once available (e.g., from live events) - Pack Grael, Rare Tthuun, Max, and Gurog.
Adds missing palette template and clothing base to Pack Gold Remoran to correct appearance.
Updates the final fight in the Prodigal Harbinger quest based on Xeo and Loud Lou videos for a closer match to retail.
Removed clothing base, which was causing the orb to look incorrect (like glitchy graphics).
)

* Create 5D4E.sql

Add surface portal to Olthoi Abyssal Chasm

According to vloc data, Surface Portal - @teleloc 0x5D4E0113 [75.250000 -40.819336 -54] 1 0 0. 0.
Also world objects data confirms 38239 14 5D4E0113 -27.24 -39.72 -0.23 Surface Portal Surface Portal (0.7N, 44.7E).
Looking at weenies, ace46019-surfaceportal Surface Portal matches this data.

This change addresses issue reported here: ACEmulator/ACE#3950

* Update 5D4E.sql

oops missed the teleloc in the comment.
* Various Bug Fixes

Adds attuned, bonded to society recall spell scrolls.
Fixes graveyard rat breath attacks and sets skills from pcaps.
Sets Rynthid platforms generator respawn to 10 min (timed from a Loud Lou retail video). It was previously 3 min.
Adds NPC looks like object to a rock on Bur.
Adds leyline hotspot to Radiant Blood Infusion quest dungeon.

* Update 35888 Paradox-touched Olthoi Queen.sql

Set skills from pcap and nerf missile defense. Previously, it was impossible to hit by even a max archer, which was not the case in retail.
Makes Embers that shoot flame waves in Geraine's Hosts quest visible to the player (as in retail).
* Kill Task Reward Delays

Removes reward emote delays on two Tou Tou kill task NPCs (e.g., when handing multiple aged legendary keys to players). The remaining NPCs do not have these delays.

* gy kill task npc delays

Does the same for 3 of the 4 GY kill task NPCs. The 4th did not have delays in the reward emote.
Adds mukkir spawn traps to the dungeon as per retail and cleans up the landblock from duplicate spawns (and spawns that come from the traps).
Corrects appearance of this NPC to match retail (thanks Raile).
* Fix Mobs in Bulb of Mornings

Adds missing kill task stamp to a Vizier and missing stubborn missile to a Spectral Archer.

* Update 88228 Seed of Essence.sql

Sets correct icon.
@LtRipley36706 LtRipley36706 marked this pull request as ready for review May 26, 2024 19:15
@LtRipley36706 LtRipley36706 merged commit 29dcae5 into master May 26, 2024
1 check passed
@LtRipley36706 LtRipley36706 deleted the v0.9.280 branch May 26, 2024 19:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants