Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,726 Commits 151 Branches 18 Tags 2.1 GiB
003b9f57ce
Commit Graph

1838 Commits

Author SHA1 Message Date
Joshua Barretto
003b9f57ce Merge branch 'juliancoffee/pvp_command' into 'master' 
Implement /battlemode command and more

See merge request veloren/veloren!2787
 2021-09-04 18:37:01 +00:00
juliancoffee
670e29a286 Better formatting 2021-09-04 20:56:55 +03:00
juliancoffee
3cf9d0cdb0 Adress review: 
- explanation of what pvp/pve means in /battlemode help
- check for radius from town instead of town in chunks (because it count
  plant fields, which is kinda meh)
- better error displaying
 2021-09-04 20:38:53 +03:00
Sam
261fd562dc Raiders raid less often, raid for less time, and sit at their home for longer. 2021-09-04 12:42:42 -04:00
Sam
f65b3a094d Cultists now properly raid villages. 2021-09-04 12:25:04 -04:00
Sam
f198349f61 Attempt at getting raiders to wander around village once they get there. 2021-09-04 01:10:57 -04:00
Sam
e75156e052 Hacky raid mechanics for cultist raiders. 2021-09-04 00:34:30 -04:00
Sam
57ba9a0300 Cultist enemies are now spawned by rtsim. 2021-09-04 00:05:48 -04:00
Sam
311fb251c1 Allowed specifying that rtsim entities spawn at a particular site. 2021-09-03 23:34:24 -04:00
juliancoffee
43d40c4efc Workaround of bug with global Player component 
* Set default value of battle_mode and last_battlemode_change explicitly
if isn't found in battlemode_buffer
 2021-09-04 02:29:02 +03:00
juliancoffee
844e93e67b Improve UX of /battlemode 2021-09-04 01:41:48 +03:00
juliancoffee
1baa9e9879 Add in-memory persistence for battlemode changes 2021-09-04 01:41:48 +03:00
juliancoffee
fbe745fe1e Cooldowns 
- Add last_battlemode_change to Player component
- check on last_battlemode_change in handle_battlemode
- set last_battlemode_change after setting battlemode
- still are not persisted in any way
 2021-09-04 01:41:48 +03:00
juliancoffee
85e8c50d35 Fix town detection 2021-09-03 17:28:34 +03:00
juliancoffee
1838d151f5 Make it compile without feature(worldgen) 
+ move settings check to toggling mode segment
 2021-09-03 17:28:34 +03:00
juliancoffee
68a4b269d2 Allow changing mode only with enabled settings 
- send warning in force mode
 2021-09-03 17:28:34 +03:00
juliancoffee
3fd573f1ec Allow changing battle_mode only in towns 2021-09-03 17:28:34 +03:00
juliancoffee
338e81de10 Deduplicate pvp-checks 2021-09-03 17:28:34 +03:00
juliancoffee
2e79c61123 Implement /battlemode_force command 
+ add placeholder for /battlemode command (currently can only show your
  battle mode)
 2021-09-03 17:28:34 +03:00
juliancoffee
f01309dfc2 Add PerPlayer server flag for BattleMode 2021-09-03 17:28:34 +03:00
juliancoffee
6b0d016418 Don't forget about pets in PvP checks 2021-09-03 17:28:34 +03:00
Marcel
970d57f905 Merge branch 'juliancoffee/skill_boost_rework' into 'master' 
ECS & Diary info synchronization

See merge request veloren/veloren!2771
 2021-09-02 16:04:23 +00:00
ubruntu
bbc366e1b3 NPCs can drop nothing 2021-09-01 23:17:36 +00:00
Knightress Paladin
f49dc2191d Make parrying refund the block stamina cost and cancel the recover animation 2021-08-31 23:46:33 -07:00
Sam
156820cd5c Chest sprite interact kind changed to only check that sprite is a container rather than matching on every 'chest-like' sprite. 2021-08-31 13:57:17 -04:00
Sam
c66e1b3a56 Removed distance check from sprite colelction event handling as it is already checked when entering state. 2021-08-31 13:37:56 -04:00
Sam
44c3b0f153 Added attack hook event, attacks now cancel item use and sprite interaction. 2021-08-31 13:37:32 -04:00
Joshua Barretto
6f15233448 Fixed first-person zoom, added fixation to allow more precise mouse movement when zoomed 2021-08-31 13:31:52 +01:00
Joshua Barretto
0b1a820762 Make arrows 'bonk' hanging sprites 2021-08-31 13:31:27 +01:00
Joshua Barretto
643807e5ff Multiple color gradient options 2021-08-29 13:57:36 +01:00
juliancoffee
9211b4a00a Inline skills::Boost to voxygen code 2021-08-26 14:49:52 +03:00
juliancoffee
54cb990d52 Move to one SKILL_MODIFIERS constant 2021-08-26 14:49:52 +03:00
juliancoffee
b1bac83319 SkillTreeModifiers data structs 2021-08-26 14:49:52 +03:00
Joshua Barretto
f9580a576c Fix warning agents not switching aggro on attack 2021-08-24 23:17:52 +01:00
ubruntu
20e33f5575 Split up iteration of rtsim entities each tick 2021-08-23 21:49:32 +00:00
Marcel
30c446f8ee Merge branch 'ubruntu/npcs-ignore-when-busy' into 'master' 
Prevent NPCs from being chat spammed

Closes #1301

See merge request veloren/veloren!2780
 2021-08-23 07:48:34 +00:00
Bryant Deters
5983c87120 Check for existing target before initiating interaction 2021-08-21 22:28:26 -05:00
Ben Wallis
08d8b01a2a Merge branch 'xvar/fix-add-admin-message' into 'master' 
Fixed the message shown when adding an admin or moderator to show the correct role

See merge request veloren/veloren!2777
 2021-08-21 15:40:27 +00:00
Ben Wallis
0c55b7b4b3 Fixed the message shown when adding an admin or moderator to show the correct role 2021-08-21 15:43:33 +01:00
Samuel Keiffer
4d62b9b937 Merge branch 'ygor/combat-rating-all-stats' into 'master' 
Use all armor stats to calculate combat rating

Closes #1285

See merge request veloren/veloren!2770
 2021-08-20 21:16:05 +00:00
Marcel Märtens
fc98213996 simd must be last till we have a propper vek crate update 2021-08-20 12:44:46 +02:00
Ben Wallis
9e35f5ec33 Explosions no longer change block colours within the radius of a safe zone. Doubled the radius of the safe zone in the /home town. 2021-08-20 09:00:55 +01:00
Ygor Souza
54c3adf9af Use all armor stats to calculate combat rating 
- Added terms to account for poise (stun resistance), max energy bonus,
  energy reward bonus, and crit power.
- The weights were chosen to yield roughly the same CR for each of the 3
  types of armor in the same tier.
- Weapon rating multiplied by a constant to keep in the same order of
  magnitude as the other terms.
 2021-08-16 19:59:54 +02:00
juliancoffee
09e8ee2b3f Remove giants 2021-08-16 18:15:01 +03:00
juliancoffee
e24cd2598d Implement /make_npc 2021-08-16 17:27:59 +03:00
juliancoffee
5941d6731c Refactor supplement evaluation to use NpcData 2021-08-16 17:27:59 +03:00
juliancoffee
e9dde3ecec Add MakeNPC admin command 2021-08-16 16:45:36 +03:00
Imbris
1fd25c22dd Merge branch 'juliancoffee/explode_vines' into 'master' 
Make Fireballs explode EnsnaringVines

See merge request veloren/veloren!2758
 2021-08-14 19:09:05 +00:00
Joshua Barretto
87851293c2 Improved aggro system to reduce hyper-focused enemies 2021-08-14 11:09:33 +01:00
Joshua Barretto
c2498d81c7 Added feature flag for terrain persistence 2021-08-12 10:48:00 +01:00