loxotron (#934)

* loxotron * lottery_fix * Update Resources/Prototypes/Entities/Objects/Misc/space_cash.yml * Update Resources/Prototypes/SS220/Catalog/Cargo/cargo_fun.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/SS220/Entities/Objects/Misc/lottery.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Textures/SS220/Objects/Fun/Lottery.rsi/meta.json Co-authored-by: Kit0vras <[email protected]> --------- Co-authored-by: Dexler <[email protected]> Co-authored-by: Kit0vras <[email protected]>
SerbiaStrong-220 · Apr 26, 2024 · af84383 · af84383
1 parent a6531a8
commit af84383
Show file tree

Hide file tree

Showing 9 changed files with 151 additions and 1 deletion.
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -208,3 +208,39 @@
   cost: 20000 #SS220 fix_cargo
   category: cargoproduct-category-name-fun
   group: market
+
+#SS220 Lottery start
+- type: cargoProduct
+  id: cargoLotteryCash
+  name: лотерея V&L
+  icon: #SS220 fix_cargo begin
+    sprite: SS220/Objects/Fun/Lottery.rsi
+    state: icon
+  #SS220 fix_cargo end
+  product: LotteryCash
+  cost: 5000
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: FunCrateLottery5
+  icon: #SS220 fix_cargo begin
+    sprite: Structures/Storage/Crates/privatecrate_secure.rsi
+    state: icon
+  #SS220 fix_cargo end
+  product: CrateCargoLottery5
+  cost: 23500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: FunCrateLottery10
+  icon: #SS220 fix_cargo begin
+    sprite: Structures/Storage/Crates/privatecrate_secure.rsi
+    state: icon
+  #SS220 fix_cargo end
+  product: CrateCargoLottery10
+  cost: 45000
+  category: cargoproduct-category-name-fun
+  group: market
+#SS220 Lottery end 
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -44,6 +44,8 @@
         prob: 0.05
       - id: BoxMRE
         prob: 0.1
+      - id: LotteryCash #SS220 Lottery
+        prob: 0.05
 
 - type: entity
   id: ClosetWallEmergencyFilledRandom
@@ -76,6 +78,8 @@
         prob: 0.05
       - id: BoxMRE
         prob: 0.1
+      - id: LotteryCash #SS220 Lottery
+        prob: 0.05
 
 - type: entity
   id: ClosetFireFilled
@@ -225,6 +229,8 @@
         - id: RandomID
           prob: 0.005
           orGroup: syndiemaintloot
+        - id: LotteryCash #SS220 Lottery
+          prob: 0.05
 
 - type: entity
   id: ClosetWallMaintenanceFilledRandom
@@ -283,6 +289,8 @@
           prob: 0.20
         - id: ModularReceiver
           prob: 0.1
+        - id: LotteryCash #SS220 Lottery
+          prob: 0.05
         # Syndicate loot
         - id: null
           prob: 0.95

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -160,6 +160,7 @@
         - WelderIndustrial
         - SheetPlasteel10
         - ClothingMaskGasExplorer
+        - LotteryCash #SS220 Lottery
       rareChance: 0.08
       prototypes:
         - FlashlightLantern

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
@@ -78,6 +78,9 @@
       - WeaponCrusherDagger
       - WeaponCrusherGlaive
       - MiningDrill
+      rarePrototypes:
+        - LotteryCash #SS220 Lottery
+      rareChance: 0.05
       offset: 0.0
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
@@ -158,6 +158,30 @@
   - type: Stack
     count: 30000
 
+#SS220-loxotron begin
+- type: entity
+  parent: SpaceCash
+  id: SpaceCash50000
+  suffix: 50000
+  components:
+  - type: Icon
+    sprite: Objects/Economy/cash.rsi
+    state: cash_1000000
+  - type: Stack
+    count: 50000
+
+- type: entity
+  parent: SpaceCash
+  id: SpaceCash100000
+  suffix: 100000
+  components:
+  - type: Icon
+    sprite: Objects/Economy/cash.rsi
+    state: cash_1000000
+  - type: Stack
+    count: 100000
+#SS220-loxotron end
+
 - type: entity
   parent: SpaceCash
   id: SpaceCash1000000

diff --git a/Resources/Prototypes/SS220/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/SS220/Catalog/Cargo/cargo_fun.yml
@@ -18,4 +18,28 @@
   - type: StorageFill
     contents:
     - id: VehicleSyndicateSegway
-    - id: VehicleKeySyndicateSegway
+    - id: VehicleKeySyndicateSegway
+
+- type: entity
+  id: CrateCargoLottery5
+  parent: CratePrivateSecure
+  name: ящик лотерейных билетов
+  description: Больше билетов - больше выигрыш! Стань миллионером уже сегодня!
+  suffix: 5 штук
+  components:
+  - type: StorageFill
+    contents:
+    - id: LotteryCash
+      amount: 5
+
+- type: entity
+  id: CrateCargoLottery10
+  parent: CrateCargoLottery5
+  name: большой ящик лотерейных билетов
+  suffix: 10 штук
+  components:
+  - type: StorageFill
+    contents:
+    - id: LotteryCash
+      amount: 10
+
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/lottery.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/lottery.yml
@@ -0,0 +1,40 @@
+- type: entity
+  id: LotteryBase
+  name: лотерея V&L
+  description: Лотерея, исполняющая мечты! Стань миллионером прямо сейчас!
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: SS220/Objects/Fun/Lottery.rsi
+    state: icon
+  - type: Item
+    size: Tiny
+
+- type: entity
+  id: LotteryCash
+  parent: [LotteryBase, BaseItem]
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: SpaceCash1000
+        orGroup: CashPool
+      - id: SpaceCash5000
+        prob: .11
+        orGroup: CashPool
+      - id: SpaceCash10000
+        prob: .055
+        orGroup: CashPool
+      - id: SpaceCash20000
+        prob: .0275
+        orGroup: CashPool
+      - id: SpaceCash50000
+        prob: .011
+        orGroup: CashPool
+      - id: SpaceCash100000
+        prob: .0055
+        orGroup: CashPool
+      - id: SpaceCash1000000
+        prob: .00055
+        orGroup: CashPool
+    sound:
+      path: /Audio/Effects/unwrap.ogg
diff --git a/Resources/Textures/SS220/Objects/Fun/Lottery.rsi/icon.png b/Resources/Textures/SS220/Objects/Fun/Lottery.rsi/icon.png
diff --git a/Resources/Textures/SS220/Objects/Fun/Lottery.rsi/meta.json b/Resources/Textures/SS220/Objects/Fun/Lottery.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+  "copyright": "Created by glek3197 (Discord) for SS220",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
+}