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

328 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
dee8651e61 Add DevtestCommand to easily test without restarting server 2024-05-21 21:36:54 +02:00
P0nk
948a9de667 Remove Spirit of Rock die sound 2024-05-21 20:23:34 +02:00
P0nk
d55437ddf3 Remove subway whistle 2024-05-21 19:56:09 +02: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
46f767d79c Merge branch 'master' into feat/postgresql-database 2023-05-29 15:56:53 +02:00
Favouris
9223957931 Rename MCRevive6.js to MCrevive6.js 2023-05-14 19:17:38 +08:00
Favouris
5cddb7f2b6 Rename MCRevive5.js to MCrevive5.js 2023-05-14 19:17:25 +08:00
Favouris
08e7a3af16 Rename MCRevive4.js to MCrevive4.js 2023-05-14 19:17:15 +08:00
Favouris
1416cd432d Rename MCRevive3.js to MCrevive3.js 2023-05-14 19:17:03 +08:00
Favouris
2d6cf07a65 Rename MCRevive2.js to MCrevive2.js 2023-05-14 19:16:51 +08:00
Favouris
0b73d6112a Rename MCRevive1.js to MCrevive1.js 2023-05-14 19:16:40 +08: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
Charlie Unfricht
991873dcbe Update ritual stone reactor script (see PR 135 discussion) 2022-09-23 17:32:34 -04:00
Ponk
18fe7b9906 Merge pull request #138 from cpurules/bugfix/pet-quests 
Fix reported bugs in pet quests
 2022-09-22 07:23:11 +02:00
Ponk
a350d58065 Merge pull request #135 from cpurules/bugfix/lowb-reactor 
Add handler for Land of Wild Boar's ritual stones
 2022-09-22 07:19:49 +02:00
Charlie Unfricht
f34e271b6d Complete quest after pet evolves (repeatable) 2022-09-21 21:54:57 -04:00
Charlie Unfricht
a9715a694c Complete quest on successful evolution 2022-09-21 21:40:42 -04:00
Charlie Unfricht
c0d6917721 Fix bug in Pet's Re-Evolution quest 2022-09-21 21:37:14 -04:00
Charlie Unfricht
08edd8595f Update closeness --> tameness 2022-09-21 21:36:41 -04:00
Charlie Unfricht
79f19331f4 Add reactor script for Land of Wild Boar's ritual stones 2022-09-21 17:56:56 -04:00
P0nk
1a28fc98ac Commit to "tameness" name over "closeness" for pets, fix scripts 2022-09-15 17:12:21 +02:00
P0nk
958286e078 Make Riche text MSEA-like (at least) 
MSEA text is likely not the same as GMS text, but it's better than making things up.
 2022-08-31 22:04:58 +02:00
P0nk
ea76880b7f Use act() in reactor scripts where possible, provide empty act() otherwise 
"function hit()" has triggered on each reactor hit,
while "function act()" is only triggered once it's destroyed or reached an end state
 2022-08-31 21:34:49 +02:00
P0nk
7d28e00e4f Make Riche killable after destroying the reactor 2022-08-29 23:32:59 +02:00
P0nk
0118844c2e Make Scholar Ghost killable after triggering the reactor 2022-08-29 23:05:25 +02:00
P0nk
8c418f197a Make Rurumo killable after triggering the reactor 2022-08-29 22:53:29 +02:00
P0nk
7fa677d766 Fix act for scripts that reset to initial state after some time 2022-08-29 22:46:46 +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