Skip to content

Commit

Permalink
Merge remote-tracking branch 'azerothcore/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
talamortis committed Mar 11, 2024
2 parents 2eb07a1 + 9aab94e commit 5696ada
Show file tree
Hide file tree
Showing 14 changed files with 302 additions and 106 deletions.
8 changes: 8 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[*]
charset = utf-8
indent_style = space
indent_size = 4
tab_width = 4
insert_final_newline = true
trim_trailing_whitespace = true
max_line_length = 80
104 changes: 104 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
## AUTO-DETECT
## Handle line endings automatically for files detected as
## text and leave all files detected as binary untouched.
## This will handle all files NOT defined below.
* text eol=lf

# Text
*.conf text
*.conf.dist text
*.cmake text

## Scripts
*.sh text
*.fish text
*.lua text

## SQL
*.sql text

## C++
*.c text
*.cc text
*.cxx text
*.cpp text
*.c++ text
*.hpp text
*.h text
*.h++ text
*.hh text

## For documentation

# Documents
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain

## DOCUMENTATION
*.markdown text
*.md text
*.mdwn text
*.mdown text
*.mkd text
*.mkdn text
*.mdtxt text
*.mdtext text
*.txt text
AUTHORS text
CHANGELOG text
CHANGES text
CONTRIBUTING text
COPYING text
copyright text
COPYRIGHT text
INSTALL text
license text
LICENSE text
NEWS text
readme text
README text
TODO text

## GRAPHICS
*.ai binary
*.bmp binary
*.eps binary
*.gif binary
*.ico binary
*.jng binary
*.jp2 binary
*.jpg binary
*.jpeg binary
*.jpx binary
*.jxr binary
*.pdf binary
*.png binary
*.psb binary
*.psd binary
*.svg text
*.svgz binary
*.tif binary
*.tiff binary
*.wbmp binary
*.webp binary


## ARCHIVES
*.7z binary
*.gz binary
*.jar binary
*.rar binary
*.tar binary
*.zip binary

## EXECUTABLES
*.exe binary
*.pyc binary
72 changes: 72 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Bug report
description: Create a bug report to help us improve.
title: "Bug: "
body:
- type: textarea
id: current
attributes:
label: Current Behaviour
description: |
Description of the problem or issue here.
Include entries of affected creatures / items / quests / spells etc.
If this is a crash, post the crashlog (upload to https://gist.github.com/) and include the link here.
Never upload files! Use GIST for text and YouTube for videos!
validations:
required: true
- type: textarea
id: expected
attributes:
label: Expected Behaviour
description: |
Tell us what should happen instead.
validations:
required: true
- type: textarea
id: reproduce
attributes:
label: Steps to reproduce the problem
description: |
What does someone else need to do to encounter the same bug?
placeholder: |
1. Step 1
2. Step 2
3. Step 3
validations:
required: true
- type: textarea
id: extra
attributes:
label: Extra Notes
description: |
Do you have any extra notes that can help solve the issue that does not fit any other field?
placeholder: |
None
validations:
required: false
- type: textarea
id: commit
attributes:
label: AC rev. hash/commit
description: |
Copy the result of the `.server debug` command (if you need to run it from the client get a prat addon)
validations:
required: true
- type: input
id: os
attributes:
label: Operating system
description: |
The Operating System the Server is running on.
i.e. Windows 11 x64, Debian 10 x64, macOS 12, Ubuntu 20.04
validations:
required: true
- type: textarea
id: custom
attributes:
label: Custom changes or Modules
description: |
List which custom changes or modules you have applied, i.e. Eluna module, etc.
placeholder: |
None
validations:
required: false
33 changes: 33 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Feature request
description: Suggest an idea for this project
title: "Feature: "
body:
- type: markdown
attributes:
value: |
Thank you for taking your time to fill out a feature request. Remember to fill out all fields including the title above.
An issue that is not properly filled out will be closed.
- type: textarea
id: description
attributes:
label: Describe your feature request or suggestion in detail
description: |
A clear and concise description of what you want to happen.
validations:
required: true
- type: textarea
id: solution
attributes:
label: Describe a possible solution to your feature or suggestion in detail
description: |
A clear and concise description of any alternative solutions or features you've considered.
validations:
required: false
- type: textarea
id: additional
attributes:
label: Additional context
description: |
Add any other context or screenshots about the feature request here.
validations:
required: false
12 changes: 12 additions & 0 deletions .github/workflows/core-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: core-build
on:
push:
branches:
- 'master'
pull_request:

jobs:
build:
uses: azerothcore/reusable-workflows/.github/workflows/core_build_modules.yml@main
with:
module_repo: ${{ github.event.repository.name }}
42 changes: 0 additions & 42 deletions .travis.yml

This file was deleted.

9 changes: 0 additions & 9 deletions CMakeLists.txt

This file was deleted.

14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
# PvPScript
# ![logo](https://raw.githubusercontent.com/azerothcore/azerothcore.github.io/master/images/logo-github.png) AzerothCore

This is a module for [AzerothCore](http://www.azerothcore.org)
## PvPScript

### This is a module for [AzerothCore](http://www.azerothcore.org)

- Latest build status with azerothcore:

[![Build Status](https://github.com/azerothcore/mod-pvpscript/workflows/core-build/badge.svg?branch=master&event=push)](https://github.com/azerothcore/mod-pvpscript)

Current features:

-**Puts a players armor in a chest for other players to loot if they are killed. Only works in open world.
-**Puts a players armor in a chest for other players to loot if they are killed. Only works in open world.**

Upcoming features:


## Requirements

PvPScript Module currently requires:
Expand All @@ -30,4 +35,5 @@ AzerothCore v1.0.1+
If you need to change the module configuration, go to your server configuration folder (e.g. **etc**), copy `PvPScript.conf.dist` to `PvPScript.conf` and edit it as you prefer.

# Show your appreciation

[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=SBJFTAJKUNEXC)
17 changes: 11 additions & 6 deletions conf/PvPScript.conf.dist
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,38 @@
# Description: Enable or Disable this feature for the players to drop loot.
# Default: Enabled = 1
# Disabled = 0

PvPChest = 1

#
# ChestID
# Description: allows the player to spawn the chest of their choice
# Default: Enabled = 179697
#
#

ChestID = "80000"

#
# KillAnnounce
# Description: Announces to the player who killed them.
# Config: Disable = "0" : Announce = "1" : Notifaction = "2" : Both = "3"
#
#

KillAnnounce = "1"

#
# ChestTimer
# Description: The ammount of time the chest is in world before despawn (In Seconds)
# Config: Default = 120
#
#

ChestTimer = "120"

#
# spawnchestIP
# Description: Allow the chest to spawn if player is on the same IP address
# Config: Disable = "0"
# Enable = "1" do not spawn chest if same IP
#
spawnchestIP = "1"
# Enable = "1" do not spawn chest if same IP
#

spawnchestIP = "1"
25 changes: 25 additions & 0 deletions pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<!-- First of all, THANK YOU for your contribution. -->

## Changes Proposed:
-
-

## Issues Addressed:
<!-- If your fix has a relating issue, link it below -->
- Closes

## SOURCE:
<!-- If you can, include a source that can strengthen your claim -->

## Tests Performed:
<!-- Does it build without errors? Did you test in-game? What did you test? On which OS did you test? Describe any other tests performed -->
-
-


## How to Test the Changes:
<!-- Describe in a detailed step-by-step order how to test the changes -->

1.
2.
3.
6 changes: 6 additions & 0 deletions src/PS_loader.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
void AddPvPScripts();

void Addmod_pvpscriptScripts()
{
AddPvPScripts();
}
Loading

0 comments on commit 5696ada

Please sign in to comment.