Merge pull request #24 from Hedgefog/dev

Update 6.0.0 Release

README.md

@@ -1,7 +1,7 @@
 ![](./images/logo.png)
 
 ### Halloween Mod for Counter-Strike 1.6
-__Version:__ 4.0.0
+__Version:__ 6.0.0
 
 #### Deploy
 - Clone repository.

assets/addons/amxmodx/configs/hwn.cfg

@@ -1,17 +1,45 @@
 hwn_gamemode_spell_on_spawn 1
 hwn_gamemode_random_events 1
 hwn_gamemode_change_lighting 1
-hwn_gamemode_respawn_time 10.0
+hwn_gamemode_respawn_time 5.0
 hwn_gamemode_spawn_protection_time 3.0
 
 hwn_collector_teampoints_limit 50
 hwn_bucket_health 300
 
-hwn_gifts_spawn_delay 450.0
-hwn_gifts_cosmetic_min_time 300
-hwn_gifts_cosmetic_max_time 600
+hwn_gifts_spawn_delay 300.0
+hwn_gifts_cosmetic_min_time 450
+hwn_gifts_cosmetic_max_time 1200
 
-hwn_boss_spawn_delay 600.0
+hwn_boss_spawn_delay 300.0
 hwn_boss_life_time 120.0
 
-hwn_npc_hhh_use_astar 1
+hwn_npc_hhh_use_astar 1
+
+hwn_wof_effect_time 20.0
+hwn_collector_wof 1
+hwn_collector_wof_delay 90.0
+
+hwn_crits_damage_multiplier 2.2
+hwn_crits_random 1
+hwn_crits_random_chance_initial 0.0
+hwn_crits_random_chance_max 12.0
+hwn_crits_random_chance_bonus 1.0
+hwn_crits_random_chance_penalty 2.0
+hwn_crits_effect_trace 1
+hwn_crits_effect_splash 1
+hwn_crits_effect_flash 1
+hwn_crits_effect_status_icon 1
+hwn_crits_sound_use 1
+hwn_crits_sound_hit 1
+hwn_crits_sound_shoot 1
+
+hwn_bucket_collect_flash 1
+hwn_pumpkin_pickup_flash 1
+
+hwn_spellbook_max_spell_count 3
+
+hwn_hud_collector_hide_money 1
+hwn_hud_collector_hide_timer 1
+
+hwn_boss_pve 0

assets/addons/amxmodx/configs/plugins-hwn.ini

@@ -27,7 +27,6 @@ entity_hwn_prop_explosive_pumpkin.amxx
 entity_hwn_prop_jackolantern.amxx
 
 entity_hwn_item_pumpkin.amxx
-entity_hwn_item_pumpkin_big.amxx
 entity_hwn_item_spellbook.amxx
 entity_hwn_item_gift.amxx
 entity_hwn_item_spellball.amxx
@@ -51,13 +50,16 @@ hwn_gamemode.amxx
 hwn_bosses.amxx
 
 hwn_spells.amxx
+hwn_wof.amxx
 hwn_player_equipment.amxx
 hwn_player_cosmetic.amxx
 
 hwn_gifts.amxx
 
 hwn_controlls.amxx
 
+hwn_crits.amxx
+
 ; Gamemodes
 
 hwn_gamemode_default.amxx
@@ -71,6 +73,10 @@ hwn_spell_invisibility.amxx
 hwn_spell_overheal.amxx
 hwn_spell_lightning.amxx
 hwn_spell_moonjump.amxx
+hwn_spell_crits.amxx
+hwn_spell_fortune.amxx
+hwn_spell_powerup.amxx
+hwn_spell_dance.amxx
 
 ; Cosmetics
 

assets/addons/amxmodx/data/lang/hwn.txt

@@ -2,37 +2,49 @@
 HWN_GIFT_SPAWN = A Haunted Halloween Gift has^nmysteriously spawned somewhere,^nplaced just for you. Go and find it!
 HWN_GIFT_DISAPPEARED = The Haunted Halloween Gift has disappeared!
 HWN_GIFT_FOUND = %s found the Haunted Halloween Gift!
-HWN_PLAYER_POINTS = Points: %d 
+HWN_PLAYER_POINTS = Pumpkins collected: %d
 HWN_SPELL = Spell: %s
 HWN_DEFEAT_BOSS = %s defeat the boss!
 HWN_BOSS_REWARD = Boss is defeated!^nMysterious reward is waiting for you in your inventory.
-HWN_SPELLBOOK_PICKUP = You picked spell!^nUse flashlight key ('f' by default) to cast spell.
+HWN_SPELLBOOK_PICKUP = You picked a spell!^nUse flashlight key ('f' by default) to cast spell.
 HWN_MENU_HELP = Use choose team key ('m' by default) to open mod menu.
 HWN_MENU_TITLE = Halloween Mod Menu
 HWN_EQUIPMENT_MENU_TITLE = Equipment
 HWN_COSMETIC_MENU_TITLE = Cosmetic Inventory
 HWN_COSMETIC_MENU_EMPTY = You have no cosmetic items
+HWN_TEAM_PUMPKIN_COLLECTED = Pumpkins in bucket
+HWN_FIRST_PUMPKIN_PICKED = You picked a pumpkin, take it to the team bucket.
+HWN_BOSS_SPAWN = %s has appeared!
+HWN_BOSS_ESCAPE = %s has gone!
+HWN_WOF_ROLL_STARTED = Wheel of Fate roll started...
+HWN_WOF_EFFECT_STARTED = Your fate... is... %s!
 
 [ru]
-HWN_GIFT_SPAWN = Призрачный Подарок таинственно появился в случайном месте,^nтолько для вас. Идите и найдите его!
+HWN_GIFT_SPAWN = Призрачный Подарок таинственно появился в случайном месте!
 HWN_GIFT_DISAPPEARED = Призрачный Подарок исчез!
 HWN_GIFT_FOUND = %s нашел Призрачный Подарок.
-HWN_PLAYER_POINTS = Очки: %d
+HWN_PLAYER_POINTS = Тыкв собрано: %d
 HWN_SPELL = Заклинание: %s
 HWN_DEFEAT_BOSS = %s победил босса!
 HWN_BOSS_REWARD = Босс побежден!^nТаинственная награда ждет вас в вашем инвентаре.
-HWN_SPELLBOOK_PICKUP = Вы подобрали заклинание!^nИспользуйте клавишу активации фонаря ('f' по умолчанию), чтоб колдовать.
+HWN_SPELLBOOK_PICKUP = Вы подобрали заклинание!^nИспользуйте клавишу фонаря, чтоб колдовать.
 HWN_MENU_HELP = Используйте клавишу смены команды ('m' по умолчанию), чтоб открыть меню.
 HWN_MENU_TITLE = Halloween Mod Меню
 HWN_EQUIPMENT_MENU_TITLE = Экипировка
 HWN_COSMETIC_MENU_TITLE = Аксессуары
 HWN_COSMETIC_MENU_EMPTY = У вас нету аксессуаров
+HWN_TEAM_PUMPKIN_COLLECTED = Тыкв в корзине
+HWN_FIRST_PUMPKIN_PICKED = Вы подобрали тыкву, отнесите ее в корзину вашей команды.
+HWN_BOSS_SPAWN = %s появился!
+HWN_BOSS_ESCAPE = %s ушел!
+HWN_WOF_ROLL_STARTED = Колесо судьбы начало свое вращение...
+HWN_WOF_EFFECT_STARTED = Ваша судьба... это... %s!
 
 [es]
 HWN_GIFT_SPAWN = Un misterioso regalo de ^nHalloween ha aparecido en algun lugar,^nve y encuentralo!
 HWN_GIFT_DISAPPEARED = El misterioso regalo de Halloween desaparecio!
 HWN_GIFT_FOUND = %s encontro el misterioso regalo de Halloween!
-HWN_PLAYER_POINTS = Puntos: %d 
+HWN_PLAYER_POINTS = Pumpkins collected: %d
 HWN_SPELL = Hechizos: %s
 HWN_DEFEAT_BOSS = %s derroto al jefe!
 HWN_BOSS_REWARD = El jefe fue derrotado!^nUn misterioso regaldo te aguarda en tu inventario.
@@ -42,12 +54,18 @@ HWN_MENU_TITLE = Halloween Mod Menu
 HWN_EQUIPMENT_MENU_TITLE = Equipment
 HWN_COSMETIC_MENU_TITLE = Cosmetic Inventory
 HWN_COSMETIC_MENU_EMPTY = You have no cosmetic items
+HWN_TEAM_PUMPKIN_COLLECTED = Pumpkins in bucket
+HWN_FIRST_PUMPKIN_PICKED = You picked a pumpkin, take it to the team bucket.
+HWN_BOSS_SPAWN = %s has appeared!
+HWN_BOSS_ESCAPE = %s has gone!
+HWN_WOF_ROLL_STARTED = Wheel of Fate roll started...
+HWN_WOF_EFFECT_STARTED = Your fate... is... %s!
 
 [ro]
 HWN_GIFT_SPAWN = Un Cadou Bantuit de Halloween a^naparut in mod misterios undeva,^nasezat doar pentru tine. Du-te si gaseste-l!
 HWN_GIFT_DISAPPEARED = Cadoul Bantuit de Halloween a disparut!
 HWN_GIFT_FOUND = %s a gasit Cadoul Bantuit de Halloween!
-HWN_PLAYER_POINTS = Puncte: %d 
+HWN_PLAYER_POINTS = Pumpkins collected: %d
 HWN_SPELL = Vraja: %s
 HWN_DEFEAT_BOSS = %s a invins seful!
 HWN_BOSS_REWARD = Seful este invins!^nUn cadou misterios te asteapta in inventarul tau.
@@ -57,12 +75,18 @@ HWN_MENU_TITLE = Halloween Mod Menu
 HWN_EQUIPMENT_MENU_TITLE = Equipment
 HWN_COSMETIC_MENU_TITLE = Cosmetic Inventory
 HWN_COSMETIC_MENU_EMPTY = You have no cosmetic items
+HWN_TEAM_PUMPKIN_COLLECTED = Pumpkins in bucket
+HWN_FIRST_PUMPKIN_PICKED = You picked a pumpkin, take it to the team bucket.
+HWN_BOSS_SPAWN = %s has appeared!
+HWN_BOSS_ESCAPE = %s has gone!
+HWN_WOF_ROLL_STARTED = Wheel of Fate roll started...
+HWN_WOF_EFFECT_STARTED = Your fate... is... %s!
 
 [hu]
 HWN_GIFT_SPAWN = Egy Kísérteties Halloweeni Ajándék^nrejtelmesen megjelent valahol,^ncsak a számodra. Menj és találd meg!
 HWN_GIFT_DISAPPEARED = A Kísérteties Halloweeni Ajándék eltűnt!
 HWN_GIFT_FOUND = %s megtalálta a Kísérteties Halloweeni Ajándékot!
-HWN_PLAYER_POINTS = Pontok: %d 
+HWN_PLAYER_POINTS = Pumpkins collected: %d
 HWN_SPELL = Varázslat: %s
 HWN_DEFEAT_BOSS = %s legyőzte a bosst!
 HWN_BOSS_REWARD = A Boss legyőzve!^nEgy rejtélyes jutalom vár a Leltáradban rád!
@@ -72,3 +96,9 @@ HWN_MENU_TITLE = Halloween Mod Menu
 HWN_EQUIPMENT_MENU_TITLE = Felszerelés
 HWN_COSMETIC_MENU_TITLE = Kozmetikai Leltár
 HWN_COSMETIC_MENU_EMPTY = Nincs kozmetikai tárgyad
+HWN_TEAM_PUMPKIN_COLLECTED = Pumpkins in bucket
+HWN_FIRST_PUMPKIN_PICKED = You picked a pumpkin, take it to the team bucket.
+HWN_BOSS_SPAWN = %s has appeared!
+HWN_BOSS_ESCAPE = %s has gone!
+HWN_WOF_ROLL_STARTED = Wheel of Fate roll started...
+HWN_WOF_EFFECT_STARTED = Your fate... is... %s!

builder/factories/build-task.factory.js

@@ -11,7 +11,7 @@ module.exports = (name, options) => {
     }
 
     const gulpMethod = options.watch === true ? watch : gulp.src;
-    const gulpOptions = options.watch === true ? {ignoreInitial: false} : undefined;
+    const gulpOptions = options.watch === true ? {ignoreInitial: !!options.ignoreInitial} : undefined;
 
     const resolvedTasks = [];
 
@@ -60,5 +60,5 @@ module.exports = (name, options) => {
         resolvedTasks.push(taskName);
     }
 
-    gulp.task(name, gulp.series(...resolvedTasks));
+    gulp.task(name, gulp.parallel(...resolvedTasks));
 };

builder/tasks/build.tasks.js

@@ -36,14 +36,16 @@ if (config.build.vanilla) {
         smaConfig: vanillaSmaConfig,
         dest: vanillaDestConfig
     });
-    
+
     buildTaskFactory('watch:vanilla', {
-        smaConfig: vanillaSmaConfig,
+        smaConfig: Object.assign({}, vanillaSmaConfig, {ignoreError: true}),
         dest: vanillaDestConfig,
-        watch: true
+        watch: true,
+        ignoreInitial: true
     });
 
     buildTasks.push('build:vanilla');
+    watchTasks.push('build:vanilla');
     watchTasks.push('watch:vanilla');
 }
 
@@ -61,9 +63,10 @@ if (config.build.reapi) {
     }
 
     buildTaskFactory('watch:reapi', {
-        smaConfig: reapiSmaConfig,
+        smaConfig: Object.assign({}, reapiSmaConfig, {ignoreError: true}),
         dest: reapiDestConfig,
-        watch: true
+        watch: true,
+        ignoreInitial: true
     });
 
     buildTaskFactory('build:reapi', {
@@ -72,10 +75,11 @@ if (config.build.reapi) {
     });
 
     buildTasks.push('build:reapi');
+    watchTasks.push('build:reapi');
     watchTasks.push('watch:reapi');
 }
 
 // final tasks
 
 gulp.task('build', gulp.series(...buildTasks));
-gulp.task('watch', gulp.series(...watchTasks));
+gulp.task('watch', gulp.parallel(...watchTasks));

builder/tasks/pack.tasks.js

@@ -54,7 +54,7 @@ gulp.task('pack:alliedmods', () => {
 
 gulp.task('pack:full', () => {
     const build = config.build.vanilla || config.build.reapi;
-    
+
     if (!build) {
         throw new Error('Building config not found!');
     }
@@ -69,7 +69,7 @@ gulp.task('pack:full', () => {
     };
 
     const tasks = [];
-    
+
     if (config.build.vanilla) {
         const vanillaDistDir = config.build.vanilla.destDir;
 

doc/pages/api/spell.md

@@ -37,7 +37,7 @@
 | scale      | Scale of spellball sprite.                                                        | Float             | 0.25          |
 
 ---
- 
+
 ### UTIL_HwnSpellDetonateEffect
 > Create detonation effect.
 

doc/pages/cosmetics/2016.md

@@ -6,7 +6,7 @@
 ---
 
 # Devil Horns
-- **Groups:** Mask 
+- **Groups:** Mask
 - **Unusual Color:** 120 0 200
 
 ---
@@ -19,28 +19,28 @@
 ---
 
 # Devil Wings
-- **Groups:** Back 
+- **Groups:** Back
 - **Unusual Color:** 120 0 200
 
 ---
 
 # Garlik Flank Stake
 ![](../../images/cosmetics/garlic-flank-stake.png)
-- **Groups:** Legs 
+- **Groups:** Legs
 - **Unusual Color:** 120 0 200
 
 ---
 
 # Holy Hunter
 ![](../../images/cosmetics/holy-hunter.png)
-- **Groups:** Hat 
+- **Groups:** Hat
 - **Unusual Color:** 120 0 200
 
 ---
 
 # Pumpkin
 ![](../../images/cosmetics/pumpkin.png)
-- **Groups:** Hat, Mask 
+- **Groups:** Hat, Mask
 - **Unusual Color:** 120 0 200
 
 ---