Added damage scaling up to 4x based on fusion team items

milesthenerd · Sep 18, 2021 · 94c2b0a · 94c2b0a
1 parent 6a426cc
commit 94c2b0a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/Configs/Default.config.gmx b/Configs/Default.config.gmx
@@ -17,10 +17,10 @@
     <option_android_arch_mipsr2sf>false</option_android_arch_mipsr2sf>
     <option_android_arch_x86>True</option_android_arch_x86>
     <option_android_build_tools_version>28.0.3</option_android_build_tools_version>
-    <option_android_build_version>0</option_android_build_version>
+    <option_android_build_version>1</option_android_build_version>
     <option_android_color_depth>0</option_android_color_depth>
     <option_android_compile_sdk_version>28</option_android_compile_sdk_version>
-    <option_android_display_name>AM2R Server</option_android_display_name>
+    <option_android_display_name>AM2R Server 1.4.1</option_android_display_name>
     <option_android_facebook_app_display_name></option_android_facebook_app_display_name>
     <option_android_facebook_appid></option_android_facebook_appid>
     <option_android_facebook_enable>0</option_android_facebook_enable>
@@ -46,7 +46,7 @@
     <option_android_lint>0</option_android_lint>
     <option_android_major_version>1</option_android_major_version>
     <option_android_min_sdk_version>14</option_android_min_sdk_version>
-    <option_android_minor_version>0</option_android_minor_version>
+    <option_android_minor_version>4</option_android_minor_version>
     <option_android_mmedia_ads>0</option_android_mmedia_ads>
     <option_android_moga>0</option_android_moga>
     <option_android_mopub_ads>0</option_android_mopub_ads>
@@ -211,7 +211,7 @@
     <option_changeresolution>false</option_changeresolution>
     <option_closeesc>true</option_closeesc>
     <option_colordepth>0</option_colordepth>
-    <option_display_name>AM2R Server 1.4</option_display_name>
+    <option_display_name>AM2R Server 1.4.1</option_display_name>
     <option_displayerrors>True</option_displayerrors>
     <option_ecma>0</option_ecma>
     <option_facebook_app_display_name></option_facebook_app_display_name>
@@ -351,7 +351,7 @@
     <option_ios_texture_page>1024</option_ios_texture_page>
     <option_ios_use_test_ads>false</option_ios_use_test_ads>
     <option_lastchanged></option_lastchanged>
-    <option_linux_display_name>AM2R Server 1.4</option_linux_display_name>
+    <option_linux_display_name>AM2R Server 1.4.1</option_linux_display_name>
     <option_linux_enable_steam>0</option_linux_enable_steam>
     <option_linux_fullscreen>0</option_linux_fullscreen>
     <option_linux_homepage></option_linux_homepage>
@@ -367,9 +367,9 @@
     <option_linux_steam_app_id>0</option_linux_steam_app_id>
     <option_linux_sync>0</option_linux_sync>
     <option_linux_texture_page>2048</option_linux_texture_page>
-    <option_linux_version_build>0</option_linux_version_build>
+    <option_linux_version_build>1</option_linux_version_build>
     <option_linux_version_major>1</option_linux_version_major>
-    <option_linux_version_minor>3</option_linux_version_minor>
+    <option_linux_version_minor>4</option_linux_version_minor>
     <option_loadalpha>255</option_loadalpha>
     <option_loadimage>nil</option_loadimage>
     <option_loadtransparent>false</option_loadtransparent>
@@ -503,9 +503,9 @@
     <option_version_copyright></option_version_copyright>
     <option_version_description></option_version_description>
     <option_version_major>1</option_version_major>
-    <option_version_minor>3</option_version_minor>
+    <option_version_minor>4</option_version_minor>
     <option_version_product></option_version_product>
-    <option_version_release>0</option_version_release>
+    <option_version_release>1</option_version_release>
     <option_win8_advertising_appid></option_win8_advertising_appid>
     <option_win8_advertising_enable>0</option_win8_advertising_enable>
     <option_win8_advertising_key></option_win8_advertising_key>
@@ -586,11 +586,11 @@
     <option_windows_enable_steam>0</option_windows_enable_steam>
     <option_windows_game_icon>Configs\Default\windows\runner_icon.ico</option_windows_game_icon>
     <option_windows_license>Configs\Default\windows\License.txt</option_windows_license>
-    <option_windows_mainor_version>3</option_windows_mainor_version>
+    <option_windows_mainor_version>4</option_windows_mainor_version>
     <option_windows_major_version>1</option_windows_major_version>
     <option_windows_nsis_file>Configs\Default\windows\RunnerInstaller.nsi</option_windows_nsis_file>
     <option_windows_product_info></option_windows_product_info>
-    <option_windows_release_version>0</option_windows_release_version>
+    <option_windows_release_version>1</option_windows_release_version>
     <option_windows_runner_finished>Configs\Default\windows\Runner_finish.bmp</option_windows_runner_finished>
     <option_windows_runner_header>Configs\Default\windows\Runner_header.bmp</option_windows_runner_header>
     <option_windows_save_location>0</option_windows_save_location>

diff --git a/objects/oServer.object.gmx b/objects/oServer.object.gmx
@@ -117,6 +117,8 @@ syncedELM = 0;
 posMapModified = false;
 
 global.lobbyLocked = false;
+
+global.damageMult = 0;
 </string>
           </argument>
         </arguments>
@@ -211,13 +213,15 @@ buffer_write(buffer, buffer_u8, 113);
 buffer_write(buffer, buffer_u8, global.saxmode);
 buffer_write(buffer, buffer_u8, global.lobbyLocked);
 buffer_write(buffer, buffer_u8, samCount);
+buffer_write(buffer, buffer_string, string(global.damageMult));
 var bufferSize = buffer_tell(buffer);
 buffer_seek(buffer, buffer_seek_start, 0);
 buffer_write(buffer, buffer_s32, bufferSize);
 buffer_write(buffer, buffer_u8, 113);
 buffer_write(buffer, buffer_u8, global.saxmode);
 buffer_write(buffer, buffer_u8, global.lobbyLocked);
 buffer_write(buffer, buffer_u8, samCount);
+buffer_write(buffer, buffer_string, string(global.damageMult));
 for(var i=0; i&lt;sockets; i++){
     network_send_packet(playerList[| i], buffer, buffer_tell(buffer));
 }

diff --git a/scripts/check_items.gml b/scripts/check_items.gml
@@ -48,6 +48,16 @@ if(mtankCount != global.mtanks){
     global.mtanks = mtankCount;
 }
 
+var itemCount = 0;
+for(var h=0; h<array_length_1d(global.itemSamus); h++){
+    var val = global.itemSamus[h];
+    if(val == 1 && h != 1){
+        itemCount++;
+    }
+}
+
+global.damageMult = (itemCount / 88) * 3;
+
 //SAX
 
 var etankCount = 0;