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

Added Acolyte to equip_jobs.php #397

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions config/access.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,6 @@
'delete' => AccountLevel::ADMIN,
'imagedel' => AccountLevel::ADMIN
),
'cashshop' => array(
'index' => AccountLevel::ADMIN,
'add' => AccountLevel::ADMIN,
'edit' => AccountLevel::ADMIN,
'delete' => AccountLevel::ADMIN
),
'account' => array(
'index' => AccountLevel::LOWGM,
'view' => AccountLevel::NORMAL,
Expand Down Expand Up @@ -220,7 +214,6 @@
'AddShopItem' => AccountLevel::ADMIN, // Ability to add an item to the shop.
'EditShopItem' => AccountLevel::ADMIN, // Ability to modify a shop item's details.
'DeleteShopItem' => AccountLevel::ADMIN, // Ability to remove an item for sale on the shop.
'ManageCashShop' => AccountLevel::ADMIN, // Ability to manage the in-game cash shop.
'ViewGuild' => AccountLevel::ADMIN, // Ability to view another guild's details.
'SearchWhosOnline' => AccountLevel::ANYONE, // Ability to search the "Who's Online" page.
'ViewOnlinePosition' => AccountLevel::LOWGM, // Ability to see a character's current map on "Who's Online" page.
Expand Down
4 changes: 0 additions & 4 deletions config/application.php
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,6 @@
'ReInstallLabel' => array('module' => 'install', 'action' => 'reinstall'),
'SendMailLabel' => array('module' => 'mail'),
'WCTitleLabel' => array('module' => 'webcommands'),
'Cash Shop' => array('module' => 'cashshop'),
//'Auction' => array('module' => 'auction'),
//'Economy' => array('module' => 'economy')
)
Expand Down Expand Up @@ -496,9 +495,6 @@
// Item shop categories.
'ShopCategories' => include('shopcategories.php'),

// Cash shop categories.
'CashShopCategories' => include('cashshopcategories.php'),

// Item pick and zeny log types.
'PickTypes' => include('picktypes.php'),

Expand Down
1 change: 1 addition & 0 deletions config/equip_jobs.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
'job_swordman' => 'Swordman',
'job_mage' => 'Mage',
'job_archer' => 'Archer',
'job_acolyte' => 'Acolyte',
'job_merchant' => 'Merchant',
'job_thief' => 'Thief',
'job_knight' => 'Knight',
Expand Down
102 changes: 0 additions & 102 deletions lib/Flux/CashShop.php

This file was deleted.

52 changes: 0 additions & 52 deletions modules/cashshop/add.php

This file was deleted.

20 changes: 0 additions & 20 deletions modules/cashshop/delete.php

This file was deleted.

59 changes: 0 additions & 59 deletions modules/cashshop/edit.php

This file was deleted.

31 changes: 0 additions & 31 deletions modules/cashshop/index.php

This file was deleted.

3 changes: 0 additions & 3 deletions modules/item/pagemenu/view.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,5 @@
$pageMenu['Add to Item Shop'] = $this->url('itemshop', 'add', array('id' => $item->item_id));
}
}
if ($auth->actionAllowed('cashshop', 'add') && $auth->allowedToManageCashShop) {
$pageMenu['Add to Cash Shop'] = $this->url('cashshop', 'add', array('id' => $item->item_id));
}
return $pageMenu;
?>
41 changes: 0 additions & 41 deletions themes/default/cashshop/add.php

This file was deleted.

3 changes: 0 additions & 3 deletions themes/default/cashshop/delete.php

This file was deleted.

Loading
Loading