Skip to content

Commit

Permalink
feat. Misc fixs (#47)
Browse files Browse the repository at this point in the history
* feat. Misc fixs

* fix build
  • Loading branch information
pangolp authored Jul 19, 2023
1 parent b4c178e commit 4d1af07
Show file tree
Hide file tree
Showing 8 changed files with 123 additions and 146 deletions.
49 changes: 0 additions & 49 deletions .git_commit_template

This file was deleted.

10 changes: 5 additions & 5 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@
## For documentation

# Documents
*.doc diff=astextplain
*.DOC diff=astextplain
*.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
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain

## DOCUMENTATION
*.markdown text
Expand Down
13 changes: 10 additions & 3 deletions .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,33 @@
![icon](https://github.com/azerothcore/mod-1v1-arena/assets/2810187/ba375f70-71c7-4c71-aa3f-d3ab6c6fdda7)

#### Features:

- 1v1 Rated Arena Games
- 1v1 Unrated Arena Games

### This module currently requires:

- AzerothCore v1.0.1+

### How to install

1. Simply place the module under the `modules` folder of your AzerothCore source folder.
2. Re-run cmake and launch a clean build of AzerothCore
3. Run the Sql file into your database.
4. Ready.

### Usage
- Enable the module and join 1 v 1 with 2 characters at the BattleMaster Npc.

- Enable the module and join 1v1 with 2 characters at the BattleMaster Npc.

### Info
This module runs over the 5v5.You can configure it to run over 4v4/3v3..etc As you desire.

This module runs over the 5v5. You can configure it to run over 4v4/3v3..etc As you desire.

If you leave the default value at 3, you can have 1v1, 2v2, 3v3 and 5v5. Unless you want to replace it with one of the existing ones.

## Credits
* [XDev](https://github.com/XdevTLKWoW):
* [XDev](https://github.com/XdevTLKWoW)
* Adjusted by fr4z3n for azerothcore
* Written by Teiby

Expand Down
14 changes: 10 additions & 4 deletions conf/1v1arena.conf.dist
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,22 @@ Arena1v1.BlockForbiddenTalents = 1
#
# Arena1v1.ForbiddenTalentsIDs
# Description: List to block specific talents id in arena. See TalentTab.dbc for available talents (you will need an DBC-Editor). The list is coma(,) separated and should have no spaces
# Default: "0" - (no talent blocked)
# Example: "201,202,382,362,282,383,163"
# Default: "0" - (no talent blocked)
# Example: "201,202,382,362,282,383,163"

Arena1v1.ForbiddenTalentsIDs = "0"


#
# Arena1v1.ArenaSlotID
# Description: The slot the 1v1 will be working over. Needs to be bigger or equals then 3 otherwise it will overwrite the 2v2,3v3 or 5v5 data
# Default: 3
# Description: The slot the 1v1 will be working over. Needs to be bigger or equals then 3 otherwise it will overwrite the 2v2, 3v3 or 5v5 data
# Default: 3
# Value:
# 2v2 = 0
# 3v3 = 1
# 5v5 = 2
# 1v1 = 3
#

Arena1v1.ArenaSlotID = 3

Expand Down
3 changes: 1 addition & 2 deletions data/sql/db-world/base/1v1_Battlemaster.sql
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
DELETE FROM `creature_template` WHERE `entry`=999991;
INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `modelid1`, `modelid2`, `modelid3`, `modelid4`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
(999991, 0, 0, 0, 0, 0, 23766, 0, 0, 0, 'Arena Battlemaster 1v1', '', '', 8218, 70, 70, 2, 35, 1048577, 1.1, 1.14286, 3, 0, 0, 1, 2000, 2000, 1, 768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 'npc_1v1arena', 12340);
(999991, 0, 0, 0, 0, 0, 23766, 0, 0, 0, 'Arena Battlemaster 1v1', '', '', 8218, 70, 70, 2, 35, 1048577, 1.1, 1.14286, 1, 0, 0, 1, 2000, 2000, 1, 768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 'npc_1v1arena', 12340);

DELETE FROM `battlemaster_entry` WHERE `entry`=999991;

INSERT INTO `battlemaster_entry` (`entry`, `bg_template`) VALUES (999991, 6);
2 changes: 2 additions & 0 deletions data/sql/delete/1v1_delete.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
DELETE FROM `creature_template` WHERE `entry`=999991;
DELETE FROM `battlemaster_entry` WHERE `entry`=999991;
4 changes: 0 additions & 4 deletions setup_git_commit_template.sh

This file was deleted.

Loading

0 comments on commit 4d1af07

Please sign in to comment.