Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lapine UI Features #4348

Closed
wants to merge 56 commits into from
Closed
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
10f0ead
Lapine UI Features
cydh Sep 6, 2019
600ff37
Follow up 10f0ead08f82711135ee0d582e2ab905579380e0
cydh Sep 16, 2019
6abd846
Follow up 600ff371c2f66be63f481337ea39fbad7f02cc58
cydh Sep 16, 2019
fe16295
Follow up 10f0ead08f82711135ee0d582e2ab905579380e0
cydh Sep 16, 2019
9e05ed3
Follow up updates
cydh Sep 17, 2019
c8bd4db
Item script corrections
cydh Sep 17, 2019
7d9d112
Apply suggestions from code review
cydh Sep 18, 2019
22c466b
Follow up
cydh Sep 19, 2019
80218e9
Act restriction on Lapine UI
cydh Sep 19, 2019
c16cbc5
Follow up 80218e99e26df77d95e674098ce03eccf4ff09a6
cydh Sep 20, 2019
c56b498
Item fixes
cydh Sep 22, 2019
70642d4
Item updates
cydh Sep 25, 2019
dc0d742
Item DB Updates
cydh Sep 28, 2019
7c7e888
Some cleanup
cydh Oct 1, 2019
38a05e9
Fixed Gold Statue enchant script
cydh Oct 25, 2019
0368896
Misc updates
cydh Nov 4, 2019
c1c0204
* Typo fixed, thanks to @xEasycore
cydh Nov 12, 2019
91fb8e8
Fixed upgradeui and synthesisui atcommand
cydh Nov 12, 2019
f41f65f
Cleanup
cydh Nov 20, 2019
50bda6a
typo
cydh Nov 24, 2019
4ef7888
Merge branch 'master' into feature/lapine_synthesis_and_upgrade
aleos89 Mar 27, 2020
be9fc60
Added remove option for importing & item updates
cydh Apr 15, 2020
d13eed6
Merge branch 'master' into feature/lapine_synthesis_and_upgrade
aleos89 Jun 19, 2020
30cb8fa
Fixes some parsing issues
aleos89 Jun 19, 2020
a02e829
Merge branch 'master' into feature/lapine_synthesis_and_upgrade
aleos89 Sep 10, 2020
480e6e7
Corrects F_Lapine_Gray_Charcoal_Melee
aleos89 Sep 10, 2020
616ca96
Fixes a couple typos
aleos89 Sep 10, 2020
22da4ef
Item group typo
aleos89 Sep 10, 2020
2bf7e81
Another item group typo
aleos89 Sep 10, 2020
b44f0e6
Fixes packet header
aleos89 Sep 10, 2020
93cfc55
Converts item ID to item name
aleos89 Sep 14, 2020
51bb52a
Removes synthesis and upgrade from pre-renewal
aleos89 Sep 15, 2020
de5bf08
Remove pre-renewal calls from main
aleos89 Sep 15, 2020
0dae6b4
Merge branch 'master' into feature/lapine_synthesis_and_upgrade
Atemo Oct 5, 2020
89dc2df
Items updates
Atemo Oct 7, 2020
d795134
Merge branch 'master' into feature/lapine_synthesis_and_upgrade
Atemo Oct 31, 2020
9dab8f9
Item txt to yaml
Atemo Oct 31, 2020
5e59893
Merge branch 'master' into feature/lapine_synthesis_and_upgrade
Atemo Oct 31, 2020
b4ef4db
Merge branch 'master' into feature/lapine_synthesis_and_upgrade
aleos89 Dec 2, 2020
72b5772
Resolves some compile issues
aleos89 Dec 2, 2020
6d69a4d
Corrects an item name
aleos89 Dec 3, 2020
c8a3b7d
Resolves some LGTM alerts
aleos89 Dec 3, 2020
bf9bcbe
Merge branch 'master' into feature/lapine_synthesis_and_upgrade
Atemo Apr 19, 2021
e188374
Replace the KRO name by the aegis items name
Atemo Apr 19, 2021
70feb94
Corrected the aegis item name in item_synthesis.yml and item_upgrade.yml
Atemo Apr 20, 2021
9ebdb0d
Corrected the rates of the boxes IG_Costume_Exchange_Box and IG_Shado…
Atemo Apr 22, 2021
667e9dd
Merge branch 'master' into feature/lapine_synthesis_and_upgrade
Atemo Apr 26, 2021
3369b00
Merge branch 'master' into feature/lapine_synthesis_and_upgrade
cydh Oct 13, 2021
432dfd0
Some fixes to follow recent updates
cydh Oct 13, 2021
4a2a2ab
Merge branch 'master' into feature/lapine_synthesis_and_upgrade
cydh Nov 2, 2021
32b0b5e
Readded item_syntesis.hpp and item_syntesis.cpp to map-server filter
cydh Nov 2, 2021
d2ac0d9
Added newline at EOF
cydh Nov 9, 2021
97af1d5
Removed unused item_package.txt
cydh Nov 9, 2021
0a32c17
Removed unnecessary changes
cydh Nov 9, 2021
d8b35cb
Removed unnecessary changes part2
cydh Nov 9, 2021
4eaa33c
Removed an attempt to copy file for import/item_package.txt
cydh Nov 9, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion conf/msg_conf/map_msg.conf
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,10 @@
// pcblock command
794: This action is currently blocked.

//795-899 free
795: Item Synthesis database has been reloaded.
796: Item Upgrade database has been reloaded.

//797-899 free

//------------------------------------
// More atcommands message
Expand Down
19 changes: 19 additions & 0 deletions db/import-tmpl/item_synthesis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
###########################################################################
#
# Item Synthesis Database
#
# This feature need a sync client file: LapineDdukDDakBox.lub
#
###########################################################################
# - Id: # (int) Item ID of synthesis box
# NeedRefine: # (int) Minimum refine level for source item
# SourceNeeded: # (int) Number of item sets (in SourceItem) must be selected
# SourceItem: # List of item required
# - Item: # (int) Item ID for source
# - Amount: # (int) Item amount will be consumed
# Reward: # (string) Script on synthesis success
###########################################################################

Header:
Type: ITEM_SYNTHESIS_DB
Version: 1
19 changes: 19 additions & 0 deletions db/import-tmpl/item_upgrade.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
###########################################################################
#
# Item Upgrade Database
#
# This feature need a sync client file: LapineUpgradeBox.lub
#
###########################################################################
# - Id: # (int) Item ID of upgrade box
# NeedRefineMin: # (int) Minimum refine level for target item (default :0)
# NeedOptionNumMin: # (int) Minimum random option that target item has (default :0)
# NotSocketEnchantItem: # (bool) Target item must not has enchant stone (default: true)
# TargetItem: # List of possible item to be upgraded
# - Item: # (int) Target's Item ID
# Result: # (string) Script on upgrade success
###########################################################################

Header:
Type: ITEM_UPGRADE_DB
Version: 1
11 changes: 11 additions & 0 deletions db/item_synthesis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Header:
Type: ITEM_SYNTHESIS_DB
Version: 1

Footer:
Imports:
- Path: db/pre-re/item_synthesis.yml
Mode: Prerenewal
- Path: db/re/item_synthesis.yml
Mode: Renewal
- Path: db/import/item_synthesis.yml
11 changes: 11 additions & 0 deletions db/item_upgrade.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Header:
Type: ITEM_UPGRADE_DB
Version: 1

Footer:
Imports:
- Path: db/pre-re/item_upgrade.yml
Mode: Prerenewal
- Path: db/re/item_upgrade.yml
Mode: Renewal
- Path: db/import/item_upgrade.yml
19 changes: 19 additions & 0 deletions db/pre-re/item_synthesis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
###########################################################################
#
# Item Synthesis Database
#
# This feature need a sync client file: LapineDdukDDakBox.lub
#
###########################################################################
# - Id: # (int) Item ID of synthesis box
# NeedRefine: # (int) Minimum refine level for source item
# SourceNeeded: # (int) Number of item sets (in SourceItem) must be selected
# SourceItem: # List of item required
# - Item: # (int) Item ID for source
# - Amount: # (int) Item amount will be consumed
# Reward: # (string) Script on synthesis success
###########################################################################

Header:
Type: ITEM_SYNTHESIS_DB
Version: 1
19 changes: 19 additions & 0 deletions db/pre-re/item_upgrade.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
###########################################################################
#
# Item Upgrade Database
#
# This feature need a sync client file: LapineUpgradeBox.lub
#
###########################################################################
# - Id: # (int) Item ID of upgrade box
# NeedRefineMin: # (int) Minimum refine level for target item (default :0)
# NeedOptionNumMin: # (int) Minimum random option that target item has (default :0)
# NotSocketEnchantItem: # (bool) Target item must not has enchant stone (default: true)
# TargetItem: # List of possible item to be upgraded
# - Item: # (int) Target's Item ID
# Result: # (string) Script on upgrade success
###########################################################################

Header:
Type: ITEM_UPGRADE_DB
Version: 1
182 changes: 180 additions & 2 deletions db/re/item_combo_db.txt

Large diffs are not rendered by default.

524 changes: 519 additions & 5 deletions db/re/item_db.txt

Large diffs are not rendered by default.

1,060 changes: 1,060 additions & 0 deletions db/re/item_package.txt

Large diffs are not rendered by default.

Loading