SteamWar/FightSystem
Archiviert
13
1
Commit graph

484 Commits

Autor SHA1 Nachricht Datum
7fab960315 Fix unchecked schematics at events
Signed-off-by: Lixfel <agga-games@gmx.de>
2024-01-01 16:45:32 +01:00
c18de054a8 Merge branch 'master' into hullhiderv2 2023-12-30 12:26:43 +01:00
6f4e0f0293 Replay REntity HullHider
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-12-30 12:26:11 +01:00
65028799b0 Correct HullHider behaviour for boarding
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-12-19 22:18:16 +01:00
9b78103592 Replay HullHider, Fix HullHider for players already online
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-12-19 16:40:12 +01:00
ce3384c7e9 Bugfixes, remove debug info
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-12-17 18:23:54 +01:00
8de15e0af5 Fix rotation of teamname display in gamemodes without schematic rotation
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-12-17 16:29:04 +01:00
5fab7e5404 Untested entity 1.18+ hullhiding
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-12-17 16:18:20 +01:00
4d5f4e9be6 Fast recursive 45° approx hullhider implementation
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-12-16 21:59:56 +01:00
29927985b1 Initial directional quadrant 45° hullhider implementation
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-12-16 18:21:33 +01:00
a17bd4c401 Fix imports
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-12-16 14:08:14 +01:00
b09de0a70f Commit leftover changes
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-12-16 14:05:14 +01:00
5851d5019b Fix percent display
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-12-12 17:24:07 +01:00
0fb7a7b8ce Change percent damage display to damage health
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-12-12 12:48:56 +01:00
0a45b161a2 Simplify percent system by adding entern percent and whitelist config toggles
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-12-12 00:10:05 +01:00
yoyosource
4f65023491 Hotfix FightSchematic public choosing with no publics abailable in schematictype 2023-12-05 15:36:40 +01:00
ad7a42a685 Merge pull request 'MultiSchemTypes' () from MultiSchemTypes into master
Reviewed-on: 
Reviewed-by: Lixfel <lixfel@steamwar.de>
2023-12-05 15:21:22 +01:00
6396264194 Fix schem deleted bug
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-12-03 20:55:36 +01:00
d140db2401 Fix entern after reset
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-12-03 20:26:04 +01:00
yoyosource
2e8ad5301e Add pasting of non prepared schem on red side 2023-12-02 20:03:48 +01:00
yoyosource
c08cec7cf2 Add pasting of non prepared schem on red side 2023-12-02 16:02:30 +01:00
yoyosource
3ee7411591 Revert lowercase
Fix SchematicType not used for checking available schematics
Fix leader not present to enable public only schem selection
2023-12-01 18:15:28 +01:00
yoyosource
c0665b1868 Fix non lower case SchematicType fromDB lookup
Fix RankedEvent not being considered für ignore publics only
Fix using index 0 instead of i for creating of gui
Fix config.yml missing comment
2023-12-01 18:03:09 +01:00
yoyosource
8d77f4dcf4 Fix Fight.publicOnly method 2023-12-01 16:19:55 +01:00
yoyosource
b3ad960973 Add MultiSchemType selection for GUI.preSchemDialog 2023-12-01 16:14:37 +01:00
ad5a2d4a08 Document manualcheck option
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-11-29 16:40:10 +01:00
ef8cdef05c Distribute first TNT after 300s
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-11-29 15:47:48 +01:00
86de472fe0 Revert "Make Armor Mandatory in yaml kits."
This reverts commit a8112eccc8.
2023-11-29 15:35:33 +01:00
a8112eccc8 Make Armor Mandatory in yaml kits.
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-11-29 15:34:07 +01:00
70c86f40c6 Fix override
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-10-29 17:35:42 +01:00
61eb28f78e Fix double item drops
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-10-27 23:38:31 +02:00
7ad5a1dc22 Fix TNT Distribution
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-10-12 18:57:03 +02:00
c87bac641e TPS Warp
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-10-11 10:56:05 +02:00
0c762e5624 TNT Distribution
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-10-08 18:21:19 +02:00
4b82ea9426 Persistent Damage Event
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-10-08 18:08:13 +02:00
2cb9c12e46 Fix item and item location
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-16 11:09:41 +02:00
230169e163 Unchecked schematics
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-15 20:50:39 +02:00
cbd5fe407f Fix Lockschem in Replays
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-09 18:45:41 +02:00
a309541e7e Not working Waterlogged detection
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-09 18:43:52 +02:00
3b6cde085d Don't load destroyed cannons
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-04 19:58:54 +02:00
21ee580c0f New StateMachine, improved Height Classification
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-04 16:21:25 +02:00
b3c5186699 DummyAI, fix ActionSystem, fix AI.move
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-03 18:25:20 +02:00
39ccb113a8 Improved Pathplanning, WIP StateMachine
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-03 13:39:38 +02:00
Chaoscaot
71ddeb4ac8
Upgrades, Leude, Upgrades! 2023-09-03 00:44:33 +02:00
Chaoscaot
c507e7ec97
Merge remote-tracking branch 'origin/lixfel-ai-v1' into chaos-ai 2023-09-02 23:19:43 +02:00
efb2537097 Improved Pathplanning (less suffocating)
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-02 23:19:07 +02:00
Chaoscaot
8e963bffef
Merge remote-tracking branch 'origin/lixfel-ai-v1' into chaos-ai 2023-09-02 22:18:36 +02:00
5a0614974e Fix planToAnywhere
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-02 22:18:13 +02:00
Chaoscaot
2151134dcc
Revert FightSystem 2023-09-02 22:13:51 +02:00
Chaoscaot
fc7b8b6233
Basics™ 2023-09-02 22:12:18 +02:00
78ae119719 Fix Button press, Lixfel AI v1
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-02 21:51:05 +02:00
84be0b3244 Fix TestJoin
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-02 20:24:07 +02:00
97113b1ae2 Implement planToAnywhere
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-02 20:21:51 +02:00
26f2fb2afd AI and Pathplanning fixes
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-02 20:11:47 +02:00
15e0fbde06 AI and Pathplanning fixes
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-02 19:58:47 +02:00
e7bb1e6669 Pathplanning
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-02 18:23:30 +02:00
PsiRobot
2ed5f5000d Fixed previous commmit 2023-09-02 15:28:34 +00:00
PsiRobot
071b76a4ce Add Repeater, Comparator and Lectern to interact method 2023-09-02 15:20:33 +00:00
891a26cc12 Fix 1.8 and 1.9
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-30 14:49:21 +02:00
11a8d0a612 UserPerm
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-29 22:01:54 +02:00
1cc247f6dd AI API
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-29 13:45:46 +02:00
d7b63841a1 AI API prototype
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-29 00:36:28 +02:00
a9453aa859 Rename for better clarity
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-28 23:35:02 +02:00
783474c958 WIP villager AI
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-28 23:31:00 +02:00
a24585e497 Potential posToChunk fix
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-27 15:20:16 +02:00
c7eba24ae6 Fight info command rename to fightinfo
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-25 21:59:46 +02:00
09bc0d8fbb Fight info command
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-25 21:43:27 +02:00
1a8255e94c Do not replace Obsidian and Bedrock in prepare arenas
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-25 15:52:48 +02:00
13e1610f61 Move Spawnoffset to GameMode config
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-19 11:12:22 +02:00
0cad5fa3ae Fix /leader
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-07-01 22:06:21 +02:00
9da8e33360 Fix checking
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-25 21:40:06 +02:00
fd5db46700 Fix reset
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-25 21:06:35 +02:00
722a8748d5 Merge pull request 'join anytime' () from joinAnytime into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2023-06-25 20:11:51 +02:00
5e4190ea75 Limit JoinAnytime to variable teams
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-25 20:07:41 +02:00
cbb0dcf8eb Some of the requested changes
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-13 22:00:43 +02:00
43e63b4201 Bugfixes: Offline players, rejoining
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-06 18:44:17 +02:00
72ef2bc486 Fix item pickup and exploding chests
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-06 18:08:18 +02:00
6081c5f565 Prevent players from switching teams
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-06 17:55:55 +02:00
1a2eabaea4 Bugfixes: No multiple player instances, spectator kit after death, confirmation message, allow request command while in team
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-06 11:47:37 +02:00
98a376a62b Bugfixes, Simplify UX to requests-Command
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-05 17:00:45 +02:00
0020b2b152 Fix build
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-05 16:10:41 +02:00
c91f22658b Merge branch 'master' into joinAnytime
# Conflicts:
#	FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.properties
#	FightSystem_Core/src/de/steamwar/fightsystem/FightSystem_de.properties
#	FightSystem_Core/src/de/steamwar/fightsystem/countdown/EnternCountdown.java
#	FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java
#	FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java
2023-06-05 16:08:57 +02:00
c7248cfb45 Remove explosion workaround
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-05-18 20:38:34 +02:00
089b702910 Spawn items on player block destruction
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-05-18 20:34:01 +02:00
5b76af19d1 Fix 1.8-1.10 PlayerPickupItemEvent
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-05-14 07:50:34 +02:00
f7485eb603 Fix long to int conversation
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-05-11 09:14:14 +02:00
f404dafa8d Merge pull request 'Add duration to FightStatistics.disable' () from DurationFieldInFightEndsPacket into master
Reviewed-on: 
Reviewed-by: Lixfel <lixfel@steamwar.de>
2023-05-11 09:11:12 +02:00
b48577d325 „FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java“ ändern 2023-05-11 09:07:43 +02:00
706e6c5ffd „FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java“ ändern 2023-05-11 09:06:06 +02:00
5ed1e0f024 Fix TNT prior to start
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-05-10 20:57:48 +02:00
yoyosource
1f032ff3c8 Add duration to FightStatistics.disable 2023-05-10 17:11:00 +02:00
4ac1c3759a Fix Handswapping
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-05-09 21:15:15 +02:00
c1ed222a24 Merge pull request 'Reenable Items' () from items into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2023-05-09 16:43:13 +02:00
87dfd28636 Test fix clipping while crouching
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-04-29 22:21:55 +02:00
e6823ca496 Prevent placing solid block clipping with player position
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-04-13 15:26:06 +02:00
a726166dc3 Shuffle new leader selection
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-04-11 11:37:31 +02:00
cb4cb1d6fe Merge branch 'master' into items
# Conflicts:
#	FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
2023-04-11 11:27:21 +02:00
70d4f96999 Unlimited preparation phase option
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-04-11 11:00:24 +02:00
98cd6f5b25 Remove delay
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-03-11 21:46:33 +01:00
896665a405 Fix NametagVisibility
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-03-11 21:14:19 +01:00