Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,361 Commits 3 Branches 72 Tags
0a8591aa080d8853d19e56e718b83aedb316bffc
Commit Graph

254 Commits

Author SHA1 Message Date
P0nk
559fe2d550 Merge branch 'refs/heads/master' into feat/postgresql-database 
# Conflicts:
#	config.yaml
#	docker-compose.yml
#	pom.xml
#	src/main/java/client/Character.java
#	src/main/java/client/Client.java
#	src/main/java/client/MonsterBook.java
#	src/main/java/client/command/commands/gm0/BuyBackCommand.java
#	src/main/java/client/processor/stat/AssignAPProcessor.java
#	src/main/java/config/ServerConfig.java
#	src/main/java/net/server/channel/Channel.java
#	src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java
#	src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java
#	src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java
#	src/main/java/net/server/channel/handlers/EnterMTSHandler.java
#	src/main/java/net/server/channel/handlers/NPCTalkHandler.java
#	src/main/java/net/server/channel/handlers/RangedAttackHandler.java
#	src/main/java/net/server/channel/handlers/SummonDamageHandler.java
#	src/main/java/net/server/channel/handlers/UseCashItemHandler.java
#	src/main/java/net/server/handlers/login/CreateCharHandler.java
#	src/main/java/net/server/world/World.java
#	src/main/java/scripting/npc/NPCConversationManager.java
#	src/main/java/server/ItemInformationProvider.java
#	src/main/java/server/life/Monster.java
#	src/main/java/server/life/MonsterInformationProvider.java
#	src/main/java/server/maps/MapleMap.java
#	src/main/java/tools/PacketCreator.java
#	src/test/java/service/NoteServiceTest.java
#	src/test/java/testutil/Any.java
 2024-09-02 20:43:55 +02:00
Ponk
8f2b8dd013 Merge pull request #248 from HarkuLi/fix/vard-plastic-surgery #patch 
NPC (Vard): Fix "Plastic Surgery" option
 2024-08-28 19:57:04 +02:00
P0nk
cad10c4d5c Remove rebirth system 2024-07-19 17:16:14 +02:00
HarkuLi
0245e7d1af NPC (Vard): Fix "Plastic Surgery" option 
Correct typos for variable `fface_v`.
 2024-06-19 18:56:14 +08:00
HarkuLi
31e901ab6d Ariant Coliseum: Fix score counting and trade conversation 2024-06-19 18:42:31 +08:00
P0nk
98fd8c13d4 Remove brazil anthem 2024-05-21 19:54:30 +02:00
P0nk
04a92fe0c1 Remove buyback custom feature 2024-05-21 19:44:25 +02:00
P0nk
a7d03cf8c0 Merge branch 'master' into feat/postgresql-database 2024-02-04 15:12:14 +01:00
Ponk
11c1e4655e Merge pull request #213 from yuzumika/ppq-npc-fix #patch 
Fix bug in PPQ where non-party leader can get stuck in an NPC dialogue loop
 2024-02-04 12:09:33 +01:00
yuzumika
7004de6e71 ppq: fix bug where non-party leader can get stuck in an npc dialogue loop 2024-01-04 14:30:59 -08:00
yuzumika
9c54f3a8ea minigame npc: add more disposes, fix typo 2023-12-27 15:35:45 -08:00
yuzumika
ee8cb545e1 minigame npc: use omokamount constant consistently; tiny text tweak to 
make it more GMS-like
 2023-12-27 15:18:22 -08:00
yuzumika
64bbff462d minigame npc: dispose after creating a set of match cards 2023-12-27 14:54:10 -08:00
P0nk
449ab01bc2 Remove "vote points" feature 2023-08-06 16:55:34 +02:00
P0nk
84ad5b4db8 Remove scroll generator (custom feature) 
This allowed me to remove the getCardTierSize db query
 2023-07-25 17:20:16 +02:00
P0nk
785f74ed21 Fix HelpCommand not working without static CommandsExecutor 2023-03-31 07:59:43 +02:00
P0nk
705efb4340 Remove access to shops from scripts 2023-03-29 20:38:34 +02:00
P0nk
ec1450cec1 Rewrite Mo NPC script to be GMS-like 2023-03-29 19:54:59 +02:00
P0nk
290bf78db3 Notes about difficulties of DI for scripts 2023-03-18 16:04:01 +01:00
P0nk
02c1fe46f3 Remove custom shops 
These custom shops we introduced in HeavenMS.
2082014 - Asia selling scrolls
9201101 - T-1337 selling special potions
 2023-03-18 15:14:00 +01:00
P0nk
7315dd80fc Remove redundant scripts for Ariant weapon & armor merchants 2023-03-18 15:08:06 +01:00
P0nk
f267b1fc0b Fix error summoning master guardians on CWKPQ last stage 2022-10-16 12:30:01 +02:00
Ponk
c1fbf2c18c Merge pull request #134 from cpurules/feature/quest-3239-rework 
Rework quest 3239: The Missing Mechanical Parts
 2022-09-29 20:00:39 +02:00
P0nk
1a28fc98ac Commit to "tameness" name over "closeness" for pets, fix scripts 2022-09-15 17:12:21 +02:00
P0nk
17ae269cc9 Make Security Camera killable after talking to control device 2022-08-29 22:04:07 +02:00
P0nk
535b6c3e8e Make Deet and Roi killable after talking to magic pentagram 2022-08-29 21:58:58 +02:00
P0nk
f1d0cb6b4d Make Shade killable after talking to lamp post 2022-08-29 21:42:57 +02:00
Charlie Unfricht
a67666af62 Set Mechanical Parts as event exclusive item for removal on exit 2022-08-26 01:27:12 -04:00
Charlie Unfricht
2ed69407de Add instanced event handling 2022-08-26 01:20:57 -04:00
Charlie Unfricht
bdc0756655 Dispose base NPC dialogue 2022-08-26 00:36:04 -04:00
Ponk
677a956b25 Merge pull request #102 from cpurules/bugfix/magatia-quests 
Fix broken Magatia quests
 2022-08-17 20:55:25 +02:00
Charlie Unfricht
4d73416952 Add NPC handling for quest 3322 2022-08-17 03:49:34 -04:00
Charlie Unfricht
871c8a4477 Update NPC handling for quest 3311 2022-08-17 03:31:30 -04:00
Charlie Unfricht
9592b8323f Update Desk NPC to not require double click 2022-08-17 02:38:32 -04:00
Ponk
2e55deebc9 Merge pull request #100 from cpurules/bug/phil-town-descriptions 
Fix Phil's town descriptions for Ellinia/Henesys
 2022-08-16 13:16:36 +02:00
Charlie Unfricht
098a52b485 Swap Ellinia and Henesys so descriptions are aligned 2022-08-16 02:53:55 -04:00
Charlie Unfricht
cd706c544b Fix bug where non-200 capped classes can't rebirth 2022-08-16 02:17:49 -04:00
Charlie Unfricht
a456b27011 Update rebirth NPC to allow for path selection 2022-08-16 02:12:31 -04:00
P0nk
6ea4e3cfc1 Fix one-time lens coupon for female 
Last commit fixed Orbis, this one fixes:
Henesys, Showa, NLC, Mu Lung, Ludibrium, Singapore, Amoria, Ariant
 2022-08-11 21:14:26 +02:00
P0nk
ae7b832e00 Fix Orbis one-time lens coupon for female 2022-08-11 20:20:45 +02:00
P0nk
79ab28a52e Break up Orbis lens NPC script into multiple functions 2022-08-11 19:10:57 +02:00
P0nk
e2b8236b59 Fix negated comparison 2022-08-05 22:49:42 +02:00
P0nk
bfb2c1cb3d Fix various other scripts with broken comparisons 2022-08-05 22:46:01 +02:00
P0nk
3f1a6ecc8c Fix NPC script at end of Puppeteer's Secret Passage (910510100) 2022-08-03 08:29:57 +02:00
P0nk
8d213e4d6e Fix broken dojo scripts since introduction of MapId constants 2022-08-02 16:31:15 +02:00
P0nk
d893309b4f Reformat and clean up npc scripts 2021-09-09 23:35:02 +02:00
P0nk
8162d0aacd Rename and clean up MapleGachapon and subclasses 2021-09-09 23:02:22 +02:00
P0nk
43a80f0491 Rename and clean up MapleShopFactory 2021-09-09 22:48:25 +02:00
P0nk
9c8abf6f62 Rename and clean up MapleItemInformationProvider 2021-09-09 22:45:55 +02:00
P0nk
f8e7a525bd Rename and clean up MaplePlayerNPC 2021-09-09 22:12:29 +02:00