Browse Source

Some more fixes (#116)

* stone stack, sprite fix for braziers

* deepwater in mapgeneration

* anvil and kiln recipes, fuel burn (attempted) fix

* burnables

* weapon sounds of sprites

* fixes missing plant sprites, plant yelds
Taislin 1 năm trước cách đây
mục cha
commit
0c1cde2639
100 tập tin đã thay đổi với 79 bổ sung13 xóa
  1. 2 2
      Content.Server/Civ14/Rocks/FlintRockSystem.cs
  2. BIN
      Resources/Audio/Weapons/Guns/Fire/2a72.ogg
  3. BIN
      Resources/Audio/Weapons/Guns/Fire/30mm.ogg
  4. BIN
      Resources/Audio/Weapons/Guns/Fire/32ACP.ogg
  5. BIN
      Resources/Audio/Weapons/Guns/Fire/44Mag.ogg
  6. BIN
      Resources/Audio/Weapons/Guns/Fire/45ACP.ogg
  7. BIN
      Resources/Audio/Weapons/Guns/Fire/762x25.ogg
  8. BIN
      Resources/Audio/Weapons/Guns/Fire/9mm.ogg
  9. BIN
      Resources/Audio/Weapons/Guns/Fire/AK74.ogg
  10. BIN
      Resources/Audio/Weapons/Guns/Fire/AKM-SD.ogg
  11. BIN
      Resources/Audio/Weapons/Guns/Fire/AKM.ogg
  12. BIN
      Resources/Audio/Weapons/Guns/Fire/BarrettM99.ogg
  13. BIN
      Resources/Audio/Weapons/Guns/Fire/Crossbow.ogg
  14. BIN
      Resources/Audio/Weapons/Guns/Fire/DP28.ogg
  15. BIN
      Resources/Audio/Weapons/Guns/Fire/Deagle-SD.ogg
  16. BIN
      Resources/Audio/Weapons/Guns/Fire/Garand.ogg
  17. BIN
      Resources/Audio/Weapons/Guns/Fire/Glock17-SD.ogg
  18. BIN
      Resources/Audio/Weapons/Guns/Fire/Gyrza-SD.ogg
  19. BIN
      Resources/Audio/Weapons/Guns/Fire/Kar98k.ogg
  20. BIN
      Resources/Audio/Weapons/Guns/Fire/M14.ogg
  21. BIN
      Resources/Audio/Weapons/Guns/Fire/M14Alt.ogg
  22. BIN
      Resources/Audio/Weapons/Guns/Fire/M1918A2.ogg
  23. BIN
      Resources/Audio/Weapons/Guns/Fire/M1919.ogg
  24. BIN
      Resources/Audio/Weapons/Guns/Fire/M1Carbine.ogg
  25. BIN
      Resources/Audio/Weapons/Guns/Fire/M2HB.ogg
  26. BIN
      Resources/Audio/Weapons/Guns/Fire/M3A1.ogg
  27. BIN
      Resources/Audio/Weapons/Guns/Fire/M4A1.ogg
  28. BIN
      Resources/Audio/Weapons/Guns/Fire/M60.ogg
  29. BIN
      Resources/Audio/Weapons/Guns/Fire/M79.ogg
  30. BIN
      Resources/Audio/Weapons/Guns/Fire/MG34.ogg
  31. BIN
      Resources/Audio/Weapons/Guns/Fire/MG42.ogg
  32. BIN
      Resources/Audio/Weapons/Guns/Fire/MP5.ogg
  33. BIN
      Resources/Audio/Weapons/Guns/Fire/Maxim.ogg
  34. BIN
      Resources/Audio/Weapons/Guns/Fire/Minimi.ogg
  35. BIN
      Resources/Audio/Weapons/Guns/Fire/Mosin.ogg
  36. BIN
      Resources/Audio/Weapons/Guns/Fire/Nambu.ogg
  37. BIN
      Resources/Audio/Weapons/Guns/Fire/PDW.ogg
  38. BIN
      Resources/Audio/Weapons/Guns/Fire/RifleSuppressed.ogg
  39. BIN
      Resources/Audio/Weapons/Guns/Fire/SKS.ogg
  40. BIN
      Resources/Audio/Weapons/Guns/Fire/SVD.ogg
  41. BIN
      Resources/Audio/Weapons/Guns/Fire/Springfield.ogg
  42. BIN
      Resources/Audio/Weapons/Guns/Fire/Type100.ogg
  43. BIN
      Resources/Audio/Weapons/Guns/Fire/Type92.ogg
  44. BIN
      Resources/Audio/Weapons/Guns/Fire/Vickers.ogg
  45. BIN
      Resources/Audio/Weapons/Guns/Fire/assault_rifle.ogg
  46. BIN
      Resources/Audio/Weapons/Guns/Fire/battle_rifle.ogg
  47. BIN
      Resources/Audio/Weapons/Guns/Fire/blasterdc1.ogg
  48. BIN
      Resources/Audio/Weapons/Guns/Fire/blasterdc2.ogg
  49. BIN
      Resources/Audio/Weapons/Guns/Fire/blasterdl44.ogg
  50. BIN
      Resources/Audio/Weapons/Guns/Fire/blasterdl442.ogg
  51. BIN
      Resources/Audio/Weapons/Guns/Fire/blasterdl443.ogg
  52. BIN
      Resources/Audio/Weapons/Guns/Fire/blastere5sniper.ogg
  53. BIN
      Resources/Audio/Weapons/Guns/Fire/blasterimperial.ogg
  54. BIN
      Resources/Audio/Weapons/Guns/Fire/blasterimperial2.ogg
  55. BIN
      Resources/Audio/Weapons/Guns/Fire/blasterrebel.ogg
  56. BIN
      Resources/Audio/Weapons/Guns/Fire/bushmaster35.ogg
  57. BIN
      Resources/Audio/Weapons/Guns/Fire/dcb2.ogg
  58. BIN
      Resources/Audio/Weapons/Guns/Fire/deagle.ogg
  59. BIN
      Resources/Audio/Weapons/Guns/Fire/flaregun.ogg
  60. BIN
      Resources/Audio/Weapons/Guns/Fire/fnfal.ogg
  61. BIN
      Resources/Audio/Weapons/Guns/Fire/heavy_rifle.ogg
  62. BIN
      Resources/Audio/Weapons/Guns/Fire/hpistol.ogg
  63. BIN
      Resources/Audio/Weapons/Guns/Fire/laserrifle.ogg
  64. BIN
      Resources/Audio/Weapons/Guns/Fire/lasgun.ogg
  65. BIN
      Resources/Audio/Weapons/Guns/Fire/mp40.ogg
  66. BIN
      Resources/Audio/Weapons/Guns/Fire/musket.ogg
  67. BIN
      Resources/Audio/Weapons/Guns/Fire/panzershreck.ogg
  68. BIN
      Resources/Audio/Weapons/Guns/Fire/piatfire.ogg
  69. BIN
      Resources/Audio/Weapons/Guns/Fire/pistol.ogg
  70. BIN
      Resources/Audio/Weapons/Guns/Fire/ptrd.ogg
  71. BIN
      Resources/Audio/Weapons/Guns/Fire/revolver.ogg
  72. BIN
      Resources/Audio/Weapons/Guns/Fire/rifle.ogg
  73. BIN
      Resources/Audio/Weapons/Guns/Fire/rpg7.ogg
  74. BIN
      Resources/Audio/Weapons/Guns/Fire/shotgun.ogg
  75. BIN
      Resources/Audio/Weapons/Guns/Fire/silenced_pistol.ogg
  76. BIN
      Resources/Audio/Weapons/Guns/Fire/smg.ogg
  77. BIN
      Resources/Audio/Weapons/Guns/Fire/stg.ogg
  78. BIN
      Resources/Audio/Weapons/Guns/Fire/tec9.ogg
  79. BIN
      Resources/Audio/Weapons/Guns/Fire/thompson.ogg
  80. BIN
      Resources/Audio/Weapons/Guns/Fire/winchester.ogg
  81. 1 1
      Resources/Maps/civ/nomads_classic.yml
  82. 3 0
      Resources/Prototypes/Civ14/Entities/Objects/Materials/civ_materials.yml
  83. 6 6
      Resources/Prototypes/Civ14/Entities/Objects/Specific/Farming/plants.yml
  84. 2 2
      Resources/Prototypes/Civ14/Recipes/Construction/metallurgy.yml
  85. 2 2
      Resources/Prototypes/Entities/Objects/Decoration/flora.yml
  86. 3 0
      Resources/Prototypes/Entities/Objects/Materials/ore.yml
  87. 3 0
      Resources/Prototypes/tags.yml
  88. BIN
      Resources/Textures/Civ14/Weapons/Guns/A280.rsi/A280.png
  89. BIN
      Resources/Textures/Civ14/Weapons/Guns/A280.rsi/inhand-left.png
  90. BIN
      Resources/Textures/Civ14/Weapons/Guns/A280.rsi/inhand-right.png
  91. BIN
      Resources/Textures/Civ14/Weapons/Guns/A280.rsi/open.png
  92. BIN
      Resources/Textures/Civ14/Weapons/Guns/DC-15 dualwield_r.rsi/DC-15 dualwield_r.png
  93. BIN
      Resources/Textures/Civ14/Weapons/Guns/DC-15 dualwield_r.rsi/icon.png
  94. 19 0
      Resources/Textures/Civ14/Weapons/Guns/DC-15 dualwield_r.rsi/meta.json
  95. BIN
      Resources/Textures/Civ14/Weapons/Guns/DC-15 inhand_r.rsi/DC-15 inhand_r.png
  96. BIN
      Resources/Textures/Civ14/Weapons/Guns/DC-15 inhand_r.rsi/icon.png
  97. 19 0
      Resources/Textures/Civ14/Weapons/Guns/DC-15 inhand_r.rsi/meta.json
  98. BIN
      Resources/Textures/Civ14/Weapons/Guns/DC-15 onback_r.rsi/DC-15 onback_r.png
  99. BIN
      Resources/Textures/Civ14/Weapons/Guns/DC-15 onback_r.rsi/icon.png
  100. 19 0
      Resources/Textures/Civ14/Weapons/Guns/DC-15 onback_r.rsi/meta.json

+ 2 - 2
Content.Server/Civ14/Rocks/FlintRockSystem.cs

@@ -32,7 +32,7 @@ public override void Initialize()
 
     private void OnMapInit(EntityUid uid, FlintRockComponent component, MapInitEvent args)
     {
-        component.CurrentFlints = Random.Next(0, component.MaxFlints + 1);
+        component.CurrentFlints = Random.Next(1, component.MaxFlints + 1);
     }
 
     public override void Update(float frameTime)
@@ -108,4 +108,4 @@ private void OnExamined(EntityUid uid, FlintRockComponent component, ExaminedEve
             args.PushMarkup(message);
         }
     }
-}
+}

BIN
Resources/Audio/Weapons/Guns/Fire/2a72.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/30mm.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/32ACP.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/44Mag.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/45ACP.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/762x25.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/9mm.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/AK74.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/AKM-SD.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/AKM.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/BarrettM99.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/Crossbow.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/DP28.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/Deagle-SD.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/Garand.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/Glock17-SD.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/Gyrza-SD.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/Kar98k.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/M14.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/M14Alt.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/M1918A2.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/M1919.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/M1Carbine.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/M2HB.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/M3A1.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/M4A1.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/M60.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/M79.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/MG34.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/MG42.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/MP5.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/Maxim.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/Minimi.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/Mosin.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/Nambu.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/PDW.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/RifleSuppressed.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/SKS.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/SVD.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/Springfield.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/Type100.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/Type92.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/Vickers.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/assault_rifle.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/battle_rifle.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/blasterdc1.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/blasterdc2.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/blasterdl44.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/blasterdl442.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/blasterdl443.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/blastere5sniper.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/blasterimperial.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/blasterimperial2.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/blasterrebel.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/bushmaster35.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/dcb2.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/deagle.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/flaregun.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/fnfal.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/heavy_rifle.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/hpistol.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/laserrifle.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/lasgun.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/mp40.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/musket.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/panzershreck.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/piatfire.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/pistol.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/ptrd.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/revolver.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/rifle.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/rpg7.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/shotgun.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/silenced_pistol.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/smg.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/stg.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/tec9.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/thompson.ogg


BIN
Resources/Audio/Weapons/Guns/Fire/winchester.ogg


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
Resources/Maps/civ/nomads_classic.yml


+ 3 - 0
Resources/Prototypes/Civ14/Entities/Objects/Materials/civ_materials.yml

@@ -22,6 +22,9 @@
     - type: Tag
       tags:
         - RawMaterial
+        - Burnable
+    - type: BurnFuel
+      burnTime: 1
 
 - type: entity
   parent: MaterialStraw

+ 6 - 6
Resources/Prototypes/Civ14/Entities/Objects/Specific/Farming/plants.yml

@@ -32,13 +32,13 @@
   plantRsi: Objects/Specific/Hydroponics/spacemans_trumpet.rsi
   packetPrototype: ComfreySeedsCiv
   productPrototypes:
-    - HealingHerbs
+    - ComfreyHealingHerbs
   lifespan: 20
   maturation: 8
   production: 3
   yield: 3
   potency: 10
-  growthStages: 5
+  growthStages: 4
   waterConsumption: 0.60
   chemicals:
     Bruizine:
@@ -54,7 +54,7 @@
   plantRsi: Civ14/Objects/Farming/yarrow.rsi
   packetPrototype: YarrowSeedsCiv
   productPrototypes:
-    - HealingHerbs
+    - YarrowHealingHerbs
   lifespan: 20
   maturation: 8
   production: 3
@@ -76,7 +76,7 @@
   plantRsi: Civ14/Objects/Farming/elderflower.rsi
   packetPrototype: ElderflowerSeedsCiv
   productPrototypes:
-    - HealingHerbs
+    - ElderflowerHealingHerbs
   lifespan: 22
   maturation: 10
   production: 3
@@ -98,13 +98,13 @@
   plantRsi: Objects/Specific/Hydroponics/galaxythistle.rsi
   packetPrototype: MilkThistleSeedsCiv
   productPrototypes:
-    - HealingHerbs
+    - MilkThistleHealingHerbs
   lifespan: 15
   maturation: 6
   production: 3
   yield: 3
   potency: 10
-  growthStages: 5
+  growthStages: 3
   waterConsumption: 0.60
   chemicals:
     Dylovene:

+ 2 - 2
Resources/Prototypes/Civ14/Recipes/Construction/metallurgy.yml

@@ -61,7 +61,7 @@
     - !type:TileNotBlocked
 
 - type: constructionGraph
-  id: StoneAnvil
+  id: AnvilStone
   start: start
   graph:
     - node: start
@@ -72,7 +72,7 @@
               amount: 20
               doAfter: 15
     - node: end
-      entity: StoneAnvil
+      entity: AnvilStone
 
 - type: construction
   name: stone anvil

+ 2 - 2
Resources/Prototypes/Entities/Objects/Decoration/flora.yml

@@ -83,8 +83,8 @@
             - !type:SpawnEntitiesBehavior
               spawn:
                 MaterialWoodPlank1:
-                  min: 4
-                  max: 5
+                  min: 7
+                  max: 8
     - type: TreeBranches
 
 - type: entity

+ 3 - 0
Resources/Prototypes/Entities/Objects/Materials/ore.yml

@@ -320,6 +320,9 @@
     - type: Sprite
       state: coal
     - type: Material
+    - type: Tag
+      tags:
+        - Burnable
     - type: Extractable
       grindableSolutionName: coal
     - type: SolutionContainerManager

+ 3 - 0
Resources/Prototypes/tags.yml

@@ -183,6 +183,9 @@
 - type: Tag
   id: Burnt
 
+- type: Tag
+  id: Burnable
+
 - type: Tag
   id: Bun
 

BIN
Resources/Textures/Civ14/Weapons/Guns/A280.rsi/A280.png


BIN
Resources/Textures/Civ14/Weapons/Guns/A280.rsi/inhand-left.png


BIN
Resources/Textures/Civ14/Weapons/Guns/A280.rsi/inhand-right.png


BIN
Resources/Textures/Civ14/Weapons/Guns/A280.rsi/open.png


BIN
Resources/Textures/Civ14/Weapons/Guns/DC-15 dualwield_r.rsi/DC-15 dualwield_r.png


BIN
Resources/Textures/Civ14/Weapons/Guns/DC-15 dualwield_r.rsi/icon.png


+ 19 - 0
Resources/Textures/Civ14/Weapons/Guns/DC-15 dualwield_r.rsi/meta.json

@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "AGPL-3.0",
+  "copyright": "Exported from https://github.com/civ13/civ13",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "DC-15 dualwield_r",
+      "directions": 4
+    },
+    {
+      "name": "icon",
+      "directions": 4
+    }
+  ]
+}

BIN
Resources/Textures/Civ14/Weapons/Guns/DC-15 inhand_r.rsi/DC-15 inhand_r.png


BIN
Resources/Textures/Civ14/Weapons/Guns/DC-15 inhand_r.rsi/icon.png


+ 19 - 0
Resources/Textures/Civ14/Weapons/Guns/DC-15 inhand_r.rsi/meta.json

@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "AGPL-3.0",
+  "copyright": "Exported from https://github.com/civ13/civ13",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "DC-15 inhand_r",
+      "directions": 4
+    },
+    {
+      "name": "icon",
+      "directions": 4
+    }
+  ]
+}

BIN
Resources/Textures/Civ14/Weapons/Guns/DC-15 onback_r.rsi/DC-15 onback_r.png


BIN
Resources/Textures/Civ14/Weapons/Guns/DC-15 onback_r.rsi/icon.png


+ 19 - 0
Resources/Textures/Civ14/Weapons/Guns/DC-15 onback_r.rsi/meta.json

@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "AGPL-3.0",
+  "copyright": "Exported from https://github.com/civ13/civ13",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "DC-15 onback_r",
+      "directions": 4
+    },
+    {
+      "name": "icon",
+      "directions": 4
+    }
+  ]
+}

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác