From d55608bc83d50f0f837e4609a2a0730aa9e16601 Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Mon, 10 Sep 2018 07:09:35 +1000 Subject: [PATCH 1/2] move features folder --- .../features/_features.pwn} | 0 .../{ => cnr}/features/ammunation.pwn | 0 .../{ => cnr}/features/cash_cards.pwn | 0 .../{ => cnr}/features/crowdfund.pwn | 0 .../irresistible/{ => cnr}/features/duel.pwn | 0 .../irresistible/{ => cnr}/features/fishing.pwn | 0 .../irresistible/{ => cnr}/features/fps.pwn | 0 .../{ => cnr}/features/furniture.pwn | 0 .../{ => cnr}/features/gangs/cannon.pwn | 0 .../{ => cnr}/features/gangs/facilities.pwn | 0 .../{ => cnr}/features/gangs/gangs.pwn | 0 .../cnr/features/gangs/gvehicles.pwn | 17 +++++++++++++++++ .../{ => cnr}/features/gangs/turfs.pwn | 0 .../irresistible/{ => cnr}/features/pilot.pwn | 0 .../irresistible/{ => cnr}/features/radio.pwn | 0 .../{ => cnr}/features/visage/_visage.pwn | 0 .../{ => cnr}/features/visage/apartments.pwn | 0 .../{ => cnr}/features/visage/blackjack.pwn | 0 .../{ => cnr}/features/visage/boxing.pwn | 0 .../{ => cnr}/features/visage/casino.pwn | 0 .../{ => cnr}/features/visage/fireworks.pwn | 0 .../{ => cnr}/features/visage/poker.pwn | 0 .../{ => cnr}/features/visage/roulette.pwn | 0 .../irresistible/{ => cnr}/features/vote.pwn | 0 .../{ => cnr}/features/weapon_drop.pwn | 0 25 files changed, 17 insertions(+) rename gamemodes/irresistible/{features/gangs/gvehicles.pwn => cnr/features/_features.pwn} (100%) rename gamemodes/irresistible/{ => cnr}/features/ammunation.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/cash_cards.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/crowdfund.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/duel.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/fishing.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/fps.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/furniture.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/gangs/cannon.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/gangs/facilities.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/gangs/gangs.pwn (100%) create mode 100644 gamemodes/irresistible/cnr/features/gangs/gvehicles.pwn rename gamemodes/irresistible/{ => cnr}/features/gangs/turfs.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/pilot.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/radio.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/visage/_visage.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/visage/apartments.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/visage/blackjack.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/visage/boxing.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/visage/casino.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/visage/fireworks.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/visage/poker.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/visage/roulette.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/vote.pwn (100%) rename gamemodes/irresistible/{ => cnr}/features/weapon_drop.pwn (100%) diff --git a/gamemodes/irresistible/features/gangs/gvehicles.pwn b/gamemodes/irresistible/cnr/features/_features.pwn similarity index 100% rename from gamemodes/irresistible/features/gangs/gvehicles.pwn rename to gamemodes/irresistible/cnr/features/_features.pwn diff --git a/gamemodes/irresistible/features/ammunation.pwn b/gamemodes/irresistible/cnr/features/ammunation.pwn similarity index 100% rename from gamemodes/irresistible/features/ammunation.pwn rename to gamemodes/irresistible/cnr/features/ammunation.pwn diff --git a/gamemodes/irresistible/features/cash_cards.pwn b/gamemodes/irresistible/cnr/features/cash_cards.pwn similarity index 100% rename from gamemodes/irresistible/features/cash_cards.pwn rename to gamemodes/irresistible/cnr/features/cash_cards.pwn diff --git a/gamemodes/irresistible/features/crowdfund.pwn b/gamemodes/irresistible/cnr/features/crowdfund.pwn similarity index 100% rename from gamemodes/irresistible/features/crowdfund.pwn rename to gamemodes/irresistible/cnr/features/crowdfund.pwn diff --git a/gamemodes/irresistible/features/duel.pwn b/gamemodes/irresistible/cnr/features/duel.pwn similarity index 100% rename from gamemodes/irresistible/features/duel.pwn rename to gamemodes/irresistible/cnr/features/duel.pwn diff --git a/gamemodes/irresistible/features/fishing.pwn b/gamemodes/irresistible/cnr/features/fishing.pwn similarity index 100% rename from gamemodes/irresistible/features/fishing.pwn rename to gamemodes/irresistible/cnr/features/fishing.pwn diff --git a/gamemodes/irresistible/features/fps.pwn b/gamemodes/irresistible/cnr/features/fps.pwn similarity index 100% rename from gamemodes/irresistible/features/fps.pwn rename to gamemodes/irresistible/cnr/features/fps.pwn diff --git a/gamemodes/irresistible/features/furniture.pwn b/gamemodes/irresistible/cnr/features/furniture.pwn similarity index 100% rename from gamemodes/irresistible/features/furniture.pwn rename to gamemodes/irresistible/cnr/features/furniture.pwn diff --git a/gamemodes/irresistible/features/gangs/cannon.pwn b/gamemodes/irresistible/cnr/features/gangs/cannon.pwn similarity index 100% rename from gamemodes/irresistible/features/gangs/cannon.pwn rename to gamemodes/irresistible/cnr/features/gangs/cannon.pwn diff --git a/gamemodes/irresistible/features/gangs/facilities.pwn b/gamemodes/irresistible/cnr/features/gangs/facilities.pwn similarity index 100% rename from gamemodes/irresistible/features/gangs/facilities.pwn rename to gamemodes/irresistible/cnr/features/gangs/facilities.pwn diff --git a/gamemodes/irresistible/features/gangs/gangs.pwn b/gamemodes/irresistible/cnr/features/gangs/gangs.pwn similarity index 100% rename from gamemodes/irresistible/features/gangs/gangs.pwn rename to gamemodes/irresistible/cnr/features/gangs/gangs.pwn diff --git a/gamemodes/irresistible/cnr/features/gangs/gvehicles.pwn b/gamemodes/irresistible/cnr/features/gangs/gvehicles.pwn new file mode 100644 index 0000000..9a59345 --- /dev/null +++ b/gamemodes/irresistible/cnr/features/gangs/gvehicles.pwn @@ -0,0 +1,17 @@ +/* + * Irresistible Gaming (c) 2018 + * Developed by Lorenc Pekaj + * Module: + * Purpose: + */ + +/* ** Includes ** */ +#include < YSI\y_hooks > + +/* ** Definitions ** */ + +/* ** Variables ** */ + +/* ** Hooks ** */ + +/* ** Functions ** */ diff --git a/gamemodes/irresistible/features/gangs/turfs.pwn b/gamemodes/irresistible/cnr/features/gangs/turfs.pwn similarity index 100% rename from gamemodes/irresistible/features/gangs/turfs.pwn rename to gamemodes/irresistible/cnr/features/gangs/turfs.pwn diff --git a/gamemodes/irresistible/features/pilot.pwn b/gamemodes/irresistible/cnr/features/pilot.pwn similarity index 100% rename from gamemodes/irresistible/features/pilot.pwn rename to gamemodes/irresistible/cnr/features/pilot.pwn diff --git a/gamemodes/irresistible/features/radio.pwn b/gamemodes/irresistible/cnr/features/radio.pwn similarity index 100% rename from gamemodes/irresistible/features/radio.pwn rename to gamemodes/irresistible/cnr/features/radio.pwn diff --git a/gamemodes/irresistible/features/visage/_visage.pwn b/gamemodes/irresistible/cnr/features/visage/_visage.pwn similarity index 100% rename from gamemodes/irresistible/features/visage/_visage.pwn rename to gamemodes/irresistible/cnr/features/visage/_visage.pwn diff --git a/gamemodes/irresistible/features/visage/apartments.pwn b/gamemodes/irresistible/cnr/features/visage/apartments.pwn similarity index 100% rename from gamemodes/irresistible/features/visage/apartments.pwn rename to gamemodes/irresistible/cnr/features/visage/apartments.pwn diff --git a/gamemodes/irresistible/features/visage/blackjack.pwn b/gamemodes/irresistible/cnr/features/visage/blackjack.pwn similarity index 100% rename from gamemodes/irresistible/features/visage/blackjack.pwn rename to gamemodes/irresistible/cnr/features/visage/blackjack.pwn diff --git a/gamemodes/irresistible/features/visage/boxing.pwn b/gamemodes/irresistible/cnr/features/visage/boxing.pwn similarity index 100% rename from gamemodes/irresistible/features/visage/boxing.pwn rename to gamemodes/irresistible/cnr/features/visage/boxing.pwn diff --git a/gamemodes/irresistible/features/visage/casino.pwn b/gamemodes/irresistible/cnr/features/visage/casino.pwn similarity index 100% rename from gamemodes/irresistible/features/visage/casino.pwn rename to gamemodes/irresistible/cnr/features/visage/casino.pwn diff --git a/gamemodes/irresistible/features/visage/fireworks.pwn b/gamemodes/irresistible/cnr/features/visage/fireworks.pwn similarity index 100% rename from gamemodes/irresistible/features/visage/fireworks.pwn rename to gamemodes/irresistible/cnr/features/visage/fireworks.pwn diff --git a/gamemodes/irresistible/features/visage/poker.pwn b/gamemodes/irresistible/cnr/features/visage/poker.pwn similarity index 100% rename from gamemodes/irresistible/features/visage/poker.pwn rename to gamemodes/irresistible/cnr/features/visage/poker.pwn diff --git a/gamemodes/irresistible/features/visage/roulette.pwn b/gamemodes/irresistible/cnr/features/visage/roulette.pwn similarity index 100% rename from gamemodes/irresistible/features/visage/roulette.pwn rename to gamemodes/irresistible/cnr/features/visage/roulette.pwn diff --git a/gamemodes/irresistible/features/vote.pwn b/gamemodes/irresistible/cnr/features/vote.pwn similarity index 100% rename from gamemodes/irresistible/features/vote.pwn rename to gamemodes/irresistible/cnr/features/vote.pwn diff --git a/gamemodes/irresistible/features/weapon_drop.pwn b/gamemodes/irresistible/cnr/features/weapon_drop.pwn similarity index 100% rename from gamemodes/irresistible/features/weapon_drop.pwn rename to gamemodes/irresistible/cnr/features/weapon_drop.pwn From 219f1aeb13dcf17073e06b476054566034975406 Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Mon, 10 Sep 2018 07:18:09 +1000 Subject: [PATCH 2/2] features thrown into cnr ... gangs has now its own index include --- gamemodes/irresistible/_main.pwn | 29 +------------------ gamemodes/irresistible/cnr/_cnr.pwn | 13 ++++++++- .../irresistible/cnr/features/_features.pwn | 26 ++++++++++++----- .../cnr/features/gangs/_gangs.pwn | 13 +++++++++ .../cnr/features/visage/_visage.pwn | 14 ++++----- 5 files changed, 51 insertions(+), 44 deletions(-) create mode 100644 gamemodes/irresistible/cnr/features/gangs/_gangs.pwn diff --git a/gamemodes/irresistible/_main.pwn b/gamemodes/irresistible/_main.pwn index 0eaddb1..a572162 100644 --- a/gamemodes/irresistible/_main.pwn +++ b/gamemodes/irresistible/_main.pwn @@ -1,7 +1,7 @@ /* * Irresistible Gaming 2018 * Developed by Lorenc Pekaj - * Module: main.inc + * Module: _main.inc * Purpose: centralize includes */ @@ -28,30 +28,3 @@ // cnr configuration #include "irresistible\cnr\_cnr.pwn" -// commands - -// features -#include "irresistible\features\fps.pwn" -#include "irresistible\features\radio.pwn" -#include "irresistible\features\cash_cards.pwn" -#include "irresistible\features\furniture.pwn" -#include "irresistible\features\weapon_drop.pwn" -#include "irresistible\features\ammunation.pwn" -#include "irresistible\features\duel.pwn" -#include "irresistible\features\crowdfund.pwn" -// #include "irresistible\features\pilot.pwn" -// #include "irresistible\features\fishing.pwn" -// #include "irresistible\features\vote.pwn" - -// gangs and facilities -#include "irresistible\features\gangs\gangs.pwn" -#include "irresistible\features\gangs\facilities.pwn" -#include "irresistible\features\gangs\turfs.pwn" -#include "irresistible\features\gangs\cannon.pwn" -// #include "irresistible\features\gangs\gvehicles.pwn" - -// visage casino -#include "irresistible\features\visage\_visage.pwn" - -// static cnr features -#include "irresistible\cnr\static\_cnr_static.pwn" diff --git a/gamemodes/irresistible/cnr/_cnr.pwn b/gamemodes/irresistible/cnr/_cnr.pwn index 56fa05c..2d6606c 100644 --- a/gamemodes/irresistible/cnr/_cnr.pwn +++ b/gamemodes/irresistible/cnr/_cnr.pwn @@ -2,10 +2,12 @@ * Irresistible Gaming (c) 2018 * Developed by Lorenc Pekaj * Module: cnr/_cnr.pwn - * Purpose: ecnloses all cnr related components (cnr) + * Purpose: encloses all cnr related components (cnr) */ /* ** Includes ** */ + +// core #include "irresistible\cnr\player.pwn" #include "irresistible\cnr\global.pwn" #include "irresistible\cnr\classes.pwn" @@ -13,4 +15,13 @@ #include "irresistible\cnr\cities.pwn" #include "irresistible\cnr\dialog_ids.pwn" #include "irresistible\cnr\vip.pwn" + +// static cnr features +#include "irresistible\cnr\static\_cnr_static.pwn" + +// features +#include "irresistible\cnr\features\_features.pwn" + +// commands #include "irresistible\cnr\commands\_commands.pwn" + diff --git a/gamemodes/irresistible/cnr/features/_features.pwn b/gamemodes/irresistible/cnr/features/_features.pwn index 9a59345..b8e46b9 100644 --- a/gamemodes/irresistible/cnr/features/_features.pwn +++ b/gamemodes/irresistible/cnr/features/_features.pwn @@ -1,17 +1,27 @@ /* * Irresistible Gaming (c) 2018 * Developed by Lorenc Pekaj - * Module: - * Purpose: + * Module: cnr\features\_features.pwn + * Purpose: encloses all feature modules & components (cnr) */ /* ** Includes ** */ -#include < YSI\y_hooks > -/* ** Definitions ** */ +// core +#include "irresistible\cnr\features\fps.pwn" +#include "irresistible\cnr\features\radio.pwn" +#include "irresistible\cnr\features\cash_cards.pwn" +#include "irresistible\cnr\features\furniture.pwn" +#include "irresistible\cnr\features\weapon_drop.pwn" +#include "irresistible\cnr\features\ammunation.pwn" +#include "irresistible\cnr\features\duel.pwn" +#include "irresistible\cnr\features\crowdfund.pwn" +// #include "irresistible\cnr\features\pilot.pwn" +// #include "irresistible\cnr\features\fishing.pwn" +// #include "irresistible\cnr\features\vote.pwn" -/* ** Variables ** */ +// gangs and facilities +#include "irresistible\cnr\features\gangs\_gangs.pwn" -/* ** Hooks ** */ - -/* ** Functions ** */ +// visage casino +#include "irresistible\cnr\features\visage\_visage.pwn" diff --git a/gamemodes/irresistible/cnr/features/gangs/_gangs.pwn b/gamemodes/irresistible/cnr/features/gangs/_gangs.pwn new file mode 100644 index 0000000..4da3425 --- /dev/null +++ b/gamemodes/irresistible/cnr/features/gangs/_gangs.pwn @@ -0,0 +1,13 @@ +/* + * Irresistible Gaming (c) 2018 + * Developed by Lorenc Pekaj + * Module: cnr\features\gangs\_gangs.pwn + * Purpose: encloses all gang and facility related modules (cnr) + */ + +/* ** Includes ** */ +#include "irresistible\cnr\features\gangs\gangs.pwn" +#include "irresistible\cnr\features\gangs\facilities.pwn" +#include "irresistible\cnr\features\gangs\turfs.pwn" +#include "irresistible\cnr\features\gangs\cannon.pwn" +// #include "irresistible\features\gangs\gvehicles.pwn" diff --git a/gamemodes/irresistible/cnr/features/visage/_visage.pwn b/gamemodes/irresistible/cnr/features/visage/_visage.pwn index f05d5da..e1734d4 100644 --- a/gamemodes/irresistible/cnr/features/visage/_visage.pwn +++ b/gamemodes/irresistible/cnr/features/visage/_visage.pwn @@ -6,10 +6,10 @@ */ /* ** Includes ** */ -#include "irresistible\features\visage\roulette.pwn" -#include "irresistible\features\visage\blackjack.pwn" -#include "irresistible\features\visage\poker.pwn" -#include "irresistible\features\visage\fireworks.pwn" -#include "irresistible\features\visage\casino.pwn" -#include "irresistible\features\visage\apartments.pwn" -#include "irresistible\features\visage\boxing.pwn" +#include "irresistible\cnr\features\visage\roulette.pwn" +#include "irresistible\cnr\features\visage\blackjack.pwn" +#include "irresistible\cnr\features\visage\poker.pwn" +#include "irresistible\cnr\features\visage\fireworks.pwn" +#include "irresistible\cnr\features\visage\casino.pwn" +#include "irresistible\cnr\features\visage\apartments.pwn" +#include "irresistible\cnr\features\visage\boxing.pwn"