Added a a gun select system (#214)

* add intro transition * added new phone removed old phone assets * add controller support * added weapon wheel
Gdevelop-game · Apr 22, 2024 · 33a2a73 · 33a2a73
1 parent 9368b7d
commit 33a2a73
Show file tree

Hide file tree

Showing 43 changed files with 7,894 additions and 342 deletions.
diff --git a/src/assets/weapons/icons/ammo_machinegun.png b/src/assets/weapons/icons/ammo_machinegun.png
diff --git a/src/assets/weapons/icons/ammo_machinegunLauncher.png b/src/assets/weapons/icons/ammo_machinegunLauncher.png
diff --git a/src/assets/weapons/icons/ammo_pistol.png b/src/assets/weapons/icons/ammo_pistol.png
diff --git a/src/assets/weapons/icons/ammo_rocket.png b/src/assets/weapons/icons/ammo_rocket.png
diff --git a/src/assets/weapons/icons/ammo_rocketModern.png b/src/assets/weapons/icons/ammo_rocketModern.png
diff --git a/src/assets/weapons/icons/ammo_shotgun.png b/src/assets/weapons/icons/ammo_shotgun.png
diff --git a/src/assets/weapons/icons/ammo_sniper.png b/src/assets/weapons/icons/ammo_sniper.png
diff --git a/src/assets/weapons/icons/ammo_uzi.png b/src/assets/weapons/icons/ammo_uzi.png
diff --git a/src/assets/weapons/icons/bar.png b/src/assets/weapons/icons/bar.png
diff --git a/src/assets/weapons/icons/flamethrower_long.png b/src/assets/weapons/icons/flamethrower_long.png
diff --git a/src/assets/weapons/icons/flamethrower_short.png b/src/assets/weapons/icons/flamethrower_short.png
diff --git a/src/assets/weapons/icons/grenade.png b/src/assets/weapons/icons/grenade.png
diff --git a/src/assets/weapons/icons/grenadeFlash.png b/src/assets/weapons/icons/grenadeFlash.png
diff --git a/src/assets/weapons/icons/grenadeSmoke.png b/src/assets/weapons/icons/grenadeSmoke.png
diff --git a/src/assets/weapons/icons/grenadeVintage.png b/src/assets/weapons/icons/grenadeVintage.png
diff --git a/src/assets/weapons/icons/knifeRound_sharp.png b/src/assets/weapons/icons/knifeRound_sharp.png
diff --git a/src/assets/weapons/icons/knifeRound_smooth.png b/src/assets/weapons/icons/knifeRound_smooth.png
diff --git a/src/assets/weapons/icons/knife_sharp.png b/src/assets/weapons/icons/knife_sharp.png
diff --git a/src/assets/weapons/icons/knife_smooth.png b/src/assets/weapons/icons/knife_smooth.png
diff --git a/src/assets/weapons/icons/machinegun.png b/src/assets/weapons/icons/machinegun.png
diff --git a/src/assets/weapons/icons/machinegunLauncher.png b/src/assets/weapons/icons/machinegunLauncher.png
diff --git a/src/assets/weapons/icons/pistol.png b/src/assets/weapons/icons/pistol.png
diff --git a/src/assets/weapons/icons/pistolSilencer.png b/src/assets/weapons/icons/pistolSilencer.png
diff --git a/src/assets/weapons/icons/rocketlauncher.png b/src/assets/weapons/icons/rocketlauncher.png
diff --git a/src/assets/weapons/icons/rocketlauncherModern.png b/src/assets/weapons/icons/rocketlauncherModern.png
diff --git a/src/assets/weapons/icons/shotgun.png b/src/assets/weapons/icons/shotgun.png
diff --git a/src/assets/weapons/icons/shotgunShort.png b/src/assets/weapons/icons/shotgunShort.png
diff --git a/src/assets/weapons/icons/sniper.png b/src/assets/weapons/icons/sniper.png
diff --git a/src/assets/weapons/icons/uzi.png b/src/assets/weapons/icons/uzi.png
diff --git a/src/assets/weapons/icons/uziLong.png b/src/assets/weapons/icons/uziLong.png
diff --git a/src/assets/weapons/icons/uziLongSilencer.png b/src/assets/weapons/icons/uziLongSilencer.png
diff --git a/src/assets/weapons/icons/uziSilencer.png b/src/assets/weapons/icons/uziSilencer.png
diff --git a/src/eventsFunctionsExtensions/extendedvariables.json b/src/eventsFunctionsExtensions/extendedvariables.json
diff --git a/src/eventsFunctionsExtensions/gamepads.json b/src/eventsFunctionsExtensions/gamepads.json
diff --git a/src/eventsFunctionsExtensions/references.json b/src/eventsFunctionsExtensions/references.json
@@ -0,0 +1,152 @@
+{
+  "author": "Arthur Pacaud (arthuro555)",
+  "category": "",
+  "extensionNamespace": "",
+  "fullName": "Variables/References",
+  "helpPath": "",
+  "iconUrl": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0ibWRpLXZhcmlhYmxlLWJveCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGQ9Ik0xOSAzSDVDMy45IDMgMyAzLjkgMyA1VjE5QzMgMjAuMSAzLjkgMjEgNSAyMUgxOUMyMC4xIDIxIDIxIDIwLjEgMjEgMTlWNUMyMSAzLjkgMjAuMSAzIDE5IDNNNy40IDE4QzUuOSAxNi41IDUgMTQuMyA1IDEyUzUuOSA3LjUgNy40IDZMOSA2LjdDNy43IDcuOSA3IDkuOSA3IDEyUzcuNyAxNi4xIDkgMTcuM0w3LjQgMThNMTIuNyAxNUwxMS45IDEzTDEwLjUgMTVIOUwxMS4zIDExLjlMMTAgOUgxMS4zTDEyLjEgMTFMMTMuNSA5SDE1TDEyLjggMTJMMTQuMSAxNUgxMi43TTE2LjYgMThMMTUgMTcuM0MxNi4zIDE2IDE3IDE0LjEgMTcgMTJTMTYuMyA3LjkgMTUgNi43TDE2LjYgNkMxOC4xIDcuNSAxOSA5LjcgMTkgMTJTMTguMSAxNi41IDE2LjYgMThaIiAvPjwvc3ZnPg==",
+  "name": "References",
+  "previewIconUrl": "https://resources.gdevelop-app.com/assets/Icons/variable-box.svg",
+  "shortDescription": "Adds references and pointers for variables.",
+  "version": "1.0.0",
+  "description": "Adds actions to use references (variable that redirect any read/write to another variable) and pointers (unique numbers identifying a variable that can be resolved to a reference). Some usages are for callback variables in events based functions (getting a variable with a fixed name referring to a variable with a name passed as parameter), pointers to make advanced data structures like linked lists, and getting a top level variable dynamically.",
+  "origin": {
+    "identifier": "References",
+    "name": "gdevelop-extension-store"
+  },
+  "tags": [
+    "advanced",
+    "variables",
+    "reference",
+    "pointer",
+    "ref",
+    "memory",
+    "callback"
+  ],
+  "authorIds": [
+    "ZgrsWuRTAkXgeuPV9bo0zuEcA2w1"
+  ],
+  "dependencies": [],
+  "eventsFunctions": [
+    {
+      "description": "Transforms a scene variable into a reference to another scene variable.",
+      "fullName": "Create reference to scene variable",
+      "functionType": "Action",
+      "name": "CreateReference",
+      "sentence": "Make variable _PARAM1_ a reference to _PARAM2_",
+      "events": [
+        {
+          "type": "BuiltinCommonInstructions::JsCode",
+          "inlineCode": [
+            "const reference = eventsFunctionContext.getArgument(\"reference\");",
+            "const source = eventsFunctionContext.getArgument(\"source\");",
+            "",
+            "// Override each method ",
+            "for (let func of Object.getOwnPropertyNames(gdjs.Variable.prototype))",
+            "    reference[func] = gdjs.Variable.prototype[func].bind(source);",
+            ""
+          ],
+          "parameterObjects": "",
+          "useStrict": true,
+          "eventsSheetExpanded": false
+        }
+      ],
+      "parameters": [
+        {
+          "description": "The scene variable to turn into a reference",
+          "name": "reference",
+          "type": "scenevar"
+        },
+        {
+          "description": "The scene variable the reference will refer to",
+          "name": "source",
+          "type": "scenevar"
+        }
+      ],
+      "objectGroups": []
+    },
+    {
+      "description": "Transforms a scene variable into a reference to a global variable.",
+      "fullName": "Create reference to global variable",
+      "functionType": "Action",
+      "name": "CreateGlobalReference",
+      "sentence": "Make variable _PARAM1_ a reference to _PARAM2_",
+      "events": [
+        {
+          "type": "BuiltinCommonInstructions::JsCode",
+          "inlineCode": [
+            "const reference = eventsFunctionContext.getArgument(\"reference\");",
+            "const source = eventsFunctionContext.getArgument(\"source\");",
+            "",
+            "// Override each method ",
+            "for (let func of Object.getOwnPropertyNames(gdjs.Variable.prototype))",
+            "    reference[func] = gdjs.Variable.prototype[func].bind(source);",
+            ""
+          ],
+          "parameterObjects": "",
+          "useStrict": true,
+          "eventsSheetExpanded": false
+        }
+      ],
+      "parameters": [
+        {
+          "description": "The scene variable to turn into a reference",
+          "name": "reference",
+          "type": "scenevar"
+        },
+        {
+          "description": "The global variable the reference will refer to",
+          "name": "source",
+          "type": "globalvar"
+        }
+      ],
+      "objectGroups": []
+    },
+    {
+      "description": "Transforms a scene variable into a reference to an object's variable.",
+      "fullName": "Create reference to object variable",
+      "functionType": "Action",
+      "name": "CreateObjectReference",
+      "sentence": "Make variable _PARAM2_ a reference to variable _PARAM3_ of _PARAM1_",
+      "events": [
+        {
+          "type": "BuiltinCommonInstructions::JsCode",
+          "inlineCode": [
+            "const reference = eventsFunctionContext.getArgument(\"reference\");",
+            "const source = eventsFunctionContext.getArgument(\"source\");",
+            "",
+            "console.log(reference, source)",
+            "",
+            "// Override each method ",
+            "for (let func of Object.getOwnPropertyNames(gdjs.Variable.prototype))",
+            "    reference[func] = gdjs.Variable.prototype[func].bind(source);",
+            ""
+          ],
+          "parameterObjects": "",
+          "useStrict": true,
+          "eventsSheetExpanded": false
+        }
+      ],
+      "parameters": [
+        {
+          "description": "The object that possesses the variable to refer to",
+          "name": "Object",
+          "type": "objectList"
+        },
+        {
+          "description": "The scene variable to turn into a reference",
+          "name": "reference",
+          "type": "scenevar"
+        },
+        {
+          "description": "The object variable the reference will refer to",
+          "name": "source",
+          "type": "objectvar"
+        }
+      ],
+      "objectGroups": []
+    }
+  ],
+  "eventsBasedBehaviors": [],
+  "eventsBasedObjects": []
+}
diff --git a/src/externalEvents/game.json b/src/externalEvents/game.json
@@ -13,6 +13,13 @@
       "source": "",
       "type": "BuiltinCommonInstructions::Group",
       "events": [
+        {
+          "type": "BuiltinCommonInstructions::Link",
+          "include": {
+            "includeConfig": 0
+          },
+          "target": "WeaponWheel"
+        },
         {
           "type": "BuiltinCommonInstructions::Link",
           "include": {

diff --git a/src/externalEvents/player.json b/src/externalEvents/player.json
@@ -1719,11 +1719,31 @@
                   "conditions": [
                     {
                       "type": {
-                        "value": "KeyPressed"
+                        "value": "BuiltinCommonInstructions::Or"
                       },
-                      "parameters": [
-                        "",
-                        "a"
+                      "parameters": [],
+                      "subInstructions": [
+                        {
+                          "type": {
+                            "value": "KeyPressed"
+                          },
+                          "parameters": [
+                            "",
+                            "a"
+                          ]
+                        },
+                        {
+                          "type": {
+                            "value": "Gamepads::C_Axis_pushed"
+                          },
+                          "parameters": [
+                            "",
+                            "1",
+                            "\"Left\"",
+                            "\"Left\"",
+                            ""
+                          ]
+                        }
                       ]
                     }
                   ],
@@ -1747,11 +1767,31 @@
                   "conditions": [
                     {
                       "type": {
-                        "value": "KeyPressed"
+                        "value": "BuiltinCommonInstructions::Or"
                       },
-                      "parameters": [
-                        "",
-                        "d"
+                      "parameters": [],
+                      "subInstructions": [
+                        {
+                          "type": {
+                            "value": "KeyPressed"
+                          },
+                          "parameters": [
+                            "",
+                            "d"
+                          ]
+                        },
+                        {
+                          "type": {
+                            "value": "Gamepads::C_Axis_pushed"
+                          },
+                          "parameters": [
+                            "",
+                            "1",
+                            "\"Left\"",
+                            "\"Right\"",
+                            ""
+                          ]
+                        }
                       ]
                     }
                   ],
@@ -1775,11 +1815,31 @@
                   "conditions": [
                     {
                       "type": {
-                        "value": "KeyPressed"
+                        "value": "BuiltinCommonInstructions::Or"
                       },
-                      "parameters": [
-                        "",
-                        "w"
+                      "parameters": [],
+                      "subInstructions": [
+                        {
+                          "type": {
+                            "value": "KeyPressed"
+                          },
+                          "parameters": [
+                            "",
+                            "w"
+                          ]
+                        },
+                        {
+                          "type": {
+                            "value": "Gamepads::C_Axis_pushed"
+                          },
+                          "parameters": [
+                            "",
+                            "1",
+                            "\"Left\"",
+                            "\"Up\"",
+                            ""
+                          ]
+                        }
                       ]
                     }
                   ],
@@ -1803,11 +1863,31 @@
                   "conditions": [
                     {
                       "type": {
-                        "value": "KeyPressed"
+                        "value": "BuiltinCommonInstructions::Or"
                       },
-                      "parameters": [
-                        "",
-                        "s"
+                      "parameters": [],
+                      "subInstructions": [
+                        {
+                          "type": {
+                            "value": "KeyPressed"
+                          },
+                          "parameters": [
+                            "",
+                            "s"
+                          ]
+                        },
+                        {
+                          "type": {
+                            "value": "Gamepads::C_Axis_pushed"
+                          },
+                          "parameters": [
+                            "",
+                            "1",
+                            "\"Left\"",
+                            "\"Down\"",
+                            ""
+                          ]
+                        }
                       ]
                     }
                   ],