swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-01-17 00:05:07 -05:00
Code Issues Projects Releases Wiki Activity
4,152 Commits 9 Branches 0 Tags
f0239f5bf363d4cf365f5c4e973e711fa07ca2c5
Commit Graph

4152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John
f0239f5bf3 Merge pull request #352 from TalisaKnight/master 
Fixed for Jedi Starfighter Part 3
 2022-06-15 13:38:38 -04:00
Talisa Knight
9436690347 Fixed Issues with Jedi Starfighter Part III. 2022-06-15 12:02:23 -05:00
John
512756a27d Change line break encoding of planet_crc_string_table.txt 2022-05-09 18:33:15 -04:00
Cekis
325daf84c8 Merge pull request #350 from HeronAlexandria/master 
Fix for trader crafting assembly build a buff
 2022-04-09 20:55:14 -07:00
Heron
f0915d1fa3 Updated per code review 
Moved declaration of row and affect outside of the loop.
 2022-03-25 19:35:41 -05:00
Heron
96a3c6521a Merge branch 'SWG-Source:master' into master 2022-03-25 19:29:24 -05:00
Cekis
fe51f84ec1 Merge branch 'master' of https://github.com/SWG-Source/dsrc 2022-03-21 15:32:06 -04:00
Cekis
a2c5a35c47 Server account lot size now a config value. 2022-03-21 15:30:37 -04:00
Heron
b6943fb901 Update reset.java 2022-03-15 12:59:28 -05:00
Heron
f630c5adaf Tables for the build a buff fix. 
These are the tables for the trader assembly fix in the build a buff system.
 2022-03-14 10:31:26 -05:00
Heron
e5a59e66a5 Fix for trade buffs in build a buff. 
This fix adds an effect map to build a buff, which allows multiple buffs to be applied to an effect. This fixes the trader assembly buff, which only applied food_assembly. The mapping table allows multiple assembly buffs to be applied without hard coding. This fix also makes a change to the experience buff. The trade buffs also apply an experience bonus, but were not limited to crafting. The XP buff provides an additional buff, to chronicler xp.

I moved the xp application to a common function, and they no longer overwrite each other. The highest buff is applied.

I did a partial refactor to make the code easier to follow. This refactor is limited to the build a buff handlers.
 2022-03-14 10:21:31 -05:00
John
d53d234573 Merge pull request #347 from HeronAlexandria/master 
NPC Vendor Permissions Fix
 2022-03-12 03:22:41 -05:00
HeronAlexandria
f1fcbadffb Added Chroniclers Tokens to Character Terminal 
A simple modification to add chroniclers tokens to character builder terminal ("the frog") for testing.
 2022-03-12 01:18:32 -06:00
HeronAlexandria
b862114e8c Fixed access issue on NPC vendors 
If an item on an NPC vendor is no trade you can get a permissions error when you attempt to purchase the item. Aconite gave me this fix, and I am including it from my private repo.
 2022-03-12 01:15:06 -06:00
Cekis
4117b14087 Quick code review pass on the space spawner. 2022-01-25 02:29:45 -05:00
Cekis
4e00d42d9f Fixed null pointer issue 2021-11-16 11:22:36 -05:00
erusman
0e5ae3ab96 Small fix to frog. Forgot to add a break line in structures 2021-09-19 15:53:05 -07:00
erusman
b07c7bc118 update frog. Added and organized all structures 2021-09-19 11:04:39 -07:00
erusman
f9ffc7f6eb Update to frog. Adding more structures for easier spawn and testing 2021-09-18 19:11:38 -07:00
Erusman
0115e20457 partial reverse and fix my bad 2021-09-11 04:37:41 -07:00
Erusman
084c6d0156 Player character alts can now access harvesters and generators placed on same account 2021-09-10 07:03:17 -07:00
Erusman
62986128c1 Added charactersAreSamePlayer to base_class for player alt checks 2021-09-09 16:39:40 -07:00
John
b8387da492 Delete pfilbee_jhorn.java Ref Issue #312 and PR #311 2021-08-11 19:31:16 -04:00
John
ec8a9c2c8a Merge pull request #311 from BloodCommando/master 
GU 16.6 - Pfilbee Jhorn NPC Clothing Correction
 2021-08-11 19:27:48 -04:00
BloodCommando
4d033ba4a0 GU 16.6 - Pfilbee Jhorn NPC Clothing Correction 
Detaches deprecated script from the mob in question. Fixes server side mobile to reference the correct shared mobile. Removes unneeded name generation.

tl;dr Pfilbee Jhorn wears one outfit now and has hair!
 2021-08-11 19:19:20 -04:00
Cekis
84dc37040b Fixed issues with settings not using default values and not loading custom values on startup. 2021-07-09 00:28:34 -04:00
John
18f6957a7c Merge pull request #305 from BloodCommando/master 
Added Non-Customer Service Tauntaun DNA & Replaced on Respective Vendors
 2021-06-13 16:25:37 -04:00
BloodCommando
8a728b01f6 Added Non-Customer Service Tauntaun DNA & Replaced on Respective Vendors 
Current DNA on the Hoth vendors was the one customer service staff would award. This was reflected in both the name and the string associated with it. Restored the regular tauntaun DNA utilizing the correct string found in the EoL strings.
 2021-06-13 16:19:54 -04:00
AconiteX
9e301702d1 Remove Duplicate Ryatt Scout Trooper Spawner 2021-06-11 22:26:23 -04:00
John
53ccc47dcc Merge pull request #300 from BloodCommando/master 
Fixed Undead Boss Collection Badge to Properly Update
 2021-06-08 12:59:52 -04:00
AconiteX
89b5f62455 Fix Kashyyyk Ikvizi Convo/Collision Obstruction 2021-06-07 19:39:48 -04:00
AconiteX
bc5aaa33cc Fixes for NPC Spawning in/on Collidables (ref #301) 2021-05-10 15:00:40 -04:00
BloodCommando
375b9fd54a Fixed Undead Boss Collection Badge to Properly Update 
Boss badge collection now correctly updates/completes. Previously it would not update when the Undead Rancor was killed.
 2021-05-01 15:56:45 -04:00
John
20231330df Merge pull request #299 from BloodCommando/master 
Fixed Ithorian Backpack Issue #275 and Imperial Command Hat Issue #160. Added GU 17.6 All Restuss Weapons Can Now Be Deconstructed.
 2021-05-01 15:01:25 -04:00
BloodCommando
3e183b2dba GU 17.6 All Restuss Weapons Can Now Be Deconstructed 
Updates weapon_stats.tab to allow all Restuss weapons to be deconstructable per GU 17.6. Draft schematics, weapon_appearance and appearance_bonus already have the required entries to make this possible.
 2021-04-30 15:05:00 -04:00
BloodCommando
a96976f9a9 Fixed Ithorian Backpack Issue #275 and Imperial Command Hat Issue #160 
Updates appearance_table to show certain backpacks that previously weren't displaying on Ithorians. Removes duplicate entry of shared_hat_imp_s01 that blocked hat from showing on human females, zabrak males and females.
 2021-04-30 14:15:19 -04:00
John
1f0043beba Merge pull request #297 from BloodCommando/master 2021-04-30 02:31:44 -04:00
BloodCommando
24ea50c39a Hotfix 19.5 - All Newly Crafted Melee Weapons Will Have a Range of 0-5m 
Updates all newly crafted melee weapons to have a potential range of 0-5m per Hotfix 19.5 on live.
 2021-04-29 23:33:34 -04:00
AconiteGodOfSWG
fb0b640743 Update force_shrine.java 2021-04-02 11:35:46 -04:00
AconiteGodOfSWG
694a499356 willy wonka is dead 2021-03-26 02:21:12 -04:00
AconiteGodOfSWG
3dece87a5a Move generateCraftedItem to gm.cmd 2021-03-17 13:03:04 -04:00
AconiteGodOfSWG
8fac56c948 Dirty Cell Perms Update (Fix for DWB/GEO) 2021-03-16 12:07:53 -04:00
AconiteGodOfSWG
ab81dadb32 Remove unnecessary throws 2021-03-13 20:19:03 -05:00
AconiteGodOfSWG
f05c1f06dc Create buildout_utility.java 2021-03-10 22:04:59 -05:00
AconiteGodOfSWG
5d78ff793b add getUsername admin cmd 2021-03-08 22:06:47 -05:00
AconiteGodOfSWG
74c4a69f91 fix typo 2021-03-08 20:44:46 -05:00
AconiteGodOfSWG
4202903a6f more script clean up 2021-03-08 19:09:53 -05:00
John
4f86bfe786 Merge pull request #244 from Reedux/Pet-Changes 
Various Pet Changes See Commits for info
 2021-03-06 15:27:08 -06:00
Reedux
9875530638 Revert "Pet revive health will now increase with expertise options" 
This reverts commit 6a5b63927c.
 2021-03-06 13:58:53 +00:00
Reedux
8025be7759 Fix and change the beast xp modifier 2021-03-06 13:56:49 +00:00